From 6e53b6fbd4e68371ea5e2994768e750a44debb74 Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 16 Jun 2021 19:43:31 +1000 Subject: [PATCH] Extra announcements: Don't read invalid memory, make IDs consistent --- src/Chat.c | 2 +- src/Chat.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Chat.c b/src/Chat.c index f40aac1ad..e06a36d89 100644 --- a/src/Chat.c +++ b/src/Chat.c @@ -19,7 +19,7 @@ #include "Options.h" #include "Drawer2D.h" -static char msgs[10][STRING_SIZE]; +static char msgs[12][STRING_SIZE]; cc_string Chat_Status[4] = { String_FromArray(msgs[0]), String_FromArray(msgs[1]), String_FromArray(msgs[2]), String_FromArray(msgs[3]) }; cc_string Chat_BottomRight[3] = { String_FromArray(msgs[4]), String_FromArray(msgs[5]), String_FromArray(msgs[6]) }; cc_string Chat_ClientStatus[2] = { String_FromArray(msgs[7]), String_FromArray(msgs[8]) }; diff --git a/src/Chat.h b/src/Chat.h index 3619543c4..0e8af2c43 100644 --- a/src/Chat.h +++ b/src/Chat.h @@ -17,8 +17,8 @@ enum MsgType { MSG_TYPE_BOTTOMRIGHT_2 = 12, MSG_TYPE_BOTTOMRIGHT_3 = 13, MSG_TYPE_ANNOUNCEMENT = 100, - MSG_TYPE_BIGANNOUNCEMENT = 150, - MSG_TYPE_SMALLANNOUNCEMENT = 200, + MSG_TYPE_BIGANNOUNCEMENT = 101, + MSG_TYPE_SMALLANNOUNCEMENT = 102, MSG_TYPE_CLIENTSTATUS_1 = 256, /* Cuboid messages */ MSG_TYPE_CLIENTSTATUS_2 = 257 /* Tab list matching names */ };