okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some "> MAX_*" to be ">= MAX_*".

Browse source
This commit is contained in:
Zack Middleton 2012-11-18 19:09:54 +00:00
parent d635193e19
commit 82f83cd092
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/botlib/be_ai_move.c
View file

@ -522,7 +522,7 @@ void BotSetBrushModelTypes(void)
if (model[0]) modelnum = atoi(model+1); if (model[0]) modelnum = atoi(model+1);
else modelnum = 0; else modelnum = 0;
if (modelnum < 0 || modelnum > MAX_MODELS) if (modelnum < 0 || modelnum >= MAX_MODELS)
{ {
botimport.Print(PRT_MESSAGE, "entity %s model number out of range\n", classname); botimport.Print(PRT_MESSAGE, "entity %s model number out of range\n", classname);
continue; continue;

4
code/client/snd_dma.c
View file

@ -529,7 +529,7 @@ static void S_Base_StartSoundEx( vec3_t origin, int entityNum, int entchannel, s
return; return;
} }
if ( !origin && ( entityNum < 0 || entityNum > MAX_GENTITIES ) ) { if ( !origin && ( entityNum < 0 || entityNum >= MAX_GENTITIES ) ) {
Com_Error( ERR_DROP, "S_StartSound: bad entitynum %i", entityNum ); Com_Error( ERR_DROP, "S_StartSound: bad entitynum %i", entityNum );
} }
@ -1092,7 +1092,7 @@ let the sound system know where an entity currently is
====================== ======================
*/ */
void S_Base_UpdateEntityPosition( int entityNum, const vec3_t origin ) { void S_Base_UpdateEntityPosition( int entityNum, const vec3_t origin ) {
if ( entityNum < 0 || entityNum > MAX_GENTITIES ) { if ( entityNum < 0 || entityNum >= MAX_GENTITIES ) {
Com_Error( ERR_DROP, "S_UpdateEntityPosition: bad entitynum %i", entityNum ); Com_Error( ERR_DROP, "S_UpdateEntityPosition: bad entitynum %i", entityNum );
} }
VectorCopy( origin, loopSounds[entityNum].origin ); VectorCopy( origin, loopSounds[entityNum].origin );

4
code/client/snd_openal.c
View file

@ -1121,7 +1121,7 @@ void S_AL_UpdateEntityPosition( int entityNum, const vec3_t origin )
VectorCopy( origin, sanOrigin ); VectorCopy( origin, sanOrigin );
S_AL_SanitiseVector( sanOrigin ); S_AL_SanitiseVector( sanOrigin );
if ( entityNum < 0 || entityNum > MAX_GENTITIES ) if ( entityNum < 0 || entityNum >= MAX_GENTITIES )
Com_Error( ERR_DROP, "S_UpdateEntityPosition: bad entitynum %i", entityNum ); Com_Error( ERR_DROP, "S_UpdateEntityPosition: bad entitynum %i", entityNum );
VectorCopy( sanOrigin, entityList[entityNum].origin ); VectorCopy( sanOrigin, entityList[entityNum].origin );
} }
@ -1135,7 +1135,7 @@ Necessary for i.g. Western Quake3 mod which is buggy.
*/ */
static qboolean S_AL_CheckInput(int entityNum, sfxHandle_t sfx) static qboolean S_AL_CheckInput(int entityNum, sfxHandle_t sfx)
{ {
if (entityNum < 0 || entityNum > MAX_GENTITIES) if (entityNum < 0 || entityNum >= MAX_GENTITIES)
Com_Error(ERR_DROP, "ERROR: S_AL_CheckInput: bad entitynum %i", entityNum); Com_Error(ERR_DROP, "ERROR: S_AL_CheckInput: bad entitynum %i", entityNum);
if (sfx < 0 || sfx >= numSfx) if (sfx < 0 || sfx >= numSfx)

4
code/game/ai_dmq3.c
View file

@ -4838,7 +4838,7 @@ void BotCheckEvents(bot_state_t *bs, entityState_t *state) {
} }
case EV_GLOBAL_SOUND: case EV_GLOBAL_SOUND:
{ {
if (state->eventParm < 0 || state->eventParm > MAX_SOUNDS) { if (state->eventParm < 0 || state->eventParm >= MAX_SOUNDS) {
BotAI_Print(PRT_ERROR, "EV_GLOBAL_SOUND: eventParm (%d) out of range\n", state->eventParm); BotAI_Print(PRT_ERROR, "EV_GLOBAL_SOUND: eventParm (%d) out of range\n", state->eventParm);
break; break;
} }
@ -4948,7 +4948,7 @@ void BotCheckEvents(bot_state_t *bs, entityState_t *state) {
{ {
//if this sound is played on the bot //if this sound is played on the bot
if (state->number == bs->client) { if (state->number == bs->client) {
if (state->eventParm < 0 || state->eventParm > MAX_SOUNDS) { if (state->eventParm < 0 || state->eventParm >= MAX_SOUNDS) {
BotAI_Print(PRT_ERROR, "EV_GENERAL_SOUND: eventParm (%d) out of range\n", state->eventParm); BotAI_Print(PRT_ERROR, "EV_GENERAL_SOUND: eventParm (%d) out of range\n", state->eventParm);
break; break;
} }

2
code/qcommon/files.c
View file

@ -395,7 +395,7 @@ static fileHandle_t FS_HandleForFile(void) {
} }
static FILE *FS_FileForHandle( fileHandle_t f ) { static FILE *FS_FileForHandle( fileHandle_t f ) {
if ( f < 1 || f > MAX_FILE_HANDLES ) { if ( f < 1 || f >= MAX_FILE_HANDLES ) {
Com_Error( ERR_DROP, "FS_FileForHandle: out of range" ); Com_Error( ERR_DROP, "FS_FileForHandle: out of range" );
} }
if (fsh[f].zipFile == qtrue) { if (fsh[f].zipFile == qtrue) {