r280 - in trunk/code: cgame qcommon
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Nov 5 10:54:56 EST 2005
Author: tma
Date: 2005-11-05 10:54:56 -0500 (Sat, 05 Nov 2005)
New Revision: 280
Modified:
trunk/code/cgame/cg_weapons.c
trunk/code/qcommon/msg.c
Log:
* Patch from AJ <anthonyj at planetquake.com> which replaces a bunch of hard coded
constants with #define constants
Modified: trunk/code/cgame/cg_weapons.c
===================================================================
--- trunk/code/cgame/cg_weapons.c 2005-11-05 15:07:05 UTC (rev 279)
+++ trunk/code/cgame/cg_weapons.c 2005-11-05 15:54:56 UTC (rev 280)
@@ -1489,7 +1489,7 @@
// 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 @@
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 @@
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 @@
break;
}
}
- if ( i == 16 ) {
+ if ( i == MAX_WEAPONS ) {
cg.weaponSelect = original;
}
}
@@ -1606,10 +1606,10 @@
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 @@
break;
}
}
- if ( i == 16 ) {
+ if ( i == MAX_WEAPONS ) {
cg.weaponSelect = original;
}
}
@@ -1640,7 +1640,7 @@
num = atoi( CG_Argv( 1 ) );
- if ( num < 1 || num > 15 ) {
+ if ( num < 1 || num > MAX_WEAPONS-1 ) {
return;
}
@@ -1665,7 +1665,7 @@
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;
Modified: trunk/code/qcommon/msg.c
===================================================================
--- trunk/code/qcommon/msg.c 2005-11-05 15:07:05 UTC (rev 279)
+++ trunk/code/qcommon/msg.c 2005-11-05 15:54:56 UTC (rev 280)
@@ -813,7 +813,7 @@
{ 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 @@
// send the arrays
//
statsbits = 0;
- for (i=0 ; i<16 ; i++) {
+ for (i=0 ; i<MAX_STATS ; i++) {
if (to->stats[i] != from->stats[i]) {
statsbits |= 1<<i;
}
}
persistantbits = 0;
- for (i=0 ; i<16 ; i++) {
+ for (i=0 ; i<MAX_PERSISTANT ; i++) {
if (to->persistant[i] != from->persistant[i]) {
persistantbits |= 1<<i;
}
}
ammobits = 0;
- for (i=0 ; i<16 ; i++) {
+ for (i=0 ; i<MAX_WEAPONS ; i++) {
if (to->ammo[i] != from->ammo[i]) {
ammobits |= 1<<i;
}
}
powerupbits = 0;
- for (i=0 ; i<16 ; i++) {
+ for (i=0 ; i<MAX_POWERUPS ; i++) {
if (to->powerups[i] != from->powerups[i]) {
powerupbits |= 1<<i;
}
@@ -1264,8 +1264,8 @@
if ( statsbits ) {
MSG_WriteBits( msg, 1, 1 ); // changed
- MSG_WriteShort( msg, statsbits );
- for (i=0 ; i<16 ; i++)
+ MSG_WriteBits( msg, statsbits, MAX_STATS );
+ for (i=0 ; i<MAX_STATS ; i++)
if (statsbits & (1<<i) )
MSG_WriteShort (msg, to->stats[i]);
} else {
@@ -1275,8 +1275,8 @@
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 ; i<MAX_PERSISTANT ; i++)
if (persistantbits & (1<<i) )
MSG_WriteShort (msg, to->persistant[i]);
} else {
@@ -1286,8 +1286,8 @@
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 ; i<MAX_WEAPONS ; i++)
if (ammobits & (1<<i) )
MSG_WriteShort (msg, to->ammo[i]);
} else {
@@ -1297,8 +1297,8 @@
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 ; i<MAX_POWERUPS ; i++)
if (powerupbits & (1<<i) )
MSG_WriteLong( msg, to->powerups[i] );
} else {
@@ -1395,8 +1395,8 @@
// 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 ; i<MAX_STATS ; i++) {
if (bits & (1<<i) ) {
to->stats[i] = MSG_ReadShort(msg);
}
@@ -1406,8 +1406,8 @@
// 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 ; i<MAX_PERSISTANT ; i++) {
if (bits & (1<<i) ) {
to->persistant[i] = MSG_ReadShort(msg);
}
@@ -1417,8 +1417,8 @@
// 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 ; i<MAX_WEAPONS ; i++) {
if (bits & (1<<i) ) {
to->ammo[i] = MSG_ReadShort(msg);
}
@@ -1428,8 +1428,8 @@
// 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 ; i<MAX_POWERUPS ; i++) {
if (bits & (1<<i) ) {
to->powerups[i] = MSG_ReadLong(msg);
}
More information about the quake3-commits
mailing list