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

Moved enableDust out of the missionpack

Browse source
This commit is contained in:
Richard Allen 2002-03-23 05:50:47 +00:00
parent 24b3613714
commit ce5910d3bc
4 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.58 2002/03/23 05:50:47 jbravo
// Moved enableDust out of the missionpack
//
// Revision 1.57 2002/03/23 05:17:42 jbravo // Revision 1.57 2002/03/23 05:17:42 jbravo
// Major cleanup of game -> cgame communication with LCA vars. // Major cleanup of game -> cgame communication with LCA vars.
// //
@ -1048,9 +1051,11 @@ typedef struct {
qhandle_t invulnerabilityImpactModel; qhandle_t invulnerabilityImpactModel;
qhandle_t invulnerabilityJuicedModel; qhandle_t invulnerabilityJuicedModel;
qhandle_t medkitUsageModel; qhandle_t medkitUsageModel;
qhandle_t dustPuffShader;
qhandle_t heartShader; qhandle_t heartShader;
#endif #endif
// JBravo: moved out of MISSIONPACK
qhandle_t dustPuffShader;
qhandle_t invulnerabilityPowerupModel; qhandle_t invulnerabilityPowerupModel;
// scoreboard headers // scoreboard headers
@ -1550,10 +1555,11 @@ extern vmCvar_t cg_singlePlayerActive;
extern vmCvar_t cg_recordSPDemo; extern vmCvar_t cg_recordSPDemo;
extern vmCvar_t cg_recordSPDemoName; extern vmCvar_t cg_recordSPDemoName;
extern vmCvar_t cg_obeliskRespawnDelay; extern vmCvar_t cg_obeliskRespawnDelay;
extern vmCvar_t cg_enableDust;
#endif #endif
// NiceAss: No longer part of the MissionPack // NiceAss: No longer part of the MissionPack
extern vmCvar_t cg_enableBreath; extern vmCvar_t cg_enableBreath;
// JBravo: ditto
extern vmCvar_t cg_enableDust;
//Blaze: Cheat cvars //Blaze: Cheat cvars
extern cheat_cvar cheats[30]; extern cheat_cvar cheats[30];
// JBravo: Teamplay cvars synched from game // JBravo: Teamplay cvars synched from game

13
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.50 2002/03/23 05:50:47 jbravo
// Moved enableDust out of the missionpack
//
// Revision 1.49 2002/03/23 05:17:42 jbravo // Revision 1.49 2002/03/23 05:17:42 jbravo
// Major cleanup of game -> cgame communication with LCA vars. // Major cleanup of game -> cgame communication with LCA vars.
// //
@ -268,7 +271,6 @@ vmCvar_t cg_singlePlayerActive;
vmCvar_t cg_recordSPDemo; vmCvar_t cg_recordSPDemo;
vmCvar_t cg_recordSPDemoName; vmCvar_t cg_recordSPDemoName;
vmCvar_t cg_obeliskRespawnDelay; vmCvar_t cg_obeliskRespawnDelay;
vmCvar_t cg_enableDust;
#endif #endif
//Blaze: cheat struct //Blaze: cheat struct
cheat_cvar cheats[30]; cheat_cvar cheats[30];
@ -283,6 +285,8 @@ vmCvar_t MM_team1;
vmCvar_t MM_team2; vmCvar_t MM_team2;
// NiceAss: Taken out of the missionpack // NiceAss: Taken out of the missionpack
vmCvar_t cg_enableBreath; vmCvar_t cg_enableBreath;
// JBravo: ditto
vmCvar_t cg_enableDust;
typedef struct { typedef struct {
vmCvar_t *vmCvar; vmCvar_t *vmCvar;
@ -382,10 +386,11 @@ static cvarTable_t cvarTable[] = { // bk001129
{ &cg_recordSPDemoName, "ui_recordSPDemoName", "", CVAR_ARCHIVE}, { &cg_recordSPDemoName, "ui_recordSPDemoName", "", CVAR_ARCHIVE},
{ &cg_obeliskRespawnDelay, "g_obeliskRespawnDelay", "10", CVAR_SERVERINFO}, { &cg_obeliskRespawnDelay, "g_obeliskRespawnDelay", "10", CVAR_SERVERINFO},
{ &cg_hudFiles, "cg_hudFiles", "ui/hud.txt", CVAR_ARCHIVE}, { &cg_hudFiles, "cg_hudFiles", "ui/hud.txt", CVAR_ARCHIVE},
{ &cg_enableDust, "g_enableDust", "0", CVAR_SERVERINFO},
#endif #endif
// NiceAss: Taken out of the missionpack // NiceAss: Taken out of the missionpack
{ &cg_enableBreath, "g_enableBreath", "0", CVAR_SERVERINFO}, { &cg_enableBreath, "g_enableBreath", "0", CVAR_SERVERINFO},
// JBravo: ditto
{ &cg_enableDust, "g_enableDust", "0", CVAR_SERVERINFO},
{ &cg_cameraOrbit, "cg_cameraOrbit", "0", CVAR_CHEAT}, { &cg_cameraOrbit, "cg_cameraOrbit", "0", CVAR_CHEAT},
{ &cg_cameraOrbitDelay, "cg_cameraOrbitDelay", "50", CVAR_ARCHIVE}, { &cg_cameraOrbitDelay, "cg_cameraOrbitDelay", "50", CVAR_ARCHIVE},
@ -1199,8 +1204,10 @@ static void CG_RegisterGraphics( void ) {
} }
cgs.media.redKamikazeShader = trap_R_RegisterShader( "models/weaphits/kamikred" ); cgs.media.redKamikazeShader = trap_R_RegisterShader( "models/weaphits/kamikred" );
cgs.media.dustPuffShader = trap_R_RegisterShader("hasteSmokePuff" );
#endif #endif
// JBravo: moved outof MISSIONPACK
cgs.media.dustPuffShader = trap_R_RegisterShader("hasteSmokePuff" );
if ( cgs.gametype >= GT_TEAM || cg_buildScript.integer ) { if ( cgs.gametype >= GT_TEAM || cg_buildScript.integer ) {
cgs.media.friendShader = trap_R_RegisterShader( "sprites/foe" ); cgs.media.friendShader = trap_R_RegisterShader( "sprites/foe" );

10
reaction/cgame/cg_players.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.20 2002/03/23 05:50:47 jbravo
// Moved enableDust out of the missionpack
//
// Revision 1.19 2002/03/04 20:50:59 jbravo // Revision 1.19 2002/03/04 20:50:59 jbravo
// No floating scores over dead bodies, triangles disabled, and no viewing // No floating scores over dead bodies, triangles disabled, and no viewing
// names of enemys just of teammates. // names of enemys just of teammates.
@ -1779,12 +1782,12 @@ static void CG_BreathPuffs( centity_t *cent, refEntity_t *head) {
ci->breathPuffTime = cg.time + 2000; ci->breathPuffTime = cg.time + 2000;
} }
#ifdef MISSIONPACK
/* /*
=============== ===============
CG_DustTrail CG_DustTrail
=============== ===============
*/ */
// JBravo: no longer in MISSIONPACK.
static void CG_DustTrail( centity_t *cent ) { static void CG_DustTrail( centity_t *cent ) {
int anim; int anim;
localEntity_t *dust; localEntity_t *dust;
@ -1829,8 +1832,6 @@ static void CG_DustTrail( centity_t *cent ) {
cgs.media.dustPuffShader ); cgs.media.dustPuffShader );
} }
#endif
/* /*
=============== ===============
CG_TrailItem CG_TrailItem
@ -2815,10 +2816,9 @@ void CG_Player( centity_t *cent ) {
// NiceAss: Outside the MISSIONPACK // NiceAss: Outside the MISSIONPACK
CG_BreathPuffs(cent, &head); CG_BreathPuffs(cent, &head);
#ifdef MISSIONPACK
// JBravo: ditto
CG_DustTrail(cent); CG_DustTrail(cent);
#endif
// //
// add the gun / barrel / flash // add the gun / barrel / flash

10
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.36 2002/03/23 05:50:47 jbravo
// Moved enableDust out of the missionpack
//
// Revision 1.35 2002/03/23 05:17:43 jbravo // Revision 1.35 2002/03/23 05:17:43 jbravo
// Major cleanup of game -> cgame communication with LCA vars. // Major cleanup of game -> cgame communication with LCA vars.
// //
@ -185,11 +188,13 @@ vmCvar_t g_cubeTimeout;
vmCvar_t g_redteam; vmCvar_t g_redteam;
vmCvar_t g_blueteam; vmCvar_t g_blueteam;
vmCvar_t g_singlePlayer; vmCvar_t g_singlePlayer;
vmCvar_t g_enableDust;
vmCvar_t g_proxMineTimeout; vmCvar_t g_proxMineTimeout;
#endif #endif
// NiceAss: Taken out of the missionpack // NiceAss: Taken out of the missionpack
vmCvar_t g_enableBreath; vmCvar_t g_enableBreath;
// JBravo: ditto
vmCvar_t g_enableDust;
// bk001129 - made static to avoid aliasing // bk001129 - made static to avoid aliasing
static cvarTable_t gameCvarTable[] = { static cvarTable_t gameCvarTable[] = {
@ -267,11 +272,12 @@ static cvarTable_t gameCvarTable[] = {
{ &g_blueteam, "g_blueteam", "Pagans", CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO , 0, qtrue, qtrue }, { &g_blueteam, "g_blueteam", "Pagans", CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO , 0, qtrue, qtrue },
{ &g_singlePlayer, "ui_singlePlayerActive", "", 0, 0, qfalse, qfalse }, { &g_singlePlayer, "ui_singlePlayerActive", "", 0, 0, qfalse, qfalse },
{ &g_enableDust, "g_enableDust", "0", CVAR_SERVERINFO, 0, qtrue, qfalse },
{ &g_proxMineTimeout, "g_proxMineTimeout", "20000", 0, 0, qfalse }, { &g_proxMineTimeout, "g_proxMineTimeout", "20000", 0, 0, qfalse },
#endif #endif
// NiceAss: Taken out of the missionpack // NiceAss: Taken out of the missionpack
{ &g_enableBreath, "g_enableBreath", "0", CVAR_SERVERINFO, 0, qtrue, qfalse }, { &g_enableBreath, "g_enableBreath", "0", CVAR_SERVERINFO, 0, qtrue, qfalse },
// JBravo: ditto
{ &g_enableDust, "g_enableDust", "0", CVAR_SERVERINFO, 0, qtrue, qfalse },
{ &g_smoothClients, "g_smoothClients", "1", 0, 0, qfalse}, { &g_smoothClients, "g_smoothClients", "1", 0, 0, qfalse},
{ &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO, 0, qfalse}, { &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO, 0, qfalse},
{ &pmove_msec, "pmove_msec", "8", CVAR_SYSTEMINFO, 0, qfalse}, { &pmove_msec, "pmove_msec", "8", CVAR_SYSTEMINFO, 0, qfalse},