diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp index 2dd8b97c..83b68063 100644 --- a/code/cgame/cg_commands.cpp +++ b/code/cgame/cg_commands.cpp @@ -1144,11 +1144,20 @@ void ClientGameCommandManager::Print(Event* ev) } } +qboolean ClientGameCommandManager::IsBlockCommand(const str& name) +{ + return qfalse; +} + +void ClientGameCommandManager::DelayedRepeat(Event* ev) +{ + // FIXME: unimplemented +} + //=============== // CommandDelay //=============== void ClientGameCommandManager::CommandDelay(Event* ev) - { int i; int delay; @@ -1182,6 +1191,26 @@ void ClientGameCommandManager::CommandDelay(Event* ev) ProcessEvent(ev1); } +void ClientGameCommandManager::StartSFX(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::StartSFXDelayed(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::StartSFXCommand(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::EndIgnoreSfxBlock() +{ + // FIXME: unimplemented +} + void ClientGameCommandManager::SetCurrentSFX(specialeffect_t* pSFX) { m_pCurrentSfx = pSFX; @@ -1212,6 +1241,7 @@ void ClientGameCommandManager::RandomChance(Event* ev) ProcessEvent(ev1); } } + //=============== // SetDetail //=============== @@ -1221,6 +1251,36 @@ void ClientGameCommandManager::SetDetail(Event* ev) m_spawnthing->cgd.flags |= T_DETAIL; } +void ClientGameCommandManager::SetWindAffect(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SpriteGridLighting(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetWaterOnly(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetClampVel(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetClampVelAxis(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetAlignStretch(Event* ev) +{ + // FIXME: unimplemented +} + //=============== // SetDecalRadius //=============== @@ -1564,6 +1624,11 @@ void ClientGameCommandManager::SetRandomRoll(Event* ev) m_spawnthing->cgd.flags |= T_RANDOMROLL; } +void ClientGameCommandManager::SetVolumetric(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetCollision //============= @@ -1611,6 +1676,11 @@ void ClientGameCommandManager::SetOffsetAlongAxis(Event* ev) } } +void ClientGameCommandManager::SetCone(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetOriginOffset //============= @@ -1742,6 +1812,11 @@ void ClientGameCommandManager::SetFadeDelay(Event* ev) m_spawnthing->cgd.flags |= T_FADE; } +void ClientGameCommandManager::SetSpawnRange(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetFadeIn //============= @@ -1830,6 +1905,11 @@ void ClientGameCommandManager::SetColor(Event* ev) } } +void ClientGameCommandManager::SetColorRange(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetEntityColor //============= @@ -1899,6 +1979,11 @@ void ClientGameCommandManager::SetRandomVelocityAlongAxis(Event* ev) SetRandomVelocity(ev); } +void ClientGameCommandManager::SetRadialVelocity(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetVelocity //============= @@ -1973,6 +2058,11 @@ void ClientGameCommandManager::ParentAngles(Event* ev) m_spawnthing->cgd.flags |= T_ANGLES; } +void ClientGameCommandManager::EmitterAngles(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetAccel //============= @@ -1986,6 +2076,16 @@ void ClientGameCommandManager::SetAccel(Event* ev) m_spawnthing->cgd.flags2 |= T2_ACCEL; } +void ClientGameCommandManager::SetFriction(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetVaryColor(Event* ev) +{ + // FIXME: unimplemented +} + //============= // SetCount //============= @@ -2049,6 +2149,16 @@ void ClientGameCommandManager::TagList(Event* ev) } } +void ClientGameCommandManager::SetEyeLimits(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetEyeMovement(Event* ev) +{ + // FIXME: unimplemented +} + //============= // InitializeSpawnthing //============= @@ -2148,6 +2258,11 @@ spawnthing_t* ClientGameCommandManager::InitializeSpawnthing(spawnthing_t* sp) return sp; } +void ClientGameCommandManager::SpawnEffect(int count, spawnthing_t* sp) +{ + // FIXME: unimplemented +} + //================== // GetEmitterByName //================== @@ -4089,6 +4204,11 @@ void ClientGameCommandManager::StopSound(Event* ev) cgi.S_StopSound(current_entity_number, channel); } +void ClientGameCommandManager::StopAliasChannel(Event* ev) +{ + // FIXME: unimplemented +} + //=============== // LoopSound //=============== @@ -4194,6 +4314,16 @@ void ClientGameCommandManager::Cache(Event* ev) CacheResource(ev->GetString(1)); } +void ClientGameCommandManager::CacheImage(Event* ev) +{ + // FIXME: stub +} + +void ClientGameCommandManager::CacheFont(Event* ev) +{ + // FIXME: stub +} + //=============== // AliasResource //=============== @@ -4211,6 +4341,12 @@ void AliasResource(dtiki_t* pmdl, const char* alias, const char* realname, } } +int bLoadForMap__FPCcT0(char* psMapsBuffer, char* name) +{ + // FIXME: stub + return 0; +} + //=============== // AliasCache //=============== @@ -4268,6 +4404,16 @@ void ClientGameCommandManager::Alias(Event* ev) AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer); } +void CacheAliasList(AliasList_t* alias_list, str & name) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::CacheAlias(Event* ev) +{ + // FIXME: unimplemented +} + //=============== // Footstep //=============== @@ -4287,6 +4433,21 @@ void ClientGameCommandManager::Footstep(Event* ev) } } +void ClientGameCommandManager::LandingSound(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::BodyFallSOund(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SetAlwaysDraw(Event* ev) +{ + // FIXME: unimplemented +} + //=============== // Client //=============== @@ -4408,6 +4569,16 @@ void ClientGameCommandManager::DynamicLight(Event* ev) } } +void ClientGameCommandManager::BlockDynamicLight(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::EndBlockDynamicLight(Event* ev) +{ + // FIXME: unimplemented +} + static int emittercount = 0; //=============== @@ -4764,6 +4935,18 @@ void ClientGameCommandManager::RemoveClientEntity(int number, dtiki_t* tiki, } } +bool ClientGameCommandManager::GetTagPositionAndOrientation(int tagnum, orientation_t* new_or) +{ + // FIXME: unimplemented + return false; +} + +bool ClientGameCommandManager::GetTagPositionAndOrientation(str tagname, orientation_t* new_or) +{ + // FIXME: unimplemented + return false; +} + //=============== // FreeAllTempModels //=============== @@ -4785,31 +4968,19 @@ void ClientGameCommandManager::FreeAllTempModels(void) //=============== // FreeAllEmitters //=============== -void ClientGameCommandManager::FreeAllEmitters(void) - +void ClientGameCommandManager::RestartAllEmitters(void) { - m_emitters.ClearObjectList(); + // FIXME: stub?? } //=============== // CG_RestartCommandManager //=============== void CG_RestartCommandManager() - { commandManager.FreeAllTempModels(); } -//=============== -// CG_FlushCommandManager -//=============== -void CG_FlushCommandManager(void) - -{ - commandManager.FreeAllTempModels(); - commandManager.FreeAllEmitters(); -} - //================= // CG_ProcessInitCommands //================= @@ -5478,4 +5649,28 @@ void ClientGameCommandManager::InitializeBeams() // FIXME: unimplemented } -void CG_Event(centity_t* cent) { commandManager.CGEvent(cent); } +void CG_Event(centity_t* cent) +{ + commandManager.CGEvent(cent); +} + + +void ClientGameCommandManager::SetCurrentTiki(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::EventViewKick(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::SpawnTreads(Event* ev) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::TreadsOff(Event* ev) +{ + // FIXME: unimplemented +} diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h index 6b3b47f0..d822f7a4 100644 --- a/code/cgame/cg_commands.h +++ b/code/cgame/cg_commands.h @@ -691,12 +691,10 @@ private: float m_fEventWait; void (ClientGameCommandManager::*endblockfcn)(void); - ctempmodel_t* AllocateTempModel(void); - qboolean TempModelPhysics(ctempmodel_t* p, float ftime, float time2, - float scale); - qboolean TempModelRealtimeEffects(ctempmodel_t* p, float ftime, float time2, - float scale); - qboolean LerpTempModel(refEntity_t* newEnt, ctempmodel_t* p, float frac); + cvssource_t* AllocateVSSSource(); + void FreeVSSSource(cvssource_t *p); + void SpawnVSSSource(int count, int timealive); + void EventViewKick(Event* ev); void Print(Event* ev); void StartBlock(Event* ev); void EndBlock(Event* ev); @@ -712,6 +710,7 @@ private: void SetColor(Event* ev); void SetColorRange(Event* ev); void SetLightstyle(Event* ev); + void SetRadialVelocity(Event* ev); void SetVelocity(Event* ev); void SetAngularVelocity(Event* ev); void SetCount(Event* ev); @@ -723,15 +722,20 @@ private: void SetRandomVelocity(Event* ev); void SetRandomVelocityAlongAxis(Event* ev); void SetAccel(Event* ev); + void SetFriction(Event* ev); + void SetVaryColor(Event* ev); void SetFade(Event* ev); void SetFadeDelay(Event* ev); + void SetSpawnRange(Event* ev); void SetSpawnRate(Event* ev); void SetOriginOffset(Event* ev); void SetOffsetAlongAxis(Event* ev); + void SetCone(Event* ev); void SetCircle(Event* ev); void SetSphere(Event* ev); void SetInwardSphere(Event* ev); void SetRandomRoll(Event* ev); + void SetVolumetric(Event* ev); void SetSwarm(Event* ev); void SetAlign(Event* ev); void SetAlignOnce(Event* ev); @@ -745,13 +749,12 @@ private: void SetHardLink(Event* ev); void SetAngles(Event* ev); void ParentAngles(Event* ev); + void EmitterAngles(Event* ev); void SetTwinkle(Event* ev); void SetTrail(Event* ev); void SetPhysicsRate(Event* ev); void SetBounceDecal(Event* ev); void UpdateSwarm(ctempmodel_t* p); - void SpawnTempModel(int count, int timealive = 0); - void FreeTempModel(ctempmodel_t* le); void BeginOriginSpawn(Event* ev); void EndOriginSpawn(void); void BeginOriginBeamSpawn(Event* ev); @@ -772,22 +775,23 @@ private: void EmitterOff(Event* ev); void RainTouch(Event* ev); void Sound(Event* ev); + void SetCurrentTiki(Event* ev); void StopSound(Event* ev); + void StopAliasChannel(Event* ev); void LoopSound(Event* ev); void Cache(Event* ev); + void CacheImage(Event* ev); + void CacheFont(Event* ev); void AliasCache(Event* ev); void Alias(Event* ev); + void CacheAlias(Event* ev); void Client(Event* ev); void TagDynamicLight(Event* ev); void OriginDynamicLight(Event* ev); void DynamicLight(Event* ev); + void BlockDynamicLight(Event* ev); + void EndBlockDynamicLight(Event* ev); void GetOrientation(int tagnum, spawnthing_t* sp); - void AnimateTempModel(ctempmodel_t* ent, Vector origin, - refEntity_t* newEnt); - void OtherTempModelEffects(ctempmodel_t* p, Vector origin, - refEntity_t* newEnt); - qboolean IsBlockCommand(const str& name); - void SetBaseAndAmplitude(Event* ev, Vector& base, Vector& amplitude); void Swipe(Event* ev); void SwipeOn(Event* ev); void SwipeOff(Event* ev); @@ -798,7 +802,30 @@ private: void TagList(Event* ev); void SetParallel(Event* ev); void Footstep(Event* ev); + void LandingSound(Event* ev); + void BodyFallSOund(Event* ev); + void SetAlwaysDraw(Event* ev); void SetDetail(Event* ev); + void SetWindAffect(Event* ev); + void SpriteGridLighting(Event* ev); + void SetWaterOnly(Event* ev); + void SetAlignStretch(Event* ev); + void SetClampVel(Event* ev); + void SetClampVelAxis(Event* ev); + ctempmodel_t* AllocateTempModel(void); + qboolean TempModelPhysics(ctempmodel_t* p, float ftime, float time2, + float scale); + qboolean TempModelRealtimeEffects(ctempmodel_t* p, float ftime, float time2, + float scale); + qboolean LerpTempModel(refEntity_t* newEnt, ctempmodel_t* p, float frac); + void SpawnTempModel(int count, int timealive = 0); + void FreeTempModel(ctempmodel_t* le); + void AnimateTempModel(ctempmodel_t* ent, Vector origin, + refEntity_t* newEnt); + void OtherTempModelEffects(ctempmodel_t* p, Vector origin, + refEntity_t* newEnt); + qboolean IsBlockCommand(const str& name); + void SetBaseAndAmplitude(Event* ev, Vector& base, Vector& amplitude); // Beam stuff void SetSubdivisions(Event* ev); @@ -814,9 +841,19 @@ private: void SetSpread(Event* ev); void SetUseLastTraceEnd(Event* ev); void SetEndAlpha(Event* ev); - + void SetEyeLimits(Event* ev); + void SetEyeMovement(Event* ev); + void StartSFX(Event* ev); + void StartSFXDelayed(Event* ev); + void StartSFXCommand(Event* ev); + void EndIgnoreSfxBlock(); void RandomChance(Event* ev); + void DelayedRepeat(Event* ev); void CommandDelay(Event* ev); + void SpawnTreads(Event* ev); + void TreadsOff(Event* ev); + bool GetTagPositionAndOrientation(int tagnum, orientation_t* new_or); + bool GetTagPositionAndOrientation(str tagname, orientation_t* new_or); public: CLASS_PROTOTYPE(ClientGameCommandManager); @@ -831,9 +868,9 @@ public: float min_distance = -1, float pitch = -1, int argstype = 0); spawnthing_t* InitializeSpawnthing(spawnthing_t* ep); - void SpawnTempModel(int count, class spawnthing_t* sp); + void SpawnEffect(int count, spawnthing_t* sp); void FreeAllTempModels(void); - void FreeAllEmitters(void); + void RestartAllEmitters(void); void InitializeTempModels(void); void InitializeTempModelCvars(void); @@ -842,6 +879,7 @@ public: ctempmodel_t* p = NULL); void ClearSwipes(void); void ResetTempModels(void); + void SpawnTempModel(int count, spawnthing_t* sp); inline void SetSpawnthing(spawnthing_t* st) { m_spawnthing = st; }; spawnthing_t* CreateNewEmitter(str emittername); spawnthing_t* CreateNewEmitter(void); diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index 1f82058c..18023994 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -497,7 +497,6 @@ void CG_ProcessCacheInitCommands(dtiki_t* tiki); void CG_EndTiki(dtiki_t* tiki); qboolean CG_Command_ProcessFile( const char * filename, qboolean quiet, dtiki_t *curTiki ); void CG_RestartCommandManager(); -void CG_FlushCommandManager( void ); qboolean CG_ProcessEntityCommands(int frame, int anim, int entnum, refEntity_t* ent, centity_t* cent); void CG_ClientCommands(refEntity_t* ent, centity_t* cent, int slot); diff --git a/code/cgame/cg_nature.cpp b/code/cgame/cg_nature.cpp index 69b1030d..8f690f82 100644 --- a/code/cgame/cg_nature.cpp +++ b/code/cgame/cg_nature.cpp @@ -29,6 +29,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA cvar_t* cg_rain; cvar_t* cg_rain_drawcoverage; +void RainTouch(ctempmodel_t* ct, trace_t* trace) +{ + // FIXME: unimplemented +} + +void ClientGameCommandManager::RainTouch(Event* ev) +{ + // FIXME: stub?? +} + void ClientGameCommandManager::InitializeRainCvars() { int i; @@ -50,3 +60,8 @@ void ClientGameCommandManager::InitializeRainCvars() cg.rain.numshaders = 0; } + +void CG_Rain(centity_t* cent) +{ + // FIXME: unimplemented +} diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp index 237f4b52..1048396a 100644 --- a/code/cgame/cg_volumetricsmoke.cpp +++ b/code/cgame/cg_volumetricsmoke.cpp @@ -60,13 +60,29 @@ cvar_t *vss_gridsize; cvar_t *vss_default_r; cvar_t *vss_default_g; cvar_t *vss_default_b; -cvar_t *vss_lighting_fps; +cvar_t* vss_lighting_fps; + +cvssource_t* ClientGameCommandManager::AllocateVSSSource() +{ + // FIXME: unimplemented + return nullptr; +} + +void ClientGameCommandManager::FreeVSSSource(cvssource_t* p) +{ + // FIXME: unimplemented +} void ClientGameCommandManager::ResetVSSSources() { // FIXME: unimplemented } +void ClientGameCommandManager::ResetVSSSources(Event* ev) +{ + // FIXME: unimplemented +} + void CG_ResetVSSSources() { commandManager.ResetVSSSources(); @@ -99,6 +115,11 @@ void ClientGameCommandManager::InitializeVSSCvars() vss_lighting_fps = cgi.Cvar_Get("vss_lighting_fps", "15", 0); } +void ClientGameCommandManager::SpawnVSSSource(int count, int timealive) +{ + // FIXME: unimplemented +} + void CG_AddVSSSources() { commandManager.AddVSSSources();