ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2025-03-21 23:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed all compile warning in game

Browse source
This commit is contained in:
UberGames 2011-06-09 13:31:41 +02:00
parent 37b6c87082
commit f5f25895d8
16 changed files with 81 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/ai_dmq3.c
View file

@ -2114,7 +2114,7 @@ int BotEntityToActivate(int entitynum) {
return 0;
}
trap_AAS_ValueForBSPEpairKey(ent, "classname", classname, sizeof(classname));
if (!classname) {
if (!classname[0]) {
BotAI_Print(PRT_ERROR, "BotEntityToActivate: entity with model %s has no classname\n", model);
return 0;
}

6
game/g_active.c
View file

@ -123,7 +123,7 @@ void TryUse( gentity_t *ent )
#endif
return;
}
else if ( target && target->s.number == ENTITYNUM_WORLD || (target->s.pos.trType == TR_STATIONARY && !(trace.surfaceFlags & SURF_NOIMPACT) && !target->takedamage) )
else if ( (target && target->s.number == ENTITYNUM_WORLD) || (target->s.pos.trType == TR_STATIONARY && !(trace.surfaceFlags & SURF_NOIMPACT) && !target->takedamage) )
{
//switch( ent->client->sess.sessionClass )
//{
@ -595,7 +595,7 @@ char *TimedMessage( void ){
}
//TiM: Cheap hack to stop it freezing if string0 is empty. THe above condition don't work here
if ( ( i == lastTimedMessage == 1 ) && !strlen( rpg_message[i-1] ) ) {
if ( ((i == 1 && lastTimedMessage == 1) && !strlen( rpg_message[i-1] )) ) {
return NULL;
}
@ -1499,7 +1499,7 @@ void CreateShield(gentity_t *ent)
int height, posWidth, negWidth, halfWidth = 0;
qboolean xaxis;
int paramData = 0;
static int shieldID;
//static int shieldID;
//gentity_t *emitter;
// trace upward to find height of shield

2
game/g_bot.c
View file

@ -398,7 +398,7 @@ void G_CheckMinimumPlayers( void ) {
}
}
if ( g_pModAssimilation.integer != 0 && numKilled != 0 || g_pModElimination.integer != 0 && numKilled != 0 )
if ( (g_pModAssimilation.integer != 0 && numKilled != 0) || (g_pModElimination.integer != 0 && numKilled != 0) )
{
return;
}

7
game/g_client.c
View file

@ -1379,6 +1379,8 @@ void SetCSTeam( team_t team, char *teamname )
case TEAM_RED:
trap_SetConfigstring( CS_RED_GROUP, teamname );
break;
default: // make gcc happy
break;
}
}
/*
@ -1744,7 +1746,8 @@ void ClientUserinfoChanged( int clientNum ) {
}
break;
}
default:
break;
}
if ( g_gametype.integer >= GT_TEAM && sess->sessionTeam == TEAM_SPECTATOR ) {
// don't ever use a default skin in teamplay, it would just waste memory
@ -4000,7 +4003,7 @@ void ClientSpawn(gentity_t *ent, int rpgx_spawn, qboolean fromDeath ) {
//body->s.apos.trBase[PITCH] = 0;
//body->s.apos.trBase[ROLL] = 0;
/*AngleVectors( body->s.apos.trBase, f, r, u );
AngleVectors( body->s.apos.trBase, f, r, u );
VectorMA( pad->r.currentOrigin, offset[0], f, vec );
VectorMA( vec, offset[1], r, vec );
VectorMA( vec, offset[2], u, vec );

60
game/g_cmds.c
View file

@ -6,6 +6,8 @@
//#include <windows.h>
static void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, const char *name, const char *message );
extern void G_CheckReplaceQueen( int clientNum );
extern qboolean PlaceDecoy( gentity_t *ent );
@ -86,7 +88,7 @@ RPG-X Addition
Phenix
14/06/2004
===================*/
static void RPGX_SendVersion( gentity_t *other ) {
/*static void RPGX_SendVersion( gentity_t *other ) {
if (!other) {
return;
}
@ -99,7 +101,7 @@ static void RPGX_SendVersion( gentity_t *other ) {
//AWAYS UPDATE! - Version No. - Complier Name - Complier Date
trap_SendServerCommand( other-g_entities, va("chat \"%c ^1RPG-X: Version ^7%s ^1- ^7%s ^1- ^7%s\"",
Q_COLOR_ESCAPE, RPGX_VERSION, RPGX_COMPILEDBY, RPGX_COMPILEDATE));
}
}*/
/*static void RPGX_SendRcon( gentity_t *other ) {
//char buf[144];
@ -142,7 +144,7 @@ static void RPGX_SendVersion( gentity_t *other ) {
//TiM: Removed for 'finnal' release :)
}*/
static void RPGX_SendHelp( gentity_t *other ) {
/*static void RPGX_SendHelp( gentity_t *other ) {
if (!other) {
return;
}
@ -154,9 +156,9 @@ static void RPGX_SendHelp( gentity_t *other ) {
}
trap_SendServerCommand( other-g_entities, "chat \"^1!version = Sends Server Version. !os = Sends OS of Server\"");
}
}*/
static void RPGX_SendOSVersion( gentity_t * other)
/*static void RPGX_SendOSVersion( gentity_t * other)
{
char buf[144];
@ -173,9 +175,9 @@ static void RPGX_SendOSVersion( gentity_t * other)
trap_Cvar_VariableStringBuffer("version", buf, sizeof(buf));
//finish me
/*
strstr(buf, "win")
*/
//strstr(buf, "win")
if (strstr (buf, "win") != 0 ) {
trap_SendServerCommand( other-g_entities, "chat \"^1EXE Operating System: ^7Windows\"" );
} else if (strstr (buf, "linux") != 0 ) {
@ -187,7 +189,7 @@ static void RPGX_SendOSVersion( gentity_t * other)
} else {
trap_SendServerCommand( other-g_entities, "chat \"^1EXE Operating System: ^7Unkown\"" );
}
}
}*/
/*===================
End Addition
====================*/
@ -1510,7 +1512,7 @@ qboolean SetTeam( gentity_t *ent, char *s ) {
}
else
{
if ( g_pModElimination.integer != 0 && numKilled == 0 || g_pModElimination.integer == 0 )
if ( (g_pModElimination.integer != 0 && numKilled == 0) || g_pModElimination.integer == 0 )
{
team = TEAM_FREE;
}
@ -2118,7 +2120,7 @@ static void Cmd_Team_f( gentity_t *ent ) {
trap_Argv( 1, s, sizeof( s ) );
if ( !s || s[0] != 's' )
if ( !s[0] || s[0] != 's' )
{//not trying to become a spectator
/*if ( g_pModElimination.integer )
{
@ -2577,7 +2579,7 @@ static void Cmd_Flight_f( gentity_t *ent )
Cmd_Follow_f
=================
*/
static void Cmd_Follow_f( gentity_t *ent ) {
/*static void Cmd_Follow_f( gentity_t *ent ) {
int i;
char arg[MAX_TOKEN_CHARS];
playerState_t *ps, *ps2;
@ -2586,10 +2588,10 @@ static void Cmd_Follow_f( gentity_t *ent ) {
{//bots can't follow!
return;
}
/*else
else
{
return;
}*/
}
if ( trap_Argc() != 2 ) {
if ( ent->client->sess.spectatorState == SPECTATOR_FOLLOW ) {
@ -2624,7 +2626,7 @@ static void Cmd_Follow_f( gentity_t *ent ) {
return;
// }
/* // if they are playing a tournement game, count as a loss
// if they are playing a tournement game, count as a loss
if ( g_gametype.integer == GT_TOURNAMENT && ent->client->sess.sessionTeam == TEAM_FREE ) {
ent->client->sess.losses++;
}
@ -2632,12 +2634,12 @@ static void Cmd_Follow_f( gentity_t *ent ) {
// first set them to spectator
if ( ent->client->sess.sessionTeam != TEAM_SPECTATOR ) {
SetTeam( ent, "spectator" );
}*/
}
//ent->client->sess.spectatorState = SPECTATOR_FOLLOW;
//ent->client->sess.spectatorClient = i;
}
}*/
/*
=================
@ -2830,7 +2832,7 @@ static void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, cons
name, Q_COLOR_ESCAPE, color, message));
}
static void G_ModifyChatTextForRace(char *chatText, int race) {
/*static void G_ModifyChatTextForRace(char *chatText, int race) {
char c;
int i, min;
@ -2853,9 +2855,9 @@ static void G_ModifyChatTextForRace(char *chatText, int race) {
}
chatText[i] = c;
}
}
}*/
static void G_LanguageMod(char *chatText, int clientNum, int targetNum) {
/*static void G_LanguageMod(char *chatText, int clientNum, int targetNum) {
gentity_t *ent = &g_entities[clientNum];
gentity_t *target = &g_entities[targetNum];
languageData_t *targetLang = target->client->languages;
@ -2868,7 +2870,7 @@ static void G_LanguageMod(char *chatText, int clientNum, int targetNum) {
G_ModifyChatTextForRace(chatText, entLang->language);
}
}
}
}*/
static void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText ) {
int j;
@ -6926,14 +6928,14 @@ void Cmd_BeamToPlayer_f( gentity_t *ent ) {
qboolean validTraceFound = qfalse;
int startPoint;
int totalCount;
int offsetRA[8][2] = { 1, 0, //offsets for each beam test location
1, -1,
0, -1,
-1, -1,
-1, 0,
-1, 1,
0, 1,
1, 1
int offsetRA[8][2] = { { 1, 0 }, //offsets for each beam test location
{ 1, -1 },
{ 0, -1 },
{ -1, -1 },
{ -1, 0 },
{ -1, 1 },
{ 0, 1 },
{ 1, 1 }
};
int viewAngleHeading[8] = { 180, 135, 90, 45, 0, -45, -90, -135 };
qboolean everyone = qfalse;

6
game/g_combat.c
View file

@ -356,7 +356,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
contents = trap_PointContents( self->r.currentOrigin, -1 );
if(rpg_medicsrevive.integer == 1 && !( contents & CONTENTS_NODROP ) && (meansOfDeath != MOD_TRIGGER_HURT)){
static int deathNum;
//static int deathNum;
int anim;
char *classname = NULL;
gentity_t *detpack = NULL;
@ -1574,8 +1574,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
}
// shootable doors / buttons don't actually have any health
if ( targ->s.eType == ET_MOVER && Q_stricmp("func_breakable", targ->classname) != 0 && Q_stricmp("misc_model_breakable", targ->classname) != 0 ||
targ->s.eType == ET_MOVER_STR && Q_stricmp("func_breakable", targ->classname) != 0 && Q_stricmp("misc_model_breakable", targ->classname) != 0) //RPG-X | GSIO01 | 13/05/2009
if ( (targ->s.eType == ET_MOVER && Q_stricmp("func_breakable", targ->classname) != 0 && Q_stricmp("misc_model_breakable", targ->classname) != 0) ||
(targ->s.eType == ET_MOVER_STR && Q_stricmp("func_breakable", targ->classname) != 0 && Q_stricmp("misc_model_breakable", targ->classname) != 0)) //RPG-X | GSIO01 | 13/05/2009
{
if ( !Q_stricmp( targ->classname, "func_forcefield" ) )
{

3
game/g_items.c
View file

@ -65,7 +65,7 @@ vmCvar_t *Min_Weapons[WP_NUM_WEAPONS] = {
// RPG-X: Marcin: Definitions of the PADD messaging system data structures - 06/12/2008
paddData_t paddData[PADD_DATA_MAX] = { 0 };
paddData_t paddData[PADD_DATA_MAX];
int paddDataNum = 0;
int numTotalDropped = 0;
@ -95,6 +95,7 @@ int Max_Weapon(int num)
Min_Weapon
RPG-X | Marcin | 06/12/2008
===============
*/
/**
* Get the minimum ammount of weapons a player can carry for a weapon.
* \param num weapon number (WP_...)

2
game/g_local.h
View file

@ -965,7 +965,7 @@ void SP_fx_spark( gentity_t *ent );
//
// g_cmds.c
//
static void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, const char *name, const char *message );
//static void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, const char *name, const char *message );
//
// g_pweapon.c

30
game/g_main.c
View file

@ -750,25 +750,25 @@ void QDECL G_Error( const char *fmt, ... ) {
stringID_table_t WeaponTable[] = {
ENUM2STRING(WP_TRICORDER),
ENUM2STRING(WP_PADD),
ENUM2STRING(WP_COFFEE),
{ ENUM2STRING(WP_TRICORDER) },
{ ENUM2STRING(WP_PADD) },
{ ENUM2STRING(WP_COFFEE) },
ENUM2STRING(WP_PHASER),
ENUM2STRING(WP_COMPRESSION_RIFLE),
ENUM2STRING(WP_TR116),
{ ENUM2STRING(WP_PHASER) },
{ ENUM2STRING(WP_COMPRESSION_RIFLE) },
{ ENUM2STRING(WP_TR116) },
ENUM2STRING(WP_GRENADE_LAUNCHER),
ENUM2STRING(WP_QUANTUM_BURST),
ENUM2STRING(WP_DISRUPTOR),
{ ENUM2STRING(WP_GRENADE_LAUNCHER) },
{ ENUM2STRING(WP_QUANTUM_BURST) },
{ ENUM2STRING(WP_DISRUPTOR) },
ENUM2STRING(WP_MEDKIT),
ENUM2STRING(WP_VOYAGER_HYPO),
ENUM2STRING(WP_DERMAL_REGEN),
{ ENUM2STRING(WP_MEDKIT) },
{ ENUM2STRING(WP_VOYAGER_HYPO) },
{ ENUM2STRING(WP_DERMAL_REGEN) },
ENUM2STRING(WP_TOOLKIT),
ENUM2STRING(WP_HYPERSPANNER),
NULL, -1
{ ENUM2STRING(WP_TOOLKIT) },
{ ENUM2STRING(WP_HYPERSPANNER) },
{ NULL, -1 }
};
/**************************

18
game/g_mover.c
View file

@ -422,6 +422,8 @@ void ROT_SetMoverState( gentity_t *ent, moverState_t moverState, int time )
VectorScale( delta, f, ent->s.apos.trDelta );
ent->s.apos.trType = TR_LINEAR_STOP;
break;
default: // to make gcc happy
break;
}
BG_EvaluateTrajectory( &ent->s.apos, level.time, ent->r.currentAngles );
}
@ -521,6 +523,8 @@ void SetMoverState( gentity_t *ent, moverState_t moverState, int time ) {
case MOVER_LUA:
break;
#endif
default: // to make gcc happy
break;
}
BG_EvaluateTrajectory( &ent->s.pos, level.time, ent->r.currentOrigin );
BG_EvaluateTrajectory( &ent->s.apos, level.time, ent->r.currentAngles );
@ -868,8 +872,8 @@ void Use_BinaryMover( gentity_t *ent, gentity_t *other, gentity_t *activator ) {
}
//GSIO01 | 09/05/2009: do engage if door is admin only and player isn admin
if(!Q_stricmp(ent->classname, "func_door") && ent->spawnflags & 128
|| !Q_stricmp(ent->classname, "func_door_rotating") && ent->spawnflags & 64) {
if((!Q_stricmp(ent->classname, "func_door") && (ent->spawnflags & 128))
|| (!Q_stricmp(ent->classname, "func_door_rotating") && (ent->spawnflags & 64))) {
if(activator && !IsAdmin(activator))
return;
}
@ -1401,8 +1405,8 @@ void Think_SpawnNewDoorTrigger( gentity_t *ent ) {
}
// should we have a big old trigger volume, or a small one?
if(ent->spawnflags & 256 && !Q_stricmp(ent->classname, "func_door") ||
ent->spawnflags & 128 && !Q_stricmp(ent->classname, "func_door_rotating")) {
if(((ent->spawnflags & 256) && !Q_stricmp(ent->classname, "func_door")) ||
((ent->spawnflags & 128) && !Q_stricmp(ent->classname, "func_door_rotating"))) {
maxs[best] += 12;
mins[best] -= 12;
}
@ -2350,8 +2354,8 @@ static void forcefield_touch( gentity_t *ent, gentity_t *other, trace_t *trace )
ent->r.svFlags &= ~SVF_NOCLIENT;
ent->s.eFlags &= ~EF_NODRAW;
if ( (ent->spawnflags & 4) && /*g_classData[other->client->sess.sessionClass].isAdmin*/ IsAdmin(other) ||
(rpg_borgAdapt.integer && rpg_borgMoveThroughFields.integer && IsBorg(other) && !(ent->spawnflags & 256)) )
if ( ((ent->spawnflags & 4) && IsAdmin(other)) ||
((rpg_borgAdapt.integer && rpg_borgMoveThroughFields.integer && IsBorg(other) && !(ent->spawnflags & 256))) )
{
FieldGoNotSolid( ent );
}
@ -3149,7 +3153,7 @@ void Reached_AdvancedMover(gentity_t *ent) {
ent->damage = 0;
if(!touched->targetname2 && !(ent->spawnflags & 1))
ent->damage = 1;
if(!touched->target && touched->angle || !touched->targetname2 && !(ent->spawnflags & 1) && touched->angle)
if((!touched->target && touched->angle) || (!touched->targetname2 && !(ent->spawnflags & 1) && touched->angle))
bypass = qtrue;
if( touched->wait < 0) {

2
game/g_target.c
View file

@ -1040,7 +1040,7 @@ static void target_turbolift_endMove ( gentity_t *ent )
#ifdef XTRA
// check for shader remaps
if(rpg_calcLiftTravelDuration.integer) {
if(ent->truename && otherLift->truename || ent->falsename && otherLift->falsename) {
if((ent->truename && otherLift->truename) || (ent->falsename && otherLift->falsename)) {
f = level.time * 0.001;
AddRemap(ent->targetShaderName, ent->targetShaderName, f);
AddRemap(otherLift->targetShaderName, otherLift->targetShaderName, f);

4
game/g_team.c
View file

@ -755,9 +755,9 @@ gentity_t *SelectCTFSpawnPoint ( gentity_t *ent, team_t team, int teamstate, vec
}
/*---------------------------------------------------------------------------*/
static int QDECL SortClients( const void *a, const void *b ) {
/*static int QDECL SortClients( const void *a, const void *b ) {
return *(int *)a - *(int *)b;
}
}*/
/*
==================

2
game/g_ui.c
View file

@ -67,7 +67,7 @@ void ui_transporter_use(gentity_t *ent, gentity_t *other, gentity_t *activator)
*/
void ui_transporter_setup(gentity_t *ent) {
//int i;
gentity_t *target;
gentity_t *target = NULL;
target = G_Find(target, FOFS(targetname), ent->target);

4
game/g_weapon.c
View file

@ -500,7 +500,7 @@ void IMODHit(qboolean alt_fire, gentity_t *traceEnt, gentity_t *ent, vec3_t d_di
if (alt_fire)
{
ent->client->accurateCount++;
/*if ( ent->client->accurateCount >= 2 )
if ( ent->client->accurateCount >= 2 )
{
ent->client->accurateCount -= 2;
ent->client->ps.persistant[PERS_REWARD_COUNT]++;
@ -642,7 +642,7 @@ void FireScavengerBullet( gentity_t *ent, vec3_t start, vec3_t dir )
grenade->parent = ent;
grenade->damage = SCAV_ALT_DAMAGE*DMG_VAR*s_quadFactor;
grenade->splashDamage = SCAV_ALT_SPLASH_DAM*s_quadFactor;
grenade->splashRadius = SCAV_ALT_SPLASH_RAD;//*s_quadFactor;
grenade->splashRadius = SCAV_ALT_SPLASH_RAD;// *s_quadFactor;
grenade->methodOfDeath = MOD_SCAVENGER_ALT;
grenade->splashMethodOfDeath = MOD_SCAVENGER_ALT_SPLASH;
grenade->clipmask = MASK_SHOT;

4
game/lua_game.c
View file

@ -279,9 +279,9 @@ static int Game_AlertAddShader(lua_State *L) {
// game.Alert(entity ent, integer target, boolean silent)
static int Game_Alert(lua_State *L) {
lent_t *lent;
/*lent_t *lent;
int current, target;
qboolean silent;
qboolean silent;*/
return 0;
}

BIN
stefgame.suo
View file

Binary file not shown.