From 3e2c0b5e1b090cbdaa44844badb35a0de7a2d532 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 28 Nov 2013 02:09:30 +0000 Subject: [PATCH] Switch multi_allow_powerup_text to [][] from *[] --- common/main/multi.h | 4 +++- similar/main/multi.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/main/multi.h b/common/main/multi.h index 9ede1dd64..9fa6e6ae7 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -224,10 +224,12 @@ for_each_multiplayer_command(enum {, define_multiplayer_command, }); #define MULTI_GAME_TYPE_COUNT 8 #if defined(DXX_BUILD_DESCENT_I) #define MULTI_GAME_NAME_LENGTH 13 +#define MULTI_ALLOW_POWERUP_TEXT_LENGTH 18 #define MULTI_ALLOW_POWERUP_MAX 12 #define D2X_MP_NETFLAGS(VALUE) #elif defined(DXX_BUILD_DESCENT_II) #define MULTI_GAME_NAME_LENGTH 17 +#define MULTI_ALLOW_POWERUP_TEXT_LENGTH 21 #define MULTI_ALLOW_POWERUP_MAX 26 #define D2X_MP_NETFLAGS(VALUE) \ VALUE(NETFLAG_DOSUPERLASER, "Super lasers") \ @@ -256,7 +258,7 @@ enum { for_each_netflag_value(define_netflag_bit_enum) }; enum { for_each_netflag_value(define_netflag_bit_mask) }; enum { NETFLAG_DOPOWERUP = 0 for_each_netflag_value(define_netflag_powerup_mask) }; -extern const char *const multi_allow_powerup_text[MULTI_ALLOW_POWERUP_MAX]; +extern const char multi_allow_powerup_text[MULTI_ALLOW_POWERUP_MAX][MULTI_ALLOW_POWERUP_TEXT_LENGTH]; extern const char GMNames[MULTI_GAME_TYPE_COUNT][MULTI_GAME_NAME_LENGTH]; extern const char GMNamesShrt[MULTI_GAME_TYPE_COUNT][8]; diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index d666f798a..e216376a3 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -206,7 +206,7 @@ char PowerupsInMine[MAX_POWERUP_TYPES],MaxPowerupsAllowed[MAX_POWERUP_TYPES]; const char RankStrings[10][14]={"(unpatched) ","Cadet ","Ensign ","Lieutenant ","Lt.Commander ", "Commander ","Captain ","Vice Admiral ","Admiral ","Demigod "}; -const char *const multi_allow_powerup_text[MULTI_ALLOW_POWERUP_MAX] = +const char multi_allow_powerup_text[MULTI_ALLOW_POWERUP_MAX][MULTI_ALLOW_POWERUP_TEXT_LENGTH] = { #define define_netflag_string(NAME,STR) STR, for_each_netflag_value(define_netflag_string)