diff options
| author | Tim Angus <tim@ngus.net> | 2003-09-21 18:23:47 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2003-09-21 18:23:47 +0000 |
| commit | 51f8195fe9846eaf3482da7ccce44064a7c2900a (patch) | |
| tree | 62fa42690362537f3419753bf738765a12aaac80 /src/cgame/cg_main.c | |
| parent | 84e75ec07a5027e76726bc28073438d8c9a8d04a (diff) | |
* Fully generalised scriptable paricle system
* Changes to Makefile and depend file for above
* Tweaks to entities.def
* Apparently a bunch of other stuff I've forgotten about
Diffstat (limited to 'src/cgame/cg_main.c')
| -rw-r--r-- | src/cgame/cg_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 22db4dba..01e8bedd 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -788,6 +788,8 @@ static void CG_RegisterGraphics( void ) cgs.media.wakeMarkShader = trap_R_RegisterShader( "wake" ); cgs.media.bloodMarkShader = trap_R_RegisterShader( "bloodMark" ); + cgs.media.testParticleSystem = CG_RegisterParticleSystem( "blah" ); + // register the inline models cgs.numInlineModels = trap_CM_NumInlineModels( ); @@ -1677,8 +1679,11 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) cg.loading = qtrue; // force players to load instead of defer + CG_LoadParticleSystems( ); + CG_UpdateMediaFraction( 0.05f ); + CG_RegisterSounds( ); - CG_UpdateMediaFraction( 0.33f ); + CG_UpdateMediaFraction( 0.60f ); CG_RegisterGraphics( ); CG_UpdateMediaFraction( 0.90f ); |