q3f atmosphere

This commit is contained in:
Bryce Hutchings 2002-08-25 00:47:00 +00:00
parent a2574a9c4f
commit b45489686a
6 changed files with 49 additions and 3 deletions

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.118 2002/08/25 00:45:24 niceass
// q3f atmosphere
//
// Revision 1.117 2002/08/24 08:01:11 niceass
// new ref system for scoreboard
//
@ -1770,6 +1773,10 @@ extern vmCvar_t cg_RQ3_showOwnKills;
//extern vmCvar_t cg_RQ3_RefID;
extern vmCvar_t cg_RQ3_matchmode;
// q3f atmospheric stuff:
extern vmCvar_t cg_atmosphericEffects;
extern vmCvar_t cg_lowEffects;
//
// cg_main.c
//
@ -1794,6 +1801,13 @@ void CG_SetScoreSelection(void *menu);
score_t *CG_GetSelectedScore();
void CG_BuildSpectatorString();
//
// cg_atmospheric.c
//
void CG_EffectParse( const char *effectstr );
void CG_AddAtmosphericEffects();
qboolean CG_AtmosphericKludge();
//
// cg_view.c
//

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.103 2002/08/25 00:45:24 niceass
// q3f atmosphere
//
// Revision 1.102 2002/08/07 03:35:57 jbravo
// Added dynamic radio and stopped all radio usage during lca
//
@ -502,6 +505,9 @@ vmCvar_t cg_RQ3_capturelimit;
vmCvar_t cg_RQ3_dmflags;
vmCvar_t cg_RQ3_bot_minplayers;
vmCvar_t cg_RQ3_showOwnKills;
// q3f atmospheric stuff
vmCvar_t cg_atmosphericEffects;
vmCvar_t cg_lowEffects;
typedef struct {
vmCvar_t *vmCvar;
@ -691,9 +697,12 @@ static cvarTable_t cvarTable[] = { // bk001129
{&cg_RQ3_dmflags, "dmflags", "0", CVAR_ROM},
{&cg_RQ3_bot_minplayers, "bot_minplayers", "0", CVAR_ROM},
{&cg_RQ3_showOwnKills, "g_RQ3_showOwnKills", "0", CVAR_ROM},
//{ &cg_RQ3_RefID, "g_RQ3_RefID", "0", 0}
// q3f atmospheric stuff:
{ &cg_atmosphericEffects, "cg_atmosphericEffects", "1", CVAR_ARCHIVE },
{ &cg_lowEffects, "cg_lowEffects", "0", CVAR_ARCHIVE },
// { &cg_pmove_fixed, "cg_pmove_fixed", "0", CVAR_USERINFO | CVAR_ARCHIVE }
//{ &cg_RQ3_RefID, "g_RQ3_RefID", "0", 0}
//{ &cg_pmove_fixed, "cg_pmove_fixed", "0", CVAR_USERINFO | CVAR_ARCHIVE }
};
static int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]);

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.64 2002/08/25 00:45:04 niceass
// q3f atmosphere
//
// Revision 1.63 2002/08/24 07:59:23 niceass
// new scoreboard info for refs
//
@ -422,6 +425,9 @@ void CG_SetConfigValues(void)
cgs.blueflag = s[1] - '0';
}
cg.warmup = atoi(CG_ConfigString(CS_WARMUP));
// q3f atmospheric stuff:
if ( cg_atmosphericEffects.integer )
CG_EffectParse( CG_ConfigString( CS_ATMOSEFFECT ) );
}
/*
@ -539,7 +545,9 @@ static void CG_ConfigStringModified(void)
}
} else if (num == CS_SHADERSTATE) {
CG_ShaderStateChanged();
}
} else if( num == CS_ATMOSEFFECT ) {
CG_EffectParse( str );
}
}

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.26 2002/08/25 00:45:40 niceass
// q3f atmosphere
//
// Revision 1.25 2002/08/07 03:35:57 jbravo
// Added dynamic radio and stopped all radio usage during lca
//
@ -1201,6 +1204,7 @@ void CG_DrawActiveFrame(int serverTime, stereoFrame_t stereoView, qboolean demoP
CG_AddMarks();
CG_AddParticles();
CG_AddLocalEntities();
CG_AddAtmosphericEffects(); // q3f atmospheric stuff: Add rain/snow etc.
}
CG_AddViewWeapon(&cg.predictedPlayerState);

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.94 2002/08/25 00:47:00 niceass
// q3f atmosphere
//
// Revision 1.93 2002/08/21 07:00:07 jbravo
// Added CTB respawn queue and fixed game <-> cgame synch problem in CTB
//
@ -542,6 +545,7 @@ extern radio_msg_t female_radio_msgs[];
#define CS_BOTINFO 25
#define CS_ITEMS 27 // string of 0's and 1's that tell which items are present
#define CS_ATMOSEFFECT 28 // q3f: Atmospheric effect, if any.
//Makro - color for the loading screen text
//#define CS_LOADINGSCREEN 29

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.38 2002/08/25 00:46:52 niceass
// q3f atmosphere
//
// Revision 1.37 2002/07/19 04:29:18 niceass
// typo fix
//
@ -832,6 +835,10 @@ void SP_worldspawn(void)
G_SpawnString("enableBreath", "0", &s);
trap_Cvar_Set("g_enableBreath", s);
// q3f atmospheric stuff:
G_SpawnString( "atmosphere", "", &s );
trap_SetConfigstring( CS_ATMOSEFFECT, s ); // Atmospheric effect
G_SpawnString("enableLaserFog", "1", &s);
trap_Cvar_Set("g_enableLaserFog", s);