rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-13 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

More cleanups

Browse source
This commit is contained in:
Richard Allen 2002-03-31 13:52:48 +00:00
parent 3c2a5e576c
commit d4fa0e669f
4 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/Makefile
View file

@ -76,7 +76,7 @@ CGOBJ = \
$(CGDIRNAME)/cg_view.o \ $(CGDIRNAME)/cg_view.o \
$(CGDIRNAME)/cg_weapons.o $(CGDIRNAME)/cg_weapons.o
UIOBJ = \ OLDUIOBJ = \
$(UIDIRNAME)/ui_main.o \ $(UIDIRNAME)/ui_main.o \
$(UIDIRNAME)/ui_cdkey.o \ $(UIDIRNAME)/ui_cdkey.o \
$(UIDIRNAME)/ui_ingame.o \ $(UIDIRNAME)/ui_ingame.o \
@ -121,7 +121,7 @@ UIOBJ = \
$(UIDIRNAME)/ui_mods.o $(UIDIRNAME)/ui_mods.o
TAUIOBJ = \ UIOBJ = \
$(UIDIRNAME)/ui_main.o \ $(UIDIRNAME)/ui_main.o \
$(GDIRNAME)/bg_misc.o \ $(GDIRNAME)/bg_misc.o \
$(GDIRNAME)/q_math.o \ $(GDIRNAME)/q_math.o \

22
reaction/cgame/cg_consolecmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.39 2002/03/31 13:52:48 jbravo
// More cleanups
//
// Revision 1.38 2002/03/30 21:51:42 jbravo // Revision 1.38 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam. // Removed all those ifdefs for zcam.
// //
@ -89,10 +92,11 @@ void CG_TargetCommand_f( void ) {
/* /*
================= =================
CG_DropWeapon_f CG_DropWeapon_f
JBravo: not used.
Elder: reset local zoom, then proceed with server action Elder: reset local zoom, then proceed with server action
================= =================
*/ */
/*
static void CG_DropWeapon_f (void) { static void CG_DropWeapon_f (void) {
if ( !cg.snap ) { if ( !cg.snap ) {
//CG_Printf("No snapshot: normally exiting\n"); //CG_Printf("No snapshot: normally exiting\n");
@ -119,14 +123,16 @@ static void CG_DropWeapon_f (void) {
// CG_RQ3_Zoom1x(); // CG_RQ3_Zoom1x();
trap_SendClientCommand("dropweapon"); trap_SendClientCommand("dropweapon");
} }
*/
/* /*
================= =================
CG_DropItem_f CG_DropItem_f
JBravo: not used.
Elder: Do any client pre-processing here for drop item Elder: Do any client pre-processing here for drop item
================= =================
*/ */
/*
static void CG_DropItem_f (void) { static void CG_DropItem_f (void) {
if ( !cg.snap ) { if ( !cg.snap ) {
//CG_Printf("No snapshot: normally exiting\n"); //CG_Printf("No snapshot: normally exiting\n");
@ -145,6 +151,7 @@ static void CG_DropItem_f (void) {
trap_SendClientCommand("dropitem"); trap_SendClientCommand("dropitem");
} }
*/
/* /*
================= =================
@ -698,11 +705,11 @@ static void CG_Camera_f( void ) {
/* /*
================== ==================
CG_Say_f CG_Say_f
JBravo: not used.
Elder: Pre-validate say command to avoid text flooding Elder: Pre-validate say command to avoid text flooding
================== ==================
*/ */
/*
static void CG_Say_f ( void ) { static void CG_Say_f ( void ) {
if (cg.time - cg.sayTime > 2000) if (cg.time - cg.sayTime > 2000)
@ -723,16 +730,16 @@ static void CG_Say_f ( void ) {
trap_SendClientCommand("say"); trap_SendClientCommand("say");
} }
*/
/* /*
================== ==================
CG_SayTeam_f CG_SayTeam_f
JBravo: Not used.
Elder: Pre-validate say_team command to avoid text flooding Elder: Pre-validate say_team command to avoid text flooding
================== ==================
*/ */
/*
static void CG_SayTeam_f ( void ) { static void CG_SayTeam_f ( void ) {
if (cg.time - cg.sayTime > 2000) if (cg.time - cg.sayTime > 2000)
@ -753,6 +760,7 @@ static void CG_SayTeam_f ( void ) {
trap_SendClientCommand("say_team"); trap_SendClientCommand("say_team");
} }
*/
/* /*
================== ==================

5
reaction/cgame/cg_ents.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.22 2002/03/31 13:52:48 jbravo
// More cleanups
//
// Revision 1.21 2002/03/31 03:31:24 jbravo // Revision 1.21 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups // Compiler warning cleanups
// //
@ -483,7 +486,7 @@ static void CG_Item( centity_t *cent ) {
if ( item->giTag == WP_KNIFE ) if ( item->giTag == WP_KNIFE )
scale = WEAPON_KNIFE_SCALE; scale = WEAPON_KNIFE_SCALE;
else if ( item->giType == IT_WEAPON && item->giTag != WP_KNIFE ) else if ( item->giType == IT_WEAPON && item->giTag != WP_KNIFE )
scale = WEAPON_GUN_SCALE; scale = (float)WEAPON_GUN_SCALE;
else else
scale = WEAPON_OTHER_SCALE; scale = WEAPON_OTHER_SCALE;

9
reaction/cgame/cg_weapons.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.61 2002/03/31 13:52:48 jbravo
// More cleanups
//
// Revision 1.60 2002/03/31 03:31:24 jbravo // Revision 1.60 2002/03/31 03:31:24 jbravo
// Compiler warning cleanups // Compiler warning cleanups
// //
@ -1580,9 +1583,9 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent
float scale; float scale;
vec3_t angles, Offset; vec3_t angles, Offset;
if (weaponNum == WP_PISTOL) scale = 0.6; if (weaponNum == WP_PISTOL) scale = (float)0.6;
if (weaponNum == WP_SSG3000) scale = 0.9; if (weaponNum == WP_SSG3000) scale = (float)0.9;
if (weaponNum == WP_MP5) scale = 1.0; if (weaponNum == WP_MP5) scale = (float)1.0;
memset( &silencer, 0, sizeof( silencer ) ); memset( &silencer, 0, sizeof( silencer ) );
silencer.hModel = cgs.media.rq3_silencerModel; silencer.hModel = cgs.media.rq3_silencerModel;