From 8497c8e83584935876b2b493857b3c0f8feb5721 Mon Sep 17 00:00:00 2001 From: tma Date: Sat, 5 Nov 2005 15:54:56 +0000 Subject: * Patch from AJ which replaces a bunch of hard coded constants with #define constants git-svn-id: svn://svn.icculus.org/quake3/trunk@280 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/cgame/cg_weapons.c | 20 ++++++++++---------- code/qcommon/msg.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/code/cgame/cg_weapons.c b/code/cgame/cg_weapons.c index 89af232..d15de2d 100644 --- a/code/cgame/cg_weapons.c +++ b/code/cgame/cg_weapons.c @@ -1489,7 +1489,7 @@ void CG_DrawWeaponSelect( void ) { // count the number of weapons owned bits = cg.snap->ps.stats[ STAT_WEAPONS ]; count = 0; - for ( i = 1 ; i < 16 ; i++ ) { + for ( i = 1 ; i < MAX_WEAPONS ; i++ ) { if ( bits & ( 1 << i ) ) { count++; } @@ -1498,7 +1498,7 @@ void CG_DrawWeaponSelect( void ) { x = 320 - count * 20; y = 380; - for ( i = 1 ; i < 16 ; i++ ) { + for ( i = 1 ; i < MAX_WEAPONS ; i++ ) { if ( !( bits & ( 1 << i ) ) ) { continue; } @@ -1570,9 +1570,9 @@ void CG_NextWeapon_f( void ) { cg.weaponSelectTime = cg.time; original = cg.weaponSelect; - for ( i = 0 ; i < 16 ; i++ ) { + for ( i = 0 ; i < MAX_WEAPONS ; i++ ) { cg.weaponSelect++; - if ( cg.weaponSelect == 16 ) { + if ( cg.weaponSelect == MAX_WEAPONS ) { cg.weaponSelect = 0; } if ( cg.weaponSelect == WP_GAUNTLET ) { @@ -1582,7 +1582,7 @@ void CG_NextWeapon_f( void ) { break; } } - if ( i == 16 ) { + if ( i == MAX_WEAPONS ) { cg.weaponSelect = original; } } @@ -1606,10 +1606,10 @@ void CG_PrevWeapon_f( void ) { cg.weaponSelectTime = cg.time; original = cg.weaponSelect; - for ( i = 0 ; i < 16 ; i++ ) { + for ( i = 0 ; i < MAX_WEAPONS ; i++ ) { cg.weaponSelect--; if ( cg.weaponSelect == -1 ) { - cg.weaponSelect = 15; + cg.weaponSelect = MAX_WEAPONS - 1; } if ( cg.weaponSelect == WP_GAUNTLET ) { continue; // never cycle to gauntlet @@ -1618,7 +1618,7 @@ void CG_PrevWeapon_f( void ) { break; } } - if ( i == 16 ) { + if ( i == MAX_WEAPONS ) { cg.weaponSelect = original; } } @@ -1640,7 +1640,7 @@ void CG_Weapon_f( void ) { num = atoi( CG_Argv( 1 ) ); - if ( num < 1 || num > 15 ) { + if ( num < 1 || num > MAX_WEAPONS-1 ) { return; } @@ -1665,7 +1665,7 @@ void CG_OutOfAmmoChange( void ) { cg.weaponSelectTime = cg.time; - for ( i = 15 ; i > 0 ; i-- ) { + for ( i = MAX_WEAPONS-1 ; i > 0 ; i-- ) { if ( CG_WeaponSelectable( i ) ) { cg.weaponSelect = i; break; diff --git a/code/qcommon/msg.c b/code/qcommon/msg.c index 825fcb1..4e302fc 100644 --- a/code/qcommon/msg.c +++ b/code/qcommon/msg.c @@ -813,7 +813,7 @@ netField_t entityStateFields[] = { NETF(origin[1]), 0 }, { NETF(origin[2]), 0 }, { NETF(solid), 24 }, -{ NETF(powerups), 16 }, +{ NETF(powerups), MAX_POWERUPS }, { NETF(modelindex), 8 }, { NETF(otherEntityNum2), GENTITYNUM_BITS }, { NETF(loopSound), 8 }, @@ -1231,25 +1231,25 @@ void MSG_WriteDeltaPlayerstate( msg_t *msg, struct playerState_s *from, struct p // send the arrays // statsbits = 0; - for (i=0 ; i<16 ; i++) { + for (i=0 ; istats[i] != from->stats[i]) { statsbits |= 1<persistant[i] != from->persistant[i]) { persistantbits |= 1<ammo[i] != from->ammo[i]) { ammobits |= 1<powerups[i] != from->powerups[i]) { powerupbits |= 1<stats[i]); } else { @@ -1275,8 +1275,8 @@ void MSG_WriteDeltaPlayerstate( msg_t *msg, struct playerState_s *from, struct p if ( persistantbits ) { MSG_WriteBits( msg, 1, 1 ); // changed - MSG_WriteShort( msg, persistantbits ); - for (i=0 ; i<16 ; i++) + MSG_WriteBits( msg, persistantbits, MAX_PERSISTANT ); + for (i=0 ; ipersistant[i]); } else { @@ -1286,8 +1286,8 @@ void MSG_WriteDeltaPlayerstate( msg_t *msg, struct playerState_s *from, struct p if ( ammobits ) { MSG_WriteBits( msg, 1, 1 ); // changed - MSG_WriteShort( msg, ammobits ); - for (i=0 ; i<16 ; i++) + MSG_WriteBits( msg, ammobits, MAX_WEAPONS ); + for (i=0 ; iammo[i]); } else { @@ -1297,8 +1297,8 @@ void MSG_WriteDeltaPlayerstate( msg_t *msg, struct playerState_s *from, struct p if ( powerupbits ) { MSG_WriteBits( msg, 1, 1 ); // changed - MSG_WriteShort( msg, powerupbits ); - for (i=0 ; i<16 ; i++) + MSG_WriteBits( msg, powerupbits, MAX_POWERUPS ); + for (i=0 ; ipowerups[i] ); } else { @@ -1395,8 +1395,8 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t // parse stats if ( MSG_ReadBits( msg, 1 ) ) { LOG("PS_STATS"); - bits = MSG_ReadShort (msg); - for (i=0 ; i<16 ; i++) { + bits = MSG_ReadBits (msg, MAX_STATS); + for (i=0 ; istats[i] = MSG_ReadShort(msg); } @@ -1406,8 +1406,8 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t // parse persistant stats if ( MSG_ReadBits( msg, 1 ) ) { LOG("PS_PERSISTANT"); - bits = MSG_ReadShort (msg); - for (i=0 ; i<16 ; i++) { + bits = MSG_ReadBits (msg, MAX_PERSISTANT); + for (i=0 ; ipersistant[i] = MSG_ReadShort(msg); } @@ -1417,8 +1417,8 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t // parse ammo if ( MSG_ReadBits( msg, 1 ) ) { LOG("PS_AMMO"); - bits = MSG_ReadShort (msg); - for (i=0 ; i<16 ; i++) { + bits = MSG_ReadBits (msg, MAX_WEAPONS); + for (i=0 ; iammo[i] = MSG_ReadShort(msg); } @@ -1428,8 +1428,8 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t // parse powerups if ( MSG_ReadBits( msg, 1 ) ) { LOG("PS_POWERUPS"); - bits = MSG_ReadShort (msg); - for (i=0 ; i<16 ; i++) { + bits = MSG_ReadBits (msg, MAX_POWERUPS); + for (i=0 ; ipowerups[i] = MSG_ReadLong(msg); } -- cgit v1.2.3