rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-26 14:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed all those ifdefs for zcam.

Browse source
This commit is contained in:
Richard Allen 2002-03-30 21:51:42 +00:00
parent c45a75013b
commit 633f42bbf8
8 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/cgame/cg_consolecmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.38 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.37 2002/03/30 02:29:43 jbravo
// Lots of spectator code updates. Removed debugshit, added some color.
//
@ -945,9 +948,7 @@ void CG_InitConsoleCommands( void ) {
trap_AddCommand ("choose");
trap_AddCommand ("drop");
// JBravo: for zcam
#ifdef __ZCAM__
trap_AddCommand ("camera");
#endif
// JBravo: for radio
trap_AddCommand ("radio");
trap_AddCommand ("radiogender");

4
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.60 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.59 2002/03/24 22:48:29 niceass
// cg_draw change for scoreboard
//
@ -88,7 +91,6 @@
// so there is NO persistant data between levels on the client side.
// If you absolutely need something stored, it can either be kept
// by the server in the server stored userinfos, or stashed in a cvar.
#define __ZCAM__
#ifdef MISSIONPACK
#define CG_FONT_THRESHOLD 0.1

6
reaction/game/g_active.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.66 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.65 2002/03/30 17:37:48 jbravo
// Added damage tracking to the server. Added zcam flic mode. cleaned up g_damage.
//
@ -98,10 +101,7 @@
#include "g_local.h"
// JBravo: need TP functions
#include "g_teamplay.h"
#ifdef __ZCAM__
#include "zcam.h"
#endif /* __ZCAM__ */
//Elder: got rid of these

7
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.56 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.55 2002/03/30 02:29:43 jbravo
// Lots of spectator code updates. Removed debugshit, added some color.
//
@ -107,9 +110,7 @@
// Copyright (C) 1999-2000 Id Software, Inc.
//
#include "g_local.h"
#ifdef __ZCAM__
#include "zcam.h"
#endif /* __ZCAM__ */
// JBravo: fixme. Hack to use SelectInitialSpawnPoint() in ClientSpawn.
gentity_t *SelectInitialSpawnPoint( vec3_t origin, vec3_t angles );
@ -1707,9 +1708,7 @@ void ClientDisconnect( int clientNum ) {
}
}
#ifdef __ZCAM__
camera_disconnect (ent);
#endif /* __ZCAM__ */
// send effect if they were completely connected
if ( ent->client->pers.connected == CON_CONNECTED

7
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.84 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.83 2002/03/30 02:29:43 jbravo
// Lots of spectator code updates. Removed debugshit, added some color.
//
@ -153,9 +156,7 @@
// Copyright (C) 1999-2000 Id Software, Inc.
//
#include "g_local.h"
#ifdef __ZCAM__
#include "zcam.h"
#endif /* __ZACM__ */
//Blaze: was there a extra ../ here?
#include "../ui/menudef.h" // for the voice chats
@ -2953,10 +2954,8 @@ void ClientCommand( int clientNum ) {
//Elder: stuff for dropping items
else if (Q_stricmp (cmd, "dropitem") == 0)
Cmd_DropItem_f( ent );
#ifdef __ZCAM__
else if (Q_stricmp (cmd, "camera") == 0)
camera_cmd ( ent );
#endif /* __ZCAM__ */
else if (Q_stricmp (cmd, "playerstats") == 0)
{
Cmd_PlayerStats_f( ent );

14
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.60 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.59 2002/03/26 11:32:05 jbravo
// Remember specstate between rounds.
//
@ -103,9 +106,6 @@
// the "gameversion" client command will print this plus compile date
#define GAMEVERSION "reaction"
// NiceAss: Took it out until later.
#define __ZCAM__
#define BODY_QUEUE_SIZE 8
// JBravo: Max number of killed enemys to track
@ -315,11 +315,9 @@ typedef enum {
SPECTATOR_NOT,
SPECTATOR_FREE,
SPECTATOR_FOLLOW,
#ifdef __ZCAM__
SPECTATOR_ZCAM,
SPECTATOR_CAMERA_FLIC,
SPECTATOR_CAMERA_SWING,
#endif
SPECTATOR_SCOREBOARD
} spectatorState_t;
@ -407,9 +405,7 @@ typedef struct {
int records[REC_NUM_RECORDS]; // Elder: for our statistics tracking
} clientPersistant_t;
#ifdef __ZCAM__
struct camera_s;
#endif /* __ZCAM__ */
// Elder: spam prevention defaults
/*
@ -575,9 +571,7 @@ struct gclient_s {
#endif
char *areabits;
#ifdef __ZCAM__
struct camera_s *camera;
#endif /* __ZCAM__ */
struct camera_s *camera;
// JBravo adding TP stuff
int specMode;
int teamplayWeapon;

9
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.40 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.39 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
@ -93,9 +96,7 @@
//
#include "g_local.h"
#ifdef __ZCAM__
#include "zcam.h"
#endif /* __ZCAM__ */
level_locals_t level;
@ -613,9 +614,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
g_entities[i].client = level.clients + i;
}
#ifdef __ZCAM__
camera_init ();
#endif /* __ZCAM__ */
// always leave room for the max number of clients,
// even if they aren't all used, so numbers inside that
@ -712,9 +711,7 @@ void G_ShutdownGame( int restart ) {
trap_FS_FCloseFile( level.logFile );
}
#ifdef __ZCAM__
camera_shutdown ();
#endif /* __ZCAM__ */
// write all the client session data so we can get it back
G_WriteSessionData();

11
reaction/game/g_session.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.13 2002/03/30 21:51:42 jbravo
// Removed all those ifdefs for zcam.
//
// Revision 1.12 2002/03/26 11:32:05 jbravo
// Remember specstate between rounds.
//
@ -38,10 +41,7 @@
// Copyright (C) 1999-2000 Id Software, Inc.
//
#include "g_local.h"
#ifdef __ZCAM__
#include "zcam.h"
#endif /* __ZCAM__ */
/*
@ -88,9 +88,7 @@ void G_WriteClientSessionData( gclient_t *client ) {
trap_Cvar_Set( var, s );
#ifdef __ZCAM__
camera_state_save (client);
#endif /* __ZCAM__ */
}
/*
@ -131,9 +129,8 @@ void G_ReadSessionData( gclient_t *client ) {
client->sess.teamLeader = (qboolean)teamLeader;
client->sess.savedTeam = (team_t)savedTeam;
#ifdef __ZCAM__
camera_state_load (client);
#endif /* __ZCAM__ */
}