TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch multi_allow_powerup_text to [][] from *[]

Browse source
This commit is contained in:
Kp 2013-11-28 02:09:30 +00:00
parent 5d1769cd2c
commit 3e2c0b5e1b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/multi.h
View file

@ -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];

2
similar/main/multi.cpp
View file

@ -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)