From fef4d12d685b06aaf4006a2a2159f4f37126e34c Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Sat, 5 Mar 2011 19:20:37 +0000 Subject: [PATCH] Refactoring patch by DevHC --- code/botlib/be_aas_reach.c | 6 ++--- code/cgame/cg_consolecmds.c | 4 +-- code/cgame/cg_main.c | 2 +- code/cgame/cg_servercmds.c | 2 +- code/game/bg_misc.c | 2 +- code/game/g_active.c | 2 +- code/game/g_cmds.c | 2 +- code/game/g_combat.c | 2 +- code/game/g_main.c | 2 +- code/game/g_public.h | 7 ++--- code/q3_ui/ui_main.c | 2 +- code/q3_ui/ui_video.c | 6 ++--- code/qcommon/files.c | 2 +- code/qcommon/msg.c | 8 +++--- code/qcommon/q_shared.h | 2 +- code/qcommon/vm.c | 6 ++--- code/qcommon/vm_powerpc.c | 4 +-- code/qcommon/vm_powerpc_asm.c | 6 +---- code/qcommon/vm_sparc.c | 4 +-- code/qcommon/vm_x86_64_assembler.c | 12 ++++----- code/renderer/tr_init.c | 2 +- code/renderer/tr_local.h | 3 --- code/renderer/tr_shader.c | 5 +--- code/sdl/sdl_input.c | 8 +++--- code/sdl/sdl_snd.c | 3 +-- code/server/sv_ccmds.c | 4 +-- code/server/sv_client.c | 2 +- code/server/sv_game.c | 2 +- code/ui/ui_local.h | 1 - code/ui/ui_main.c | 41 ++++++------------------------ code/ui/ui_shared.c | 4 +-- 31 files changed, 60 insertions(+), 98 deletions(-) diff --git a/code/botlib/be_aas_reach.c b/code/botlib/be_aas_reach.c index 95ead20c..291325be 100644 --- a/code/botlib/be_aas_reach.c +++ b/code/botlib/be_aas_reach.c @@ -1556,7 +1556,7 @@ int AAS_Reachability_Step_Barrier_WaterJump_WalkOffLedge(int area1num, int area2 if (AAS_PointAreaNum(trace.endpos) == area2num) { //if not going through a cluster portal - numareas = AAS_TraceAreas(start, end, areas, NULL, sizeof(areas) / sizeof(int)); + numareas = AAS_TraceAreas(start, end, areas, NULL, ARRAY_LEN(areas)); for (i = 0; i < numareas; i++) if (AAS_AreaClusterPortal(areas[i])) break; @@ -2311,7 +2311,7 @@ int AAS_Reachability_Jump(int area1num, int area2num) //because the predicted jump could have rushed through the area VectorMA(move.endpos, -64, dir, teststart); teststart[2] += 1; - numareas = AAS_TraceAreas(move.endpos, teststart, areas, NULL, sizeof(areas) / sizeof(int)); + numareas = AAS_TraceAreas(move.endpos, teststart, areas, NULL, ARRAY_LEN(areas)); for (j = 0; j < numareas; j++) { if (areas[j] == area2num) @@ -4254,7 +4254,7 @@ void AAS_Reachability_WalkOffLedge(int areanum) break; } //end if //if not going through a cluster portal - numareas = AAS_TraceAreas(mid, testend, areas, NULL, sizeof(areas) / sizeof(int)); + numareas = AAS_TraceAreas(mid, testend, areas, NULL, ARRAY_LEN(areas)); for (p = 0; p < numareas; p++) if (AAS_AreaClusterPortal(areas[p])) break; diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c index c8f80190..c0421b56 100644 --- a/code/cgame/cg_consolecmds.c +++ b/code/cgame/cg_consolecmds.c @@ -518,7 +518,7 @@ qboolean CG_ConsoleCommand( void ) { cmd = CG_Argv(0); - for ( i = 0 ; i < sizeof( commands ) / sizeof( commands[0] ) ; i++ ) { + for ( i = 0 ; i < ARRAY_LEN( commands ) ; i++ ) { if ( !Q_stricmp( cmd, commands[i].cmd ) ) { commands[i].function(); return qtrue; @@ -540,7 +540,7 @@ so it can perform tab completion void CG_InitConsoleCommands( void ) { int i; - for ( i = 0 ; i < sizeof( commands ) / sizeof( commands[0] ) ; i++ ) { + for ( i = 0 ; i < ARRAY_LEN( commands ) ; i++ ) { trap_AddCommand( commands[i].cmd ); } diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 6d559933..bdd5fb00 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -316,7 +316,7 @@ static cvarTable_t cvarTable[] = { // { &cg_pmove_fixed, "cg_pmove_fixed", "0", CVAR_USERINFO | CVAR_ARCHIVE } }; -static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); +static int cvarTableSize = ARRAY_LEN( cvarTable ); /* ================= diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c index a38136b7..2c7a0747 100644 --- a/code/cgame/cg_servercmds.c +++ b/code/cgame/cg_servercmds.c @@ -44,7 +44,7 @@ static const orderTask_t validOrders[] = { { VOICECHAT_FOLLOWFLAGCARRIER, TEAMTASK_ESCORT } }; -static const int numValidOrders = sizeof(validOrders) / sizeof(orderTask_t); +static const int numValidOrders = ARRAY_LEN(validOrders); #ifdef MISSIONPACK static int CG_ValidOrder(const char *p) { diff --git a/code/game/bg_misc.c b/code/game/bg_misc.c index 2589748f..597b4928 100644 --- a/code/game/bg_misc.c +++ b/code/game/bg_misc.c @@ -920,7 +920,7 @@ Only in One Flag CTF games {NULL} }; -int bg_numItems = sizeof(bg_itemlist) / sizeof(bg_itemlist[0]) - 1; +int bg_numItems = ARRAY_LEN( bg_itemlist ) - 1; /* diff --git a/code/game/g_active.c b/code/game/g_active.c index aa48c80e..4bec0a73 100644 --- a/code/game/g_active.c +++ b/code/game/g_active.c @@ -469,7 +469,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) { if( bg_itemlist[client->ps.stats[STAT_PERSISTANT_POWERUP]].giTag == PW_AMMOREGEN ) { int w, max, inc, t, i; int weapList[]={WP_MACHINEGUN,WP_SHOTGUN,WP_GRENADE_LAUNCHER,WP_ROCKET_LAUNCHER,WP_LIGHTNING,WP_RAILGUN,WP_PLASMAGUN,WP_BFG,WP_NAILGUN,WP_PROX_LAUNCHER,WP_CHAINGUN}; - int weapCount = sizeof(weapList) / sizeof(int); + int weapCount = ARRAY_LEN( weapList ); // for (i = 0; i < weapCount; i++) { w = weapList[i]; diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c index 5c747bd8..6185c2a5 100644 --- a/code/game/g_cmds.c +++ b/code/game/g_cmds.c @@ -1158,7 +1158,7 @@ void Cmd_GameCommand_f( gentity_t *ent ) { if ( player < 0 || player >= MAX_CLIENTS ) { return; } - if ( order < 0 || order > sizeof(gc_orders)/sizeof(char *) ) { + if ( order < 0 || order > ARRAY_LEN( gc_orders ) ) { return; } G_Say( ent, &g_entities[player], SAY_TELL, gc_orders[order] ); diff --git a/code/game/g_combat.c b/code/game/g_combat.c index 65386567..bc71acc8 100644 --- a/code/game/g_combat.c +++ b/code/game/g_combat.c @@ -486,7 +486,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int killerName = ""; } - if ( meansOfDeath < 0 || meansOfDeath >= sizeof( modNames ) / sizeof( modNames[0] ) ) { + if ( meansOfDeath < 0 || meansOfDeath >= ARRAY_LEN( modNames ) ) { obit = ""; } else { obit = modNames[meansOfDeath]; diff --git a/code/game/g_main.c b/code/game/g_main.c index 41fa3fe9..963355ff 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -181,7 +181,7 @@ static cvarTable_t gameCvarTable[] = { }; -static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[0] ); +static int gameCvarTableSize = ARRAY_LEN( gameCvarTable ); void G_InitGame( int levelTime, int randomSeed, int restart ); diff --git a/code/game/g_public.h b/code/game/g_public.h index ab0aac36..f56a9e1c 100644 --- a/code/game/g_public.h +++ b/code/game/g_public.h @@ -54,7 +54,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA typedef struct { - entityState_t s; // communicated by server to clients + entityState_t unused; // apparently this field was put here accidentally + // (and is kept only for compatibility, as a struct pad) qboolean linked; // qfalse if not in any good cluster int linkcount; @@ -83,8 +84,8 @@ typedef struct { // when a trace call is made and passEntityNum != ENTITYNUM_NONE, // an ent will be excluded from testing if: // ent->s.number == passEntityNum (don't interact with self) - // ent->s.ownerNum = passEntityNum (don't interact with your own missiles) - // entity[ent->s.ownerNum].ownerNum = passEntityNum (don't interact with other missiles from owner) + // ent->r.ownerNum == passEntityNum (don't interact with your own missiles) + // entity[ent->r.ownerNum].r.ownerNum == passEntityNum (don't interact with other missiles from owner) int ownerNum; } entityShared_t; diff --git a/code/q3_ui/ui_main.c b/code/q3_ui/ui_main.c index 9876b929..1dd7e89f 100644 --- a/code/q3_ui/ui_main.c +++ b/code/q3_ui/ui_main.c @@ -217,7 +217,7 @@ static cvarTable_t cvarTable[] = { { &ui_ioq3, "ui_ioq3", "1", CVAR_ROM } }; -static int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]); +static int cvarTableSize = ARRAY_LEN( cvarTable ); /* diff --git a/code/q3_ui/ui_video.c b/code/q3_ui/ui_video.c index 160037d1..7bb97109 100644 --- a/code/q3_ui/ui_video.c +++ b/code/q3_ui/ui_video.c @@ -318,7 +318,7 @@ static InitialVideoOptions_s s_ivo_templates[] = } }; -#define NUM_IVO_TEMPLATES ( sizeof( s_ivo_templates ) / sizeof( s_ivo_templates[0] ) ) +#define NUM_IVO_TEMPLATES ( ARRAY_LEN( s_ivo_templates ) ) static const char *builtinResolutions[ ] = { @@ -496,7 +496,7 @@ static void GraphicsOptions_GetResolutions( void ) { char* s = resbuf; unsigned int i = 0; - while( s && i < sizeof(detectedResolutions)/sizeof(detectedResolutions[0])-1) + while( s && i < ARRAY_LEN(detectedResolutions)-1 ) { detectedResolutions[i++] = s; s = strchr(s, ' '); @@ -662,7 +662,7 @@ static void GraphicsOptions_ApplyChanges( void *unused, int notification ) // search for builtin mode that matches the detected mode int mode; if ( s_graphicsoptions.mode.curvalue == -1 - || s_graphicsoptions.mode.curvalue >= sizeof(detectedResolutions)/sizeof(detectedResolutions[0]) ) + || s_graphicsoptions.mode.curvalue >= ARRAY_LEN( detectedResolutions ) ) s_graphicsoptions.mode.curvalue = 0; mode = GraphicsOptions_FindBuiltinResolution( s_graphicsoptions.mode.curvalue ); diff --git a/code/qcommon/files.c b/code/qcommon/files.c index f6af8ee6..641365ac 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -3459,7 +3459,7 @@ void FS_PureServerSetReferencedPaks( const char *pakSums, const char *pakNames ) fs_serverReferencedPaks[i] = atoi( Cmd_Argv( i ) ); } - for (i = 0 ; i < sizeof(fs_serverReferencedPakNames) / sizeof(*fs_serverReferencedPakNames); i++) + for (i = 0 ; i < ARRAY_LEN(fs_serverReferencedPakNames); i++) { if(fs_serverReferencedPakNames[i]) Z_Free(fs_serverReferencedPakNames[i]); diff --git a/code/qcommon/msg.c b/code/qcommon/msg.c index 889b32dc..cf60aec1 100644 --- a/code/qcommon/msg.c +++ b/code/qcommon/msg.c @@ -895,7 +895,7 @@ void MSG_WriteDeltaEntity( msg_t *msg, struct entityState_s *from, struct entity float fullFloat; int *fromF, *toF; - numFields = sizeof(entityStateFields)/sizeof(entityStateFields[0]); + numFields = ARRAY_LEN( entityStateFields ); // all fields should be 32 bits to avoid any compiler packing issues // the "number" field is not part of the field list @@ -1040,7 +1040,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to, return; } - numFields = sizeof(entityStateFields)/sizeof(entityStateFields[0]); + numFields = ARRAY_LEN( entityStateFields ); lc = MSG_ReadByte(msg); if ( lc > numFields || lc < 0 ) { @@ -1210,7 +1210,7 @@ void MSG_WriteDeltaPlayerstate( msg_t *msg, struct playerState_s *from, struct p c = msg->cursize; - numFields = sizeof( playerStateFields ) / sizeof( playerStateFields[0] ); + numFields = ARRAY_LEN( playerStateFields ); lc = 0; for ( i = 0, field = playerStateFields ; i < numFields ; i++, field++ ) { @@ -1377,7 +1377,7 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t print = 0; } - numFields = sizeof( playerStateFields ) / sizeof( playerStateFields[0] ); + numFields = ARRAY_LEN( playerStateFields ); lc = MSG_ReadByte(msg); if ( lc > numFields || lc < 0 ) { diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index ea7521fe..44e929bd 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -194,7 +194,7 @@ typedef int clipHandle_t; #define MAX_QINT 0x7fffffff #define MIN_QINT (-MAX_QINT-1) -#define ARRAY_LEN(x) (sizeof(x) / sizeof(*x)) +#define ARRAY_LEN(x) (sizeof(x) / sizeof(*(x))) // angle indexes diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c index 72307398..d3fb85bc 100644 --- a/code/qcommon/vm.c +++ b/code/qcommon/vm.c @@ -346,7 +346,7 @@ intptr_t QDECL VM_DllSyscall( intptr_t arg, ... ) { args[0] = arg; va_start(ap, arg); - for (i = 1; i < sizeof (args) / sizeof (args[i]); i++) + for (i = 1; i < ARRAY_LEN (args); i++) args[i] = va_arg(ap, intptr_t); va_end(ap); @@ -756,7 +756,7 @@ intptr_t QDECL VM_Call( vm_t *vm, int callnum, ... ) { int args[10]; va_list ap; va_start(ap, callnum); - for (i = 0; i < sizeof (args) / sizeof (args[i]); i++) { + for (i = 0; i < ARRAY_LEN(args); i++) { args[i] = va_arg(ap, int); } va_end(ap); @@ -781,7 +781,7 @@ intptr_t QDECL VM_Call( vm_t *vm, int callnum, ... ) { a.callnum = callnum; va_start(ap, callnum); - for (i = 0; i < sizeof (a.args) / sizeof (a.args[0]); i++) { + for (i = 0; i < ARRAY_LEN(a.args); i++) { a.args[i] = va_arg(ap, int); } va_end(ap); diff --git a/code/qcommon/vm_powerpc.c b/code/qcommon/vm_powerpc.c index 18a449f4..c18e679b 100644 --- a/code/qcommon/vm_powerpc.c +++ b/code/qcommon/vm_powerpc.c @@ -690,7 +690,7 @@ static const long int gpr_list[] = { r7, r8, r9, r10, }; static const long int gpr_vstart = 8; /* position of first volatile register */ -static const long int gpr_total = sizeof( gpr_list ) / sizeof( gpr_list[0] ); +static const long int gpr_total = ARRAY_LEN( gpr_list ); static const long int fpr_list[] = { /* static registers, normally none is used */ @@ -704,7 +704,7 @@ static const long int fpr_list[] = { f12, f13, }; static const long int fpr_vstart = 8; -static const long int fpr_total = sizeof( fpr_list ) / sizeof( fpr_list[0] ); +static const long int fpr_total = ARRAY_LEN( fpr_list ); /* * prepare some dummy structures and emit init code diff --git a/code/qcommon/vm_powerpc_asm.c b/code/qcommon/vm_powerpc_asm.c index 64c59771..eef41c50 100644 --- a/code/qcommon/vm_powerpc_asm.c +++ b/code/qcommon/vm_powerpc_asm.c @@ -389,8 +389,7 @@ static const struct powerpc_operand powerpc_operands[] = }; -static const unsigned int num_powerpc_operands = - (sizeof (powerpc_operands) / sizeof (powerpc_operands[0])); +static const unsigned int num_powerpc_operands = ARRAY_LEN (powerpc_operands); /* The functions used to insert and extract complicated operands. */ @@ -1004,6 +1003,3 @@ static const struct powerpc_opcode powerpc_opcodes[] = { { "fsub", A(63,20,0), AFRC_MASK, PPCCOM, { FRT, FRA, FRB } }, { "fneg", XRC(63,40,0), XRA_MASK, COM, { FRT, FRB } }, }; - -static const int powerpc_num_opcodes = - sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]); diff --git a/code/qcommon/vm_sparc.c b/code/qcommon/vm_sparc.c index 06119d56..4018216b 100644 --- a/code/qcommon/vm_sparc.c +++ b/code/qcommon/vm_sparc.c @@ -259,7 +259,7 @@ static const struct sparc_opcode sparc_opcodes[] = { { "fbg", BFCC(0,6), { ARG_DISP22 }, }, { "fble", BFCC(0,13), { ARG_DISP22 }, }, }; -#define SPARC_NUM_OPCODES (sizeof(sparc_opcodes) / sizeof(sparc_opcodes[0])) +#define SPARC_NUM_OPCODES (ARRAY_LEN(sparc_opcodes)) #define RS1(X) (((X) & 0x1f) << 14) #define RS2(X) (((X) & 0x1f) << 0) @@ -320,7 +320,7 @@ static unsigned int sparc_assemble(enum sparc_iname iname, const int argc, const #define IN(inst, args...) \ ({ const int argv[] = { args }; \ - const int argc = sizeof(argv) / sizeof(argv[0]); \ + const int argc = ARRAY_LEN(argv); \ sparc_assemble(inst, argc, argv); \ }) diff --git a/code/qcommon/vm_x86_64_assembler.c b/code/qcommon/vm_x86_64_assembler.c index a8abb075..c939dadc 100644 --- a/code/qcommon/vm_x86_64_assembler.c +++ b/code/qcommon/vm_x86_64_assembler.c @@ -243,7 +243,7 @@ static void hash_add_label(const char* label, unsigned address) unsigned i = hashkey(label, -1U); int labellen; - i %= sizeof(labelhash)/sizeof(labelhash[0]); + i %= ARRAY_LEN(labelhash); h = Z_Malloc(sizeof(struct hashentry)); labellen = strlen(label) + 1; @@ -259,7 +259,7 @@ static unsigned lookup_label(const char* label) { struct hashentry* h; unsigned i = hashkey(label, -1U); - i %= sizeof(labelhash)/sizeof(labelhash[0]); + i %= ARRAY_LEN(labelhash); for(h = labelhash[i]; h; h = h->next ) { if(!strcmp(h->label, label)) @@ -275,7 +275,7 @@ static void labelhash_free(void) struct hashentry* h; unsigned i; unsigned z = 0, min = -1U, max = 0, t = 0; - for ( i = 0; i < sizeof(labelhash)/sizeof(labelhash[0]); ++i) + for ( i = 0; i < ARRAY_LEN(labelhash); ++i) { unsigned n = 0; h = labelhash[i]; @@ -293,7 +293,7 @@ static void labelhash_free(void) min = MIN(min, n); max = MAX(max, n); } - printf("total %u, hsize %"PRIu64", zero %u, min %u, max %u\n", t, sizeof(labelhash)/sizeof(labelhash[0]), z, min, max); + printf("total %u, hsize %"PRIu64", zero %u, min %u, max %u\n", t, ARRAY_LEN(labelhash), z, min, max); memset(labelhash, 0, sizeof(labelhash)); } @@ -1015,7 +1015,7 @@ static op_t* getop(const char* n) #else unsigned m, t, b; int r; - t = sizeof(ops)/sizeof(ops[0])-1; + t = ARRAY_LEN(ops)-1; b = 0; while(b <= t) @@ -1306,7 +1306,7 @@ void assembler_init(int pass) if(!ops_sorted) { ops_sorted = 1; - qsort(ops, sizeof(ops)/sizeof(ops[0])-1, sizeof(ops[0]), opsort); + qsort(ops, ARRAY_LEN(ops)-1, sizeof(ops[0]), opsort); } } diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c index 43035750..d4f493f9 100644 --- a/code/renderer/tr_init.c +++ b/code/renderer/tr_init.c @@ -286,7 +286,7 @@ vidmode_t r_vidModes[] = { "Mode 10: 2048x1536", 2048, 1536, 1 }, { "Mode 11: 856x480 (wide)",856, 480, 1 } }; -static int s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) ); +static int s_numVidModes = ARRAY_LEN( r_vidModes ); qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) { vidmode_t *vm; diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h index 163dc33f..d4ed1a2f 100644 --- a/code/renderer/tr_local.h +++ b/code/renderer/tr_local.h @@ -1062,7 +1062,6 @@ extern cvar_t *r_colorMipLevels; // development aid to see texture mip usage extern cvar_t *r_picmip; // controls picmip values extern cvar_t *r_finish; extern cvar_t *r_drawBuffer; -extern cvar_t *r_glDriver; extern cvar_t *r_swapInterval; extern cvar_t *r_textureMode; extern cvar_t *r_offsetFactor; @@ -1115,8 +1114,6 @@ extern cvar_t *r_saveFontData; extern cvar_t *r_marksOnTriangleMeshes; -extern cvar_t *r_GLlibCoolDownMsec; - //==================================================================== float R_NoiseGet4f( float x, float y, float z, float t ); diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c index e8f1a8b1..a88ba2bd 100644 --- a/code/renderer/tr_shader.c +++ b/code/renderer/tr_shader.c @@ -30,7 +30,6 @@ static char *s_shaderText; static shaderStage_t stages[MAX_SHADER_STAGES]; static shader_t shader; static texModInfo_t texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS]; -static qboolean deferLoad; #define FILE_HASH_SIZE 1024 static shader_t* hashTable[FILE_HASH_SIZE]; @@ -1371,7 +1370,7 @@ surfaceparm */ static void ParseSurfaceParm( char **text ) { char *token; - int numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]); + int numInfoParms = ARRAY_LEN( infoParms ); int i; token = COM_ParseExt( text, qfalse ); @@ -3070,8 +3069,6 @@ void R_InitShaders( void ) { Com_Memset(hashTable, 0, sizeof(hashTable)); - deferLoad = qfalse; - CreateInternalShaders(); ScanAndLoadShaderFiles(); diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c index ac3e7a01..097177da 100644 --- a/code/sdl/sdl_input.c +++ b/code/sdl/sdl_input.c @@ -34,8 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../client/client.h" #include "../sys/sys_local.h" -#define ARRAYLEN(x) (sizeof(x)/sizeof(x[0])) - #ifdef MACOS_X // Mouse acceleration needs to be disabled #define MACOS_X_ACCELERATION_HACK @@ -648,7 +646,7 @@ IN_JoyMove */ static void IN_JoyMove( void ) { - qboolean joy_pressed[ARRAYLEN(joy_keys)]; + qboolean joy_pressed[ARRAY_LEN(joy_keys)]; unsigned int axes = 0; unsigned int hats = 0; int total = 0; @@ -691,8 +689,8 @@ static void IN_JoyMove( void ) total = SDL_JoystickNumButtons(stick); if (total > 0) { - if (total > ARRAYLEN(stick_state.buttons)) - total = ARRAYLEN(stick_state.buttons); + if (total > ARRAY_LEN(stick_state.buttons)) + total = ARRAY_LEN(stick_state.buttons); for (i = 0; i < total; i++) { qboolean pressed = (SDL_JoystickGetButton(stick, i) != 0); diff --git a/code/sdl/sdl_snd.c b/code/sdl/sdl_snd.c index a131db7a..61ae0dd8 100644 --- a/code/sdl/sdl_snd.c +++ b/code/sdl/sdl_snd.c @@ -99,8 +99,7 @@ static struct { AUDIO_S16MSB, "AUDIO_S16MSB" } }; -static int formatToStringTableSize = - sizeof( formatToStringTable ) / sizeof( formatToStringTable[ 0 ] ); +static int formatToStringTableSize = ARRAY_LEN( formatToStringTable ); /* =============== diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c index 6cf5c899..7684138d 100644 --- a/code/server/sv_ccmds.c +++ b/code/server/sv_ccmds.c @@ -660,7 +660,7 @@ static qboolean SV_DelBanEntryFromList(int index) { if(index == serverBansCount - 1) serverBansCount--; - else if(index < sizeof(serverBans) / sizeof(*serverBans) - 1) + else if(index < ARRAY_LEN(serverBans) - 1) { memmove(serverBans + index, serverBans + index + 1, (serverBansCount - index - 1) * sizeof(*serverBans)); serverBansCount--; @@ -740,7 +740,7 @@ static void SV_AddBanToList(qboolean isexception) return; } - if(serverBansCount > sizeof(serverBans) / sizeof(*serverBans)) + if(serverBansCount > ARRAY_LEN(serverBans)) { Com_Printf ("Error: Maximum number of bans/exceptions exceeded.\n"); return; diff --git a/code/server/sv_client.c b/code/server/sv_client.c index 614f0619..f4ebe60f 100644 --- a/code/server/sv_client.c +++ b/code/server/sv_client.c @@ -1782,7 +1782,7 @@ void SV_UserVoip( client_t *cl, msg_t *msg ) { // Transmit this packet to the client. // !!! FIXME: I don't like this queueing system. - if (client->queuedVoipPackets >= (sizeof (client->voipPacket) / sizeof (client->voipPacket[0]))) { + if (client->queuedVoipPackets >= ARRAY_LEN(client->voipPacket)) { Com_Printf("Too many VoIP packets queued for client #%d\n", i); continue; // no room for another packet right now. } diff --git a/code/server/sv_game.c b/code/server/sv_game.c index fe78650f..46653406 100644 --- a/code/server/sv_game.c +++ b/code/server/sv_game.c @@ -219,7 +219,7 @@ void SV_AdjustAreaPortalState( sharedEntity_t *ent, qboolean open ) { /* ================== -SV_GameAreaEntities +SV_EntityContact ================== */ qboolean SV_EntityContact( vec3_t mins, vec3_t maxs, const sharedEntity_t *gEnt, int capsule ) { diff --git a/code/ui/ui_local.h b/code/ui/ui_local.h index b8f93de7..b43d5d0e 100644 --- a/code/ui/ui_local.h +++ b/code/ui/ui_local.h @@ -61,7 +61,6 @@ extern vmCvar_t ui_spSelection; extern vmCvar_t ui_browserMaster; extern vmCvar_t ui_browserGameType; -extern vmCvar_t ui_browserSortKey; extern vmCvar_t ui_browserShowFull; extern vmCvar_t ui_browserShowEmpty; diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c index 7a500feb..4fcf9bad 100644 --- a/code/ui/ui_main.c +++ b/code/ui/ui_main.c @@ -51,7 +51,7 @@ static const char *skillLevels[] = { "Nightmare" }; -static const int numSkillLevels = sizeof(skillLevels) / sizeof(const char*); +static const int numSkillLevels = ARRAY_LEN( skillLevels ); static const char *netSources[] = { @@ -60,7 +60,7 @@ static const char *netSources[] = { "Internet", "Favorites" }; -static const int numNetSources = sizeof(netSources) / sizeof(const char*); +static const int numNetSources = ARRAY_LEN( netSources ); static const serverFilter_t serverFilters[] = { {"All", "" }, @@ -72,6 +72,9 @@ static const serverFilter_t serverFilters[] = { {"OSP", "osp" }, }; +static const int numServerFilters = ARRAY_LEN( serverFilters ); + + static const char *teamArenaGameTypes[] = { "FFA", "TOURNAMENT", @@ -84,35 +87,9 @@ static const char *teamArenaGameTypes[] = { "TEAMTOURNAMENT" }; -static int const numTeamArenaGameTypes = sizeof(teamArenaGameTypes) / sizeof(const char*); +static int const numTeamArenaGameTypes = ARRAY_LEN( teamArenaGameTypes ); -static const char *teamArenaGameNames[] = { - "Free For All", - "Tournament", - "Single Player", - "Team Deathmatch", - "Capture the Flag", - "One Flag CTF", - "Overload", - "Harvester", - "Team Tournament", -}; - -static int const numTeamArenaGameNames = sizeof(teamArenaGameNames) / sizeof(const char*); - - -static const int numServerFilters = sizeof(serverFilters) / sizeof(serverFilter_t); - -static const char *sortKeys[] = { - "Server Name", - "Map Name", - "Open Player Spots", - "Game Type", - "Ping Time" -}; -static const int numSortKeys = sizeof(sortKeys) / sizeof(const char*); - static char* netnames[] = { "???", "UDP", @@ -1007,7 +984,7 @@ void UI_Load(void) { static const char *handicapValues[] = {"None","95","90","85","80","75","70","65","60","55","50","45","40","35","30","25","20","15","10","5",NULL}; #ifndef MISSIONPACK -static int numHandicaps = sizeof(handicapValues) / sizeof(const char*); +static int numHandicaps = ARRAY_LEN(handicapValues); #endif static void UI_DrawHandicap(rectDef_t *rect, float scale, vec4_t color, int textStyle) { @@ -5609,7 +5586,6 @@ vmCvar_t ui_spSelection; vmCvar_t ui_browserMaster; vmCvar_t ui_browserGameType; -vmCvar_t ui_browserSortKey; vmCvar_t ui_browserShowFull; vmCvar_t ui_browserShowEmpty; @@ -5728,7 +5704,6 @@ static cvarTable_t cvarTable[] = { { &ui_browserMaster, "ui_browserMaster", "0", CVAR_ARCHIVE }, { &ui_browserGameType, "ui_browserGameType", "0", CVAR_ARCHIVE }, - { &ui_browserSortKey, "ui_browserSortKey", "4", CVAR_ARCHIVE }, { &ui_browserShowFull, "ui_browserShowFull", "1", CVAR_ARCHIVE }, { &ui_browserShowEmpty, "ui_browserShowEmpty", "1", CVAR_ARCHIVE }, @@ -5820,7 +5795,7 @@ static cvarTable_t cvarTable[] = { }; -static int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]); +static int cvarTableSize = ARRAY_LEN( cvarTable ); /* diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c index 3b36c662..5d8fea43 100644 --- a/code/ui/ui_shared.c +++ b/code/ui/ui_shared.c @@ -1258,7 +1258,7 @@ commandDef_t commandList[] = {"orbit", &Script_Orbit} // group/name }; -int scriptCommandCount = sizeof(commandList) / sizeof(commandDef_t); +int scriptCommandCount = ARRAY_LEN(commandList); void Item_RunScript(itemDef_t *item, const char *s) { @@ -3192,7 +3192,7 @@ static bind_t g_bindings[] = }; -static const int g_bindCount = sizeof(g_bindings) / sizeof(bind_t); +static const int g_bindCount = ARRAY_LEN(g_bindings); #ifndef MISSIONPACK static configcvar_t g_configcvars[] =