ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-13 00:24:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup and reformatting of some structs in g_local.h

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-02-25 13:23:30 +01:00
parent fd6e6fca30
commit fed00c7f67
1 changed files with 130 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
code/game/g_local.h
View file

@ -115,9 +115,7 @@ typedef struct {
char message[MAX_QPATH]; //!< msg when player enters class
int weaponsFlags; //!< flags denoting default weapons of this class
//int color[3]; //Color denoting the color of dot in radar and class color
//int iconColor; //Denoting which set of icons to use in the scoreboard
char modelSkin[36]; //!< Denoting which skin this class is forced to
int isAdmin; //!< class has admin access
@ -125,10 +123,6 @@ typedef struct {
int isMedical; //!< class has medical capacity
int isn00b; //!< class is a dumbass
int isBorg; //!< class is a borg
//int hasRanks;
//int noShow; //DON'T show this rank in the UI menu
} g_classData_t;
//Class Data
@ -317,11 +311,6 @@ struct gentity_s {
gitem_t* item; //!< for bonus items
qboolean botDelayBegin;
//RPG-X: RedTechie - Added this :P
//gentity_t *beingfiredby;
//RPG-X: J2J Added to slow down the tr116 rate of fire.
//int last_tr116_fire; //TiM - Why? Why not use addTime in bg_pmove like the other weapons?
char* swapname; //RPG-X Modification | Phenix | 13/06/2004
char* truename;
@ -329,48 +318,28 @@ struct gentity_s {
char* truetarget;
char* falsetarget;
qboolean booleanstate;
//char *gravity; //End Modification || GSIO01 || 28.05.2009 || now in targetname2
//float stopAt; //RPG-X | Phenix | 8/8/2004 || GSIO01: using distance now
//float intensity; //RPG-X | Phenix | 20/11/2004 | For Target_Shake Map Entity | GSIO01: using distance now
float distance; // VALKYRIE: for rotating doors
int n00bCount; //RPG-X | Phenix | 06/04/2004 | For when people kill
//RPG-X: TiM : Additional Params for map ents
//float radius; //Explosion Radius | GSIO01: using distance instead
char* targetname2; // GSIO01 | 08/05/2009
//int soundLocked; // GSIO01 | 08/05/2009 for locked doors | now using n00bCount instead
gentity_t *touched; // GSIO01 | 08/05/2009 repairing breakables
//char *lockMsg; // GSIO01 | 10/05/2009 | --> swapname
//char *unlockMsg; // GSIO01 | 10/05/2009 | --> truename
//GSIO01 | 10/05/2009 | ok these are for target_alert:
char //*greenname, //--> swapname
//*yellowname, //--> truename
//*redname, //-->falsename
*bluename,
//*greentarget, //-->truetarget
//*yellowtarget, //-->falsetarget
//*redtarget, //-->paintarget
//*bluetarget, //-->targetname2
*greensound,
*yellowsound,
*redsound,
*bluesound;
//GSIO01 | 19/05/2009 | target_warp
//char //*swapWarp, // -->swapname
//*swapCoreState, // -->truename
//*swapCoreEject, // -->falsename
//*warpTarget, // -->truetarget
//*core, // -->falsetarget
//*coreSwap; // -->bluename
gentity_t* touched; // GSIO01 | 08/05/2009 repairing breakables
//GSIO01 | 10/05/2009 | ok these are for target_alert:
char* bluename;
char* greensound;
char* yellowsound;
char* redsound;
char* bluesound;
char *targetShaderName; //!< shader to remap for shader remapping
char *targetShaderNewName; //!< shader to remap to for shader remapping
qboolean tmpEntity; //!< is this a temporal entity?
#ifdef G_LUA
// for lua hooks
// pointers to lua functions
@ -390,6 +359,7 @@ struct gentity_s {
char* luaParm4;
qboolean luaEntity;
#endif
vec4_t startRGBA;
vec4_t finalRGBA;
};
@ -464,13 +434,13 @@ typedef struct {
* MUST be dealt with in G_InitSessionData() / G_ReadSessionData() / G_WriteSessionData()
*/
typedef struct {
team_t sessionTeam;
//pclass_t sessionClass;
int sessionClass;
team_t sessionTeam; //!< team of the client
int sessionClass; //!< class of the client is in
int spectatorTime; //!< for determining next-in-line to play
spectatorState_t spectatorState;
spectatorState_t spectatorState; //!< spectator state
int spectatorClient; //!< for chasecam and follow mode
int wins, losses; //!< tournament stats
int wins; //!< tournament stat wins
int losses; //!< tournament stat losses
} clientSession_t;
#define MAX_VOTE_COUNT 3
@ -551,7 +521,6 @@ struct gclient_s {
qboolean fireHeld; //!< used for hook
gentity_t* hook; //!< grapple hook if out
//gentity_t *lasersight; // lasersight OR flashlight if in use
int switchTeamTime;