Compiler warning cleanups

This commit is contained in:
Richard Allen 2002-03-31 03:31:24 +00:00
parent 8cb574035a
commit 0696408380
25 changed files with 194 additions and 91 deletions

View file

@ -174,7 +174,7 @@ VENDOR=unknown
endif #alpha test
BASE_CFLAGS=-pipe
DEBUG_CFLAGS=$(BASE_CFLAGS) -g -pg
DEBUG_CFLAGS=$(BASE_CFLAGS) -g -pg -Wall
DEPEND_CFLAGS= -MM
ifeq ($(ARCH),axp)

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.33 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.32 2002/03/30 02:29:43 jbravo
// Lots of spectator code updates. Removed debugshit, added some color.
//
@ -68,6 +71,9 @@
#include "cg_local.h"
// JBravo: warning fix
void CG_DrawWeaponStats(void);
#ifdef MISSIONPACK
#include "../ui/ui_shared.h"
@ -462,9 +468,10 @@ void CG_DrawFlagModel( float x, float y, float w, float h, int team, qboolean fo
/*
================
CG_DrawStatusBarHead
================
// JBravo: apparently not used.
*/
/*
#ifndef MISSIONPACK
static void CG_DrawStatusBarHead( float x ) {
@ -518,18 +525,21 @@ static void CG_DrawStatusBarHead( float x ) {
cg.snap->ps.clientNum, angles );
}
#endif // MISSIONPACK
*/
/*
================
CG_DrawStatusBarFlag
================
// JBravo: apparently not used.
*/
/*
#ifndef MISSIONPACK
static void CG_DrawStatusBarFlag( float x, int team ) {
CG_DrawFlagModel( x, 480 - ICON_SIZE, ICON_SIZE, ICON_SIZE, team, qfalse );
}
#endif // MISSIONPACK
*/
/*
================
@ -572,11 +582,11 @@ static void CG_DrawStatusBar( void ) {
playerState_t *ps;
int value;//, value2;
vec4_t hcolor;
vec3_t angles;
vec3_t origin;
// vec3_t angles;
// vec3_t origin;
qhandle_t hicon;
qhandle_t icon;
qhandle_t model;
// qhandle_t model;
//#ifdef MISSIONPACK
// qhandle_t handle;
//#endif
@ -1265,6 +1275,8 @@ CG_DrawScores
Draw the small two score display
=================
*/
// JBravo: apparently not used.
/*
#ifndef MISSIONPACK
static float CG_DrawScores( float y ) {
const char *s;
@ -1423,6 +1435,7 @@ static float CG_DrawScores( float y ) {
return y1 - 8;
}
#endif // MISSIONPACK
*/
/*
================
@ -2991,7 +3004,9 @@ CG_DrawIRBlend
Elder: Small red tint
Note: This sucks - causes 10fps drop on my system so don't use it
=====================
// JBravo: apparently not used.
*/
/*
static void CG_DrawIRBlend()
{
vec4_t irColor;
@ -3006,7 +3021,7 @@ static void CG_DrawIRBlend()
CG_FillRect(0,0,SCREEN_WIDTH, SCREEN_HEIGHT, irColor);
}
}
*/
/*
=====================

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.23 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.22 2002/03/21 02:17:39 blaze
// more func_explosive goodness
//
@ -1252,7 +1255,7 @@ void CG_BreakBreakable( centity_t *cent, int eParam ) {
int sparkCount;
int i, mass, material;
float tension, bouncyness, size;
int modelbias[10] = { 0, 0, 0, 0, 1, 1, 1, 2, 2 };
// int modelbias[10] = { 0, 0, 0, 0, 1, 1, 1, 2, 2 };
mass = ((eParam >> 4) & 0x0F) + 1;
tension = 0.25 * (((eParam >> 2) & 0x03) + 1);

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.21 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.20 2002/03/31 02:03:35 niceass
// new testing tag command
//
@ -129,7 +132,7 @@ void CG_PositionRotatedOffsetEntityOnTag( refEntity_t *entity, const refEntity_t
qhandle_t parentModel, char *tagName, vec3_t Offset ) {
int i;
orientation_t lerped;
vec3_t tempAxis[3], tmp;
vec3_t tempAxis[3]; //, tmp;
//AxisClear( entity->axis );
// lerp the tag

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.47 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.46 2002/03/23 05:17:42 jbravo
// Major cleanup of game -> cgame communication with LCA vars.
//
@ -64,6 +67,8 @@
// cg_event.c -- handle entity events at snapshot or playerstate transitions
#include "cg_local.h"
// JBravo: warning fix
void CG_BreakBreakable(centity_t *cent, int eParam);
// for the voice chats
#ifdef MISSIONPACK // bk001205

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.14 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.13 2002/03/24 21:24:51 makro
// Added a drop-shadow effect to the loading screen
//
@ -41,7 +44,9 @@ static qhandle_t loadingItemIcons[MAX_LOADING_ITEM_ICONS];
===================
CG_DrawLoadingIcons
===================
// JBravo: apparently not used.
*/
/*
static void CG_DrawLoadingIcons( void ) {
int n;
int x, y;
@ -61,7 +66,7 @@ static void CG_DrawLoadingIcons( void ) {
CG_DrawPic( x, y, 32, 32, loadingItemIcons[n] );
}
}
*/
/*
======================

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.21 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.20 2002/03/23 05:50:47 jbravo
// Moved enableDust out of the missionpack
//
@ -1182,7 +1185,7 @@ cg.time should be between oldFrameTime and frameTime after exit
static void CG_RunLerpFrame( clientInfo_t *ci, lerpFrame_t *lf, int newAnimation, float speedScale, qboolean weaponAnim ) {
int f, numFrames;
animation_t *anim;
qboolean resetAnim = qfalse;
// qboolean resetAnim = qfalse;
// debugging tool to get no animations
if ( cg_animSpeed.integer == 0 ) {

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.19 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.18 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
@ -350,7 +353,9 @@ void CG_CheckChangedPredictableEvents( playerState_t *ps ) {
==================
pushReward
==================
// JBravo: apparently not used.
*/
/*
static void pushReward(sfxHandle_t sfx, qhandle_t shader, int rewardCount) {
if (cg.rewardStack < (MAX_REWARDSTACK-1)) {
cg.rewardStack++;
@ -359,6 +364,7 @@ static void pushReward(sfxHandle_t sfx, qhandle_t shader, int rewardCount) {
cg.rewardCount[cg.rewardStack] = rewardCount;
}
}
*/
/*
==================
@ -367,7 +373,7 @@ CG_CheckLocalSounds
*/
void CG_CheckLocalSounds( playerState_t *ps, playerState_t *ops ) {
int highScore, health, armor, reward;
sfxHandle_t sfx;
// sfxHandle_t sfx;
// don't play the sounds if the player just changed teams
if ( ps->persistant[PERS_TEAM] != ops->persistant[PERS_TEAM] ) {

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.19 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.18 2002/03/30 02:29:43 jbravo
// Lots of spectator code updates. Removed debugshit, added some color.
//
@ -278,7 +281,7 @@ CG_TouchItem
===================
*/
static void CG_TouchItem( centity_t *cent ) {
gitem_t *item;
// gitem_t *item;
//Blaze: No item prediction
return;
// JBravo - Compiler warnings over unreached code.

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.21 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.20 2002/03/31 02:01:32 niceass
// fixes and changes
//
@ -61,7 +64,7 @@
// cg_scoreboard -- draw the scoreboard on top of the game screen
#include "cg_local.h"
static qboolean localClient; // true if local client has been displayed
//static qboolean localClient; // true if local client has been displayed
#define SB_WIDTH 330
#define SB_FONTSIZEW 7

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.60 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.59 2002/03/31 02:00:42 niceass
// shell stuff
//
@ -204,10 +207,10 @@ CG_MachineGunEjectBrass
localEntity_t *CG_MachineGunEjectBrass( centity_t *cent ) {
localEntity_t *le;
refEntity_t *re;
vec3_t velocity, xvelocity;
vec3_t offset, xoffset;
float waterScale = 1.0f;
vec3_t v[3];
// vec3_t velocity, xvelocity;
// vec3_t offset, xoffset;
// float waterScale = 1.0f;
// vec3_t v[3];
if ( cg_brassTime.integer <= 0 ) {
return NULL;
@ -250,11 +253,11 @@ CG_ShotgunEjectBrass
localEntity_t *CG_ShotgunEjectBrass( centity_t *cent ) {
localEntity_t *le;
refEntity_t *re;
vec3_t velocity, xvelocity;
vec3_t offset, xoffset;
vec3_t v[3];
int i;//, isHC;
float waterScale = 1.0f;
// vec3_t velocity, xvelocity;
// vec3_t offset, xoffset;
// vec3_t v[3];
// int i;//, isHC;
// float waterScale = 1.0f;
//if (cent->currentState.weapon == WP_HANDCANNON)
// isHC=1;
@ -446,6 +449,8 @@ void CG_RailTrail( clientInfo_t *ci, vec3_t start, vec3_t end ) {
CG_RocketTrail
==========================
*/
// JBravo: not used
/*
static void CG_RocketTrail( centity_t *ent, const weaponInfo_t *wi ) {
int step;
vec3_t origin, lastPos;
@ -507,6 +512,7 @@ static void CG_RocketTrail( centity_t *ent, const weaponInfo_t *wi ) {
}
}
*/
#ifdef MISSIONPACK
/*
@ -582,6 +588,8 @@ static void CG_NailTrail( centity_t *ent, const weaponInfo_t *wi ) {
CG_NailTrail
==========================
*/
// JBravo: apparently not used.
/*
static void CG_PlasmaTrail( centity_t *cent, const weaponInfo_t *wi ) {
localEntity_t *le;
refEntity_t *re;
@ -672,6 +680,8 @@ static void CG_PlasmaTrail( centity_t *cent, const weaponInfo_t *wi ) {
le->angles.trDelta[2] = 0;
}
*/
/*
==========================
CG_GrappleTrail
@ -713,12 +723,14 @@ void CG_GrappleTrail( centity_t *ent, const weaponInfo_t *wi ) {
/*
==========================
CG_GrenadeTrail
JBravo: not used
==========================
*/
/*
static void CG_GrenadeTrail( centity_t *ent, const weaponInfo_t *wi ) {
CG_RocketTrail( ent, wi );
}
*/
/*
=================
@ -1117,9 +1129,10 @@ VIEW WEAPON
/*
=================
CG_MapTorsoToWeaponFrame
// JBravo: not used.
=================
*/
/*
static int CG_MapTorsoToWeaponFrame( clientInfo_t *ci, int frame ) {
// change weapon
@ -1143,7 +1156,7 @@ static int CG_MapTorsoToWeaponFrame( clientInfo_t *ci, int frame ) {
return 0;
}
*/
/*
==============
@ -1211,8 +1224,8 @@ angle)
NiceAss; I've torn this function up with testing... ignore it =P
===============
*/
/*
static void CG_LightningBolt( centity_t *cent, vec3_t origin ) {
/*
trace_t trace;
refEntity_t beam;
vec3_t forward;
@ -1254,9 +1267,8 @@ static void CG_LightningBolt( centity_t *cent, vec3_t origin ) {
if ( trace.fraction < 1.0 ) {
}
*/
}
*/
/*
===============
@ -1266,6 +1278,8 @@ Origin will be the exact tag point, which is slightly
different than the muzzle point used for determining hits.
===============
*/
// JBravo: not used.
/*
static void CG_SpawnRailTrail( centity_t *cent, vec3_t origin ) {
clientInfo_t *ci;
@ -1281,13 +1295,15 @@ static void CG_SpawnRailTrail( centity_t *cent, vec3_t origin ) {
//Blaze: No Rail Trail
//CG_RailTrail( ci, origin, cent->pe.railgunImpact );
}
*/
/*
======================
CG_MachinegunSpinAngle
======================
*/
// JBravo: not used.
/*
#define SPIN_SPEED 0.9
#define COAST_TIME 1000
static float CG_MachinegunSpinAngle( centity_t *cent ) {
@ -1320,7 +1336,7 @@ static float CG_MachinegunSpinAngle( centity_t *cent ) {
return angle;
}
*/
/*
========================

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.31 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.30 2002/03/02 12:24:30 jbravo
// Removed some debugging messages
//
@ -870,7 +873,7 @@ gitem_t *BG_FindItemForHoldable( holdable_t pw ) {
// JBravo: fix for HoldableItem not found error during mapchanges.
// I dont understand why this gets called with pw == 0 during map changes.
if (pw == 0)
return;
return NULL;
for ( i = 0 ; i < bg_numItems ; i++ ) {
if ( bg_itemlist[i].giType == IT_HOLDABLE && bg_itemlist[i].giTag == pw ) {
@ -1461,8 +1464,6 @@ BG_TouchJumpPad
========================
*/
void BG_TouchJumpPad( playerState_t *ps, entityState_t *jumppad ) {
vec3_t angles;
float p;
int effectNum;
// spectators don't use jump pads

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.65 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.64 2002/03/27 17:20:38 jbravo
// Workaround to the bandage bug :)
//
@ -90,7 +93,7 @@ int c_pmove = 0;
float rxn_rampAccelerate = 130;
float rxn_rampAccelerateVert = 110;
/*
===============
RXN_RampMunge
@ -794,7 +797,9 @@ static void PM_GrappleMove( void ) {
PM_LimpMove
Movement while you have leg damage
===================================
// JBravo: apparently this isnt used.
*/
/*
static void PM_LimpMove( void)
{
int i;
@ -919,7 +924,7 @@ static void PM_LimpMove( void)
}
*/
/*
===================
@ -2099,9 +2104,10 @@ static void PM_TorsoAnimation( void ) {
/*
==============
PM_WeaponAnimation
JBravo: this isnt used either.
==============
*/
/*
static void PM_WeaponAnimation( void ) {
//if (pm->ps->weaponstate == WEAPON_RELOADING)
//{
@ -2115,7 +2121,7 @@ static void PM_WeaponAnimation( void ) {
//PM_ContinueWeaponAnim( WP_ANIM_ACTIVATE );
return;
}
*/
/*
==============
@ -2926,11 +2932,9 @@ static void PM_Weapon( void ) {
PM_StartTorsoAnim( TORSO_ATTACK2 );
} else {
// Elder: don't repeat if semi-auto
if ( !(pm->ps->weapon == WP_PISTOL && pm->ps->stats[STAT_BURST] ||
pm->ps->weapon == WP_M4 && pm->ps->stats[STAT_BURST] > 2 ||
pm->ps->weapon == WP_MP5 && pm->ps->stats[STAT_BURST] > 2) )
{
if (!(pm->ps->weapon == WP_PISTOL && pm->ps->stats[STAT_BURST]) ||
!(pm->ps->weapon == WP_M4 && pm->ps->stats[STAT_BURST] > 2) ||
!(pm->ps->weapon == WP_MP5 && pm->ps->stats[STAT_BURST] > 2)) {
PM_StartTorsoAnim( TORSO_ATTACK );
// QUARANTINE - Weapon animations

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.11 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.10 2002/02/04 02:05:28 jbravo
// removed an extraneous return value from a void routine
//
@ -144,10 +147,10 @@ void PM_StepSlideMove ( qboolean gravity )
vec3_t up, down;
// use the step move
vec3_t old_normal;
/* vec3_t old_normal;
float delta0;
float delta1;
float delta2;
float delta2; */
vec3_t tmp_o;
VectorCopy (pm->ps->origin, start_o);

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.57 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.56 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
@ -1321,7 +1324,7 @@ void ClientSpawn(gentity_t *ent) {
int i;
clientPersistant_t saved;
clientSession_t savedSess;
int persistant[MAX_PERSISTANT], savedpers[MAX_PERSISTANT];
int persistant[MAX_PERSISTANT];
gentity_t *spawnPoint;
int flags;
int savedPing;
@ -1682,10 +1685,12 @@ void ClientDisconnect( int clientNum ) {
switch(ent->client->pers.captain ) {
case TEAM_RED:
trap_Cvar_Set("RQ3_team1", "0");
break;
break;
case TEAM_BLUE:
trap_Cvar_Set("RQ3_team2", "0");
break;
break;
default:
break;
}
}

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.86 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.85 2002/03/30 23:20:10 jbravo
// Added damage in scoreboard.
//
@ -877,11 +880,13 @@ void SetTeam( gentity_t *ent, char *s )
// client->sess.savedTeam = team;
switch(ent->client->pers.captain) {
case TEAM_RED:
trap_Cvar_Set("RQ3_team1", "0");
break;
trap_Cvar_Set("RQ3_team1", "0");
break;
case TEAM_BLUE:
trap_Cvar_Set("RQ3_team2", "0");
break;
trap_Cvar_Set("RQ3_team2", "0");
break;
default:
break;
}
}

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.55 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.54 2002/03/30 17:37:48 jbravo
// Added damage tracking to the server. Added zcam flic mode. cleaned up g_damage.
//
@ -83,7 +86,9 @@
// g_combat.c
#include "g_local.h"
// JBravo: for warnings.
void AddKilledPlayer (gentity_t * self, gentity_t * ent);
void ResetKills(gentity_t *ent);
/*
============
@ -1362,7 +1367,7 @@ dflags these flags are used to control how T_Damage works
void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
vec3_t dir, vec3_t point, int damage, int dflags, int mod ) {
gclient_t *client;
int take, save, asave, knockback, max;
int take, save, asave, knockback; //, max;
int bleeding = 0, instant_dam = 1;
vec3_t bulletPath, bulletAngle, line;
vec_t dist;
@ -1654,10 +1659,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
// First things first. If we're not damaging them, why are we here?
// Elder: removed M3, handcannon, and grenades from location damage code
if (take && mod == MOD_M3 ||
mod == MOD_HANDCANNON ||
mod == MOD_GRENADE ||
mod == MOD_GRENADE_SPLASH) {
if (take && (mod == MOD_M3 || mod == MOD_HANDCANNON ||
mod == MOD_GRENADE || mod == MOD_GRENADE_SPLASH)) {
bleeding = 1;
instant_dam = 0;
@ -1676,9 +1679,9 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
if (targ != attacker)
trap_SendServerCommand( attacker-g_entities, va("print \"You hit %s^7\n\"", targ->client->pers.netname));
}
} else if (take && mod == MOD_PISTOL || mod == MOD_M4 ||
} else if (take && (mod == MOD_PISTOL || mod == MOD_M4 ||
mod == MOD_SNIPER || mod == MOD_MP5 || mod == MOD_AKIMBO ||
mod == MOD_KNIFE || mod == MOD_KNIFE_THROWN) {
mod == MOD_KNIFE || mod == MOD_KNIFE_THROWN)) {
bleeding = 1;
instant_dam = 0;

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.31 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.30 2002/01/14 01:20:45 niceass
// No more default 800 gravity on items
// Thrown knife+Glass fix - NiceAss
@ -1600,9 +1603,9 @@ Support function for RQ3_ResetItem
==============
*/
void RQ3_DroppedItemThink(gentity_t *ent) {
gitem_t *rq3_item;
gentity_t *rq3_temp;
float angle = rand() % 360;
// gitem_t *rq3_item;
// gentity_t *rq3_temp;
// float angle = rand() % 360;
switch (ent->item->giTag)
{

View file

@ -1,4 +1,6 @@
#include "g_local.h"
// JBravo: for warnings
int ClientNumberFromString(gentity_t *to, char *s);
qboolean checkCaptain(team_t team) {
gentity_t *ent;

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.25 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.24 2002/03/20 22:58:54 blaze
// changed dlight to light_d
//
@ -91,7 +94,7 @@ void SP_dlight( gentity_t *ent ) {
vec3_t color;
float light;
int r, g, b, i;
int style;
// int style;
G_SpawnFloat( "light", "300", &light );
G_SpawnVector( "_color", "1 1 1", color );

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.23 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.22 2002/03/21 04:27:53 blaze
// more func_explosive goodness
//
@ -61,7 +64,7 @@ G_TestEntityPosition
gentity_t *G_TestEntityPosition( gentity_t *ent ) {
trace_t tr;
int mask;
vec3_t origin2;
// vec3_t origin2;
if ( ent->clipmask ) {
mask = ent->clipmask;

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.13 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.12 2002/03/23 05:17:43 jbravo
// Major cleanup of game -> cgame communication with LCA vars.
//
@ -205,7 +208,7 @@ void SP_team_blueobelisk( gentity_t *ent );
void SP_team_redobelisk( gentity_t *ent );
void SP_team_neutralobelisk( gentity_t *ent );
#endif
void SP_item_botroam( gentity_t *ent ) {};
//void SP_item_botroam( gentity_t *ent ) {};
// JBravo: adding explosive
void SP_func_explosive (gentity_t *self);
@ -284,7 +287,7 @@ spawn_t spawns[] = {
{"team_neutralobelisk", SP_team_neutralobelisk},
#endif
{"func_explosive", SP_func_explosive}, // JBravo: for explosive.
{"item_botroam", SP_item_botroam},
// {"item_botroam", SP_item_botroam},
{0, 0}
};

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.49 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.48 2002/03/30 17:37:49 jbravo
// Added damage tracking to the server. Added zcam flic mode. cleaned up g_damage.
//
@ -172,6 +175,9 @@ gitem_t *BG_FindItemForHoldable( holdable_t pw );
char *ConcatArgs( int start );
int touch[MAX_GENTITIES];
void ResetKills(gentity_t *ent);
void ClearBodyQue (void);
void Cmd_DropItem_f(gentity_t *ent);
void Cmd_DropWeapon_f(gentity_t *ent);
void CheckTeamRules()
{
@ -309,9 +315,6 @@ void CheckTeamRules()
void StartLCA()
{
int i;
gentity_t *player;
CleanLevel();
trap_Cvar_Set("g_RQ3_lca", "1");
level.lights_camera_action = (41*level.fps)/10;
@ -322,9 +325,6 @@ void StartLCA()
void ContinueLCA()
{
int i;
gentity_t *player;
if (level.lights_camera_action == (21*level.fps)/10) {
trap_SendServerCommand( -1, "camera");
}
@ -356,7 +356,7 @@ qboolean BothTeamsHavePlayers()
void MakeAllLivePlayersObservers()
{
gentity_t *player;
int saveteam, i;
int i;
for (i = 0; i < level.maxclients; i++) {
player = &g_entities[i];
@ -580,7 +580,6 @@ void CheckForUnevenTeams(gentity_t *player)
{
int i, onteam1 = 0, onteam2 = 0;
gentity_t *ent;
char buffer[1024];
for (i = 0; i < level.maxclients; i++) {
ent = &g_entities[i];
@ -607,7 +606,7 @@ void SpawnPlayers()
{
gentity_t *player;
gclient_t *client;
int clientNum, i, x;
int clientNum, i;
level.spawnPointsLocated = qfalse;
for (i = 0; i < level.maxclients; i++) {
@ -648,7 +647,6 @@ void RQ3_Cmd_Choose_f( gentity_t *ent )
{
// char cmd[MAX_STRING_CHARS];
char *cmd;
int len, c;
if ( !ent->client ) {
return; // not fully in game yet

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.39 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.38 2002/03/30 15:25:57 makro
// Fixed door kicking
//
@ -34,6 +37,8 @@
// perform the server side effects of a weapon firing
#include "g_local.h"
// JBravo: for warnings
void Use_BinaryMover(gentity_t *ent, gentity_t *other, gentity_t *activator);
static float s_quadFactor;
static vec3_t forward, right, up;
@ -1447,7 +1452,7 @@ MK23 Attack
*/
void Weapon_MK23_Fire(gentity_t *ent)
{
int i;
// int i;
float spread;
// Homer: increment burst if needed
@ -2416,12 +2421,12 @@ void Laser_Gen( gentity_t *ent, qboolean enabled ) {
void Laser_Think( gentity_t *self )
{
vec3_t end, start, forward, up;
trace_t tr, tr2;
trace_t tr; //, tr2;
int l=0, passent;
gentity_t *traceEnt;
// NiceAss: For fog:
gentity_t *tent;
vec3_t fogStart;
// gentity_t *tent;
// vec3_t fogStart;
//If the player dies, is spectator, or wrong weapon, kill the dot
if (self->parent->client->ps.pm_type == PM_DEAD ||

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.10 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups
//
// Revision 1.9 2002/03/30 19:33:29 jbravo
// Made CameraFlicBegin and CameraSwingCycle non static for M$ VC
//
@ -229,7 +232,7 @@ static gentity_t *ClosestVisible (gentity_t *ent, float maxrange, qboolean pvs)
static int NumPlayers (void)
{
int i, count = 0;
gentity_t *current;
// gentity_t *current;
for (i = 0; i < level.maxclients; i++)
{
@ -251,7 +254,7 @@ static int NumPlayers (void)
static void PointCamAtOrigin (gentity_t *ent, vec3_t location)
{
int i;
// int i;
vec3_t diff, angles;
VectorSubtract(location, ent->client->ps.origin, diff);
@ -262,7 +265,7 @@ static void PointCamAtOrigin (gentity_t *ent, vec3_t location)
static void PointCamAtTarget (gentity_t *ent)
{
int i;
// int i;
vec3_t diff, angles;
float difference;
@ -341,11 +344,11 @@ static void FindCamPos (gentity_t *ent, float angle, vec3_t offset_position, vec
static void RepositionAtTarget (gentity_t *ent, vec3_t offset_position)
{
int i;
// int i;
vec3_t diff;
vec3_t cam_pos;
trace_t trace;
camera_t *camera;
// camera_t *camera;
qboolean snapto = qfalse; // snapto towards target when jumping to new position
ent->client->camera->flic_watching_the_wall = qfalse;
@ -447,7 +450,7 @@ static void RepositionAtTarget (gentity_t *ent, vec3_t offset_position)
static void RepositionAtOrigin (gentity_t *ent, vec3_t offset_position)
{
int i;
// int i;
vec3_t cam_pos;
trace_t trace;
@ -559,7 +562,7 @@ static void SwitchToNewTarget (gentity_t *ent, gentity_t *new_target)
static void CameraFlicThink (gentity_t *ent)
{
int clientID;
// int clientID;
vec3_t camera_offset;
int num_visible;
gentity_t *new_target;
@ -693,7 +696,7 @@ void CameraFlicBegin (gentity_t *ent)
static void CameraStaticThink (gentity_t *ent)
{
int i;
// int i;
trace_t trace;
vec3_t end_floor, end_ceiling;
static vec3_t mins = { -4, -4, -4 };
@ -966,8 +969,8 @@ static void CameraSwingThink (gentity_t *ent)
gentity_t *target;
vec3_t forward, right;
trace_t trace;
trace_t trace_left, trace_right;
int i;
// trace_t trace_left, trace_right;
// int i;
vec3_t oldgoal;
vec3_t angles;
vec3_t viewangles;