diff --git a/code/cgame/cg_beam.cpp b/code/cgame/cg_beam.cpp index 9043ea1c..56b4f36a 100644 --- a/code/cgame/cg_beam.cpp +++ b/code/cgame/cg_beam.cpp @@ -186,7 +186,6 @@ void RemoveBeamList ( int owner ) - { int i, num; @@ -209,7 +208,6 @@ beamEnt_t* FindBeamList ( int owner ) - { int i, num; @@ -230,7 +228,6 @@ int CreateNewBeamEntity int owner, float life ) - { beamEnt_t* be; int i, oldest, oldest_time; @@ -285,7 +282,6 @@ void RemoveBeamEntity ( int owner ) - { RemoveBeamList(owner); } @@ -298,7 +294,6 @@ void AddBeamSegmentToList int segnum, int renderfx ) - { beamEnt_t* be; @@ -327,7 +322,6 @@ void CG_AddBeamsFromList int owner, int beamshader ) - { int i, j, k, l; float frac, fade; @@ -386,7 +380,6 @@ void RenderSegment int beamshader, int renderfx ) - { int i, j; polyVert_t points[4]; @@ -436,7 +429,6 @@ void CG_MultiBeamBegin ( void ) - { ptctr = 0; } @@ -451,7 +443,6 @@ void CG_MultiBeamAddPoints float maxoffset, qboolean addstartpoint ) - { Vector delta, dir, randdir; float length; @@ -500,7 +491,6 @@ void CG_MultiBeamEnd int owner, float life ) - { Vector prevpt, currpt; Vector p1, p2, p3, p4, v1, v2, up, currpt1, currpt2, prevpt1, prevpt2; @@ -556,7 +546,6 @@ static void CG_MultiBeamSubdivide ( centity_t* cent ) - { Vector pt1, pt2, pt3; Vector out1, out2, out3, out4, out5, out6, out7, out8, out9; @@ -652,7 +641,6 @@ void CG_MultiBeam ( centity_t* cent ) - { Vector prevpt, currpt; entityState_t* s1; @@ -967,7 +955,6 @@ void CG_CreateModelBeam vec3_t left, vec3_t up ) - { dtiki_t* tiki; vec3_t mins, maxs; @@ -1334,7 +1321,6 @@ void CG_CreateBeam int renderfx, const char* name ) - { int i; beam_t* b; @@ -1492,7 +1478,6 @@ void CG_RestartBeams ( int timedelta ) - { int i; beam_t* b; @@ -1514,7 +1499,6 @@ void CG_Rope ( centity_t* cent ) - { Vector prevpt, currpt; entityState_t* s1; diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp index d87e4198..298e2773 100644 --- a/code/cgame/cg_commands.cpp +++ b/code/cgame/cg_commands.cpp @@ -1344,7 +1344,6 @@ CLASS_DECLARATION( Listener, ClientGameCommandManager, NULL ) }; static int DLightNameToNum(str s) - { if (!s.icmp("normal")) { return 0; @@ -1360,7 +1359,6 @@ static int DLightNameToNum(str s) } float RandomizeRange(float start, float end) - { float t; @@ -1479,7 +1477,6 @@ void ClientGameCommandManager::SetBaseAndAmplitude(Event* ev, Vector& base, Vect // ClientGameCommandManager //============= ClientGameCommandManager::ClientGameCommandManager() - { m_seed = 0; @@ -1668,7 +1665,6 @@ void ClientGameCommandManager::ClearCurrentSFX() // RandomChance //=============== void ClientGameCommandManager::RandomChance(Event* ev) - { int i; float percentage = ev->GetFloat(1); @@ -1800,7 +1796,6 @@ void ClientGameCommandManager::SetAlignStretch(Event* ev) // SetDecalRadius //=============== void ClientGameCommandManager::SetDecalRadius(Event* ev) - { if (!m_spawnthing) { return; @@ -1813,7 +1808,6 @@ void ClientGameCommandManager::SetDecalRadius(Event* ev) // SetDecalOrientation //=============== void ClientGameCommandManager::SetDecalOrientation(Event* ev) - { str deg; @@ -2100,7 +2094,6 @@ void ClientGameCommandManager::EmitterStartOff(Event* ev) // StartBlock //=============== void ClientGameCommandManager::StartBlock(Event* ev) - { // Make sure there are no more args on this line, because // they will be lost @@ -2113,7 +2106,6 @@ void ClientGameCommandManager::StartBlock(Event* ev) // EndBlock //=============== void ClientGameCommandManager::EndBlock(Event* ev) - { // Make sure there are no more args on this line, because // they will be lost @@ -2135,7 +2127,6 @@ void ClientGameCommandManager::EndBlock(Event* ev) // SetSwarm //============= void ClientGameCommandManager::SetSwarm(Event* ev) - { if (!m_spawnthing) { return; @@ -2151,7 +2142,6 @@ void ClientGameCommandManager::SetSwarm(Event* ev) // SetCircle //============= void ClientGameCommandManager::SetCircle(Event* ev) - { if (!m_spawnthing) { return; @@ -2164,7 +2154,6 @@ void ClientGameCommandManager::SetCircle(Event* ev) // SetSphere //============= void ClientGameCommandManager::SetSphere(Event* ev) - { if (!m_spawnthing) { return; @@ -2177,7 +2166,6 @@ void ClientGameCommandManager::SetSphere(Event* ev) // SetSphere //============= void ClientGameCommandManager::SetRadius(Event* ev) - { if (!m_spawnthing) { return; @@ -2190,7 +2178,6 @@ void ClientGameCommandManager::SetRadius(Event* ev) // SetInwardSphere //============= void ClientGameCommandManager::SetInwardSphere(Event* ev) - { if (!m_spawnthing) { return; @@ -2204,7 +2191,6 @@ void ClientGameCommandManager::SetInwardSphere(Event* ev) // SetAlign //============= void ClientGameCommandManager::SetAlign(Event* ev) - { if (!m_spawnthing) { return; @@ -2217,7 +2203,6 @@ void ClientGameCommandManager::SetAlign(Event* ev) // SetAlignOnce //============= void ClientGameCommandManager::SetAlignOnce(Event* ev) - { if (!m_spawnthing) { return; @@ -2230,7 +2215,6 @@ void ClientGameCommandManager::SetAlignOnce(Event* ev) // SetRandomRoll //============= void ClientGameCommandManager::SetRandomRoll(Event* ev) - { if (!m_spawnthing) { return; @@ -2252,7 +2236,6 @@ void ClientGameCommandManager::SetVolumetric(Event* ev) // SetCollision //============= void ClientGameCommandManager::SetCollision(Event* ev) - { str mask; @@ -2753,7 +2736,6 @@ void ClientGameCommandManager::SetVelocity(Event* ev) // SetAngularVelocity //============= void ClientGameCommandManager::SetAngularVelocity(Event* ev) - { int i = 1; int j = 0; @@ -2997,7 +2979,6 @@ void ClientGameCommandManager::SetEyeMovement(Event* ev) // InitializeSpawnthing //============= spawnthing_t* ClientGameCommandManager::InitializeSpawnthing(spawnthing_t* sp) - { int i; @@ -3125,7 +3106,6 @@ void ClientGameCommandManager::SpawnEffect(int count, int timealive) // GetEmitterByName //================== spawnthing_t* ClientGameCommandManager::GetEmitterByName(str name) - { int i; for (i = 1; i <= m_emitters.NumObjects(); i++) { @@ -3141,7 +3121,6 @@ spawnthing_t* ClientGameCommandManager::GetEmitterByName(str name) // CreateNewEmitter //================== spawnthing_t* ClientGameCommandManager::CreateNewEmitter(str name) - { spawnthing_t* st; @@ -3184,7 +3163,6 @@ void CG_DeleteEmitters(dtiki_t* tiki) // CreateNewEmitter //================== spawnthing_t* ClientGameCommandManager::CreateNewEmitter(void) - { return CreateNewEmitter(""); } @@ -3219,7 +3197,6 @@ void ClientGameCommandManager::BeginOriginSpawn(Event* ev) // EndOriginSpawn //=============== void ClientGameCommandManager::EndOriginSpawn(void) - { // Okay we should have a valid spawnthing, let's create a render entity SpawnTempModel(m_spawnthing->count); @@ -3299,7 +3276,6 @@ void ClientGameCommandManager::EndTagEmitter(void) { endblockfcn = NULL; } // BeginTagBeamEmitter //=============== void ClientGameCommandManager::BeginTagBeamEmitter(Event* ev) - { // Setup ending function endblockfcn = &ClientGameCommandManager::EndTagBeamEmitter; @@ -3341,7 +3317,6 @@ void ClientGameCommandManager::EndTagBeamEmitter(void) { endblockfcn = NULL; } // BeginOriginEmitter //=============== void ClientGameCommandManager::BeginOriginEmitter(Event* ev) - { // Setup ending function endblockfcn = &ClientGameCommandManager::EndOriginEmitter; @@ -3373,7 +3348,6 @@ void ClientGameCommandManager::EndOriginEmitter(void) { endblockfcn = NULL; } // BeginOriginBeamEmitter //=============== void ClientGameCommandManager::BeginOriginBeamEmitter(Event* ev) - { // Setup ending function endblockfcn = &ClientGameCommandManager::EndOriginBeamEmitter; @@ -3401,7 +3375,6 @@ void ClientGameCommandManager::BeginOriginBeamEmitter(Event* ev) // EndOriginBeamEmitter //=============== void ClientGameCommandManager::EndOriginBeamEmitter(void) - { endblockfcn = NULL; } @@ -3473,7 +3446,6 @@ void ClientGameCommandManager::BeginTagSpawn(Event* ev) // EndTagSpawn //=============== void ClientGameCommandManager::EndTagSpawn(void) - { // Okay we should have a valid spawnthing, let's create a render entity SpawnTempModel(m_spawnthing->count); @@ -3507,7 +3479,6 @@ void ClientGameCommandManager::BeginTagBeamSpawn(Event* ev) // EndTagSpawn //=============== void ClientGameCommandManager::EndTagBeamSpawn(void) - { // Okay we should have a valid spawnthing, let's create the beam now int i; @@ -3587,7 +3558,6 @@ void ClientGameCommandManager::BeginOriginBeamSpawn(Event* ev) // EndOriginBeamSpawn //=============== void ClientGameCommandManager::EndOriginBeamSpawn(void) - { // Okay we should have a valid spawnthing, let's create the beam now int i, renderfx, c, count; @@ -3655,7 +3625,6 @@ void ClientGameCommandManager::InitializeEmitters(void) {} // EmitterOn //=============== void ClientGameCommandManager::EmitterOn(Event* ev) - { int i; str name; @@ -3681,7 +3650,6 @@ void ClientGameCommandManager::EmitterOn(Event* ev) // EmitterOff //=============== void ClientGameCommandManager::EmitterOff(Event* ev) - { int i; str name; @@ -3712,7 +3680,6 @@ void ClientGameCommandManager::PlaySound(str sound_name, vec3_t origin, int channel, float volume, float min_distance, float pitch, int argstype) - { int aliaschannel; float aliasvolume; @@ -3848,7 +3815,6 @@ void ClientGameCommandManager::PlaySound(str sound_name, vec3_t origin, // Sound //=============== void ClientGameCommandManager::Sound(Event* ev) - { int channel = CHAN_AUTO; str sound_name; @@ -3888,7 +3854,6 @@ void ClientGameCommandManager::Sound(Event* ev) // StopSound //=============== void ClientGameCommandManager::StopSound(Event* ev) - { int channel; @@ -3939,7 +3904,6 @@ void ClientGameCommandManager::StopAliasChannel(Event* ev) // LoopSound //=============== void ClientGameCommandManager::LoopSound(Event* ev) - { str sound_name; float volume = -1.0; @@ -4005,7 +3969,6 @@ void ClientGameCommandManager::LoopSound(Event* ev) // CacheResource //=============== void CacheResource(const char* stuff) - { str real_stuff; @@ -4031,7 +3994,6 @@ void CacheResource(const char* stuff) // Cache //=============== void ClientGameCommandManager::Cache(Event* ev) - { if (ev->NumArgs() < 1) { return; @@ -4107,7 +4069,6 @@ qboolean bLoadForMap(const char* psMapsBuffer, const char* name) // AliasCache //=============== void ClientGameCommandManager::AliasCache(Event* ev) - { int i; char parmbuffer[2048]; // this holds the parameters to be passed into the @@ -4152,7 +4113,6 @@ void ClientGameCommandManager::AliasCache(Event* ev) // Alias //=============== void ClientGameCommandManager::Alias(Event* ev) - { int i; char parmbuffer[2048]; // this holds the parameters to be passed into the @@ -4341,7 +4301,6 @@ void ClientGameCommandManager::BodyFallSound(Event* ev) // Client //=============== void ClientGameCommandManager::Client(Event* ev) - { Event* event; const char* eventname; @@ -4402,7 +4361,6 @@ void ClientGameCommandManager::TagDynamicLight(Event* ev) // OriginDynamicLight //=============== void ClientGameCommandManager::OriginDynamicLight(Event* ev) - { str tagname; @@ -4659,7 +4617,6 @@ void ClientGameCommandManager::UpdateEmitter(dtiki_t* tiki, vec3_t axis[3], int entity_number, int parent_number, Vector entity_origin) - { int parent, lastparent, i; emittertime_t* et = NULL; @@ -4832,7 +4789,6 @@ void ClientGameCommandManager::UpdateEmitter(dtiki_t* tiki, vec3_t axis[3], void ClientGameCommandManager::RemoveClientEntity(int number, dtiki_t* tiki, centity_t* cent, ctempmodel_t* p) - { int i; @@ -4909,7 +4865,6 @@ bool ClientGameCommandManager::GetTagPositionAndOrientation(str tagname, orienta // FreeAllTempModels //=============== void ClientGameCommandManager::FreeAllTempModels(void) - { ctempmodel_t *p, *next; @@ -5328,7 +5283,6 @@ void CG_InitializeCommandManager(void) // CG_RemoveClientEntity //=============== void CG_RemoveClientEntity(int number, dtiki_t* tiki, centity_t* cent) - { commandManager.RemoveClientEntity(number, tiki, cent); @@ -5499,7 +5453,6 @@ CLASS_DECLARATION(Listener, EmitterLoader, NULL){ EmitterLoader::EmitterLoader() { emitterActive = false; } void EmitterLoader::Emitter(Event* ev) - { spawnthing_t* st; @@ -5512,7 +5465,6 @@ void EmitterLoader::Emitter(Event* ev) } void EmitterLoader::ProcessEmitter(Script& script) - { str token; @@ -5541,7 +5493,6 @@ void EmitterLoader::ProcessEmitter(Script& script) } bool EmitterLoader::Load(Script& script) - { str token; str errortext; @@ -5617,7 +5568,6 @@ void CG_Emitter(centity_t* cent) } void ClientGameCommandManager::CGEvent(centity_t* cent) - { str modelname; dtiki_t *tiki; diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h index e49988a8..bf3e167c 100644 --- a/code/cgame/cg_commands.h +++ b/code/cgame/cg_commands.h @@ -385,13 +385,11 @@ protected: }; inline enttracker_t::enttracker_t() - { memset(usedNumbers, 0, sizeof(usedNumbers)); } inline void enttracker_t::RemoveEntity(int entnum) - { // If the entnum is a magic number, then clear out the usedNumber field, so // that it may be reused for this emitter. @@ -407,7 +405,6 @@ inline void enttracker_t::RemoveEntity(int entnum) } inline int enttracker_t::AssignNumber(void) - { int i; @@ -524,7 +521,6 @@ public: }; inline void commandthing_t::RemoveEntity(int entnum) - { int num, count; commandtime_t* ct; @@ -543,7 +539,6 @@ inline void commandthing_t::RemoveEntity(int entnum) inline commandtime_t* commandthing_t::GetLastCommandTime(int entnum, int commandnum) - { int num, count; commandtime_t* ct; @@ -632,14 +627,12 @@ public: }; inline void spawnthing_t::SetModel(str model) - { m_modellist.ClearObjectList(); m_modellist.AddObject(model); } inline str spawnthing_t::GetModel(void) - { int num, index; diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c index 20536ea1..e0838668 100644 --- a/code/cgame/cg_marks.c +++ b/code/cgame/cg_marks.c @@ -149,7 +149,6 @@ void CG_ImpactMark float fSCenter, float fTCenter ) - { vec3_t axis[3]; float texCoordScale; diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c index 5cbec0b6..71577245 100644 --- a/code/cgame/cg_predict.c +++ b/code/cgame/cg_predict.c @@ -91,7 +91,6 @@ void CG_ClipMoveToEntities(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int skipNumber, int mask, trace_t* tr, qboolean cylinder) - { int i; trace_t trace; @@ -143,7 +142,6 @@ void CG_ClipMoveToEntities(const vec3_t start, const vec3_t mins, } void CG_ShowTrace(trace_t* trace, int passent, const char* reason) - { char text[1024]; @@ -170,7 +168,6 @@ void CG_Trace(trace_t* result, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int skipNumber, int mask, qboolean cylinder, qboolean cliptoentities, const char* description) - { trace_t t; @@ -204,7 +201,6 @@ CG_PlayerTrace void CG_PlayerTrace(trace_t* result, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int skipNumber, int mask, qboolean cylinder, qboolean tracedeep) - { CG_Trace(result, start, mins, maxs, end, skipNumber, mask, cylinder, qtrue, "PlayerTrace"); diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp index c2f5b3e2..11474c10 100644 --- a/code/cgame/cg_tempmodels.cpp +++ b/code/cgame/cg_tempmodels.cpp @@ -46,7 +46,6 @@ extern Event EV_Client_SwipeOff; // AllocateTempModel //============= ctempmodel_t* ClientGameCommandManager::AllocateTempModel(void) - { ctempmodel_t* p; @@ -72,7 +71,6 @@ ctempmodel_t* ClientGameCommandManager::AllocateTempModel(void) // FreeTempModel //=============== void ClientGameCommandManager::FreeTempModel(ctempmodel_t* p) - { if (!p->prev) { cgi.Error(ERR_DROP, "CCM::FreeTempModel: not active"); @@ -90,7 +88,6 @@ void ClientGameCommandManager::FreeTempModel(ctempmodel_t* p) } void ClientGameCommandManager::ResetTempModels(void) - { // Go through all the active tempmodels and free them ctempmodel_t* p, * next; @@ -114,7 +111,6 @@ void CG_ResetTempModels(void) // InitializeTempModels //============= void ClientGameCommandManager::InitializeTempModels(void) - { int i; int numtempmodels = MAX_TEMPMODELS; @@ -143,7 +139,6 @@ void ClientGameCommandManager::InitializeTempModelCvars(void) //=============== void ClientGameCommandManager::AnimateTempModel(ctempmodel_t* p, Vector origin, refEntity_t* newEnt) - { int numframes; int deltatime; @@ -186,7 +181,6 @@ void ClientGameCommandManager::AnimateTempModel(ctempmodel_t* p, Vector origin, // UpdateSwarm //=============== void ClientGameCommandManager::UpdateSwarm(ctempmodel_t* p) - { if (p->cgd.swarmfreq == 0) { return; @@ -223,7 +217,6 @@ qboolean ClientGameCommandManager::TempModelRealtimeEffects(ctempmodel_t* p, float ftime, float dtime, float scale) - { float fade, fadein; byte tempColor[4]; @@ -385,7 +378,6 @@ qboolean ClientGameCommandManager::TempModelRealtimeEffects(ctempmodel_t* p, void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t* p, Vector origin, refEntity_t* newEnt) - { vec3_t axis[3]; @@ -419,7 +411,6 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t* p, qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t* p, float ftime, float time2, float scale) - { int dtime; Vector parentOrigin(0, 0, 0); @@ -680,7 +671,6 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t* p, qboolean ClientGameCommandManager::LerpTempModel(refEntity_t* newEnt, ctempmodel_t* p, float frac) - { int i, j; @@ -759,7 +749,6 @@ void CG_AddTempModels(void) { commandManager.AddTempModels(); } //=============== #define TOO_MUCH_TIME_PASSED 500 void ClientGameCommandManager::AddTempModels(void) - { ctempmodel_t* p, * next; int count = 0; // Tempmodel count @@ -995,7 +984,6 @@ void ClientGameCommandManager::SpawnTempModel(int count, spawnthing_t* sp) // SpawnTempModel //================= void ClientGameCommandManager::SpawnTempModel(int mcount, int timeAlive) - { int i; ctempmodel_t* p; diff --git a/code/fgame/VehicleCollisionEntity.cpp b/code/fgame/VehicleCollisionEntity.cpp index 56414c93..adf32d86 100644 --- a/code/fgame/VehicleCollisionEntity.cpp +++ b/code/fgame/VehicleCollisionEntity.cpp @@ -34,7 +34,6 @@ VehicleCollisionEntity::VehicleCollisionEntity ( Entity *ent ) - { if( LoadingSavegame ) { @@ -59,7 +58,6 @@ VehicleCollisionEntity::VehicleCollisionEntity ( void ) - { if( LoadingSavegame ) { @@ -73,7 +71,6 @@ void VehicleCollisionEntity::EventDamage ( Event *ev ) - { Event *event = new Event( ev ); @@ -84,7 +81,6 @@ void VehicleCollisionEntity::Solid ( void ) - { setContents( CONTENTS_SOLID ); setSolidType( SOLID_BSP ); @@ -94,7 +90,6 @@ void VehicleCollisionEntity::NotSolid ( void ) - { setSolidType( SOLID_NOT ); } diff --git a/code/fgame/VehicleCollisionEntity.h b/code/fgame/VehicleCollisionEntity.h index d40171a3..f2b508a1 100644 --- a/code/fgame/VehicleCollisionEntity.h +++ b/code/fgame/VehicleCollisionEntity.h @@ -51,7 +51,6 @@ void VehicleCollisionEntity::Archive ( Archiver& arc ) - { Entity::Archive( arc ); diff --git a/code/fgame/VehicleSlot.cpp b/code/fgame/VehicleSlot.cpp index ba5cf3d3..c091e704 100644 --- a/code/fgame/VehicleSlot.cpp +++ b/code/fgame/VehicleSlot.cpp @@ -37,7 +37,6 @@ void cVehicleSlot::NotSolid ( void ) - { if( !( flags & FL_SWIM ) ) { @@ -62,7 +61,6 @@ void cVehicleSlot::Solid ( void ) - { if( !( flags & FL_SWIM ) ) { @@ -96,7 +94,6 @@ void cTurretSlot::NotSolid ( void ) - { if( !( flags & FL_SWIM ) ) { @@ -131,7 +128,6 @@ void cTurretSlot::Solid ( void ) - { if( !( flags & FL_SWIM ) ) { diff --git a/code/fgame/VehicleSlot.h b/code/fgame/VehicleSlot.h index b71c5dae..98e46523 100644 --- a/code/fgame/VehicleSlot.h +++ b/code/fgame/VehicleSlot.h @@ -59,7 +59,6 @@ void cVehicleSlot::Archive ( Archiver& arc ) - { Class::Archive( arc ); @@ -90,7 +89,6 @@ void cTurretSlot::Archive ( Archiver& arc ) - { cVehicleSlot::Archive( arc ); diff --git a/code/fgame/VehicleSoundEntity.cpp b/code/fgame/VehicleSoundEntity.cpp index c199e31b..cc3f2c5a 100644 --- a/code/fgame/VehicleSoundEntity.cpp +++ b/code/fgame/VehicleSoundEntity.cpp @@ -73,7 +73,6 @@ void VehicleSoundEntity::Start ( void ) - { m_bDoSoundStuff = true; } @@ -82,7 +81,6 @@ void VehicleSoundEntity::Stop ( void ) - { m_bDoSoundStuff = false; } @@ -91,7 +89,6 @@ void VehicleSoundEntity::Think ( void ) - { DoSoundStuff(); } @@ -142,7 +139,6 @@ void VehicleSoundEntity::DoSoundStuff ( void ) - { float pitch; diff --git a/code/fgame/VehicleSoundEntity.h b/code/fgame/VehicleSoundEntity.h index 3f389f58..fa41dc65 100644 --- a/code/fgame/VehicleSoundEntity.h +++ b/code/fgame/VehicleSoundEntity.h @@ -56,7 +56,6 @@ void VehicleSoundEntity::Archive ( Archiver& arc ) - { Entity::Archive( arc ); diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp index d5243d10..fa6f12e0 100644 --- a/code/fgame/actor.cpp +++ b/code/fgame/actor.cpp @@ -2745,7 +2745,6 @@ void Actor::ShowInfo ( void ) - { Com_Printf( "-------------------------------------------------------------------------------\n" ); Com_Printf( "Info for Actor:\n" ); @@ -2772,7 +2771,6 @@ void Actor::MoveTo ( Event *ev ) - { m_csPatrolCurrentAnim = ev->GetConstString( 1 ); @@ -2806,7 +2804,6 @@ void Actor::WalkTo ( Event *ev ) - { Event event = EV_Listener_ExecuteScript; event.AddConstString( STRING_GLOBAL_WALKTO_SCR ); @@ -2825,7 +2822,6 @@ void Actor::RunTo ( Event *ev ) - { Event event = EV_Listener_ExecuteScript; event.AddConstString( STRING_GLOBAL_RUNTO_SCR ); @@ -2844,7 +2840,6 @@ void Actor::CrouchTo ( Event *ev ) - { Event event = EV_Listener_ExecuteScript; event.AddConstString( STRING_GLOBAL_CROUCHTO_SCR ); @@ -2863,7 +2858,6 @@ void Actor::CrawlTo ( Event *ev ) - { Event event = EV_Listener_ExecuteScript; event.AddConstString( STRING_GLOBAL_CRAWLTO_SCR ); @@ -2882,7 +2876,6 @@ void Actor::AimAt ( Event *ev ) - { if( ev->IsVectorAt( 1 ) ) @@ -2919,7 +2912,6 @@ void Actor::DefaultRestart ( void ) - { EndState( m_ThinkLevel ); BeginState(); @@ -2936,7 +2928,6 @@ void Actor::SuspendState ( void ) - { GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ]; @@ -2955,7 +2946,6 @@ void Actor::ResumeState ( void ) - { GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ]; @@ -2974,7 +2964,6 @@ void Actor::BeginState ( void ) - { m_Think[ m_ThinkLevel ] = m_ThinkMap[ m_ThinkState ]; @@ -2997,7 +2986,6 @@ void Actor::EndState ( int level ) - { GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ level ] ]; @@ -3021,7 +3009,6 @@ void Actor::RestartState ( void ) - { GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ]; @@ -3039,7 +3026,6 @@ void Actor::setContentsSolid ( void ) - { setContents(CONTENTS_NOBOTCLIP); } @@ -3055,7 +3041,6 @@ void Actor::InitThinkStates ( void ) - { for (size_t i = 0; i < NUM_THINKSTATES; i++) { @@ -3095,7 +3080,6 @@ void Actor::UpdateEyeOrigin ( void ) - { Vector eyeTag = vec_zero; @@ -3149,7 +3133,6 @@ bool Actor::RequireThink ( void ) - { if(G_GetEntity(0)) return ( level.inttime < edict->r.lastNetTime + 60000 ); @@ -3169,7 +3152,6 @@ void Actor::UpdateEnemy ( int iMaxDirtyTime ) - { if (level.inttime > iMaxDirtyTime + m_iEnemyCheckTime) UpdateEnemyInternal(); @@ -3186,7 +3168,6 @@ void Actor::UpdateEnemyInternal ( void ) - { @@ -3220,7 +3201,6 @@ void Actor::SetEnemy Sentient *pEnemy, bool bForceConfirmed ) - { if (pEnemy == m_Enemy) { @@ -3278,7 +3258,6 @@ void Actor::SetEnemyPos ( Vector vPos ) - { if (m_vLastEnemyPos != vPos) { @@ -3313,7 +3292,6 @@ void Actor::ResetBodyQueue ( void ) - { //weird useless loop ? @@ -3337,7 +3315,6 @@ void Actor::AddToBodyQue ( void ) - { SafePtr lastActor = mBodyQueue[mCurBody + 3]; @@ -3366,7 +3343,6 @@ Vector Actor::GetAntiBunchPoint ( void ) - { int count = 0; Vector ret = vec_origin; @@ -3413,7 +3389,6 @@ void Actor::InitVoid ( GlobalFuncs_t *func ) - { func->IsState = &Actor::IsVoidState; } @@ -3430,7 +3405,6 @@ const char *Actor::DumpCallTrace const char *pszFmt, ... ) const - { cvar_t *sv_mapname; tm *ptm; @@ -3543,7 +3517,6 @@ void Actor::Init ( void ) - { g_showinfo = gi.Cvar_Get("g_showinfo", "0", 0); @@ -3637,7 +3610,6 @@ void Actor::FixAIParameters ( void ) - { //FIXME: needs revision(silly mistakes) @@ -3758,7 +3730,6 @@ bool Actor::AttackEntryAnimation ( void ) - { if (m_Enemy) { @@ -3847,7 +3818,6 @@ void Actor::CheckForThinkStateTransition ( void ) - { if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL)) { @@ -3889,7 +3859,6 @@ bool Actor::CheckForTransition eThinkState state, eThinkLevel level ) - { GlobalFuncs_t *func; @@ -3919,7 +3888,6 @@ bool Actor::PassesTransitionConditions_Grenade ( void ) - { if( !m_bLockThinkState && m_bEnableEnemy && m_pGrenade ) { @@ -3940,7 +3908,6 @@ bool Actor::PassesTransitionConditions_Attack ( void ) - { UpdateEnemy(0); @@ -3972,7 +3939,6 @@ bool Actor::PassesTransitionConditions_Disguise ( void ) - { if( m_bLockThinkState ) return false; @@ -4036,7 +4002,6 @@ bool Actor::PassesTransitionConditions_Curious ( void ) - { UpdateEnemy(200); @@ -4071,7 +4036,6 @@ void Actor::UpdateEnableEnemy ( void ) - { if (m_bEnableEnemy != m_bDesiredEnableEnemy) { @@ -4103,7 +4067,6 @@ void Actor::ThinkStateTransitions ( void ) - { int newThinkLevel; int newThinkState; @@ -4204,7 +4167,6 @@ void Actor::TransitionState int iNewState, int iPadTime ) - { //fixme: this is an inline function. m_State = iNewState; @@ -4314,7 +4276,6 @@ void Actor::ChangeAnim ( void ) - { if (m_pAnimThread) { @@ -4422,7 +4383,6 @@ void Actor::UpdateSayAnim ( void ) - { gi.DPrintf("Actor::UpdateSayAnim 1\n"); @@ -4507,7 +4467,6 @@ void Actor::UpdateUpperAnim ( void ) - { int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(m_csUpperAnim).c_str()); if (animnum != -1) @@ -4545,7 +4504,6 @@ void Actor::UpdateAnim ( void ) - { m_bAnimating = true; SimpleActor::UpdateAim(); @@ -4636,7 +4594,6 @@ void Actor::StoppedWaitFor const_str name, bool bDeleting ) - { g_iInThinks++; @@ -4664,7 +4621,6 @@ bool Actor::ValidGrenadePath const Vector& vTo, Vector& vVel ) - { //FIXME: macros float fGravity, fTime1, fTime2, fTime3, fTimeLand; @@ -4799,7 +4755,6 @@ Vector Actor::CalcThrowVelocity const Vector& vFrom, const Vector& vTo ) - { Vector ret; @@ -4865,7 +4820,6 @@ Vector Actor::CanThrowGrenade const Vector& vFrom, const Vector& vTo ) - { Vector vVel = vec_zero; @@ -4893,7 +4847,6 @@ Vector Actor::CalcRollVelocity const Vector& vFrom, const Vector& vTo ) - { float fOOTime, fVelVert, fVelHorz, fGravity; Vector vDelta = vFrom - vTo, vRet; @@ -4941,7 +4894,6 @@ Vector Actor::CanRollGrenade const Vector& vFrom, const Vector& vTo ) - { Vector vVel = vec_zero; vVel = CalcRollVelocity(vFrom, vTo); @@ -4972,7 +4924,6 @@ bool Actor::CanTossGrenadeThroughHint Vector *pvVel, eGrenadeTossMode *peMode ) - { float fGravity = 0.8 * sv_gravity->value; float fAngle, fTemp, fTemp2, fTemp3, fTemp4, /*fVelVert, fVelHorz,*/ fRange, fRangeSquared, fDist, fDistSquared, fHeight; @@ -5051,7 +5002,6 @@ Vector Actor::GrenadeThrowPoint const Vector& vDelta, const_str csAnim ) - { vec2_t axis; Vector vRet; @@ -5115,7 +5065,6 @@ Vector Actor::CalcKickVelocity Vector& vDelta, float fDist ) const - { float fScale, fGravity; Vector ret; @@ -5148,7 +5097,6 @@ bool Actor::CanKickGrenade Vector &vFace, Vector *pvVel ) - { Vector vEnd, vStart, vDelta, vVel; float fDist, fGravity, fScale; @@ -5204,7 +5152,6 @@ bool Actor::GrenadeWillHurtTeamAt ( const Vector& vTo ) - { if (m_pNextSquadMate == this) { @@ -5238,7 +5185,6 @@ bool Actor::CanGetGrenadeFromAToB Vector *pvVel, eGrenadeTossMode *peMode ) - { float fDot; Vector vHint; @@ -5345,7 +5291,6 @@ bool Actor::DecideToThrowGrenade Vector *pvVel, eGrenadeTossMode *peMode ) - { if (Sentient::AmmoCount("grenade")) { @@ -5368,7 +5313,6 @@ void Actor::Grenade_EventFire ( Event *ev ) - { const_str csAnim; str strGrenade; @@ -5419,7 +5363,6 @@ void Actor::GenericGrenadeTossThink ( void ) - { Vector vGrenadeVel = vec_zero; eGrenadeTossMode eGrenadeMode; @@ -5454,7 +5397,6 @@ void Actor::CanSee ( Event *ev ) - { float fov = 0; float vision_distance = 0; @@ -5520,7 +5462,6 @@ void Actor::Think ( void ) - { int v1, v2, v3, tempHistory,ohIndex; m_bAnimating = false; @@ -5612,7 +5553,6 @@ void Actor::PostThink ( bool bDontFaceWall ) - { CheckUnregister(); if (bDontFaceWall) @@ -5642,7 +5582,6 @@ void Actor::SetMoveInfo ( mmove_t *mm ) - { memset(mm, 0, sizeof(mmove_t)); @@ -5686,7 +5625,6 @@ void Actor::GetMoveInfo ( mmove_t *mm ) - { //FIXME: macros m_walking = mm->walking; @@ -5829,7 +5767,6 @@ void Actor::DoFailSafeMove ( vec3_t dest ) - { Com_Printf("(entnum %d, radnum %d) blocked, doing failsafe\n", entnum, radnum); @@ -5849,7 +5786,6 @@ void Actor::TouchStuff ( mmove_t *mm ) - { int i, j; gentity_t *other; @@ -5904,7 +5840,6 @@ void Actor::ExtractConstraints ( mmove_t *mm ) - { // not found in ida } @@ -5922,7 +5857,6 @@ void Actor::EventGiveWeaponInternal ( Event *ev ) - { Holster(); RemoveWeapons(); @@ -5944,7 +5878,6 @@ void Actor::EventGiveWeapon ( Event *ev ) - { Event e1(EV_Listener_ExecuteScript); str weapName = ev->GetString(1); @@ -5980,7 +5913,6 @@ void Actor::EventGetWeapon ( Event *ev ) - { ev->AddConstString(m_csWeapon); } @@ -5996,7 +5928,6 @@ void Actor::FireWeapon ( Event *ev ) - { Sentient::FireWeapon(WEAPON_MAIN, FIRE_PRIMARY); } @@ -6012,7 +5943,6 @@ bool Actor::CanTarget ( void ) - { return true; } @@ -6028,7 +5958,6 @@ bool Actor::IsImmortal ( void ) - { return false; } @@ -6037,7 +5966,6 @@ bool Actor::IsVoidState ( int state ) - { return true; } @@ -6046,7 +5974,6 @@ bool Actor::IsCuriousState ( int state ) - { return state == THINKSTATE_CURIOUS; } @@ -6055,7 +5982,6 @@ bool Actor::IsDisguiseState ( int state ) - { return state == THINKSTATE_DISGUISE; } @@ -6064,7 +5990,6 @@ bool Actor::IsAttackState ( int state ) - { return state == THINKSTATE_ATTACK; } @@ -6073,7 +5998,6 @@ bool Actor::IsGrenadeState ( int state ) - { return state == THINKSTATE_GRENADE; } @@ -6082,7 +6006,6 @@ bool Actor::IsPainState ( int state ) - { return state == THINKSTATE_PAIN; } @@ -6091,7 +6014,6 @@ bool Actor::IsKilledState ( int state ) - { return state == THINKSTATE_KILLED; } @@ -6100,7 +6022,6 @@ bool Actor::IsMachineGunnerState ( int state ) - { return true; } @@ -6109,7 +6030,6 @@ bool Actor::IsDogState ( int state ) - { return true; } @@ -6125,7 +6045,6 @@ void Actor::IgnoreSoundSet ( int iType ) - { m_iIgnoreSoundsMask |= 1 << iType; } @@ -6141,7 +6060,6 @@ void Actor::IgnoreSoundSetAll ( void ) - { m_iIgnoreSoundsMask = ~AI_EVENT_NONE; } @@ -6157,7 +6075,6 @@ void Actor::IgnoreSoundClear ( int iType ) - { m_iIgnoreSoundsMask &= ~iType; } @@ -6173,7 +6090,6 @@ void Actor::IgnoreSoundClearAll ( void ) - { m_iIgnoreSoundsMask = 0; } @@ -6189,7 +6105,6 @@ bool Actor::IgnoreSound ( int iType ) - { return ( m_iIgnoreSoundsMask >> iType ) & 1; } @@ -6205,7 +6120,6 @@ void Actor::EventShareEnemy ( Event *ev ) - { if (m_Enemy) @@ -6239,7 +6153,6 @@ void Actor::EventShareGrenade ( Event *ev ) - { if (m_pGrenade) @@ -6282,7 +6195,6 @@ void Actor::ReceiveAIEvent float fDistSquared, float fMaxDistSquared ) - { if (originator != this && originator != GetActiveWeapon(WEAPON_MAIN)) { @@ -6309,7 +6221,6 @@ void Actor::DefaultReceiveAIEvent float fDistSquared, float fMaxDistSquared ) - { if (!IsDead()) { @@ -6368,7 +6279,6 @@ int Actor::PriorityForEventType ( int iType ) - { switch( iType ) { @@ -6413,7 +6323,6 @@ void Actor::CuriousSound float fDistSquared, float fMaxDistSquared ) - { float v7, v8, fRangeFactor = 1.0; int iPriority; @@ -6494,7 +6403,6 @@ void Actor::WeaponSound float fMaxDistSquared, Entity *originator ) - { Sentient *pOwner; gi.Printf("Actor::WeaponSound"); @@ -6595,7 +6503,6 @@ void Actor::FootstepSound float fMaxDistSquared, Entity *originator ) - { if (originator->IsSubclassOfSentient()) { @@ -6631,7 +6538,6 @@ void Actor::VoiceSound float fMaxDistSquared, Entity *originator ) - { bool bFriendly; //FIXME: macros @@ -6675,7 +6581,6 @@ void Actor::GrenadeNotification ( Entity *originator ) - { if (!m_pGrenade) { @@ -6732,7 +6637,6 @@ void Actor::SetGrenade ( Entity *pGrenade ) - { m_pGrenade = pGrenade; @@ -6756,7 +6660,6 @@ void Actor::NotifySquadmateKilled Sentient *pSquadMate, Sentient *pAttacker ) - { if (m_PotentialEnemies.CaresAboutPerfectInfo(pAttacker)) { @@ -6817,7 +6720,6 @@ void Actor::RaiseAlertnessForEventType ( int iType ) - { float fAmount; @@ -6870,7 +6772,6 @@ void Actor::RaiseAlertness ( float fAmount ) - { float fMaxAmount; @@ -6892,7 +6793,6 @@ bool Actor::CanSee float fov, float vision_distance ) - { bool canSee = Sentient::CanSee(e1, fov, vision_distance); if (e1 == m_Enemy) @@ -6937,7 +6837,6 @@ Vector Actor::GunPosition ( void ) - { if (m_iGunPositionCheckTime < level.inttime) { @@ -6966,7 +6865,6 @@ bool Actor::WithinVisionDistance ( Entity *ent ) const - { float fRadius = world->m_fAIVisionDistance; @@ -7003,7 +6901,6 @@ bool Actor::InFOV float check_fov, float check_fovdot ) - { bool bInFov = true; @@ -7038,7 +6935,6 @@ bool Actor::EnemyInFOV ( int iMaxDirtyTime ) - { if (level.inttime > iMaxDirtyTime + m_iEnemyFovCheckTime) { @@ -7065,7 +6961,6 @@ bool Actor::InFOV ( Vector pos ) - { return InFOV(pos, m_fFov, m_fFovDot); } @@ -7081,7 +6976,6 @@ bool Actor::InFOV ( Entity *ent ) - { if (ent == m_Enemy) { @@ -7097,7 +6991,6 @@ bool Actor::CanSeeNoFOV ( Entity *ent ) - { if (ent == m_Enemy) { @@ -7118,7 +7011,6 @@ bool Actor::CanSeeFOV ( Entity *ent ) - { //fixme: this is an inline function. if (ent == m_Enemy) @@ -7141,7 +7033,6 @@ bool Actor::CanSeeEnemyFOV int iMaxFovDirtyTime, int iMaxSightDirtyTime ) - { return EnemyInFOV(iMaxFovDirtyTime) && CanSeeEnemy(iMaxSightDirtyTime); } @@ -7157,7 +7048,6 @@ bool Actor::CanShoot ( Entity *ent ) - { bool bCanShootEnemy = false; if (ent->IsSubclassOfSentient()) @@ -7230,7 +7120,6 @@ bool Actor::CanSeeFrom vec3_t pos, Entity *ent ) - { Vector vPos(pos); bool bCanSee = false; @@ -7255,7 +7144,6 @@ bool Actor::CanSeeEnemy ( int iMaxDirtyTime ) - { //FIXME: macro if (level.inttime > iMaxDirtyTime + m_iEnemyVisibleCheckTime) @@ -7275,7 +7163,6 @@ bool Actor::CanShootEnemy ( int iMaxDirtyTime ) - { if( level.inttime > iMaxDirtyTime + m_iCanShootCheckTime ) CanShoot( m_Enemy ); @@ -7295,7 +7182,6 @@ void Actor::ShowInfo float fDot, float fDist ) - { float fMaxDist, fMinDot; static cvar_t *g_entinfo_max; @@ -7489,7 +7375,6 @@ void Actor::DefaultPain ( Event *ev ) - { gi.Printf("DefaultPain event"); SetThink(THINKSTATE_PAIN, THINK_PAIN); @@ -7508,7 +7393,6 @@ void Actor::HandlePain ( Event *ev ) - { gi.Printf("HandlePain"); Event e1(EV_Listener_ExecuteScript); @@ -7561,7 +7445,6 @@ void Actor::EventPain ( Event *ev ) - { ShowInfo(); @@ -7584,7 +7467,6 @@ void Actor::DefaultKilled Event *ev, bool bPlayDeathAnim ) - { ClearStates(); @@ -7605,7 +7487,6 @@ void Actor::HandleKilled Event *ev, bool bPlayDeathAnim ) - { deadflag = DEAD_DEAD; health = 0.0; @@ -7645,7 +7526,6 @@ void Actor::DispatchEventKilled Event *ev, bool bPlayDeathAnim ) - { GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]]; @@ -7673,7 +7553,6 @@ void Actor::EventKilled ( Event *ev ) - { DispatchEventKilled(ev, true); @@ -7711,7 +7590,6 @@ void Actor::EventBeDead ( Event *ev ) - { DispatchEventKilled(ev, false); } @@ -7727,7 +7605,6 @@ void Actor::DeathEmbalm ( Event *ev ) - { if (maxs[2] > 8) { @@ -7779,7 +7656,6 @@ bool Actor::NoticeShot Sentient *pTarget, float fDist ) - { gi.Printf("Notice shot"); if (pShooter->m_Team != m_Team) @@ -7813,7 +7689,6 @@ bool Actor::NoticeFootstep ( Sentient *pPedestrian ) - { if (m_Team == pPedestrian->m_Team || pPedestrian->m_bIsDisguised) return false; @@ -7833,7 +7708,6 @@ bool Actor::NoticeVoice ( Sentient *pVocallist ) - { if (IsSquadMate(pVocallist)) return false; @@ -7852,7 +7726,6 @@ void Actor::ClearLookEntity ( void ) - { if (m_pLookEntity) { @@ -7875,7 +7748,6 @@ void Actor::LookAt ( const Vector& vec ) - { if (g_showlookat->integer == entnum || g_showlookat->integer == -1) { @@ -7909,7 +7781,6 @@ void Actor::LookAt ( Listener *l ) - { ClearLookEntity(); if ( l ) @@ -7954,7 +7825,6 @@ void Actor::ForwardLook ( void ) - { //fixme: this is an inline function. m_bHasDesiredLookAngles = false; @@ -7971,7 +7841,6 @@ void Actor::LookAtLookEntity ( void ) - { Vector dir; if (m_pLookEntity->IsSubclassOfSentient()) @@ -7997,7 +7866,6 @@ void Actor::IdleLook ( void ) - { if (m_pLookEntity) { @@ -8020,7 +7888,6 @@ void Actor::IdleLook ( vec3_t dir ) - { if (m_pLookEntity) { @@ -8043,7 +7910,6 @@ void Actor::SetDesiredLookDir ( vec3_t dir ) - { m_bHasDesiredLookAngles = true; vectoangles( dir, m_DesiredLookAngles ); @@ -8063,7 +7929,6 @@ void Actor::SetDesiredLookAnglesRelative ( vec3_t ang ) - { m_bHasDesiredLookAngles = true; m_DesiredLookAngles[ 0 ] = AngleNormalize180( ang[ 0 ] ); @@ -8082,7 +7947,6 @@ void Actor::EventLookAt ( Event *ev ) - { if (ev->IsVectorAt(1)) { @@ -8107,7 +7971,6 @@ void Actor::EventEyesLookAt ( Event *ev ) - { EventLookAt(ev); @@ -8125,7 +7988,6 @@ void Actor::NoPoint ( void ) - { VectorClear(m_vLUpperArmDesiredAngles); } @@ -8141,7 +8003,6 @@ void Actor::IdlePoint ( void ) - { if (m_pPointEntity) { @@ -8176,7 +8037,6 @@ void Actor::ClearPointEntity ( void ) - { if (m_pPointEntity) { @@ -8199,7 +8059,6 @@ void Actor::PointAt ( const Vector& vec ) - { ClearPointEntity(); @@ -8219,7 +8078,6 @@ void Actor::PointAt ( Listener* l ) - { ClearPointEntity(); if (l) @@ -8251,7 +8109,6 @@ void Actor::EventPointAt ( Event *ev ) - { if (ev->IsVectorAt(1)) { @@ -8275,7 +8132,6 @@ void Actor::ClearTurnEntity ( void ) - { if (m_pTurnEntity) { @@ -8298,7 +8154,6 @@ void Actor::TurnTo ( const Vector& vec ) - { ClearTurnEntity(); @@ -8318,7 +8173,6 @@ void Actor::TurnTo ( Listener *l ) - { ClearTurnEntity(); if (l) @@ -8352,7 +8206,6 @@ void Actor::IdleTurn ( void ) - { if (m_pTurnEntity) { @@ -8408,7 +8261,6 @@ void Actor::EventTurnTo ( Event *ev ) - { if (ev->IsVectorAt(1)) { @@ -8431,7 +8283,6 @@ void Actor::EventSetTurnDoneError ( Event *ev ) - { m_fTurnDoneError = ev->GetFloat(1); if (m_fTurnDoneError < 0) @@ -8452,7 +8303,6 @@ void Actor::EventGetTurnDoneError ( Event *ev ) - { ev->AddFloat(m_fTurnDoneError); } @@ -8468,7 +8318,6 @@ void Actor::LookAround ( float fFovAdd ) - { Vector vDest, vAngle; float fModTime; @@ -8521,7 +8370,6 @@ bool Actor::SoundSayAnim const_str name, byte bLevelSayAnim ) - { int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str()); if (animnum == -1) @@ -8560,7 +8408,6 @@ void Actor::EventSetAnim ( Event *ev ) - { //"anim slot weight flagged" int numArgs = ev->NumArgs(), slot = 0, animnum; @@ -8688,7 +8535,6 @@ void Actor::EventIdleSayAnim ( Event *ev ) - { const_str name; if (ev->NumArgs()) @@ -8734,7 +8580,6 @@ void Actor::EventSayAnim ( Event *ev ) - { const_str name; if (ev->NumArgs()) @@ -8774,7 +8619,6 @@ void Actor::EventSetSayAnim ( Event *ev ) - { const_str name; str sName; @@ -8857,7 +8701,6 @@ void Actor::EventSetMotionAnim ( Event *ev ) - { gi.DPrintf("Actor::EventSetMotionAnim\n"); @@ -8897,7 +8740,6 @@ void Actor::EventSetAimMotionAnim ( Event *ev ) - { int anim_crouch, anim_stand, anim_high; const_str name; @@ -8957,7 +8799,6 @@ void Actor::EventSetActionAnim ( Event *ev ) - { if (ev->NumArgs() != 3) { @@ -9026,7 +8867,6 @@ void Actor::EventUpperAnim ( Event *ev ) - { if (ev->NumArgs()) { @@ -9060,7 +8900,6 @@ void Actor::EventSetUpperAnim ( Event *ev ) - { if (ev->NumArgs() != 1) { @@ -9096,7 +8935,6 @@ void Actor::EventEndActionAnim ( Event *ev ) - { parm.upperfail = qtrue; if (!m_bLevelActionAnim) @@ -9117,7 +8955,6 @@ void Actor::EventDamagePuff ( Event *ev ) - { Vector pos = ev->GetVector(1), dir = ev->GetVector(2); @@ -9144,7 +8981,6 @@ void Actor::SafeSetOrigin ( vec3_t newOrigin ) - { if (newOrigin == origin) { @@ -9176,7 +9012,6 @@ void Actor::DoMove ( void ) - { mmove_t mm; //FIXME: macros @@ -9258,7 +9093,6 @@ void Actor::AnimFinished int slot, bool stop ) - { if (stop && slot >= 0) animFlags[slot] |= ANIM_NOACTION; @@ -9309,7 +9143,6 @@ void Actor::AnimFinished ( int slot ) - { animFlags[slot] &= ~ANIM_FINISHED; AnimFinished(slot, ((animFlags[slot] & ANIM_LOOP) != ANIM_LOOP)); @@ -9326,7 +9159,6 @@ void Actor::PlayAnimation ( Event *ev ) - { Event e1(EV_Listener_ExecuteScript); e1.AddConstString(STRING_GLOBAL_ANIM_SCR); @@ -9345,7 +9177,6 @@ void Actor::PlayScriptedAnimation ( Event *ev ) - { Event e1(EV_Listener_ExecuteScript); e1.AddConstString(STRING_GLOBAL_ANIM_SCRIPTED_SCR); @@ -9364,7 +9195,6 @@ void Actor::PlayNoclipAnimation ( Event *ev ) - { Event e1(EV_Listener_ExecuteScript); e1.AddConstString(STRING_GLOBAL_ANIM_NOCLIP_SCR); @@ -9383,7 +9213,6 @@ void Actor::MoveDest ( float fMoveSpeed ) - { mmove_t mm; vec2_t offset; @@ -9415,7 +9244,6 @@ void Actor::MovePath ( float fMoveSpeed ) - { //FIXME: macros mmove_t mm; @@ -9702,7 +9530,6 @@ void Actor::MovePathGoal ( float fMoveSpeed ) - { float fTimeToGo, fDeltaSquareLen, fSlowdownSpeed; vec2_t vDelta; @@ -9768,7 +9595,6 @@ void Actor::Dumb ( Event *ev ) - { Event e1(EV_Listener_ExecuteScript); e1.AddConstString(STRING_GLOBAL_DISABLE_AI_SCR); @@ -9786,7 +9612,6 @@ void Actor::PhysicsOn ( Event *ev ) - { m_bDoPhysics = true; } @@ -9802,7 +9627,6 @@ void Actor::PhysicsOff ( Event *ev ) - { m_bDoPhysics = false; } @@ -9818,7 +9642,6 @@ void Actor::EventStart ( Event *ev ) - { ResolveVoiceType(); setSize(MINS, MAXS);//notsure @@ -9848,7 +9671,6 @@ void Actor::EventGetMood ( Event *ev ) - { ev->AddConstString(m_csMood); } @@ -9864,7 +9686,6 @@ void Actor::EventSetMood ( Event *ev ) - { m_csMood = ev->GetConstString(1); if (m_csMood > STRING_ALERT) @@ -9885,7 +9706,6 @@ void Actor::EventGetAngleYawSpeed ( Event *ev ) - { ev->AddFloat(m_fAngleYawSpeed); } @@ -9901,7 +9721,6 @@ void Actor::EventSetAngleYawSpeed ( Event *ev ) - { float speed = ev->GetFloat(1); if (speed <= 0) @@ -9922,7 +9741,6 @@ void Actor::EventSetAimTarget ( Event *ev ) - { Weapon *weap = GetActiveWeapon(WEAPON_MAIN); weap->SetAimTarget(ev->GetEntity(1)); @@ -9939,7 +9757,6 @@ void Actor::UpdateAngles ( void ) - { float max_change, error, dist; @@ -9986,7 +9803,6 @@ void Actor::SetLeashHome ( Vector vHome ) - { if (!m_bFixedLeash) { @@ -10005,7 +9821,6 @@ void Actor::AimAtTargetPos ( void ) - { Vector vDir = mTargetPos - EyePosition() + Vector(0, 0, 16); SetDesiredLookDir(vDir); @@ -10027,7 +9842,6 @@ void Actor::AimAtAimNode ( void ) - { mTargetPos = m_aimNode->origin; @@ -10046,7 +9860,6 @@ void Actor::AimAtEnemyBehavior ( void ) - { AimAtTargetPos(); @@ -10063,7 +9876,6 @@ void Actor::FaceMotion ( void ) - { Vector delta; @@ -10113,7 +9925,6 @@ void Actor::FaceDirectionDuringMotion ( vec3_t vLook ) - { float yaw; @@ -10181,7 +9992,6 @@ float Actor::PathDistanceAlongVector ( vec3_t vDir ) - { Vector vDelta = m_Path.CurrentDelta(); @@ -10199,7 +10009,6 @@ void Actor::FaceEnemyOrMotion ( int iTimeIntoMove ) - { Vector vDelta = origin - m_vLastEnemyPos; vDelta.z = 0; @@ -10242,7 +10051,6 @@ int Actor::NextUpdateTime int iLastUpdateTime, int iUpdatePeriod ) - { int i = iLastUpdateTime; @@ -10264,7 +10072,6 @@ void Actor::ResetBoneControllers ( void ) - { if (edict->s.bone_tag[HEAD_TAG] != -1) @@ -11671,7 +11478,6 @@ void Actor::ReadyToFire ( Event *ev ) - { bool ready; @@ -11693,7 +11499,6 @@ void Actor::GetLocalYawFromVector ( Event *ev ) - { float yaw; Vector vec; @@ -11715,7 +11520,6 @@ void Actor::EventGetSight ( Event *ev ) - { ev->AddFloat(m_fSight); } @@ -11731,7 +11535,6 @@ void Actor::EventSetSight ( Event *ev ) - { m_fSight = ev->GetFloat(1); } @@ -11747,7 +11550,6 @@ void Actor::EventGetHearing ( Event *ev ) - { ev->AddFloat(m_fHearing); } @@ -11763,7 +11565,6 @@ void Actor::EventSetHearing ( Event *ev ) - { m_fHearing = ev->GetFloat(1); } @@ -11779,7 +11580,6 @@ void Actor::ClearPatrolCurrentNode ( void ) - { if (m_patrolCurrentNode) { @@ -11802,7 +11602,6 @@ void Actor::NextPatrolCurrentNode ( void ) - { if (m_bScriptGoalValid) { @@ -11832,7 +11631,6 @@ void Actor::SetPatrolCurrentNode ( Vector& vec ) - { ClearPatrolCurrentNode(); @@ -11855,7 +11653,6 @@ void Actor::SetPatrolCurrentNode ( Listener *l ) - { ClearPatrolCurrentNode(); @@ -11884,7 +11681,6 @@ void Actor::EventSetPatrolPath ( Event *ev ) - { SetPatrolCurrentNode(ev->GetListener(1)); } @@ -11900,7 +11696,6 @@ void Actor::EventGetPatrolPath ( Event *ev ) - { ev->AddListener(m_patrolCurrentNode); } @@ -11916,7 +11711,6 @@ void Actor::EventSetPatrolWaitTrigger ( Event *ev ) - { m_bPatrolWaitTrigger = ev->GetBoolean(1); } @@ -11932,7 +11726,6 @@ void Actor::EventGetPatrolWaitTrigger ( Event *ev ) - { ev->AddInteger(m_bPatrolWaitTrigger); } @@ -11948,7 +11741,6 @@ void Actor::ShowInfo_PatrolCurrentNode ( void ) - { if (m_patrolCurrentNode) @@ -11972,7 +11764,6 @@ bool Actor::MoveOnPathWithSquad ( void ) - { float fDistSquared, fIntervalSquared; vec2_t vMyNormalDir, vDelta, vHisDir; @@ -12055,7 +11846,6 @@ bool Actor::MoveToWaypointWithPlayer ( void ) - { float fIntervalSquared, fDistSquared; vec2_t vMyNormalDir, vDelta, vMyDir; @@ -12117,7 +11907,6 @@ bool Actor::PatrolNextNodeExists ( void ) - { return m_patrolCurrentNode && !( m_patrolCurrentNode->IsSubclassOfTempWaypoint() ) && m_patrolCurrentNode->Next(); } @@ -12133,7 +11922,6 @@ void Actor::UpdatePatrolCurrentNode ( void ) - { bool next = false; if (m_patrolCurrentNode) @@ -12170,7 +11958,6 @@ bool Actor::MoveToPatrolCurrentNode ( void ) - { UpdatePatrolCurrentNode(); if (m_patrolCurrentNode && !m_bPatrolWaitTrigger) @@ -12268,7 +12055,6 @@ void Actor::ClearAimNode ( void ) - { if (m_aimNode) { @@ -12292,7 +12078,6 @@ void Actor::SetAimNode ( Vector& vec ) - { ClearAimNode(); @@ -12313,7 +12098,6 @@ void Actor::SetAimNode ( Listener *l ) - { ClearAimNode(); if (l) @@ -12343,7 +12127,6 @@ void Actor::ShowInfo_AimNode ( void ) - { if (m_aimNode) { @@ -12366,7 +12149,6 @@ void Actor::EventSetAccuracy ( Event *ev ) - { mAccuracy = ev->GetFloat(1) / 100; } @@ -12382,7 +12164,6 @@ void Actor::EventGetAccuracy ( Event *ev ) - { ev->AddFloat(mAccuracy * 100); } @@ -12398,7 +12179,6 @@ int Actor::GetThinkType ( const_str csName ) - { int result = 0; while (m_csThinkNames[result] != csName) @@ -12423,7 +12203,6 @@ void Actor::SetThink eThinkState state, eThinkNum think ) - { m_ThinkMap[state] = think; if (m_ThinkState == state) @@ -12441,7 +12220,6 @@ void Actor::SetThinkIdle ( eThinkNum think_idle ) - { eThinkNum think_curious; @@ -12488,7 +12266,6 @@ void Actor::SetThinkState eThinkState state, eThinkLevel level ) - { if (IsAttackState(state)) { @@ -12525,7 +12302,6 @@ void Actor::EndCurrentThinkState ( void ) - { SetThinkState(THINKSTATE_VOID, m_ThinkLevel); } @@ -12541,7 +12317,6 @@ void Actor::ClearThinkStates ( void ) - { for (int i = 0; i <= NUM_THINKLEVELS -1; i++) { @@ -12560,7 +12335,6 @@ int Actor::CurrentThink ( void ) const - { return m_Think[ m_ThinkLevel ]; } @@ -12576,7 +12350,6 @@ bool Actor::IsAttacking ( void ) const - { return m_ThinkStates[ THINKLEVEL_NORMAL ] == THINKSTATE_ATTACK; } @@ -12592,7 +12365,6 @@ void Actor::EventGetFov ( Event *ev ) - { ev->AddFloat(m_fFov); } @@ -12608,7 +12380,6 @@ void Actor::EventSetFov ( Event *ev ) - { float fov = ev->GetFloat(1); if (fov < 0 || fov > 360) @@ -12623,7 +12394,6 @@ void Actor::EventSetDestIdle ( Event *ev ) - { // not found in ida } @@ -12632,7 +12402,6 @@ void Actor::EventSetDestIdle2 ( Event *ev ) - { // not found in ida } @@ -12641,7 +12410,6 @@ void Actor::EventSetTypeIdle ( Event *ev ) - { eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1)); glbs.Printf("EventSetTypeIdle %s : %d\n", ev->GetString(1).c_str(), think); @@ -12658,7 +12426,6 @@ void Actor::EventGetTypeIdle ( Event *ev ) - { ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_IDLE]]); } @@ -12667,7 +12434,6 @@ void Actor::EventSetTypeAttack ( Event *ev ) - { eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1)); glbs.Printf("EventSetTypeAttack %s : %d\n", ev->GetString(1).c_str(), think); @@ -12686,7 +12452,6 @@ void Actor::EventGetTypeAttack ( Event *ev ) - { ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_ATTACK]]); } @@ -12695,7 +12460,6 @@ void Actor::EventSetTypeDisguise ( Event *ev ) - { eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1)); glbs.Printf("EventSetTypeDisguise %s : %d\n", ev->GetString(1).c_str(), think); @@ -12713,7 +12477,6 @@ void Actor::EventGetTypeDisguise ( Event *ev ) - { ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_DISGUISE]]); } @@ -12722,7 +12485,6 @@ void Actor::EventSetDisguiseLevel ( Event *ev ) - { m_iDisguiseLevel = ev->GetInteger(1); if (m_iDisguiseLevel -1 > 1) @@ -12736,7 +12498,6 @@ void Actor::EventGetDisguiseLevel ( Event *ev ) - { ev->AddInteger(m_iDisguiseLevel); } @@ -12745,7 +12506,6 @@ void Actor::EventSetTypeGrenade ( Event *ev ) - { eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1)); glbs.Printf("EventSetTypeGrenade %s : %d\n", ev->GetString(1).c_str(), think); @@ -12763,7 +12523,6 @@ void Actor::EventGetTypeGrenade ( Event *ev ) - { ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_GRENADE]]); } @@ -12772,7 +12531,6 @@ void Actor::EventSetMinDistance ( Event *ev ) - { m_fMinDistance = ev->GetFloat(1); @@ -12792,7 +12550,6 @@ void Actor::EventGetMinDistance ( Event *ev ) - { ev->AddFloat(m_fMinDistance); } @@ -12801,7 +12558,6 @@ void Actor::EventSetMaxDistance ( Event *ev ) - { m_fMaxDistance = ev->GetFloat(1); //FIXME: macro @@ -12821,7 +12577,6 @@ void Actor::EventGetMaxDistance ( Event *ev ) - { ev->AddFloat(m_fMaxDistance); } @@ -12830,7 +12585,6 @@ void Actor::EventSetLeash ( Event *ev ) - { m_fLeash = ev->GetFloat(1); m_fLeashSquared = Square(m_fLeash); @@ -12840,7 +12594,6 @@ void Actor::EventGetLeash ( Event *ev ) - { ev->AddFloat(m_fLeash); } @@ -12849,7 +12602,6 @@ void Actor::EventSetInterval ( Event *ev ) - { m_fInterval = ev->GetFloat(1); } @@ -12858,7 +12610,6 @@ void Actor::EventDistToEnemy ( Event *ev ) - { float dist = 0; if (m_Enemy) @@ -12873,7 +12624,6 @@ void Actor::EventGetInterval ( Event *ev ) - { ev->AddFloat(m_fInterval); } @@ -12882,7 +12632,6 @@ void Actor::EventGetRunAnim ( Event *ev ) - { ev->AddConstString(GetRunAnim()); } @@ -12891,7 +12640,6 @@ void Actor::EventGetWalkAnim ( Event *ev ) - { ev->AddConstString(GetWalkAnim()); } @@ -12900,7 +12648,6 @@ void Actor::EventSetAnimName ( Event *ev ) - { m_csAnimName = ev->GetConstString(1); } @@ -12909,7 +12656,6 @@ void Actor::EventGetAnimName ( Event *ev ) - { ev->AddConstString(m_csAnimName); } @@ -12918,7 +12664,6 @@ void Actor::EventSetDisguiseRange ( Event *ev ) - { float range = ev->GetFloat(1); m_fMaxDisguiseDistSquared = Square(range); @@ -12928,7 +12673,6 @@ void Actor::EventGetDisguiseRange ( Event *ev ) - { ev->AddFloat(sqrt(m_fMaxDisguiseDistSquared)); } @@ -12937,7 +12681,6 @@ void Actor::EventSetDisguisePeriod ( Event *ev ) - { m_iDisguisePeriod = ev->GetFloat(1) * 1000 + 0.5; } @@ -12946,7 +12689,6 @@ void Actor::EventGetDisguisePeriod ( Event *ev ) - { ev->AddFloat(m_iDisguisePeriod / 1000.0); } @@ -12955,7 +12697,6 @@ void Actor::EventSetDisguiseAcceptThread ( Event *ev ) - { if (ev->IsFromScript()) @@ -12973,7 +12714,6 @@ void Actor::EventGetDisguiseAcceptThread ( Event *ev ) - { m_DisguiseAcceptThread.GetScriptValue(&ev->GetValue()); } @@ -12982,7 +12722,6 @@ void Actor::EventAttackPlayer ( Event *ev ) - { Player *pPlayer = (Player *)G_GetEntity(0); if (!pPlayer) @@ -13000,7 +12739,6 @@ void Actor::ForceAttackPlayer ( void ) - { m_PotentialEnemies.ConfirmEnemy(this, (Sentient *)G_GetEntity(0)); } @@ -13009,7 +12747,6 @@ void Actor::EventSetAlarmNode ( Event *ev ) - { Listener *l = ev->GetListener(1); if (l) @@ -13026,7 +12763,6 @@ void Actor::EventGetAlarmNode ( Event *ev ) - { ev->AddListener(m_AlarmNode); } @@ -13035,7 +12771,6 @@ void Actor::EventSetAlarmThread ( Event *ev ) - { if (ev->IsFromScript()) { @@ -13052,7 +12787,6 @@ void Actor::EventGetAlarmThread ( Event *ev ) - { m_AlarmThread.GetScriptValue(&ev->GetValue()); @@ -13062,7 +12796,6 @@ void Actor::EventSetSoundAwareness ( Event *ev ) - { m_fSoundAwareness = ev->GetFloat(1); } @@ -13071,7 +12804,6 @@ void Actor::EventGetSoundAwareness ( Event *ev ) - { ev->AddFloat(m_fSoundAwareness); } @@ -13080,7 +12812,6 @@ void Actor::EventSetGrenadeAwareness ( Event *ev ) - { m_fGrenadeAwareness = ev->GetFloat(1); } @@ -13089,7 +12820,6 @@ void Actor::EventGetGrenadeAwareness ( Event *ev ) - { ev->AddFloat(m_fGrenadeAwareness); } @@ -13098,7 +12828,6 @@ str Actor::ThinkName ( void ) const - { return Director.GetString( m_csThinkNames[ m_Think[ m_ThinkLevel ] ] ); } @@ -13107,7 +12836,6 @@ str Actor::ThinkStateName ( void ) const - { return Director.GetString( m_csThinkStateNames[ m_ThinkState ] ); } @@ -13116,7 +12844,6 @@ void Actor::EventSetTurret ( Event *ev ) - { Listener *l = ev->GetListener(1); if (l->inheritsFrom(&TurretGun::ClassInfo)) @@ -13129,7 +12856,6 @@ void Actor::EventGetTurret ( Event *ev ) - { ev->AddListener(m_pTurret); } @@ -13138,7 +12864,6 @@ void Actor::EventEnableEnemy ( Event *ev ) - { m_bDesiredEnableEnemy = ev->GetBoolean(1); } @@ -13147,7 +12872,6 @@ void Actor::EventEnablePain ( Event *ev ) - { m_bEnablePain = ev->GetBoolean(1); } @@ -13156,7 +12880,6 @@ void Actor::EventActivate ( Event *ev ) - { m_bPatrolWaitTrigger = false; Unregister(STRING_TRIGGER); @@ -13166,7 +12889,6 @@ void Actor::EventGetAmmoGrenade ( Event *ev ) - { ev->AddInteger(AmmoCount("grenade")); } @@ -13175,7 +12897,6 @@ void Actor::EventSetAmmoGrenade ( Event *ev ) - { GiveAmmo("grenade", ev->GetInteger(1)); } @@ -13184,7 +12905,6 @@ void Actor::EventInterruptPoint ( Event *ev ) - { GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]]; @@ -13197,7 +12917,6 @@ void Actor::EventAnimScript ( Event *ev ) - { m_bAnimScriptSet = true; m_csAnimScript = ev->GetConstString(1); @@ -13213,7 +12932,6 @@ void Actor::EventAnimScript_Scripted ( Event *ev ) - { m_bAnimScriptSet = true; m_csAnimScript = ev->GetConstString(1); @@ -13229,7 +12947,6 @@ void Actor::EventAnimScript_Noclip ( Event *ev ) - { m_bAnimScriptSet = true; m_csAnimScript = ev->GetConstString(1); @@ -13244,7 +12961,6 @@ void Actor::EventReload_mg42 ( Event *ev ) - { //FIXME: macos/enum if (m_State != 1201) @@ -13267,7 +12983,6 @@ void Actor::SetPathWithLeash const char *description, int iMaxDirtyTime ) - { vec2_t dist = { vDestPos[0] - m_vHome[0], vDestPos[1] - m_vHome[1] }; float distSq = DotProduct2D(dist, dist); @@ -13298,7 +13013,6 @@ void Actor::SetPathWithLeash const char *description, int iMaxDirtyTime ) - { if (pDestNode) { @@ -13329,7 +13043,6 @@ void Actor::FindPathAwayWithLeash vec3_t vDirPreferred, float fMinSafeDist ) - { m_Path.FindPathAway( origin, @@ -13347,7 +13060,6 @@ void Actor::FindPathNearWithLeash vec3_t vNearbyTo, float fCloseDistSquared ) - { vec2_t dist = {vNearbyTo[0] - m_vHome[0], vNearbyTo[1] - m_vHome[1]}; float distSq = DotProduct2D(dist,dist); @@ -13377,7 +13089,6 @@ bool Actor::CanMovePathWithLeash ( void ) const - { vec2_t delta; @@ -13396,7 +13107,6 @@ bool Actor::MovePathWithLeash ( void ) - { if( CanMovePathWithLeash() ) { @@ -13415,7 +13125,6 @@ bool Actor::ShortenPathToAttack ( float fMinDist ) - { if (PathExists() && !PathComplete() && PathAvoidsSquadMates()) { @@ -13441,7 +13150,6 @@ void Actor::StrafeToAttack float fDist, vec3_t vDir ) - { Vector vEnemyCentroid, vDelta, vSpot, vDestPos; Vector mins(-16,-16,16); @@ -13504,7 +13212,6 @@ Vector Actor::GunTarget ( bool bNoCollision ) - { float accuracy; static bool doInit = true; @@ -13667,7 +13374,6 @@ qboolean Actor::setModel ( void ) - { str headModel, headSkin, weapon; headModel = level.GetRandomHeadModel(model); @@ -13713,7 +13419,6 @@ void Actor::EventSetHeadModel ( Event *ev ) - { m_csHeadModel = ev->GetConstString(1); @@ -13724,7 +13429,6 @@ void Actor::EventGetHeadModel ( Event *ev ) - { ev->AddConstString(m_csHeadModel); } @@ -13733,7 +13437,6 @@ void Actor::EventSetHeadSkin ( Event *ev ) - { m_csHeadSkin = ev->GetConstString(1); setModel(); @@ -13743,7 +13446,6 @@ void Actor::EventGetHeadSkin ( Event *ev ) - { ev->AddConstString(m_csHeadSkin); } @@ -13752,7 +13454,6 @@ void Actor::EventSetNoIdle ( Event *ev ) - { m_bNoIdleAfterAnim = ev->GetInteger(1); } @@ -13761,7 +13462,6 @@ void Actor::EventGetNoIdle ( Event *ev ) - { ev->AddInteger(m_bNoIdleAfterAnim); } @@ -13770,7 +13470,6 @@ void Actor::EventGetEnemy ( Event *ev ) - { ev->AddListener(m_Enemy); } @@ -13779,7 +13478,6 @@ void Actor::EventSetMaxNoticeTimeScale ( Event *ev ) - { float noticeScale; // fst7 @@ -13798,7 +13496,6 @@ void Actor::EventGetMaxNoticeTimeScale ( Event *ev ) - { ev->AddFloat(m_fMaxNoticeTimeScale * 100); @@ -13808,7 +13505,6 @@ void Actor::EventSetFixedLeash ( Event *ev ) - { m_bFixedLeash = ev->GetBoolean(1); } @@ -13817,7 +13513,6 @@ void Actor::EventGetFixedLeash ( Event *ev ) - { ev->AddInteger(m_bFixedLeash); } @@ -13826,7 +13521,6 @@ void Actor::Holster ( void ) - { if (activeWeaponList[0]) { @@ -13838,7 +13532,6 @@ void Actor::Unholster ( void ) - { Weapon *weap; @@ -13857,7 +13550,6 @@ void Actor::EventHolster ( Event *ev ) - { if (activeWeaponList[WEAPON_MAIN]) { @@ -13869,7 +13561,6 @@ void Actor::EventUnholster ( Event *ev ) - { Unholster(); } @@ -13878,7 +13569,6 @@ void Actor::EventSoundDone ( Event *ev ) - { //soundChannel_t int channel = ev->GetInteger(1); @@ -13909,7 +13599,6 @@ void Actor::EventSound ( Event *ev ) - { ProcessSoundEvent(ev, m_Team == TEAM_AMERICAN); } @@ -13918,7 +13607,6 @@ void Actor::EventIsEnemyVisible ( Event *ev ) - { ev->AddInteger(m_bEnemyVisible); } @@ -13927,7 +13615,6 @@ void Actor::EventGetEnemyVisibleChangeTime ( Event *ev ) - { //FIXME: /100 ?? ev->AddFloat(m_iEnemyVisibleChangeTime / 100); @@ -13937,7 +13624,6 @@ void Actor::EventGetLastEnemyVisibleTime ( Event *ev ) - { //FIXME: /100 ?? ev->AddFloat(m_iLastEnemyVisibleTime / 100 ); @@ -13947,7 +13633,6 @@ void Actor::EventSetFallHeight ( Event *ev ) - { float fHeight = ev->GetFloat(1); @@ -13967,7 +13652,6 @@ void Actor::EventGetFallHeight ( Event *ev ) - { ev->AddFloat(m_Path.GetFallHeight()); } @@ -13976,7 +13660,6 @@ void Actor::EventCanMoveTo ( Event *ev ) - { float fIntervalSquared, fDistSquared; vec2_t vDelta; @@ -14067,7 +13750,6 @@ void Actor::EventMoveDir ( Event *ev ) - { vec2_t vec; @@ -14090,7 +13772,6 @@ void Actor::EventIntervalDir ( Event *ev ) - { //FIXME: macro if (level.inttime >= m_iIntervalDirTime + 250) @@ -14114,7 +13795,6 @@ void Actor::EventResetLeash ( Event *ev ) - { m_vHome = origin; //delete m_pTetherEnt; @@ -14125,7 +13805,6 @@ void Actor::EventTether ( Event *ev ) - { m_pTetherEnt = ev->GetSimpleEntity(1); } @@ -14134,7 +13813,6 @@ void Actor::EventGetThinkState ( Event *ev ) - { ev->AddConstString(m_csThinkStateNames[m_ThinkState]); } @@ -14143,7 +13821,6 @@ void Actor::EventGetEnemyShareRange ( Event *ev ) - { ev->AddFloat(m_fMaxShareDistSquared); } @@ -14152,7 +13829,6 @@ void Actor::EventSetEnemyShareRange ( Event *ev ) - { float fRange = ev->GetFloat(1); m_fMaxShareDistSquared = fRange * fRange; @@ -14162,7 +13838,6 @@ void Actor::EventGetKickDir ( Event *ev ) - { ev->AddVector(m_vKickDir); } @@ -14171,7 +13846,6 @@ void Actor::EventGetNoLongPain ( Event *ev ) - { ev->AddInteger(m_bNoLongPain); } @@ -14180,7 +13854,6 @@ void Actor::EventSetNoLongPain ( Event *ev ) - { m_bNoLongPain = ev->GetBoolean(1); } @@ -14189,7 +13862,6 @@ void Actor::EventGetFavoriteEnemy ( Event *ev ) - { ev->AddEntity(m_FavoriteEnemy); } @@ -14198,7 +13870,6 @@ void Actor::EventSetFavoriteEnemy ( Event *ev ) - { Sentient *fEnemy = (Sentient*)ev->GetEntity(1); m_FavoriteEnemy = fEnemy; @@ -14208,7 +13879,6 @@ void Actor::EventGetMumble ( Event *ev ) - { ev->AddInteger(m_bMumble); } @@ -14217,7 +13887,6 @@ void Actor::EventSetMumble ( Event *ev ) - { m_bMumble = ev->GetInteger(1); } @@ -14226,7 +13895,6 @@ void Actor::EventGetBreathSteam ( Event *ev ) - { ev->AddInteger(m_bBreathSteam); } @@ -14235,7 +13903,6 @@ void Actor::EventSetBreathSteam ( Event *ev ) - { m_bBreathSteam = ev->GetInteger(1); } @@ -14244,7 +13911,6 @@ void Actor::EventSetNextBreathTime ( Event *ev ) - { ScriptVariable sVar; ScriptThread *t = Director.CreateThread("global/breathe.scr", "nextbreathtime"); @@ -14257,7 +13923,6 @@ void Actor::EventCalcGrenadeToss ( Event *ev ) - { //FIXME: macros Vector vTarget; @@ -14304,7 +13969,6 @@ void Actor::EventSetNoSurprise ( Event *ev ) - { m_bNoSurprise = ev->GetBoolean(1); @@ -14314,7 +13978,6 @@ void Actor::EventGetSilent ( Event *ev ) - { ev->AddInteger(m_bSilent); } @@ -14323,7 +13986,6 @@ void Actor::EventSetSilent ( Event *ev ) - { m_bSilent = ev->GetBoolean(1); } @@ -14332,7 +13994,6 @@ void Actor::EventGetAvoidPlayer ( Event *ev ) - { ev->AddInteger(m_bAutoAvoidPlayer); } @@ -14341,7 +14002,6 @@ void Actor::EventSetAvoidPlayer ( Event *ev ) - { m_bAutoAvoidPlayer = ev->GetBoolean(1); } @@ -14350,7 +14010,6 @@ void Actor::EventGetLookAroundAngle ( Event *ev ) - { //FIXME: weird //ev->GetFloat(m_fLookAroundFov); @@ -14361,7 +14020,6 @@ void Actor::EventSetLookAroundAngle ( Event *ev ) - { float angle = ev->GetFloat(1); if (angle < 0.0 || angle > 60.0) @@ -14375,7 +14033,6 @@ void Actor::EventHasCompleteLookahead ( Event *ev ) - { int completeLH = PathExists() && PathHasCompleteLookahead(); @@ -14386,7 +14043,6 @@ void Actor::EventPathDist ( Event *ev ) - { float dist = 0; if (PathExists() && !PathComplete()) @@ -14400,7 +14056,6 @@ void Actor::EventCanShootEnemyFrom ( Event *ev ) - { int canShoot = false; if (m_Enemy) @@ -14414,7 +14069,6 @@ void Actor::EventCanShoot ( Event *ev ) - { Entity *target = ev->GetEntity(1); @@ -14430,7 +14084,6 @@ void Actor::EventSetInReload ( Event *ev ) - { m_bInReload = ev->GetBoolean(1); @@ -14440,7 +14093,6 @@ void Actor::EventGetInReload ( Event *ev ) - { ev->AddInteger(m_bInReload); } @@ -14449,7 +14101,6 @@ void Actor::EventSetReloadCover ( Event *ev ) - { m_bNeedReload = ev->GetBoolean(1); } @@ -14458,7 +14109,6 @@ void Actor::EventBreakSpecial ( Event *ev ) - { mbBreakSpecialAttack = true; } @@ -14467,7 +14117,6 @@ void Actor::GetVoiceType ( Event *ev ) - { //voice type in actor is a char. const char *vType = va("%c", mVoiceType); @@ -14479,7 +14128,6 @@ void Actor::SetVoiceType ( Event *ev ) - { //voice type in actor is a char. str vType = ev->GetString(1); @@ -14498,7 +14146,6 @@ void Actor::ResolveVoiceType ( void ) - { char validVoice[128]; @@ -14569,7 +14216,6 @@ void Actor::EventSetBalconyHeight ( Event *ev ) - { m_fBalconyHeight = ev->GetFloat(1); } @@ -14578,7 +14224,6 @@ void Actor::EventGetBalconyHeight ( Event *ev ) - { ev->AddFloat(m_fBalconyHeight); } @@ -14587,7 +14232,6 @@ PathNode *Actor::FindSniperNodeAndSetPath ( bool *pbTryAgain ) - { PathNode *pSniperNode = PathManager.FindNearestSniperNode( this, origin, m_Enemy ); @@ -14616,7 +14260,6 @@ void Actor::Remove ( Event *ev ) - { EndStates(); @@ -14633,7 +14276,6 @@ void Actor::DontFaceWall ( void ) - { //PathNode *pNode; vec2_t vDelta; @@ -14762,7 +14404,6 @@ bool Actor::AvoidingFacingWall ( void ) const - { return m_eDontFaceWallMode <= 8; } @@ -14771,7 +14412,6 @@ void Actor::EndStates ( void ) - { for (int i = 0; i < NUM_THINKLEVELS; i++) { @@ -14791,7 +14431,6 @@ void Actor::ClearStates ( void ) - { for (int i = 0; i < NUM_THINKSTATES; i++) { @@ -14803,7 +14442,6 @@ void Actor::CheckUnregister ( void ) - { m_bBecomeRunner = false; if (parm.movefail) @@ -14825,7 +14463,6 @@ void Actor::BecomeCorpse ( void ) - { Event e1(EV_DeathSinkStart); @@ -14845,7 +14482,6 @@ void Actor::PathnodeClaimRevoked ( PathNode *node ) - { for (int i = m_ThinkLevel; i >= 0; --i) { @@ -14863,7 +14499,6 @@ void Actor::SetPathToNotBlockSentient ( Sentient *pOther ) - { Vector vDest, vPerp, vAway; @@ -14968,7 +14603,6 @@ void Actor::EventSetMoveDoneRadius ( Event *ev ) - { float moveDoneR = ev->GetFloat(1); m_fMoveDoneRadiusSquared = Square(moveDoneR); @@ -14979,7 +14613,6 @@ bool Actor::CalcFallPath ( void ) - { float startTime, animTime, startDeltaTime, nextTime; vec3_t vAbsDelta, vRelDelta, pos[200]; @@ -15103,7 +14736,6 @@ void Actor::ClearEnemies ( void ) - { m_PotentialEnemies.RemoveAll(); SetEnemy( NULL, false ); @@ -15113,7 +14745,6 @@ bool Actor::EnemyIsDisguised ( void ) - { return ( m_bEnemyIsDisguised || (m_Enemy && m_Enemy->m_bIsDisguised) ) && ( !m_bForceAttackPlayer && m_ThinkState != THINKSTATE_ATTACK ); } @@ -15122,7 +14753,6 @@ void Actor::setOriginEvent ( Vector org ) - { bool bRejoin = false; //FIXME: macro @@ -15162,7 +14792,6 @@ void Actor::DumpAnimInfo ( void ) - { Animate::DumpAnimInfo(); Vector desiredLook = m_bHasDesiredLookAngles ? m_DesiredLookAngles : vec_zero; @@ -15184,7 +14813,6 @@ bool Actor::AutoArchiveModel ( void ) - { return false; } diff --git a/code/fgame/actor.h b/code/fgame/actor.h index fe2fc125..3ab66ed0 100644 --- a/code/fgame/actor.h +++ b/code/fgame/actor.h @@ -1289,7 +1289,6 @@ inline void Actor::ArchiveStatic ( Archiver &arc ) - { for( int i = MAX_BODYQUEUE - 1; i >= 0; i-- ) { @@ -1303,7 +1302,6 @@ inline void Actor::Archive ( Archiver &arc ) - { SimpleActor::Archive( arc ); diff --git a/code/fgame/actor_aim.cpp b/code/fgame/actor_aim.cpp index a2eee960..bffea18b 100644 --- a/code/fgame/actor_aim.cpp +++ b/code/fgame/actor_aim.cpp @@ -28,7 +28,6 @@ void Actor::InitAim ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Aim; func->ThinkState = &Actor::Think_Aim; @@ -40,7 +39,6 @@ void Actor::Begin_Aim ( void ) - { m_csMood = STRING_ALERT; m_csIdleMood = STRING_NERVOUS; @@ -50,7 +48,6 @@ void Actor::Think_Aim ( void ) - { if( !RequireThink() ) return; @@ -73,7 +70,6 @@ void Actor::ShowInfo_Aim ( void ) - { ShowInfo_AimNode(); } diff --git a/code/fgame/actor_alarm.cpp b/code/fgame/actor_alarm.cpp index db33fb0c..b404fb96 100644 --- a/code/fgame/actor_alarm.cpp +++ b/code/fgame/actor_alarm.cpp @@ -28,7 +28,6 @@ void Actor::InitAlarm ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Alarm; func->EndState = &Actor::End_Alarm; @@ -41,7 +40,6 @@ void Actor::Begin_Alarm ( void ) - { DoForceActivate(); @@ -74,7 +72,6 @@ void Actor::End_Alarm ( void ) - { parm.movefail = true; } @@ -83,7 +80,6 @@ void Actor::State_Alarm_StartThread ( void ) - { if( m_AlarmNode ) SetLeashHome( m_AlarmNode->origin ); @@ -98,7 +94,6 @@ void Actor::State_Alarm_Move ( void ) - { if( PathExists() ) { @@ -127,7 +122,6 @@ void Actor::State_Alarm_Idle ( void ) - { AimAtTargetPos(); SetThink(THINKSTATE_ATTACK, THINK_TURRET); @@ -137,7 +131,6 @@ void Actor::Think_Alarm ( void ) - { if( !RequireThink() ) return; @@ -167,7 +160,6 @@ void Actor::FinishedAnimation_Alarm ( void ) - { // not needed return; diff --git a/code/fgame/actor_anim.cpp b/code/fgame/actor_anim.cpp index 9745d1e7..3066c737 100644 --- a/code/fgame/actor_anim.cpp +++ b/code/fgame/actor_anim.cpp @@ -28,7 +28,6 @@ void Actor::InitAnim ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Anim; func->BeginState = &Actor::Begin_Anim; @@ -42,7 +41,6 @@ void Actor::Begin_Anim ( void ) - { m_csMood = m_csIdleMood; ClearPath(); @@ -54,7 +52,6 @@ void Actor::Think_Anim ( void ) - { if (RequireThink()) { @@ -87,7 +84,6 @@ void Actor::FinishedAnimation_Anim ( void ) - { if (!m_bAnimScriptSet) { @@ -103,7 +99,6 @@ void Actor::ShowInfo_Anim ( void ) - { Com_Printf("anim script: %s, anim mode %d\n", Director.GetString(m_csAnimScript).c_str(), m_AnimMode); } diff --git a/code/fgame/actor_animapi.cpp b/code/fgame/actor_animapi.cpp index cf7b84a8..6e87eaa6 100644 --- a/code/fgame/actor_animapi.cpp +++ b/code/fgame/actor_animapi.cpp @@ -28,7 +28,6 @@ const_str SimpleActor::GetRunAnim ( void ) - { if( m_csCurrentPosition != STRING_PRONE && ( m_csCurrentPosition < STRING_PRONE || m_csCurrentPosition > STRING_CROUCHRUN ) ) return STRING_ANIM_RUN_SCR; @@ -40,7 +39,6 @@ const_str SimpleActor::GetWalkAnim ( void ) - { if( m_csCurrentPosition != STRING_PRONE && ( m_csCurrentPosition < STRING_PRONE || m_csCurrentPosition > STRING_CROUCHRUN ) ) return STRING_ANIM_WALK_SCR; @@ -52,7 +50,6 @@ void SimpleActor::Anim_Attack ( void ) - { DesiredAnimation(1, m_AttackHandler); } @@ -61,7 +58,6 @@ void SimpleActor::Anim_Sniper ( void ) - { DesiredAnimation(1, m_SniperHandler); } @@ -70,7 +66,6 @@ void SimpleActor::Anim_Aim ( void ) - { DesiredAnimation(1, STRING_ANIM_AIM_SCR); } @@ -79,7 +74,6 @@ void SimpleActor::Anim_Shoot ( void ) - { DesiredAnimation(1, STRING_ANIM_SHOOT_SCR); } @@ -88,7 +82,6 @@ void SimpleActor::Anim_Idle ( void ) - { DesiredAnimation(1, STRING_ANIM_IDLE_SCR); } @@ -97,7 +90,6 @@ void SimpleActor::Anim_Crouch ( void ) - { DesiredAnimation(1, STRING_ANIM_CROUCH_SCR); } @@ -106,7 +98,6 @@ void SimpleActor::Anim_Prone ( void ) - { DesiredAnimation(1, STRING_ANIM_PRONE_SCR); } @@ -115,7 +106,6 @@ void SimpleActor::Anim_Stand ( void ) - { DesiredAnimation(1, STRING_ANIM_STAND_SCR); } @@ -124,7 +114,6 @@ void SimpleActor::Anim_Cower ( void ) - { DesiredAnimation(1, STRING_ANIM_COWER_SCR); } @@ -133,7 +122,6 @@ void SimpleActor::Anim_Killed ( void ) - { Com_Printf("m_eAnimMode Anim_Killed \n"); DesiredAnimation(1, m_DeathHandler); @@ -143,7 +131,6 @@ void SimpleActor::Anim_StartPain ( void ) - { Com_Printf("m_eAnimMode Anim_StartPain \n"); StartAnimation(1, m_PainHandler); @@ -154,7 +141,6 @@ void SimpleActor::Anim_Pain ( void ) - { ContinueAnimation(); } @@ -164,7 +150,6 @@ void SimpleActor::Anim_CrouchRunTo ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_RUN_SCR); } @@ -173,7 +158,6 @@ void SimpleActor::Anim_CrouchWalkTo ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_WALK_SCR); } @@ -182,7 +166,6 @@ void SimpleActor::Anim_StandRunTo ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SCR); } @@ -191,7 +174,6 @@ void SimpleActor::Anim_StandWalkTo ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_WALK_SCR); } @@ -200,7 +182,6 @@ void SimpleActor::Anim_RunTo ( int eAnimMode ) - { DesiredAnimation(eAnimMode, GetRunAnim()); } @@ -209,7 +190,6 @@ void SimpleActor::Anim_WalkTo ( int eAnimMode ) - { DesiredAnimation(eAnimMode, GetWalkAnim()); } @@ -218,7 +198,6 @@ void SimpleActor::Anim_RunAwayFiring ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNAWAYFIRING_SCR); } @@ -227,7 +206,6 @@ void SimpleActor::Anim_RunToShooting ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SHOOT_SCR); } @@ -236,7 +214,6 @@ void SimpleActor::Anim_RunToAlarm ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_ALARM_SCR); } @@ -245,7 +222,6 @@ void SimpleActor::Anim_RunToCasual ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_CASUAL_SCR); } @@ -254,7 +230,6 @@ void SimpleActor::Anim_RunToCover ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_COVER_SCR); } @@ -263,7 +238,6 @@ void SimpleActor::Anim_RunToDanger ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DANGER_SCR); } @@ -272,7 +246,6 @@ void SimpleActor::Anim_RunToDive ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DIVE_SCR); } @@ -281,7 +254,6 @@ void SimpleActor::Anim_RunToFlee ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_FLEE_SCR); } @@ -290,7 +262,6 @@ void SimpleActor::Anim_RunToInOpen ( int eAnimMode ) - { DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_INOPEN_SCR); } @@ -299,7 +270,6 @@ void SimpleActor::Anim_Emotion ( eEmotionMode eEmotMode ) - { m_eEmotionMode = eEmotMode; } @@ -310,7 +280,6 @@ void SimpleActor::Anim_Say int iMinTimeSinceLastSay, bool bCanInterrupt ) - { if (!m_bSayAnimSet || bCanInterrupt) { @@ -329,7 +298,6 @@ void SimpleActor::Anim_FullBody const_str csFullBodyAnim, int eAnimMode ) - { if( m_csAnimName == csFullBodyAnim ) { diff --git a/code/fgame/actor_animcurious.cpp b/code/fgame/actor_animcurious.cpp index 06f71a11..f2426f39 100644 --- a/code/fgame/actor_animcurious.cpp +++ b/code/fgame/actor_animcurious.cpp @@ -28,7 +28,6 @@ void Actor::InitAnimCurious ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_AnimCurious; func->BeginState = &Actor::Begin_AnimCurious; @@ -42,7 +41,6 @@ void Actor::Begin_AnimCurious ( void ) - { DoForceActivate(); @@ -56,7 +54,6 @@ void Actor::Think_AnimCurious ( void ) - { if( !RequireThink() ) return; @@ -74,7 +71,6 @@ void Actor::FinishedAnimation_AnimCurious ( void ) - { if( m_State == 1101 ) { diff --git a/code/fgame/actor_balcony.cpp b/code/fgame/actor_balcony.cpp index dd0ce6eb..a567e2b4 100644 --- a/code/fgame/actor_balcony.cpp +++ b/code/fgame/actor_balcony.cpp @@ -29,7 +29,6 @@ void Actor::InitBalconyIdle ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Idle; func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle; @@ -42,7 +41,6 @@ void Actor::InitBalconyCurious ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Curious; func->BeginState = &Actor::Begin_Curious; @@ -60,7 +58,6 @@ void Actor::InitBalconyAttack ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_BalconyAttack; func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack; @@ -76,7 +73,6 @@ void Actor::InitBalconyDisguise ( GlobalFuncs_t *func ) - { func->IsState = &Actor::IsDisguiseState; } @@ -85,7 +81,6 @@ void Actor::InitBalconyGrenade ( GlobalFuncs_t *func ) - { func->IsState = &Actor::IsGrenadeState; } @@ -94,7 +89,6 @@ void Actor::InitBalconyPain ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Pain; func->ThinkState = &Actor::Think_Pain; @@ -108,7 +102,6 @@ void Actor::InitBalconyKilled ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_BalconyKilled; func->EndState = &Actor::End_BalconyKilled; @@ -121,7 +114,6 @@ void Actor::Pain_Balcony ( Event *ev ) - { SetThink( THINKSTATE_PAIN, THINK_BALCONY_PAIN); HandlePain( ev ); @@ -132,7 +124,6 @@ void Actor::Killed_Balcony Event *ev, bool bPlayDeathAnim ) - { ClearStates(); SetThink( THINKSTATE_KILLED, THINK_BALCONY_KILLED); @@ -146,7 +137,6 @@ void Actor::Begin_BalconyAttack ( void ) - { TransitionState(200, 0); } @@ -155,7 +145,6 @@ void Actor::State_Balcony_PostShoot ( void ) - { if( m_Enemy ) { @@ -167,7 +156,6 @@ void Actor::State_Balcony_FindEnemy ( void ) - { m_bHasDesiredLookAngles = false; Anim_Aim(); @@ -182,7 +170,6 @@ void Actor::State_Balcony_Target ( void ) - { Anim_Aim(); AimAtTargetPos(); @@ -205,7 +192,6 @@ void Actor::State_Balcony_Shoot ( void ) - { Anim_Shoot(); AimAtTargetPos(); @@ -215,7 +201,6 @@ void Actor::Think_BalconyAttack ( void ) - { if( !RequireThink() ) return; @@ -260,7 +245,6 @@ void Actor::FinishedAnimation_BalconyAttack ( void ) - { if( m_State == 202 ) State_Balcony_PostShoot(); @@ -270,7 +254,6 @@ void Actor::Begin_BalconyKilled ( void ) - { ClearPath(); ResetBoneControllers(); @@ -287,7 +270,6 @@ void Actor::End_BalconyKilled ( void ) - { if( m_pFallPath ) { @@ -300,7 +282,6 @@ void Actor::Think_BalconyKilled ( void ) - { int animnum; @@ -395,7 +376,6 @@ void Actor::FinishedAnimation_BalconyKilled ( void ) - { if( m_State == 804 || m_State == 806 ) { diff --git a/code/fgame/actor_cover.cpp b/code/fgame/actor_cover.cpp index 029b03cf..fc3851e2 100644 --- a/code/fgame/actor_cover.cpp +++ b/code/fgame/actor_cover.cpp @@ -28,7 +28,6 @@ void Actor::InitCover ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Cover; func->BeginState = &Actor::Begin_Cover; @@ -44,7 +43,6 @@ void Actor::Begin_Cover ( void ) - { DoForceActivate(); m_csIdleMood = STRING_NERVOUS; @@ -74,7 +72,6 @@ void Actor::End_Cover ( void ) - { m_pszDebugState = ""; @@ -91,7 +88,6 @@ void Actor::Suspend_Cover ( void ) - { if( m_pCoverNode ) { @@ -107,7 +103,6 @@ void Actor::State_Cover_NewEnemy ( void ) - { m_bHasDesiredLookAngles = true; @@ -130,7 +125,6 @@ void Actor::State_Cover_FindCover ( void ) - { Anim_Aim(); AimAtTargetPos(); @@ -161,7 +155,6 @@ void Actor::State_Cover_TakeCover ( void ) - { if( PathExists() && !PathComplete() ) { @@ -194,7 +187,6 @@ void Actor::State_Cover_FinishReloading ( void ) - { if( m_bInReload ) { @@ -238,7 +230,6 @@ void Actor::State_Cover_Target ( void ) - { DontFaceWall(); @@ -279,7 +270,6 @@ void Actor::State_Cover_Hide ( void ) - { if (m_Enemy) { @@ -456,7 +446,6 @@ void Actor::State_Cover_Shoot ( void ) - { if (m_bNeedReload) { @@ -486,7 +475,6 @@ void Actor::State_Cover_Grenade ( void ) - { GenericGrenadeTossThink(); } @@ -495,7 +483,6 @@ void Actor::State_Cover_SpecialAttack ( void ) - { m_bHasDesiredLookAngles = false; @@ -543,7 +530,6 @@ void Actor::State_Cover_FindEnemy ( void ) - { if( m_Team == TEAM_AMERICAN ) { @@ -590,7 +576,6 @@ void Actor::State_Cover_SearchNode ( void ) - { m_bHasDesiredLookAngles = false; @@ -623,7 +608,6 @@ void Actor::State_Cover_HuntEnemy ( void ) - { FaceEnemyOrMotion( level.inttime - m_iStateTime ); MovePathWithLeash(); @@ -651,7 +635,6 @@ void Actor::State_Cover_FakeEnemy ( void ) - { AimAtTargetPos(); Anim_Aim(); @@ -666,7 +649,6 @@ void Actor::Think_Cover ( void ) - { if( !RequireThink() ) { @@ -776,7 +758,6 @@ void Actor::FinishedAnimation_Cover ( void ) - { if( m_State == 309 ) { @@ -799,7 +780,6 @@ void Actor::PathnodeClaimRevoked_Cover ( void ) - { TransitionState(301, 0); } @@ -808,7 +788,6 @@ bool Actor::Cover_IsValid ( PathNode *node ) - { if( !node->IsClaimedByOther( this ) ) { @@ -845,7 +824,6 @@ bool Actor::Cover_SetPath ( PathNode *node ) - { SetPathWithLeash( node, NULL, 0 ); @@ -912,7 +890,6 @@ void Actor::Cover_FindCover ( bool bCheckAll ) - { if( m_pCoverNode ) diff --git a/code/fgame/actor_curious.cpp b/code/fgame/actor_curious.cpp index 464c6b86..a78c7e86 100644 --- a/code/fgame/actor_curious.cpp +++ b/code/fgame/actor_curious.cpp @@ -28,7 +28,6 @@ void Actor::InitCurious ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Curious; func->BeginState = &Actor::Begin_Curious; @@ -44,7 +43,6 @@ void Actor::Begin_Curious ( void ) - { Vector vDelta; //float fDistSquared; @@ -157,7 +155,6 @@ void Actor::End_Curious ( void ) - { m_iCuriousTime = 0; m_iCuriousLevel = 0; @@ -167,7 +164,6 @@ void Actor::Resume_Curious ( void ) - { Begin_Curious(); } @@ -176,7 +172,6 @@ void Actor::Suspend_Curious ( void ) - { End_Curious(); } @@ -185,7 +180,6 @@ void Actor::Think_Curious ( void ) - { //horrible function! if (RequireThink()) @@ -427,7 +421,6 @@ void Actor::FinishedAnimation_Curious ( void ) - { FinishedAnimation_AnimCurious(); } @@ -437,7 +430,6 @@ void Actor::LookAtCuriosity ( void ) - { Vector vAngles; float fLookScale; @@ -495,7 +487,6 @@ void Actor::TimeOutCurious ( void ) - { //FIXME: macros if (!m_Enemy || EnemyIsDisguised()) diff --git a/code/fgame/actor_disguise_common.cpp b/code/fgame/actor_disguise_common.cpp index fb3cbbfd..636d7d82 100644 --- a/code/fgame/actor_disguise_common.cpp +++ b/code/fgame/actor_disguise_common.cpp @@ -29,7 +29,6 @@ void Actor::InitDisguiseNone ( GlobalFuncs_t *func ) - { func->IsState = &Actor::IsDisguiseState; } @@ -38,7 +37,6 @@ void Actor::State_Disguise_Wait ( void ) - { vec2_t vDelta; float fDistSquared; @@ -74,7 +72,6 @@ void Actor::State_Disguise_Papers ( void ) - { vec2_t vDelta; @@ -116,7 +113,6 @@ void Actor::State_Disguise_Fake_Papers ( void ) - { vec2_t vDelta; @@ -143,7 +139,6 @@ void Actor::State_Disguise_Enemy ( void ) - { m_eNextAnimMode = 1; m_csNextAnimString = STRING_ANIM_DISGUISE_ENEMY_SCR; @@ -159,7 +154,6 @@ void Actor::State_Disguise_Halt ( void ) - { m_eNextAnimMode = 1; m_csNextAnimString = STRING_ANIM_DISGUISE_HALT_SCR; @@ -175,7 +169,6 @@ void Actor::State_Disguise_Accept ( void ) - { m_eNextAnimMode = 1; m_csNextAnimString = STRING_ANIM_DISGUISE_ACCEPT_SCR; @@ -192,7 +185,6 @@ void Actor::State_Disguise_Deny ( void ) - { m_eNextAnimMode = 1; m_csNextAnimString = STRING_ANIM_DISGUISE_DENY_SCR; diff --git a/code/fgame/actor_disguise_officier.cpp b/code/fgame/actor_disguise_officier.cpp index 8a043baf..2508b20b 100644 --- a/code/fgame/actor_disguise_officier.cpp +++ b/code/fgame/actor_disguise_officier.cpp @@ -29,7 +29,6 @@ void Actor::InitDisguiseOfficer ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_DisguiseOfficer; func->BeginState = &Actor::Begin_DisguiseOfficer; @@ -44,7 +43,6 @@ void Actor::Begin_DisguiseOfficer ( void ) - { vec2_t vDelta; m_csMood = STRING_BORED; @@ -86,7 +84,6 @@ void Actor::End_DisguiseOfficer ( void ) - { m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500); } @@ -95,7 +92,6 @@ void Actor::Resume_DisguiseOfficer ( void ) - { Begin_DisguiseOfficer(); } @@ -104,7 +100,6 @@ void Actor::Suspend_DisguiseOfficer ( void ) - { End_DisguiseOfficer(); } @@ -113,7 +108,6 @@ void Actor::Think_DisguiseOfficer ( void ) - { if (RequireThink()) { diff --git a/code/fgame/actor_disguise_rover.cpp b/code/fgame/actor_disguise_rover.cpp index e8da0078..1fe5aec8 100644 --- a/code/fgame/actor_disguise_rover.cpp +++ b/code/fgame/actor_disguise_rover.cpp @@ -28,7 +28,6 @@ void Actor::InitDisguiseRover ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_DisguiseRover; func->BeginState = &Actor::Begin_DisguiseRover; @@ -43,7 +42,6 @@ void Actor::Begin_DisguiseRover ( void ) - { vec2_t vDelta; @@ -85,7 +83,6 @@ void Actor::End_DisguiseRover ( void ) - { m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500); } @@ -94,7 +91,6 @@ void Actor::Resume_DisguiseRover ( void ) - { Begin_DisguiseRover(); } @@ -103,7 +99,6 @@ void Actor::Suspend_DisguiseRover ( void ) - { End_DisguiseRover(); } @@ -112,7 +107,6 @@ void Actor::Think_DisguiseRover ( void ) - { if (!RequireThink()) { diff --git a/code/fgame/actor_disguise_salute.cpp b/code/fgame/actor_disguise_salute.cpp index 6950105f..0a23e89f 100644 --- a/code/fgame/actor_disguise_salute.cpp +++ b/code/fgame/actor_disguise_salute.cpp @@ -28,7 +28,6 @@ void Actor::InitDisguiseSalute ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_DisguiseSalute; func->BeginState = &Actor::Begin_DisguiseSalute; @@ -43,7 +42,6 @@ void Actor::Begin_DisguiseSalute ( void ) - { vec2_t vDelta; @@ -89,7 +87,6 @@ void Actor::End_DisguiseSalute ( void ) - { m_iNextDisguiseTime = level.inttime + m_iDisguisePeriod; } @@ -98,7 +95,6 @@ void Actor::Resume_DisguiseSalute ( void ) - { Begin_DisguiseSalute(); } @@ -107,7 +103,6 @@ void Actor::Suspend_DisguiseSalute ( void ) - { End_DisguiseSalute(); } @@ -116,7 +111,6 @@ void Actor::Think_DisguiseSalute ( void ) - { NoPoint(); ContinueAnimation(); @@ -157,7 +151,6 @@ void Actor::FinishedAnimation_DisguiseSalute ( void ) - { SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL); } diff --git a/code/fgame/actor_disguise_sentry.cpp b/code/fgame/actor_disguise_sentry.cpp index f29deac2..e833e1b5 100644 --- a/code/fgame/actor_disguise_sentry.cpp +++ b/code/fgame/actor_disguise_sentry.cpp @@ -28,7 +28,6 @@ void Actor::InitDisguiseSentry ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_DisguiseSentry; func->BeginState = &Actor::Begin_DisguiseSentry; @@ -43,7 +42,6 @@ void Actor::Begin_DisguiseSentry ( void ) - { vec2_t vDelta; @@ -87,7 +85,6 @@ void Actor::End_DisguiseSentry ( void ) - { m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500); } @@ -96,7 +93,6 @@ void Actor::Resume_DisguiseSentry ( void ) - { Begin_DisguiseSentry(); } @@ -105,7 +101,6 @@ void Actor::Suspend_DisguiseSentry ( void ) - { End_DisguiseSentry(); } @@ -114,7 +109,6 @@ void Actor::Think_DisguiseSentry ( void ) - { if (RequireThink()) { diff --git a/code/fgame/actor_dog.cpp b/code/fgame/actor_dog.cpp index 6fc01ac1..46dcb909 100644 --- a/code/fgame/actor_dog.cpp +++ b/code/fgame/actor_dog.cpp @@ -28,7 +28,6 @@ void Actor::InitDogIdle ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Dog; func->EndState = &Actor::End_Dog; @@ -41,7 +40,6 @@ void Actor::InitDogAttack ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Dog; func->EndState = &Actor::End_Dog; @@ -54,7 +52,6 @@ void Actor::InitDogCurious ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Dog; func->EndState = &Actor::End_Dog; @@ -67,7 +64,6 @@ void Actor::Begin_Dog ( void ) - { m_bDog = true; } @@ -76,7 +72,6 @@ void Actor::End_Dog ( void ) - { ; } @@ -85,7 +80,6 @@ void Actor::Think_Dog_Idle ( void ) - { if( !RequireThink() ) { @@ -105,7 +99,6 @@ void Actor::Think_Dog_Attack ( void ) - { if (!RequireThink()) { @@ -177,7 +170,6 @@ void Actor::Think_Dog_Curious ( void ) - { if (RequireThink()) { diff --git a/code/fgame/actor_grenade.cpp b/code/fgame/actor_grenade.cpp index 59ee102a..7a75aed3 100644 --- a/code/fgame/actor_grenade.cpp +++ b/code/fgame/actor_grenade.cpp @@ -29,7 +29,6 @@ void Actor::InitGrenade ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Grenade; func->BeginState = &Actor::Begin_Grenade; @@ -46,7 +45,6 @@ bool Actor::Grenade_Acquire eGrenadeState eNextState, const_str csReturnAnim ) - { bool bRetVal = false; Vector vDest; @@ -117,7 +115,6 @@ void Actor::Grenade_Flee ( void ) - { //float origin_ratio; float fMinCloseDistSquared; @@ -209,7 +206,6 @@ void Actor::Grenade_ThrowAcquire ( void ) - { if (!Grenade_Acquire(AI_GRENSTATE_THROW, STRING_ANIM_GRENADERETURN_SCR) && !CanGetGrenadeFromAToB( @@ -229,7 +225,6 @@ void Actor::Grenade_Throw ( void ) - { m_bHasDesiredLookAngles = false; @@ -242,7 +237,6 @@ void Actor::Grenade_KickAcquire ( void ) - { Vector vFace = vec_zero; if (!Grenade_Acquire(AI_GRENSTATE_KICK, STRING_ANIM_GRENADEKICK_SCR)) @@ -267,7 +261,6 @@ void Actor::Grenade_Kick ( void ) - { m_bHasDesiredLookAngles = false; ContinueAnimation(); @@ -277,7 +270,6 @@ void Actor::Grenade_MartyrAcquire ( void ) - { Vector vDest; if (m_bGrenadeBounced) @@ -340,7 +332,6 @@ void Actor::Grenade_Martyr ( void ) - { if (m_pGrenade && level.inttime >= (m_iStateTime + 1000) - 0.5) { @@ -359,7 +350,6 @@ void Actor::Grenade_Wait ( void ) - { if (rand() & 0xF) { @@ -377,7 +367,6 @@ void Actor::Grenade_NextThinkState ( void ) - { if (m_Enemy && !(m_Enemy->IsSubclassOfActor())) SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL); @@ -389,7 +378,6 @@ void Actor::Grenade_EventAttach ( Event *ev ) - { if (m_pGrenade) { @@ -426,7 +414,6 @@ void Actor::Grenade_EventDetach ( Event *ev ) - { if (m_pGrenade) { @@ -444,7 +431,6 @@ void Actor::Begin_Grenade ( void ) - { DoForceActivate(); m_csMood = STRING_ALERT; @@ -571,7 +557,6 @@ void Actor::End_Grenade ( void ) - { m_pszDebugState = ""; } @@ -580,7 +565,6 @@ void Actor::Resume_Grenade ( void ) - { if (m_pGrenade) Begin_Grenade(); @@ -592,7 +576,6 @@ void Actor::Think_Grenade ( void ) - { if (m_bEnableEnemy) UpdateEnemy(200); @@ -677,7 +660,6 @@ void Actor::FinishedAnimation_Grenade ( void ) - { switch (m_eGrenadeState) { diff --git a/code/fgame/actor_idle.cpp b/code/fgame/actor_idle.cpp index 5a8b1941..72d90f28 100644 --- a/code/fgame/actor_idle.cpp +++ b/code/fgame/actor_idle.cpp @@ -28,7 +28,6 @@ void Actor::InitIdle ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Idle; func->ThinkState = &Actor::Think_Idle; @@ -40,7 +39,6 @@ void Actor::Begin_Idle ( void ) - { glbs.Printf("Begin_Idle\n"); m_csMood = m_csIdleMood; @@ -51,7 +49,6 @@ void Actor::Think_Idle ( void ) - { if (RequireThink()) { @@ -66,7 +63,6 @@ void Actor::IdleThink ( void ) - { IdlePoint(); IdleLook(); @@ -109,7 +105,6 @@ bool Actor::PassesTransitionConditions_Idle ( void ) - { glbs.Printf("PassesTransitionConditions_Idle\n"); @@ -128,7 +123,6 @@ bool Actor::IsIdleState ( int state ) - { return state == THINKSTATE_IDLE; } \ No newline at end of file diff --git a/code/fgame/actor_killed.cpp b/code/fgame/actor_killed.cpp index 8eecac8a..366f7cde 100644 --- a/code/fgame/actor_killed.cpp +++ b/code/fgame/actor_killed.cpp @@ -28,7 +28,6 @@ void Actor::InitDead ( GlobalFuncs_t *func ) - { func->IsState = &Actor::IsKilledState; } @@ -37,7 +36,6 @@ void Actor::InitKilled ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Killed; func->ThinkState = &Actor::Think_Killed; @@ -49,7 +47,6 @@ void Actor::Begin_Killed ( void ) - { Event e1(EV_Actor_DeathEmbalm); // ebx @@ -66,7 +63,6 @@ void Actor::Think_Killed ( void ) - { Unregister(STRING_ANIMDONE); if (m_State == 700) @@ -88,7 +84,6 @@ void Actor::FinishedAnimation_Killed ( void ) - { BecomeCorpse(); TransitionState(701, 0); diff --git a/code/fgame/actor_machinegunner.cpp b/code/fgame/actor_machinegunner.cpp index dfb42f94..ddb52d66 100644 --- a/code/fgame/actor_machinegunner.cpp +++ b/code/fgame/actor_machinegunner.cpp @@ -32,7 +32,6 @@ void Actor::InitMachineGunner ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_MachineGunner; func->EndState = &Actor::End_MachineGunner; @@ -45,7 +44,6 @@ void Actor::Begin_MachineGunner ( void ) - { m_csMood = STRING_ALERT; m_csIdleMood = STRING_NERVOUS; @@ -91,7 +89,6 @@ void Actor::End_MachineGunner ( void ) - { if (!GetWeapon(WEAPON_MAIN)) giveItem("models/weapons/mp40.tik"); @@ -109,7 +106,6 @@ void Actor::BecomeTurretGuy ( void ) - { SetThinkIdle(THINK_IDLE); @@ -127,7 +123,6 @@ void Actor::Think_MachineGunner ( void ) - { if (RequireThink()) { @@ -197,7 +192,6 @@ void Actor::ThinkHoldGun ( void ) - { Vector end; trace_t trace; @@ -325,7 +319,6 @@ void Actor::FinishedAnimation_MachineGunner ( void ) - { if (!m_bAnimScriptSet && m_State == 1201) { @@ -340,7 +333,6 @@ bool Actor::MachineGunner_CanSee float fov, float vision_distance ) - { float delta[2]; diff --git a/code/fgame/actor_noclip.cpp b/code/fgame/actor_noclip.cpp index e0bfd741..738580cb 100644 --- a/code/fgame/actor_noclip.cpp +++ b/code/fgame/actor_noclip.cpp @@ -28,7 +28,6 @@ void Actor::InitNoClip ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_NoClip; func->IsState = &Actor::IsIdleState; @@ -38,7 +37,6 @@ bool Actor::IsNoClipState ( int state ) - { return state == THINKSTATE_NOCLIP; } @@ -47,7 +45,6 @@ void Actor::Think_NoClip ( void ) - { //FIXME: not sure of naming bool done = false; diff --git a/code/fgame/actor_pain.cpp b/code/fgame/actor_pain.cpp index 671aeb51..ca8e8e2f 100644 --- a/code/fgame/actor_pain.cpp +++ b/code/fgame/actor_pain.cpp @@ -28,7 +28,6 @@ void Actor::InitPain ( GlobalFuncs_t *func ) - { func->BeginState = &Actor::Begin_Pain; func->ThinkState = &Actor::Think_Pain; @@ -40,7 +39,6 @@ void Actor::Begin_Pain ( void ) - { m_PainState = 500; } @@ -49,7 +47,6 @@ void Actor::Think_Pain ( void ) - { NoPoint(); @@ -75,7 +72,6 @@ void Actor::FinishedAnimation_Pain ( void ) - { if (m_PainState != 500) EndCurrentThinkState(); diff --git a/code/fgame/actor_patrol.cpp b/code/fgame/actor_patrol.cpp index b15ed77f..77e57e08 100644 --- a/code/fgame/actor_patrol.cpp +++ b/code/fgame/actor_patrol.cpp @@ -28,7 +28,6 @@ void Actor::InitPatrol ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Patrol; func->BeginState = &Actor::Begin_Patrol; @@ -43,7 +42,6 @@ void Actor::Begin_Patrol ( void ) - { m_csMood = STRING_BORED; StopTurning(); @@ -54,7 +52,6 @@ void Actor::End_Patrol ( void ) - { parm.movefail = true; @@ -64,7 +61,6 @@ void Actor::Resume_Patrol ( void ) - { ; } @@ -73,7 +69,6 @@ void Actor::Think_Patrol ( void ) - { if (Actor::RequireThink()) { @@ -115,7 +110,6 @@ void Actor::ShowInfo_Patrol ( void ) - { ShowInfo_PatrolCurrentNode(); } diff --git a/code/fgame/actor_runner.cpp b/code/fgame/actor_runner.cpp index ae028485..9aaab8f3 100644 --- a/code/fgame/actor_runner.cpp +++ b/code/fgame/actor_runner.cpp @@ -28,7 +28,6 @@ void Actor::InitRunner ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Runner; func->BeginState = &Actor::Begin_Runner; @@ -43,7 +42,6 @@ void Actor::Begin_Runner ( void ) - { m_csMood = STRING_NERVOUS; m_csIdleMood = STRING_NERVOUS; @@ -55,7 +53,6 @@ void Actor::End_Runner ( void ) - { parm.movefail = true; } @@ -64,7 +61,6 @@ void Actor::Resume_Runner ( void ) - { ; } @@ -73,7 +69,6 @@ void Actor::Think_Runner ( void ) - { if (RequireThink()) { @@ -113,7 +108,6 @@ void Actor::ShowInfo_Runner ( void ) - { ShowInfo_PatrolCurrentNode(); } diff --git a/code/fgame/actor_turret.cpp b/code/fgame/actor_turret.cpp index df54f677..25fbee14 100644 --- a/code/fgame/actor_turret.cpp +++ b/code/fgame/actor_turret.cpp @@ -28,7 +28,6 @@ void Actor::InitTurret ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Turret; func->BeginState = &Actor::Begin_Turret; @@ -47,7 +46,6 @@ void Actor::Begin_Turret ( void ) - { DoForceActivate(); m_csMood = STRING_ALERT; @@ -68,7 +66,6 @@ void Actor::End_Turret ( void ) - { if (m_pCoverNode && m_State != 111) { @@ -82,7 +79,6 @@ void Actor::Suspend_Turret ( void ) - { if (!m_Enemy) { @@ -103,7 +99,6 @@ void Actor::Think_Turret ( void ) - { @@ -300,7 +295,6 @@ void Actor::FinishedAnimation_Turret ( void ) - { if (m_State <= 108) { @@ -316,7 +310,6 @@ void Actor::ReceiveAIEvent_Turret float fDistSquared, float fMaxDistSquared ) - { if (iType == AI_EVENT_WEAPON_IMPACT) { @@ -340,7 +333,6 @@ void Actor::InterruptPoint_Turret ( void ) - { if (m_Enemy && !Turret_TryToBecomeCoverGuy() && m_State == 100) { @@ -353,7 +345,6 @@ void Actor::PathnodeClaimRevoked_Turret ( void ) - { if (m_Enemy == NULL) { @@ -369,7 +360,6 @@ bool Actor::Turret_IsRetargeting ( void ) const - { return m_State <= 120; } @@ -378,7 +368,6 @@ bool Actor::Turret_DecideToSelectState ( void ) - { switch (m_State) { @@ -401,7 +390,6 @@ void Actor::Turret_SelectState ( void ) - { vec2_t vDelta; float fDistSquared; @@ -511,7 +499,6 @@ bool Actor::Turret_CheckRetarget ( void ) - { if (level.inttime < m_iStateTime + 5000 || level.inttime < m_iLastHitTime + 5000) return false; @@ -525,7 +512,6 @@ bool Actor::Turret_TryToBecomeCoverGuy ( void ) - { PathNode* pOldCover = m_pCoverNode; Cover_FindCover(true); @@ -550,7 +536,6 @@ void Actor::Turret_BeginRetarget ( void ) - { SetEnemyPos(m_Enemy->origin); AimAtEnemyBehavior(); @@ -563,7 +548,6 @@ void Actor::Turret_NextRetarget ( void ) - { vec2_t vDelta; float fDistSquared; @@ -629,7 +613,6 @@ void Actor::Turret_SideStep int iStepSize, vec3_t vDir ) - { AimAtEnemyBehavior(); //v3 = iStepSize; @@ -654,7 +637,6 @@ void Actor::State_Turret_Combat ( void ) - { if (CanSeeEnemy(200)) { @@ -703,7 +685,6 @@ void Actor::State_Turret_Reacquire ( void ) - { /*Sentient *v1; // ecx float v2; // ST08_4 @@ -737,7 +718,6 @@ void Actor::State_Turret_TakeSniperNode ( void ) - { if (PathExists() && !PathComplete()) { @@ -755,7 +735,6 @@ void Actor::State_Turret_SniperNode ( void ) - { AimAtTargetPos(); Anim_Sniper(); @@ -771,7 +750,6 @@ bool Actor::State_Turret_RunHome ( bool bAttackOnFail ) - { SetPath(m_vHome, NULL, 0, NULL, 0.0); @@ -802,7 +780,6 @@ void Actor::State_Turret_RunAway ( void ) - { if (!PathExists() || PathComplete()) { @@ -828,7 +805,6 @@ void Actor::State_Turret_Charge ( void ) - { SetPathWithLeash(m_vLastEnemyPos, NULL, 0); ShortenPathToAvoidSquadMates(); @@ -881,7 +857,6 @@ void Actor::State_Turret_Grenade ( void ) - { GenericGrenadeTossThink(); } @@ -890,7 +865,6 @@ void Actor::State_Turret_FakeEnemy ( void ) - { AimAtTargetPos(); Anim_Aim(); @@ -902,7 +876,6 @@ void Actor::State_Turret_Wait ( void ) - { PathNode *pNode; if (CanSeeEnemy(500) || CanShootEnemy(500)) @@ -977,7 +950,6 @@ void Actor::State_Turret_Retarget_Sniper_Node ( void ) - { PathNode *pSniperNode; bool bTryAgain; @@ -1011,7 +983,6 @@ void Actor::State_Turret_Retarget_Path_Exact ( void ) - { AimAtEnemyBehavior(); SetPathWithLeash(m_vLastEnemyPos, NULL, 0); @@ -1030,7 +1001,6 @@ void Actor::State_Turret_Retarget_Path_Near ( void ) - { AimAtEnemyBehavior(); FindPathNearWithLeash(m_vLastEnemyPos, m_fMinDistanceSquared); @@ -1048,7 +1018,6 @@ void Actor::State_Turret_Retarget_Step_Side_Small ( void ) - { int iRand; // esi @@ -1073,7 +1042,6 @@ void Actor::State_Turret_Retarget_Step_Side_Medium ( void ) - { int iRand; // esi @@ -1098,7 +1066,6 @@ void Actor::State_Turret_Retarget_Step_Side_Large ( void ) - { int iRand; // esi @@ -1123,7 +1090,6 @@ void Actor::State_Turret_Retarget_Step_Face_Medium ( void ) - { int iRand; // esi @@ -1148,7 +1114,6 @@ void Actor::State_Turret_Retarget_Step_Face_Large ( void ) - { int iRand; // esi diff --git a/code/fgame/actor_weaponless.cpp b/code/fgame/actor_weaponless.cpp index dd50e414..f4251243 100644 --- a/code/fgame/actor_weaponless.cpp +++ b/code/fgame/actor_weaponless.cpp @@ -28,7 +28,6 @@ void Actor::InitWeaponless ( GlobalFuncs_t *func ) - { func->ThinkState = &Actor::Think_Weaponless; func->BeginState = &Actor::Begin_Weaponless; @@ -42,7 +41,6 @@ void Actor::Begin_Weaponless ( void ) - { DoForceActivate(); @@ -67,7 +65,6 @@ void Actor::Suspend_Weaponless ( void ) - { if (m_State <= 902) { @@ -80,7 +77,6 @@ void Actor::Think_Weaponless ( void ) - { if (RequireThink()) @@ -131,7 +127,6 @@ void Actor::FinishedAnimation_Weaponless ( void ) - { if (m_State <= 902) { @@ -143,7 +138,6 @@ void Actor::State_Weaponless_Normal ( void ) - { int iStateTime; if (m_bScriptGoalValid) @@ -192,7 +186,6 @@ void Actor::State_Weaponless_Grenade ( void ) - { GenericGrenadeTossThink(); } diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp index 27de65f6..bc0e4b5d 100644 --- a/code/fgame/actorenemy.cpp +++ b/code/fgame/actorenemy.cpp @@ -44,7 +44,6 @@ float ActorEnemy::UpdateVisibility bool *pbInFovAndRange, bool *pbVisible ) - { float fLMRF, fFrameTime; @@ -80,7 +79,6 @@ int ActorEnemy::UpdateThreat ( Actor *pSelf ) - { //FIXME: macro static float fRangeThreatSquared[15]; @@ -237,7 +235,6 @@ Sentient *ActorEnemy::GetEnemy ( void ) const - { return m_pEnemy; } @@ -246,7 +243,6 @@ float ActorEnemy::GetVisibility ( void ) const - { return m_fVisibility; } @@ -255,7 +251,6 @@ int ActorEnemy::GetThreat ( void ) const - { return m_iThreat; } @@ -264,7 +259,6 @@ float ActorEnemy::GetRangeSquared ( void ) const - { return m_fCurrentRangeSquared; } @@ -365,7 +359,6 @@ ActorEnemy *ActorEnemySet::AddPotentialEnemy ( Sentient *pEnemy ) - { ActorEnemy NewEnemy; @@ -408,7 +401,6 @@ void ActorEnemySet::FlagBadEnemy ( Sentient *pEnemy ) - { ActorEnemy *pActorEnemy; for (int i = 0; i < m_Enemies.NumObjects(); i++) @@ -447,7 +439,6 @@ void ActorEnemySet::CheckEnemies ( Actor *pSelf ) - { float fRangeSquared; bool bVisible; @@ -588,7 +579,6 @@ Sentient *ActorEnemySet::GetCurrentEnemy ( void ) const - { return m_pCurrentEnemy; } @@ -597,7 +587,6 @@ float ActorEnemySet::GetCurrentVisibility ( void ) const - { return m_fCurrentVisibility; } @@ -606,7 +595,6 @@ int ActorEnemySet::GetCurrentThreat ( void ) const - { return m_iCurrentThreat; } @@ -615,7 +603,6 @@ qboolean ActorEnemySet::IsEnemyConfirmed ( void ) const - { // not found in ida return false; @@ -625,7 +612,6 @@ bool ActorEnemySet::HasAlternateEnemy ( void ) const - { ActorEnemy *pActorEnemy; for (int i = 0; i < m_Enemies.NumObjects(); i++) @@ -643,7 +629,6 @@ void ActorEnemySet::RemoveAll ( void ) - { m_Enemies.ClearObjectList(); m_iCheckCount = 0; @@ -661,7 +646,6 @@ void ActorEnemySet::ConfirmEnemy Actor *pSelf, Sentient *pEnemy ) - { pSelf->m_bEnemyIsDisguised = false; ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy); @@ -685,7 +669,6 @@ void ActorEnemySet::ConfirmEnemyIfCanSeeSharerOrEnemy Actor *pSharer, Sentient *pEnemy ) - { pSelf->m_bEnemyIsDisguised = false; ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy); @@ -720,7 +703,6 @@ bool ActorEnemySet::CaresAboutPerfectInfo ( Sentient *pEnemy ) - { ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy); if (pActorEnemy) diff --git a/code/fgame/actorenemy.h b/code/fgame/actorenemy.h index 0d356a9b..270322ad 100644 --- a/code/fgame/actorenemy.h +++ b/code/fgame/actorenemy.h @@ -64,7 +64,6 @@ inline void ActorEnemy::Archive ( Archiver& arc ) - { Class::Archive( arc ); @@ -111,7 +110,6 @@ inline void ActorEnemySet::Archive ( Archiver& arc ) - { Class::Archive( arc ); diff --git a/code/fgame/actorpath.cpp b/code/fgame/actorpath.cpp index be152f3d..6fead750 100644 --- a/code/fgame/actorpath.cpp +++ b/code/fgame/actorpath.cpp @@ -45,7 +45,6 @@ void ActorPath::Clear ( void ) - { m_startpathpos = 0; m_pathpos = 0; @@ -64,7 +63,6 @@ bool ActorPath::DoesTheoreticPathExist float *vLeashHome, float fLeashDistSquared ) - { return PathSearch::FindPath( start, end, ent, maxPath, NULL, 0, m_FallHeight ) != 0; } @@ -78,7 +76,6 @@ void ActorPath::FindPath float *vLeashHome, float fLeashDistSquared ) - { int depth = PathManager.FindPath( start, end, ent, maxPath, vLeashHome, fLeashDistSquared, m_FallHeight ); @@ -116,7 +113,6 @@ void ActorPath::FindPathAway float *vLeashHome, float fLeashDistSquared ) - { int depth = PathManager.FindPathAway( start, avoid, vPreferredDir, ent, fMinSafeDist, vLeashHome, fLeashDistSquared, m_FallHeight ); @@ -154,7 +150,6 @@ void ActorPath::FindPathNear float *vLeashHome, float fLeashDistSquared ) - { int depth = PathManager.FindPathNear( start, nearby, ent, maxPath, fRadiusSquared, vLeashHome, fLeashDistSquared, m_FallHeight ); @@ -187,7 +182,6 @@ void ActorPath::ReFindPath float *start, Entity *ent ) - { int depth = PathManager.FindPath( start, m_path->point, ent, 0, NULL, 0, m_FallHeight ); @@ -221,7 +215,6 @@ float ActorPath::PathLookAhead Vector& end, float *origin ) - { float area = total_area; float s; @@ -286,7 +279,6 @@ void ActorPath::UpdatePos float *origin, float fNodeRadius ) - { Vector end; float s = 0; @@ -477,7 +469,6 @@ bool ActorPath::Complete ( const float *origin ) const - { if( !m_HasCompleteLookahead ) return false; @@ -498,7 +489,6 @@ PathInfo *ActorPath::StartNode ( void ) const - { return m_startpathpos; } @@ -507,7 +497,6 @@ PathInfo *ActorPath::CurrentNode ( void ) const - { return m_pathpos; } @@ -516,7 +505,6 @@ int ActorPath::CurrentNodeIndex ( void ) const - { return m_pathpos ? m_pathpos - m_path : -1; } @@ -525,7 +513,6 @@ PathInfo *ActorPath::NextNode ( void ) const - { return m_pathpos == m_path ? NULL : m_pathpos - 1; } @@ -534,7 +521,6 @@ PathInfo *ActorPath::LastNode ( void ) const - { return m_path; } @@ -543,7 +529,6 @@ Vector ActorPath::CurrentPathDir ( void ) const - { return Vector( m_pathpos->dir[ 0 ], m_pathpos->dir[ 1 ], 0 ); } @@ -552,7 +537,6 @@ float *ActorPath::CurrentPathGoal ( void ) const - { return m_pathpos->point; } @@ -561,7 +545,6 @@ int ActorPath::Time ( void ) const - { return m_Time; } @@ -570,7 +553,6 @@ Vector ActorPath::CurrentDelta ( void ) const - { return Vector( m_delta[ 0 ], m_delta[ 1 ], 0 ); } @@ -579,7 +561,6 @@ bool ActorPath::IsAccurate ( void ) const - { return m_pathpos->bAccurate; } @@ -588,7 +569,6 @@ float ActorPath::TotalDist ( void ) const - { return m_TotalDist; } @@ -597,7 +577,6 @@ void ActorPath::SetFallHeight ( float fHeight ) - { m_FallHeight = fHeight; } @@ -606,7 +585,6 @@ float ActorPath::GetFallHeight ( void ) const - { return m_FallHeight; } @@ -615,7 +593,6 @@ void ActorPath::TrimPathFromEnd ( int nNodesPop ) - { int iLastPos = m_path - m_pathpos; @@ -636,7 +613,6 @@ void ActorPath::Shorten ( float fDistRemove ) - { if( m_path->dist > fDistRemove ) { @@ -661,7 +637,6 @@ bool ActorPath::HasCompleteLookahead ( void ) const - { return m_HasCompleteLookahead; } @@ -678,7 +653,6 @@ void ActorPath::ForceShortLookahead ( void ) - { m_fLookAhead = 4096.0f; } diff --git a/code/fgame/actorpath.h b/code/fgame/actorpath.h index 4a94df51..095faa8a 100644 --- a/code/fgame/actorpath.h +++ b/code/fgame/actorpath.h @@ -88,7 +88,6 @@ inline void ActorPath::Archive ( Archiver& arc ) - { int pos; int startpathpos; diff --git a/code/fgame/animate.cpp b/code/fgame/animate.cpp index ff64d395..bd4cf6e2 100644 --- a/code/fgame/animate.cpp +++ b/code/fgame/animate.cpp @@ -681,7 +681,6 @@ void Animate::DumpAnimInfo ( void ) - { MPrintf( "----------------------------------------\n" ); @@ -704,7 +703,6 @@ void Animate::ForwardExec ( Event *ev ) - { int slot = 0; float weight = 1.0f; @@ -737,7 +735,6 @@ void Animate::EventSetSyncTime ( Event *ev ) - { SetSyncTime( ev->GetFloat( 1 ) ); } @@ -746,7 +743,6 @@ void Animate::EventIsLoopingAnim ( Event *ev ) - { str anim_name = ev->GetString( 1 ); int animnum; diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp index cd5c83be..f987c3fd 100644 --- a/code/fgame/archive.cpp +++ b/code/fgame/archive.cpp @@ -73,7 +73,6 @@ void FileRead::Close ( bool bDoCompression ) - { if( bDoCompression ) { @@ -115,7 +114,6 @@ const char *FileRead::Filename ( void ) - { return filename.c_str(); } @@ -124,7 +122,6 @@ size_t FileRead::Length ( void ) - { return length; } @@ -133,7 +130,6 @@ size_t FileRead::Pos ( void ) - { return pos - buffer; } @@ -142,7 +138,6 @@ qboolean FileRead::Seek ( size_t newpos ) - { if( !buffer ) { @@ -163,7 +158,6 @@ qboolean FileRead::Open ( const char *name ) - { byte *tempbuf; assert( name ); @@ -228,7 +222,6 @@ qboolean FileRead::Read void *dest, size_t size ) - { assert( dest ); assert( buffer ); @@ -285,7 +278,6 @@ void Archiver::FileError const char *fmt, ... ) - { va_list argptr; char text[ 1024 ]; @@ -324,7 +316,6 @@ void Archiver::Close ( void ) - { if( file ) { @@ -391,7 +382,6 @@ qboolean Archiver::Read const char *name, qboolean harderror ) - { unsigned header; unsigned version; @@ -467,7 +457,6 @@ qboolean Archiver::Create const char *name, qboolean harderror ) - { unsigned header; unsigned version; @@ -516,7 +505,6 @@ inline void Archiver::CheckRead ( void ) - { assert( archivemode == ARCHIVE_READ ); if( !fileerror && ( archivemode != ARCHIVE_READ ) ) @@ -529,7 +517,6 @@ inline void Archiver::CheckWrite ( void ) - { assert( archivemode == ARCHIVE_WRITE ); if( !fileerror && ( archivemode != ARCHIVE_WRITE ) ) @@ -542,7 +529,6 @@ inline fileSize_t Archiver::ReadSize ( void ) - { fileSize_t s; @@ -560,7 +546,6 @@ inline void Archiver::CheckSize int type, fileSize_t size ) - { fileSize_t s; @@ -584,7 +569,6 @@ inline int Archiver::ReadType ( void ) - { int t; @@ -602,7 +586,6 @@ inline void Archiver::WriteType ( int type ) - { glbs.FS_Write( &type, sizeof( type ), file ); } @@ -612,7 +595,6 @@ inline void Archiver::CheckType ( int type ) - { int t; @@ -650,7 +632,6 @@ inline void Archiver::ArchiveData void *data, size_t size ) - { if( archivemode == ARCHIVE_READ ) { @@ -714,7 +695,6 @@ void Archiver::ArchiveSvsTime ( int *time ) - { #ifdef GAME_DLL if( archivemode == ARCHIVE_READ ) @@ -735,7 +715,6 @@ void Archiver::ArchiveVec2 ( vec2_t vec ) - { ArchiveData( ARC_Vec2, vec, sizeof( vec2_t ) ); } @@ -744,7 +723,6 @@ void Archiver::ArchiveVec3 ( vec3_t vec ) - { ArchiveData( ARC_Vec3, vec, sizeof( vec3_t ) ); } @@ -753,7 +731,6 @@ void Archiver::ArchiveVec4 ( vec4_t vec ) - { ArchiveData( ARC_Vec4, vec, sizeof( vec4_t ) ); } @@ -762,7 +739,6 @@ void Archiver::ArchiveObjectPointer ( Class ** ptr ) - { int index = 0; @@ -831,7 +807,6 @@ void Archiver::ArchiveSafePointer ( SafePtrBase * ptr ) - { int index = 0; @@ -889,7 +864,6 @@ void Archiver::ArchiveEventPointer ( Event ** ev ) - { int index; @@ -947,7 +921,6 @@ void Archiver::ArchiveRaw void *data, size_t size ) - { ArchiveData( ARC_Raw, data, size ); } @@ -956,7 +929,6 @@ void Archiver::ArchiveString ( str * string ) - { if( archivemode == ARCHIVE_READ ) { @@ -1026,7 +998,6 @@ Class * Archiver::ReadObject ( void ) - { ClassDef *cls; Class *obj; @@ -1117,7 +1088,6 @@ void Archiver::ArchiveObject ( Class *obj ) - { str classname; int index; diff --git a/code/fgame/archive.h b/code/fgame/archive.h index 0e21d8b8..1052ecce 100644 --- a/code/fgame/archive.h +++ b/code/fgame/archive.h @@ -162,7 +162,6 @@ inline qboolean Archiver::Read str &name, qboolean harderror ) - { return Read( name.c_str(), harderror ); } @@ -172,7 +171,6 @@ inline qboolean Archiver::Create str &name, qboolean harderror ) - { return Create( name.c_str(), harderror ); } @@ -207,7 +205,6 @@ inline void Container::Archive Archiver& arc, void( *ArchiveFunc )( Archiver& arc, Type *obj ) ) - { int num; int i; @@ -339,7 +336,6 @@ inline void ArchiveClass Archiver& arc, c *obj ) - { arc.ArchiveObject( obj ); } @@ -351,7 +347,6 @@ void con_set< key, value >::Archive ( Archiver& arc ) - { Entry< key, value > *e; int hash; @@ -399,7 +394,6 @@ void con_map< key, value >::Archive ( Archiver& arc ) - { m_con_set.Archive( arc ); } diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp index 5d7641b4..e23a0096 100644 --- a/code/fgame/barrels.cpp +++ b/code/fgame/barrels.cpp @@ -117,7 +117,6 @@ int BarrelObject::PickBarrelLeak ( void ) - { int iHighest; float fHighestHeight; @@ -148,7 +147,6 @@ void BarrelObject::BarrelSetup ( Event *ev ) - { setMoveType( MOVETYPE_PUSH ); setSolidType( SOLID_BSP ); @@ -167,7 +165,6 @@ void BarrelObject::BarrelSetType ( Event *ev ) - { str sType = ev->GetString( 1 ); @@ -210,7 +207,6 @@ void BarrelObject::BarrelThink ( Event *ev ) - { int i; int iBiggestLeak; @@ -415,7 +411,6 @@ void BarrelObject::BarrelDamaged ( Event *ev ) - { Vector vDir; Vector vForward; @@ -532,7 +527,6 @@ void BarrelObject::BarrelKilled ( Event *ev ) - { float fFluidTop; Vector vPos; diff --git a/code/fgame/barrels.h b/code/fgame/barrels.h index f3860b57..78caaf43 100644 --- a/code/fgame/barrels.h +++ b/code/fgame/barrels.h @@ -71,7 +71,6 @@ inline void BarrelObject::Archive ( Archiver& arc ) - { Entity::Archive( arc ); diff --git a/code/fgame/beam.cpp b/code/fgame/beam.cpp index eb0cf60c..c298a826 100644 --- a/code/fgame/beam.cpp +++ b/code/fgame/beam.cpp @@ -442,7 +442,6 @@ void FuncBeam::setAngles ( Vector angles ) - { trace_t trace; Vector endpoint; @@ -467,7 +466,6 @@ void FuncBeam::SetEndPoint ( Event *ev ) - { trace_t trace; @@ -483,7 +481,6 @@ void FuncBeam::SetModel ( Event *ev ) - { setModel( ev->GetString( 1 ) ); edict->s.renderfx &= ~RF_BEAM; @@ -688,7 +685,6 @@ void FuncBeam::SetIgnoreWalls ( Event *ev ) - { if( ev->NumArgs() > 0 ) { @@ -704,7 +700,6 @@ void FuncBeam::Activate ( Event *ev ) - { Vector forward; trace_t trace; diff --git a/code/fgame/bg_pmove.cpp b/code/fgame/bg_pmove.cpp index 21c5a84e..95a02016 100644 --- a/code/fgame/bg_pmove.cpp +++ b/code/fgame/bg_pmove.cpp @@ -315,7 +315,6 @@ void PM_CheckTerminalVelocity ( void ) - { float oldspeed; float speed; @@ -403,7 +402,6 @@ void PM_GetMove float *pfForward, float *pfRight ) - { *pfForward = pm->cmd.forwardmove; if( *pfForward < 0 ) @@ -469,7 +467,6 @@ qboolean PM_FeetOnGround ( vec3_t pos ) - { vec3_t start; vec3_t end; @@ -489,7 +486,6 @@ qboolean PM_FindBestFallPos vec3_t pos, vec3_t bestdir ) - { trace_t trace; vec3_t ang; @@ -547,7 +543,6 @@ void PM_CheckFeet ( vec3_t vWishdir ) - { vec3_t temp; trace_t trace; diff --git a/code/fgame/camera.cpp b/code/fgame/camera.cpp index 15c41e99..89afa4fc 100644 --- a/code/fgame/camera.cpp +++ b/code/fgame/camera.cpp @@ -78,7 +78,6 @@ void CameraMoveState::DoNodeEvents ( Camera * camera ) - { SplinePath *node; Entity *ent; @@ -1030,7 +1029,6 @@ Vector Camera::CalculateOrientation ( void ) - { int i; float t; @@ -1173,7 +1171,6 @@ void Camera::CameraThink ( Event *ev ) - { UpdateStates(); diff --git a/code/fgame/characterstate.cpp b/code/fgame/characterstate.cpp index bfa8d21e..9cdfe0d6 100644 --- a/code/fgame/characterstate.cpp +++ b/code/fgame/characterstate.cpp @@ -294,7 +294,6 @@ void State::readAction ( Script &script ) - { str token; @@ -584,7 +583,6 @@ const char *State::getLegAnim Entity &ent, Container *sent_conditionals ) - { int i; Expression *exp; @@ -615,7 +613,6 @@ const char *State::getActionAnim Container *sent_conditionals, int *piAnimType ) - { int i; Expression *exp; @@ -807,7 +804,6 @@ State::State Script &script, StateMap &map ) : statemap( map ) - { str cmd; diff --git a/code/fgame/characterstate.h b/code/fgame/characterstate.h index 2939eab8..0a99b3c8 100644 --- a/code/fgame/characterstate.h +++ b/code/fgame/characterstate.h @@ -172,7 +172,6 @@ inline bool Conditional::getResult testcondition_t test, Entity &ent ) - { if ( condition.func && !checked ) { diff --git a/code/fgame/crateobject.cpp b/code/fgame/crateobject.cpp index 8eabdcb2..e651f996 100644 --- a/code/fgame/crateobject.cpp +++ b/code/fgame/crateobject.cpp @@ -132,7 +132,6 @@ void CrateObject::TellNeighborsToFall ( void ) - { Entity *pEnt; Entity *pNext; @@ -179,7 +178,6 @@ void CrateObject::TellNeighborsToJitter ( Vector vJitterAdd ) - { Entity *pEnt; @@ -251,7 +249,6 @@ void CrateObject::CrateSetup ( Event *ev ) - { Vector vMins; Vector vMaxs; @@ -298,7 +295,6 @@ void CrateObject::CrateDebrisType ( Event *ev ) - { m_iDebrisType = ev->GetInteger( 1 ); @@ -312,7 +308,6 @@ void CrateObject::StartFalling ( Event *ev ) - { setMoveType( MOVETYPE_FLY ); m_fMoveTime = 0; @@ -329,7 +324,6 @@ void CrateObject::CrateFalling ( Event *ev ) - { if( velocity != vec_zero || !groundentity || edict->solid != SOLID_BSP ) { @@ -351,7 +345,6 @@ void CrateObject::CrateDamaged ( Event *ev ) - { Vector vDir; Vector vForward; @@ -440,7 +433,6 @@ void CrateObject::CrateKilled ( Event *ev ) - { Vector vCenter; Entity *attacker = ev->GetEntity( 1 ); @@ -485,7 +477,6 @@ void CrateObject::CrateThink ( Event *ev ) - { // Shake the create if it's on fire diff --git a/code/fgame/crateobject.h b/code/fgame/crateobject.h index 0446b012..7d33708d 100644 --- a/code/fgame/crateobject.h +++ b/code/fgame/crateobject.h @@ -60,7 +60,6 @@ inline void CrateObject::Archive ( Archiver& arc ) - { Entity::Archive( arc ); diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp index a91b9eb9..3ebacaf0 100644 --- a/code/fgame/debuglines.cpp +++ b/code/fgame/debuglines.cpp @@ -45,7 +45,6 @@ void G_InitDebugLines ( void ) - { if( g_numdebuglinedelays->integer <= 0 ) { @@ -94,7 +93,6 @@ void G_InitDebugStrings ( void ) - { *gi.DebugStrings = DebugStrings; *gi.numDebugStrings = 0; @@ -104,7 +102,6 @@ void G_AllocDebugLines ( void ) - { // we do a malloc here so that we don't interfere with the game's memory footprint DebugLines = ( debugline_t * )malloc( ( int )g_numdebuglines->integer * sizeof( debugline_t ) ); @@ -123,7 +120,6 @@ void G_AllocDebugStrings ( void ) - { DebugStrings = ( debugstring_t * )malloc( ( int )g_numdebugstrings->integer * sizeof( debugstring_t ) ); @@ -134,7 +130,6 @@ void G_DeAllocDebugLines ( void ) - { if( DebugLines ) { @@ -150,7 +145,6 @@ void G_ShiftDebugLines ( void ) - { int iNewPos; int iOldPos; @@ -170,7 +164,6 @@ void G_DeAllocDebugStrings ( void ) - { if( DebugStrings ) { @@ -191,7 +184,6 @@ void G_DebugLine float b, float alpha ) - { debugline_t *line; static int printTime = 0; @@ -453,7 +445,6 @@ void G_DrawDebugNumber float b, int precision ) - { int i; int j; @@ -732,7 +723,6 @@ void G_DrawCSystem Vector up, int length ) - { G_DebugLine( pos, pos + forward * length, 1.0, 0, 0, 1 ); G_DebugLine( pos, pos + right * length, 0, 1.0, 0, 1 ); diff --git a/code/fgame/dm_team.cpp b/code/fgame/dm_team.cpp index a69d50e1..d2102acb 100644 --- a/code/fgame/dm_team.cpp +++ b/code/fgame/dm_team.cpp @@ -650,7 +650,6 @@ void DM_Team::InitSpawnPoints ( void ) - { int i; diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp index 73498af0..c60440a7 100644 --- a/code/fgame/doors.cpp +++ b/code/fgame/doors.cpp @@ -488,7 +488,6 @@ void Door::SetMessageSound ( Event *ev ) - { SetMessageSound( ev->GetString( 1 ) ); } @@ -497,7 +496,6 @@ void Door::SetLockedSound ( Event *ev ) - { SetLockedSound( ev->GetString( 1 ) ); } @@ -506,7 +504,6 @@ void Door::SetWait ( Event *ev ) - { wait = ev->GetFloat( 1 ); } @@ -515,7 +512,6 @@ void Door::SetDmg ( Event *ev ) - { dmg = ev->GetInteger( 1 ); } @@ -524,7 +520,6 @@ void Door::EventAlwaysAway ( Event *ev ) - { qboolean bAlwaysAway = true; @@ -538,7 +533,6 @@ void Door::EventTrySolid ( Event *ev ) - { Entity *check; gentity_t *ent; @@ -577,7 +571,6 @@ void Door::EventDoorType ( Event *ev ) - { str s = ev->GetString( 1 ); @@ -599,7 +592,6 @@ qboolean Door::isOpen ( void ) - { return ( state == STATE_OPEN ); } @@ -608,7 +600,6 @@ qboolean Door::isCompletelyClosed ( void ) - { return ( state == STATE_CLOSED ); } @@ -617,7 +608,6 @@ void Door::OpenEnd ( Event *ev ) - { if( edict->r.contents != CONTENTS_SOLID ) { @@ -652,7 +642,6 @@ void Door::CloseEnd ( Event *ev ) - { if( sound_close_end.length() > 1 ) { @@ -680,7 +669,6 @@ void Door::Close ( Event *ev ) - { Door *door; @@ -720,7 +708,6 @@ void Door::Open ( Event *ev ) - { Door *door; Event *e; @@ -893,7 +880,6 @@ void Door::DoorBlocked ( Event *ev ) - { Event *e; Entity *other; @@ -1111,7 +1097,6 @@ void Door::LinkDoors ( Event *ev ) - { Entity *entptr; Door *ent; @@ -1276,7 +1261,6 @@ void Door::LockDoor ( Event *ev ) - { if( !level.PreSpawned() ) ScriptError( "Cannot lock door before level prespawn" ); @@ -1288,7 +1272,6 @@ void Door::UnlockDoor ( Event *ev ) - { SetLocked( false ); } @@ -1297,7 +1280,6 @@ qboolean Door::DoorTouches ( Door *e1 ) - { if( e1->absmin.x > absmax.x ) { @@ -1331,7 +1313,6 @@ void Door::UpdatePathConnection ( void ) - { if( BlocksAIMovement() ) { @@ -1347,7 +1328,6 @@ void Door::SetLocked ( qboolean newLocked ) - { if( locked == newLocked ) return; @@ -1361,7 +1341,6 @@ void Door::SetState ( int newState ) - { if( state == newState ) return; @@ -1375,7 +1354,6 @@ qboolean Door::BlocksAIMovement ( void ) const - { return ( locked || state == STATE_OPEN ); } @@ -1384,7 +1362,6 @@ qboolean Door::AIDontFace ( void ) const - { return ( locked || state == STATE_OPEN ); } @@ -1513,7 +1490,6 @@ void RotatingDoor::DoClose ( Event *ev ) - { MoveTo( origin, startangle, fabs( speed*angle ), EV_Door_CloseEnd ); } diff --git a/code/fgame/earthquake.cpp b/code/fgame/earthquake.cpp index 92149b01..4d008b6a 100644 --- a/code/fgame/earthquake.cpp +++ b/code/fgame/earthquake.cpp @@ -164,7 +164,6 @@ void ViewJitter::EventActivateJitter ( Event *ev ) - { m_fTimeRunning = 0; PostEvent( EV_ViewJitter_Think, 0 ); @@ -174,7 +173,6 @@ void ViewJitter::EventJitterThink ( Event *ev ) - { int i; int iNumSents; @@ -254,7 +252,6 @@ void ViewJitter::EventSetRadius ( Event *ev ) - { float rad = ev->GetFloat( 1 ); @@ -269,7 +266,6 @@ void ViewJitter::EventSetEdgeEffect ( Event *ev ) - { m_fEdgeEffect = ev->GetFloat( 1 ); } @@ -278,7 +274,6 @@ void ViewJitter::EventSetAmount ( Event *ev ) - { m_vJitterStrength = ev->GetVector( 1 ); } @@ -287,7 +282,6 @@ void ViewJitter::EventSetDuration ( Event *ev ) - { m_fDuration = ev->GetFloat( 1 ); } @@ -296,7 +290,6 @@ void ViewJitter::EventSetTimeDecay ( Event *ev ) - { m_vTimeDecay = ev->GetVector( 1 ); } @@ -305,7 +298,6 @@ void ViewJitter::EventSetDoneDeath ( Event *ev ) - { m_bDoneDeath = qtrue; } diff --git a/code/fgame/earthquake.h b/code/fgame/earthquake.h index f93d8a25..98157027 100644 --- a/code/fgame/earthquake.h +++ b/code/fgame/earthquake.h @@ -64,7 +64,6 @@ inline void ViewJitter::Archive ( Archiver &arc ) - { Trigger::Archive( arc ); diff --git a/code/fgame/effectentity.cpp b/code/fgame/effectentity.cpp index 99e37ff6..9bd72c61 100644 --- a/code/fgame/effectentity.cpp +++ b/code/fgame/effectentity.cpp @@ -33,7 +33,6 @@ EffectEntity::EffectEntity ( void ) - { edict->s.eType = ET_MODELANIM; } diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp index 0fc921c0..bc2b3ec1 100644 --- a/code/fgame/entity.cpp +++ b/code/fgame/entity.cpp @@ -1794,7 +1794,6 @@ bool Entity::AutoArchiveModel ( void ) - { return true; } @@ -1916,7 +1915,6 @@ qboolean Entity::setModel ( void ) - { level.skel_index[ edict->s.number ] = -1; return gi.setmodel( edict, model ); @@ -1926,7 +1924,6 @@ void Entity::SetSize ( void ) - { mins = edict->r.mins; maxs = edict->r.maxs; @@ -1941,7 +1938,6 @@ void Entity::setModel ( const char *mdl ) - { if( strcmp( mdl, "" ) ) { @@ -2099,7 +2095,6 @@ void Entity::TriggerEvent ( Event *ev ) - { const char *name; Event *event; @@ -2179,7 +2174,6 @@ void Entity::setScale ( float scale ) - { edict->s.scale = scale; } @@ -2188,7 +2182,6 @@ void Entity::setContentsSolid ( void ) - { setContents( CONTENTS_BBOX ); } @@ -2197,7 +2190,6 @@ void Entity::setSolidType ( solid_t type ) - { if( ( !LoadingSavegame ) && @@ -2242,7 +2234,6 @@ void Entity::setSize Vector min, Vector max ) - { Vector delta; @@ -2313,7 +2304,6 @@ void Entity::link ( void ) - { gi.LinkEntity( edict ); absmin = edict->r.absmin; @@ -2333,7 +2323,6 @@ void Entity::addOrigin ( Vector add ) - { setLocalOrigin( localorigin + add ); } @@ -2342,7 +2331,6 @@ void Entity::setOrigin ( void ) - { Entity *ent; @@ -2377,7 +2365,6 @@ void Entity::setLocalOrigin ( Vector org ) - { if( m_pGlueMaster ) { @@ -2411,7 +2398,6 @@ void Entity::setOrigin ( Vector org ) - { if( m_pGlueMaster ) { @@ -2451,7 +2437,6 @@ void Entity::setOriginEvent ( Vector org ) - { velocity = vec_zero; setOrigin( org ); @@ -2461,7 +2446,6 @@ void Entity::updateOrigin ( void ) - { Entity *ent; int i, num; @@ -2496,7 +2480,6 @@ void Entity::ShowInfo float fDot, float fDist ) - { int i; char szText[512]; @@ -2522,7 +2505,6 @@ void Entity::GetRawTag int tagnum, orientation_t *orient ) - { *orient = G_TIKI_Orientation( edict, tagnum & TAG_MASK ); } @@ -2532,7 +2514,6 @@ qboolean Entity::GetRawTag const char *name, orientation_t * orient ) - { int tagnum; @@ -2550,7 +2531,6 @@ void Entity::GetTag int tagnum, orientation_t *orient ) - { orientation_t o; int i; @@ -2571,7 +2551,6 @@ qboolean Entity::GetTag const char *name, orientation_t * orient ) - { int tagnum; @@ -2592,7 +2571,6 @@ void Entity::GetTag Vector *left, Vector *up ) - { orientation_t orient; @@ -2624,7 +2602,6 @@ qboolean Entity::GetTag Vector *left, Vector *up ) - { int tagnum; @@ -2642,7 +2619,6 @@ qboolean Entity::GetTagPositionAndOrientation str tagname, orientation_t *new_or ) - { int tagnum; @@ -2660,7 +2636,6 @@ void Entity::GetTagPositionAndOrientation int tagnum, orientation_t *new_or ) - { int i; orientation_t tag_or; @@ -2684,7 +2659,6 @@ void Entity::GetTagAngles ( Event *ev ) - { orientation_t orient; Vector ang; @@ -2713,7 +2687,6 @@ void Entity::GetTagPosition ( Event *ev ) - { Vector pos; str tagname; @@ -2750,7 +2723,6 @@ void Entity::addAngles ( Vector add ) - { if( bindmaster ) { @@ -2766,7 +2738,6 @@ void Entity::setAngles ( void ) - { if( bindmaster ) { @@ -2782,7 +2753,6 @@ void Entity::setAngles ( Vector ang ) - { Entity * ent; int num, i; @@ -2902,7 +2872,6 @@ void Entity::Damage int meansofdeath, int location ) - { Event *ev; @@ -2939,7 +2908,6 @@ void Entity::DamageEvent ( Event *ev ) - { Entity *inflictor; Entity *attacker; @@ -3080,7 +3048,6 @@ void Entity::Delete ( void ) - { // Delete the entity the next frame @@ -3094,7 +3061,6 @@ void Entity::Remove ( Event *ev ) - { if( ev->NumArgs() ) ScriptError( "Arguments not allowed." ); @@ -3106,7 +3072,6 @@ void Entity::EventSoundDone ( Event *ev ) - { int channelNum = ev->GetInteger( 1 ); str sfxName = ev->GetString( 2 ); @@ -3129,7 +3094,6 @@ void Entity::VolumeDamage ( float damage ) - { int i; int numtouch; @@ -3158,7 +3122,6 @@ void Entity::EventVolumeDamage ( Event *ev ) - { VolumeDamage( ev->GetFloat( 1 ) ); } @@ -3167,7 +3130,6 @@ void Entity::AddImmunity ( Event *ev ) - { str immune_string; int new_immunity; @@ -3192,7 +3154,6 @@ void Entity::RemoveImmunity ( Event *ev ) - { str immune_string; int old_immunity; @@ -3217,7 +3178,6 @@ qboolean Entity::Immune ( int meansofdeath ) - { int number_of_immunities, i; @@ -3256,7 +3216,6 @@ qboolean Entity::CanDamage Entity *target, Entity *skip_ent ) - { trace_t trace; Vector pos; @@ -3304,7 +3263,6 @@ void Entity::EventInPVS ( Event *ev ) - { ev->AddInteger( gi.AreasConnected( edict->r.areanum, ev->GetEntity( 1 )->edict->r.areanum ) != 0 ); } @@ -3313,7 +3271,6 @@ qboolean Entity::IsDead ( void ) - { return deadflag != DEAD_NO; } @@ -3356,7 +3313,6 @@ void Entity::IsTouching ( Event *ev ) - { Entity *ent = ev->GetEntity( 1 ); @@ -3373,7 +3329,6 @@ qboolean Entity::FovCheck float *delta, float fovdot ) - { float deltadot = delta[ 0 ] * orientation[ 0 ][ 0 ] + delta[ 1 ] * orientation[ 0 ][ 1 ]; @@ -3399,7 +3354,6 @@ bool Entity::CanSee float fov, float vision_distance ) - { float delta[ 2 ]; @@ -3431,7 +3385,6 @@ void Entity::CanSee ( Event *ev ) - { Entity *ent; float fov = 0.0f; @@ -3473,7 +3426,6 @@ void Entity::GetVelocity ( Event *ev ) - { ev->AddVector( velocity ); } @@ -3482,7 +3434,6 @@ void Entity::GetAVelocity ( Event *ev ) - { ev->AddVector( avelocity ); } @@ -3491,7 +3442,6 @@ void Entity::SetVelocity ( Event *ev ) - { velocity = ev->GetVector( 1 ); } @@ -3684,7 +3634,6 @@ void Entity::CheckGround ( void ) - { Vector point; trace_t trace; @@ -3743,7 +3692,6 @@ void Entity::BecomeNonSolid ( Event *ev ) - { setSolidType( SOLID_NOT ); } @@ -3772,7 +3720,6 @@ void Entity::Sound int checkSubtitle, float max_dist ) - { const char *name = NULL; vec3_t org; @@ -3901,7 +3848,6 @@ void Entity::LoopSound ( Event *ev ) - { str sound_name; float volume = DEFAULT_VOL; @@ -4046,7 +3992,6 @@ void Entity::Sound ( Event *ev ) - { if( level.spawning ) { @@ -4196,7 +4141,6 @@ void Entity::EventSetHealthOnly ( Event *ev ) - { if( IsDead() ) { @@ -4218,7 +4162,6 @@ void Entity::EventSetMaxHealth ( Event *ev ) - { max_health = ev->GetFloat( 1 ); if( max_health <= 0.0f ) @@ -4235,7 +4178,6 @@ void Entity::EventGetMaxHealth ( Event *ev ) - { ev->AddFloat( max_health ); } @@ -4244,7 +4186,6 @@ void Entity::SetHealth ( Event *ev ) - { if( IsDead() ) { @@ -4265,7 +4206,6 @@ void Entity::GetHealth ( Event *ev ) - { ev->AddFloat( health ); } @@ -4321,7 +4261,6 @@ void Entity::SetSize ( Event *ev ) - { Vector min, max; @@ -4334,7 +4273,6 @@ void Entity::SetMins ( Event *ev ) - { Vector min; @@ -4346,7 +4284,6 @@ void Entity::SetMaxs ( Event *ev ) - { Vector max; @@ -4358,7 +4295,6 @@ void Entity::SetScale ( Event *ev ) - { setScale( ev->GetFloat( 1 ) ); } @@ -4367,7 +4303,6 @@ void Entity::GetScale ( Event *ev ) - { ev->AddFloat( edict->s.scale ); } @@ -4403,7 +4338,6 @@ void Entity::SetAngles ( Event *ev ) - { setAngles( ev->GetVector( 1 ) ); } @@ -4412,7 +4346,6 @@ Vector Entity::GetControllerAngles ( int num ) - { Vector controller_angles; @@ -4433,7 +4366,6 @@ void Entity::GetControllerAngles ( Event *ev ) - { int num = ev->GetInteger( 1 ); @@ -4451,7 +4383,6 @@ void Entity::SetControllerAngles int num, vec3_t angles ) - { assert( ( num >= 0 ) && ( num < NUM_BONE_CONTROLLERS ) ); if( ( num < 0 ) || ( num >= NUM_BONE_CONTROLLERS ) ) @@ -4468,7 +4399,6 @@ void Entity::SetControllerAngles ( Event *ev ) - { int num; Vector angles; @@ -4491,7 +4421,6 @@ void Entity::SetControllerTag int num, int tag_num ) - { assert( ( num >= 0 ) && ( num < NUM_BONE_CONTROLLERS ) ); @@ -4511,7 +4440,6 @@ qboolean Entity::attach qboolean use_angles, Vector offset ) - { int i; Entity * parent; @@ -4599,7 +4527,6 @@ void Entity::detach ( void ) - { int i; int num; @@ -4754,7 +4681,6 @@ void Entity::RenderEffects ( Event *ev ) - { const char *flag; int mask = 0; @@ -4836,7 +4762,6 @@ void Entity::SVFlags ( Event *ev ) - { const char *flag; int mask = 0; @@ -4951,7 +4876,6 @@ void Entity::BroadcastAIEvent int iType, float rad ) - { G_BroadcastAIEvent( this, origin, iType, rad ); } @@ -4960,7 +4884,6 @@ void Entity::BroadcastAIEvent ( Event *ev ) - { int iType; float rad; @@ -4986,7 +4909,6 @@ void Entity::PreAnimate ( void ) - { } @@ -4994,7 +4916,6 @@ void Entity::DoForceActivate ( void ) - { edict->r.lastNetTime = level.inttime; } @@ -5003,7 +4924,6 @@ void Entity::ClientThink ( void ) - { } @@ -5012,7 +4932,6 @@ void Entity::Think ( void ) - { } @@ -5072,7 +4991,6 @@ void Entity::SurfaceCommand const char * surf_name, const char * token ) - { const char * current_surface_name; int surface_num; @@ -5183,7 +5101,6 @@ void Entity::SurfaceModelEvent ( Event *ev ) - { const char * surf_name; const char * token; @@ -5202,7 +5119,6 @@ void Entity::SetShaderData ( Event *ev ) - { edict->s.shader_data[ 0 ] = ev->GetFloat( 1 ); edict->s.shader_data[ 1 ] = ev->GetFloat( 2 ); @@ -5440,7 +5356,6 @@ void Entity::UseBoundingBoxEvent ( Event *ev ) - { edict->r.svFlags |= SVF_USEBBOX; } @@ -5449,7 +5364,6 @@ void Entity::HurtEvent ( Event *ev ) - { Vector normal; float dmg; @@ -5488,7 +5402,6 @@ void Entity::HealEvent ( Event *ev ) - { if( IsDead() ) { @@ -5691,7 +5604,6 @@ void Entity::bind qboolean use_my_angles, qboolean bBindChilds ) - { float mat[ 3 ][ 3 ]; float local[ 3 ][ 3 ]; @@ -5740,7 +5652,6 @@ void Entity::unbind ( void ) - { Entity *prev; Entity *next; @@ -5843,7 +5754,6 @@ void Entity::glue Entity *master, qboolean use_my_angles ) - { int iNumGlues; @@ -5903,7 +5813,6 @@ void Entity::unglue ( void ) - { int iNumGlues; int i; @@ -5950,7 +5859,6 @@ void Entity::BindEvent ( Event *ev ) - { Entity *ent; bool bBindChilds; @@ -5975,7 +5883,6 @@ void Entity::EventUnglue ( Event *ev ) - { unglue(); } @@ -5984,7 +5891,6 @@ void Entity::GlueEvent ( Event *ev ) - { Entity *ent; qboolean glueAngles; @@ -6009,7 +5915,6 @@ Vector Entity::getParentVector ( Vector vec ) - { Vector pos; @@ -6033,7 +5938,6 @@ void Entity::joinTeam ( Entity *teammember ) - { Entity *ent; Entity *master; @@ -6109,7 +6013,6 @@ void Entity::quitTeam ( void ) - { Entity *ent; @@ -6200,7 +6103,6 @@ inline qboolean Entity::HitSky ( trace_t *trace ) - { assert( trace ); if( trace->surfaceFlags & SURF_SKY ) @@ -6214,7 +6116,6 @@ qboolean Entity::HitSky ( void ) - { return HitSky( &level.impact_trace ); } @@ -6300,7 +6201,6 @@ void Entity::EndFrame ( void ) - { } @@ -6308,7 +6208,6 @@ void Entity::CalcBlend ( void ) - { } @@ -6316,7 +6215,6 @@ void Entity::VelocityModified ( void ) - { } @@ -6324,7 +6222,6 @@ void Entity::DetachAllChildren ( void ) - { int i; @@ -6346,7 +6243,6 @@ void Entity::DetachAllChildren ( Event *ev ) - { DetachAllChildren(); } @@ -6367,7 +6263,6 @@ void Entity::EventMovementStealth ( Event *ev ) - { SetMovementStealth( ev->GetFloat( 1 ) ); } @@ -6376,7 +6271,6 @@ void Entity::GetYaw ( Event *ev ) - { ev->AddFloat( angles[ 1 ] ); } @@ -6385,7 +6279,6 @@ void Entity::PusherEvent ( Event *ev ) - { Entity *inflictor; Entity *attacker; @@ -6423,7 +6316,6 @@ void Entity::AlwaysDraw ( Event *ev ) - { edict->s.renderfx |= RF_ALWAYSDRAW; } @@ -6432,7 +6324,6 @@ void Entity::NormalDraw ( Event *ev ) - { edict->s.renderfx &= RF_DONTDRAW | RF_ALWAYSDRAW; } @@ -6441,7 +6332,6 @@ void Entity::NeverDraw ( Event *ev ) - { edict->s.renderfx |= RF_DONTDRAW; } @@ -6450,7 +6340,6 @@ void Entity::GetMins ( Event *ev ) - { ev->AddVector( mins ); } @@ -6459,7 +6348,6 @@ void Entity::GetMaxs ( Event *ev ) - { ev->AddVector( maxs ); } @@ -6468,7 +6356,6 @@ void Entity::ForceActivate ( Event *ev ) - { DoForceActivate(); } @@ -6477,7 +6364,6 @@ void Entity::EventTrace ( Event *ev ) - { Vector start, end, mins, maxs; int mask = 0x2000B01; @@ -6527,7 +6413,6 @@ void Entity::EventSightTrace ( Event *ev ) - { Vector start, end, mins, maxs; int mask = 0x2000B01; @@ -6578,7 +6463,6 @@ void Entity::ConnectPaths ( void ) - { PathNode *node; int to; @@ -6616,7 +6500,6 @@ void Entity::DisconnectPaths ( void ) - { int i; int j; @@ -6691,7 +6574,6 @@ void Entity::EventDisconnectPaths ( Event *ev ) - { DisconnectPaths(); } @@ -6700,7 +6582,6 @@ void Entity::EventConnectPaths ( Event *ev ) - { ConnectPaths(); } @@ -6709,7 +6590,6 @@ void Entity::EventGetEntnum ( Event *ev ) - { ev->AddInteger( entnum ); } @@ -6718,7 +6598,6 @@ void Entity::EventSetRadnum ( Event *ev ) - { radnum = ev->GetInteger( 1 ); } @@ -6727,7 +6606,6 @@ void Entity::EventGetRadnum ( Event *ev ) - { ev->AddInteger( radnum ); } @@ -6736,7 +6614,6 @@ void Entity::EventSetRotatedBbox ( Event *ev ) - { if( ev->GetInteger( 1 ) ) { @@ -6754,7 +6631,6 @@ void Entity::EventGetRotatedBbox ( Event *ev ) - { ev->AddInteger( ( edict->s.eFlags & EF_LINKANGLES ) ? 1 : 0 ); } @@ -6763,7 +6639,6 @@ void Entity::DrawBoundingBox ( int showbboxes ) - { if( showbboxes >= 100 ) { @@ -6821,7 +6696,6 @@ void Entity::PathnodeClaimRevoked ( PathNode *node ) - { return node->Relinquish(); } @@ -6830,7 +6704,6 @@ qboolean Entity::BlocksAIMovement ( void ) const - { return true; } @@ -6839,7 +6712,6 @@ qboolean Entity::AIDontFace ( void ) const - { return true; } @@ -6943,7 +6815,6 @@ void Entity::SetShader ( Event *ev ) - { str shadername = ev->GetString( 1 ); qboolean fReset = false; diff --git a/code/fgame/entity.h b/code/fgame/entity.h index 82c7d26f..20dd1fa6 100644 --- a/code/fgame/entity.h +++ b/code/fgame/entity.h @@ -617,7 +617,6 @@ inline qboolean Entity::DistanceTo ( Entity *ent ) - { Vector delta; @@ -638,7 +637,6 @@ inline qboolean Entity::WithinDistance Vector pos, float dist ) - { Vector delta; @@ -696,7 +694,6 @@ inline qboolean Entity::hidden ( void ) - { if( edict->s.renderfx & RF_DONTDRAW ) { @@ -727,7 +724,6 @@ inline void Entity::GetBrushModelEvent ( Event *ev ) - { ev->AddString( model ); } @@ -736,7 +732,6 @@ inline void Entity::GetModelEvent ( Event *ev ) - { if( !edict->tiki ) { @@ -768,7 +763,6 @@ inline void Entity::hideModel ( void ) - { edict->s.renderfx |= RF_DONTDRAW; if( getSolidType() <= SOLID_TRIGGER ) @@ -781,7 +775,6 @@ inline void Entity::showModel ( void ) - { edict->s.renderfx &= ~RF_DONTDRAW; edict->r.svFlags &= ~SVF_NOCLIENT; @@ -836,7 +829,6 @@ inline int Entity::getContents ( void ) - { return edict->r.contents; } @@ -845,7 +837,6 @@ inline qboolean Entity::isClient ( void ) - { if( client ) { diff --git a/code/fgame/explosion.cpp b/code/fgame/explosion.cpp index 78019817..89e916aa 100644 --- a/code/fgame/explosion.cpp +++ b/code/fgame/explosion.cpp @@ -87,7 +87,6 @@ void CreateExplosion const char *explosionModel, float scale ) - { Explosion *explosion; Event *ev; diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp index 2984b646..a5ff1591 100644 --- a/code/fgame/g_bot.cpp +++ b/code/fgame/g_bot.cpp @@ -29,7 +29,6 @@ void G_BotBegin ( gentity_t *ent ) - { level.m_bSpawnBot = true; G_ClientBegin( ent, NULL ); @@ -40,7 +39,6 @@ void G_BotThink gentity_t *ent, int msec ) - { usercmd_t ucmd; usereyes_t eyeinfo; diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp index 61ad0144..003bcf54 100644 --- a/code/fgame/g_main.cpp +++ b/code/fgame/g_main.cpp @@ -716,7 +716,6 @@ void G_ClientDrawBoundingBoxes ( void ) - { gentity_t *edict; Entity *ent; @@ -861,7 +860,6 @@ void G_ArchivePersistantData ( Archiver &arc ) - { gentity_t *ed; int i; @@ -927,7 +925,6 @@ qboolean G_ReadPersistant ( const char *name ) - { try { @@ -956,7 +953,6 @@ void G_WritePersistant ( const char *name ) - { try { @@ -979,7 +975,6 @@ qboolean LevelArchiveValid ( Archiver &arc ) - { int version; int savegame_version; @@ -1025,7 +1020,6 @@ void ArchiveAliases ( Archiver &arc ) - { int i; byte another; @@ -1135,7 +1129,6 @@ qboolean G_ArchiveLevel qboolean autosave, qboolean loading ) - { try { @@ -1360,7 +1353,6 @@ void G_WriteLevel const char *filename, qboolean autosave ) - { game.autosaved = autosave; G_ArchiveLevel( filename, autosave, qfalse ); @@ -1386,7 +1378,6 @@ qboolean G_ReadLevel ( const char *filename ) - { qboolean status; @@ -1409,7 +1400,6 @@ qboolean G_LevelArchiveValid ( const char *filename ) - { try { diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp index 591a59e0..66a302ce 100644 --- a/code/fgame/g_mmove.cpp +++ b/code/fgame/g_mmove.cpp @@ -44,7 +44,6 @@ void MM_ClipVelocity float *out, float overbounce ) - { float backoff; float dir_z; @@ -89,7 +88,6 @@ qboolean MM_AddTouchEnt ( int entityNum ) - { int i; qboolean blockEnt; @@ -133,7 +131,6 @@ qboolean MM_SlideMove ( qboolean gravity ) - { int bumpcount; vec3_t dir; @@ -324,7 +321,6 @@ void MM_GroundTraceInternal ( void ) - { if( mml.groundTrace.fraction == 1.0f ) { @@ -376,7 +372,6 @@ void MM_GroundTrace ( void ) - { float point[ 3 ]; @@ -392,7 +387,6 @@ void MM_StepSlideMove ( void ) - { vec3_t start_o; vec3_t start_v; @@ -524,7 +518,6 @@ void MM_ClipVelocity2D float *out, float overbounce ) - { float backoff; float dir_z; @@ -569,7 +562,6 @@ void MmoveSingle ( mmove_t *mmove ) - { float point[ 3 ]; trace_t trace; diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp index d54b20a1..16d9df0a 100644 --- a/code/fgame/g_phys.cpp +++ b/code/fgame/g_phys.cpp @@ -62,7 +62,6 @@ Entity *G_FixEntityPosition ( Entity *ent ) - { int mask; trace_t trace; @@ -119,7 +118,6 @@ Entity *G_TestEntityPosition ( Entity *ent ) - { int mask; trace_t trace; @@ -190,7 +188,6 @@ void G_Impact Entity *e1, trace_t *trace ) - { gentity_t *e2; Event *ev; @@ -247,7 +244,6 @@ Entity *G_TestEntityPosition Entity *ent, Vector vOrg ) - { int mask; trace_t trace; @@ -346,7 +342,6 @@ int G_FlyMove float time, int mask ) - { Entity *hit; gentity_t *edict; @@ -573,7 +568,6 @@ trace_t G_PushEntity Entity *ent, Vector push ) - { trace_t trace; Vector start; @@ -1094,7 +1088,6 @@ void G_Physics_Pusher ( Entity *ent ) - { Vector move, amove; Entity *part, *mv; @@ -1191,7 +1184,6 @@ void G_Physics_Toss ( Entity *ent ) - { trace_t trace; Vector move; @@ -1425,7 +1417,6 @@ void G_CheckWater ( Entity *ent ) - { ent->watertype = gi.PointContents( ent->origin, 0 ); if( ent->watertype & MASK_WATER ) diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp index 0d10028a..0e56452a 100644 --- a/code/fgame/g_utils.cpp +++ b/code/fgame/g_utils.cpp @@ -245,7 +245,6 @@ float G_Random ( void ) - { return ( ( float )( rand() & 0x7fff ) ) / ( ( float )0x8000 ); } @@ -264,7 +263,6 @@ float G_Random ( float n ) - { return G_Random() * n; } @@ -283,7 +281,6 @@ float G_CRandom ( void ) - { return G_Random( 2 ) - 1; } @@ -302,7 +299,6 @@ float G_CRandom ( float n ) - { return G_CRandom() * n; } @@ -378,7 +374,6 @@ void G_SetTrajectory gentity_t *ent, vec3_t org ) - { ent->s.pos.trTime = 0; VectorClear( ent->s.pos.trDelta ); @@ -402,7 +397,6 @@ float * blue, float * radius, int * lightStyle ) - { int ir, ig, ib, iradius; @@ -653,7 +647,6 @@ Entity *G_NextEntity ( Entity *ent ) - { gentity_t *from; @@ -861,7 +854,6 @@ qboolean KillBox ( Entity *ent ) - { int i; int num; @@ -918,7 +910,6 @@ void G_TouchSolids ( Entity *ent ) - { int i; int num; @@ -955,7 +946,6 @@ void G_ShowSightTrace gentity_t *passent2, const char *reason ) - { str text; str pass1; @@ -1000,7 +990,6 @@ void G_ShowTrace gentity_t *passent, const char *reason ) - { str text; str pass; @@ -1049,7 +1038,6 @@ Vector &maxs, Vector *minbounds, Vector *maxbounds ) - { Vector bmin; Vector bmax; @@ -1083,7 +1071,6 @@ int contentmask, qboolean cylinder, const char *reason ) - { int entnum, entnum2; bool result; @@ -1137,7 +1124,6 @@ bool G_SightTrace qboolean cylinder, const char *reason ) - { gentity_t *ent, *ent2; int entnum, entnum2; @@ -1196,7 +1182,6 @@ trace_t G_Trace const char *reason, qboolean tracedeep ) - { int entnum; trace_t trace; @@ -1248,7 +1233,6 @@ trace_t G_Trace const char *reason, qboolean tracedeep ) - { gentity_t *ent; int entnum; @@ -1303,7 +1287,6 @@ void G_TraceEntities int contentmask, qboolean bIncludeTriggers ) - { trace_t trace; vec3_t boxmins; @@ -1355,7 +1338,6 @@ float PlayersRangeFromSpot ( Entity *ent ) - { float bestplayerdistance = 9999999.0f; Vector vDist; @@ -1416,7 +1398,6 @@ Entity *startent, Vector org, float rad ) - { Vector eorg; gentity_t *from; @@ -1485,7 +1466,6 @@ Entity *startent, Vector org, float rad ) - { Vector eorg; gentity_t *ed; @@ -1586,7 +1566,6 @@ void G_DebugDamage Entity *attacker, Entity *inflictor ) - { gi.DPrintf( "Victim:%s Attacker:%s Inflictor:%s Damage:%f\n", victim->getClassname(), attacker->getClassname(), inflictor->getClassname(), damage ); } @@ -1602,7 +1581,6 @@ void G_DebugString const char *pszText, ... ) - { debugstring_t *string; va_list va; @@ -1641,7 +1619,6 @@ void G_FadeOut ( float delaytime ) - { // Fade the screen out level.m_fade_color = Vector( 0, 0, 0 ); @@ -1656,7 +1633,6 @@ void G_AutoFadeIn ( void ) - { level.m_fade_time_start = 1; level.m_fade_time = 1; @@ -1672,7 +1648,6 @@ void G_ClearFade ( void ) - { level.m_fade_time = -1; level.m_fade_type = fadein; @@ -1694,7 +1669,6 @@ void G_MissionFailed ( void ) - { // Make the music system play the failure music for this level ChangeMusic( "failure", "normal", true ); @@ -1711,7 +1685,6 @@ void G_StartCinematic ( void ) - { level.cinematic = true; gi.Cvar_Set( "sv_cinematic", "1" ); @@ -1721,7 +1694,6 @@ void G_StopCinematic ( void ) - { // clear out the skip thread level.cinematic = false; @@ -2030,7 +2002,6 @@ int G_AIEventTypeFromString ( const char *pszType ) - { if( !Q_stricmp( pszType, "weapon_fire" ) ) return AI_EVENT_WEAPON_FIRE; @@ -2062,7 +2033,6 @@ float G_AIEventRadius ( int iType ) - { static float fRadius[] = { @@ -2100,7 +2070,6 @@ void G_BroadcastAIEvent Vector origin, char *pszType ) - { G_BroadcastAIEvent( originator, origin, G_AIEventTypeFromString( pszType ), -1.0f ); } @@ -2112,7 +2081,6 @@ void G_BroadcastAIEvent int iType, float radius ) - { Sentient *ent; Vector delta; @@ -2195,7 +2163,6 @@ void CloneEntity Entity *dest, Entity *src ) - { int i, num; @@ -2241,7 +2208,6 @@ weaponhand_t WeaponHandNameToNum ( str side ) - { if( !side.length() ) { @@ -2267,7 +2233,6 @@ const char *WeaponHandNumToName ( weaponhand_t hand ) - { switch( hand ) { @@ -2284,7 +2249,6 @@ firemode_t WeaponModeNameToNum ( str mode ) - { if( !mode.length() ) { @@ -2456,7 +2420,6 @@ void G_ArchiveEdict Archiver &arc, gentity_t *edict ) - { int i; str tempStr; @@ -2641,7 +2604,6 @@ str G_WeaponClassNumToName ( int num ) - { if( num & WEAPON_CLASS_PISTOL ) { @@ -2702,7 +2664,6 @@ int G_WeaponClassNameToNum ( str name ) - { int weaponindex = 0; @@ -2773,7 +2734,6 @@ void G_MoveClientToIntermission ( Entity *ent ) - { G_DisplayScores( ent ); ent->flags |= FL_IMMOBILE; @@ -2783,7 +2743,6 @@ void G_DisplayScores ( Entity *ent ) - { ent->client->ps.pm_flags |= PMF_INTERMISSION; } @@ -2792,7 +2751,6 @@ void G_HideScores ( Entity *ent ) - { ent->client->ps.pm_flags &= ~PMF_INTERMISSION; } @@ -2801,7 +2759,6 @@ void G_DisplayScoresToAllClients ( void ) - { gentity_t *ent; int i; @@ -2820,7 +2777,6 @@ void G_HideScoresToAllClients ( void ) - { gentity_t *ent; int i; diff --git a/code/fgame/g_vmove.cpp b/code/fgame/g_vmove.cpp index d9adb131..365fc148 100644 --- a/code/fgame/g_vmove.cpp +++ b/code/fgame/g_vmove.cpp @@ -43,7 +43,6 @@ void VM_ClipVelocity float *out, float overbounce ) - { float backoff; float dir_z; @@ -88,7 +87,6 @@ void VM_AddTouchEnt ( int entityNum ) - { int i; @@ -118,7 +116,6 @@ qboolean VM_SlideMove ( qboolean gravity ) - { int bumpcount; vec3_t dir; @@ -287,7 +284,6 @@ void VM_GroundTraceInternal ( void ) - { VM_GroundTraceInternal2(); VM_AddTouchEnt( vm->vs->groundTrace.entityNum ); @@ -297,7 +293,6 @@ void VM_GroundTraceInternal2 ( void ) - { if( vm->vs->groundTrace.fraction == 1.0f ) { @@ -349,7 +344,6 @@ void VM_GroundTrace ( void ) - { float point[ 3 ]; @@ -365,7 +359,6 @@ void VM_StepSlideMove ( void ) - { vec3_t start_o; vec3_t start_v; @@ -546,7 +539,6 @@ void VM_ClipVelocity2D float *out, float overbounce ) - { float backoff; float dir_z; @@ -591,7 +583,6 @@ void VmoveSingle ( vmove_t *vmove ) - { float point[ 3 ]; trace_t trace; diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp index b4b8a697..345a69fe 100644 --- a/code/fgame/game.cpp +++ b/code/fgame/game.cpp @@ -38,7 +38,6 @@ void G_BeginIntermission const char *map_name, INTTYPE_e transtype ) - { Entity *camera; Entity *node; @@ -155,7 +154,6 @@ void G_ExitLevel ( void ) - { static const char *seps = " ,\n\r"; char command[ 256 ]; diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp index b218e4cd..70e16aa0 100644 --- a/code/fgame/gamecmds.cpp +++ b/code/fgame/gamecmds.cpp @@ -75,7 +75,6 @@ void G_InitConsoleCommands ( void ) - { consolecmd_t *cmds; @@ -149,7 +148,6 @@ qboolean G_ProcessClientCommand ( gentity_t *ent ) - { const char *cmd; consolecmd_t *cmds; @@ -552,7 +550,6 @@ qboolean G_ShowVarCmd ( gentity_t *ent ) - { return qtrue; } @@ -616,7 +613,6 @@ qboolean G_CompileScript ( gentity_t *ent ) - { if( gi.Argc() <= 2 ) { @@ -634,7 +630,6 @@ qboolean G_AddBot ( gentity_t *ent ) - { int numbots; int n; @@ -724,7 +719,6 @@ qboolean G_RemoveBot ( gentity_t *ent ) - { if( gi.Argc() <= 1 ) { @@ -750,7 +744,6 @@ qboolean G_BotCommand ( gentity_t *ent ) - { const char *command; PlayerBot *bot; diff --git a/code/fgame/grenadehint.cpp b/code/fgame/grenadehint.cpp index b10e1978..2db2dae5 100644 --- a/code/fgame/grenadehint.cpp +++ b/code/fgame/grenadehint.cpp @@ -41,7 +41,6 @@ void GrenadeHint::ResetHints ( void ) - { gm_pFirst = NULL; } @@ -53,7 +52,6 @@ int GrenadeHint::GetClosestSet Vector& vOrg, float fMaxRangeSquared ) - { int i; int nFound = 0; diff --git a/code/fgame/grenadehint.h b/code/fgame/grenadehint.h index 100d07d7..48bc9803 100644 --- a/code/fgame/grenadehint.h +++ b/code/fgame/grenadehint.h @@ -48,7 +48,6 @@ inline void GrenadeHint::Archive ( Archiver& arc ) - { SimpleEntity::Archive( arc ); diff --git a/code/fgame/health.cpp b/code/fgame/health.cpp index 2edc1354..9a7b33ab 100644 --- a/code/fgame/health.cpp +++ b/code/fgame/health.cpp @@ -52,7 +52,6 @@ void Health::PickupHealth ( Event *ev ) - { Sentient *sen; Entity *other; diff --git a/code/fgame/inventoryitem.cpp b/code/fgame/inventoryitem.cpp index 0cfccfe9..08a47cfd 100644 --- a/code/fgame/inventoryitem.cpp +++ b/code/fgame/inventoryitem.cpp @@ -72,7 +72,6 @@ void InventoryItem::ActivateItem ( Event *ev ) - { if( firetype[ FIRE_PRIMARY ] == FT_CLICKITEM ) { @@ -93,7 +92,6 @@ void InventoryItem::ActivatePapers ( Event *ev ) - { GetOwner()->m_ShowPapersTime = level.inttime; } diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp index cc9c71f9..6912ecb6 100644 --- a/code/fgame/item.cpp +++ b/code/fgame/item.cpp @@ -456,7 +456,6 @@ void Item::PlaceItem ( void ) - { setSolidType( SOLID_TRIGGER ); setMoveType( MOVETYPE_TOSS ); @@ -478,7 +477,6 @@ void Item::DropToFloor ( Event *ev ) - { str fullname; Vector save; @@ -515,7 +513,6 @@ qboolean Item::Drop ( void ) - { if( !owner ) { @@ -578,7 +575,6 @@ void Item::SetOwner ( Sentient *ent ) - { assert( ent ); if( !ent ) @@ -606,7 +602,6 @@ Sentient *Item::GetOwner ( void ) - { return owner; } @@ -615,7 +610,6 @@ void Item::Delete ( void ) - { if( g_iInThinks ) { @@ -634,7 +628,6 @@ void Item::RemoveFromOwner ( void ) - { owner->RemoveItem( this ); owner = NULL; @@ -645,7 +638,6 @@ Item * Item::ItemPickup Entity *other, qboolean add_to_inventory ) - { Sentient * sent; Item * item = NULL; @@ -723,7 +715,6 @@ void Item::Respawn ( Event *ev ) - { showModel(); @@ -793,7 +784,6 @@ void Item::setRespawn ( qboolean flag ) - { respawnable = flag; } @@ -811,7 +801,6 @@ void Item::setRespawnTime ( float time ) - { respawntime = time; } @@ -847,7 +836,6 @@ qboolean Item::Pickupable ( Entity *other ) - { if( !other->IsSubclassOfSentient() ) { @@ -875,7 +863,6 @@ void Item::Pickup ( Event * ev ) - { ItemPickup( ev->GetEntity( 1 ) ); } @@ -884,7 +871,6 @@ void Item::setName ( const char *i ) - { const char *prefix; @@ -944,7 +930,6 @@ void Item::SetAmountEvent ( Event *ev ) - { setAmount( ev->GetInteger( 1 ) ); } @@ -953,7 +938,6 @@ void Item::SetDMAmountEvent ( Event *ev ) - { if (!g_gametype->integer) return; @@ -1083,7 +1067,6 @@ void Item::CoolItemEvent ( Event *ev ) - { } @@ -1092,7 +1075,6 @@ void Item::ForceCoolItemEvent ( Event *ev ) - { } @@ -1101,7 +1083,6 @@ void Item::SetPickupSound ( Event *ev ) - { sPickupSound = ev->GetString( 1 ); } @@ -1110,7 +1091,6 @@ void Item::EventViewModelPrefix ( Event *ev ) - { int i; gentity_t *ent; @@ -1139,7 +1119,6 @@ void Item::updatePrefix ( Event *ev ) - { if( !level.reborn ) { return; diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp index b5852bdc..475748e3 100644 --- a/code/fgame/level.cpp +++ b/code/fgame/level.cpp @@ -1189,7 +1189,6 @@ void Level::ResetEdicts( void ) } qboolean Level::inhibitEntity( int spawnflags ) - { if( !developer->integer && ( spawnflags & SPAWNFLAG_DEVELOPMENT ) ) { @@ -1593,7 +1592,6 @@ void Level::CheckVote ( void ) - { // FIXME: show the vote HUD like in SH and BT @@ -1629,7 +1627,6 @@ void Level::GetTime ( Event *ev ) - { ev->AddFloat( level.time ); } @@ -1638,7 +1635,6 @@ void Level::GetTotalSecrets ( Event *ev ) - { ev->AddInteger( total_secrets ); } @@ -1647,7 +1643,6 @@ void Level::GetFoundSecrets ( Event *ev ) - { ev->AddInteger( found_secrets ); } @@ -1656,7 +1651,6 @@ void Level::GetAlarm ( Event *ev ) - { ev->AddInteger( m_bAlarm ); } @@ -1665,7 +1659,6 @@ void Level::SetAlarm ( Event *ev ) - { m_bAlarm = ev->GetInteger( 1 ); } @@ -1674,7 +1667,6 @@ void Level::SetNoDropHealth ( Event *ev ) - { mbNoDropHealth = ev->GetInteger( 1 ); } @@ -1683,7 +1675,6 @@ void Level::GetLoopProtection ( Event *ev ) - { ev->AddInteger( m_LoopProtection ); } @@ -1692,7 +1683,6 @@ void Level::SetLoopProtection ( Event *ev ) - { m_LoopProtection = ev->GetInteger( 1 ); } @@ -1701,7 +1691,6 @@ void Level::GetPapersLevel ( Event *ev ) - { ev->AddInteger( m_iPapersLevel ); } @@ -1710,7 +1699,6 @@ void Level::SetPapersLevel ( Event *ev ) - { m_iPapersLevel = ev->GetInteger( 1 ); } @@ -1719,7 +1707,6 @@ void Level::EventGetDMRespawning ( Event *ev ) - { ev->AddInteger( dmManager.GameAllowsRespawns() ); } @@ -1728,7 +1715,6 @@ void Level::EventSetDMRespawning ( Event *ev ) - { dmManager.SetGameAllowsRespawns( ev->GetBoolean( 1 ) ); } @@ -1737,7 +1723,6 @@ void Level::EventGetDMRoundLimit ( Event *ev ) - { ev->AddInteger( dmManager.GetRoundLimit() ); } @@ -1746,7 +1731,6 @@ void Level::EventSetDMRoundLimit ( Event *ev ) - { int round_limit = ev->GetInteger( 1 ); @@ -1762,7 +1746,6 @@ void Level::EventGetClockSide ( Event *ev ) - { ev->AddConstString( dmManager.GetClockSide() ); } @@ -1771,7 +1754,6 @@ void Level::EventSetClockSide ( Event *ev ) - { const_str clockside = ev->GetConstString( 1 ); @@ -1787,7 +1769,6 @@ void Level::EventGetBombPlantTeam ( Event *ev ) - { ev->AddConstString( dmManager.GetBombPlantTeam() ); } @@ -1796,7 +1777,6 @@ void Level::EventSetBombPlantTeam ( Event *ev ) - { const_str plant_team = ev->GetConstString( 1 ); @@ -1812,7 +1792,6 @@ void Level::EventGetTargetsToDestroy ( Event *ev ) - { ev->AddInteger( dmManager.GetTargetsToDestroy() ); } @@ -1821,7 +1800,6 @@ void Level::EventSetTargetsToDestroy ( Event *ev ) - { dmManager.SetTargetsToDestroy( ev->GetInteger( 1 ) ); } @@ -1830,7 +1808,6 @@ void Level::EventGetTargetsDestroyed ( Event *ev ) - { ev->AddInteger( dmManager.GetTargetsDestroyed() ); } @@ -1839,7 +1816,6 @@ void Level::EventSetTargetsDestroyed ( Event *ev ) - { dmManager.SetTargetsDestroyed( ev->GetInteger( 1 ) ); } @@ -1848,7 +1824,6 @@ void Level::EventGetBombsPlanted ( Event *ev ) - { ev->AddInteger( dmManager.GetBombsPlanted() ); } @@ -1857,7 +1832,6 @@ void Level::EventSetBombsPlanted ( Event *ev ) - { dmManager.SetBombsPlanted( ev->GetInteger( 1 ) ); } @@ -1866,7 +1840,6 @@ void Level::EventGetRoundBased ( Event *ev ) - { ev->AddInteger( g_gametype->integer >= GT_TEAM_ROUNDS ); } @@ -1875,7 +1848,6 @@ void Level::EventRainDensitySet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_DENSITY, ev->GetString( 1 ) ); } @@ -1884,7 +1856,6 @@ void Level::EventRainDensityGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_DENSITY ) ); } @@ -1893,7 +1864,6 @@ void Level::EventRainSpeedSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_SPEED, ev->GetString( 1 ) ); } @@ -1902,7 +1872,6 @@ void Level::EventRainSpeedGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_SPEED ) ); } @@ -1911,7 +1880,6 @@ void Level::EventRainSpeedVarySet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_SPEEDVARY, ev->GetString( 1 ) ); } @@ -1920,7 +1888,6 @@ void Level::EventRainSpeedVaryGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_SPEEDVARY ) ); } @@ -1929,7 +1896,6 @@ void Level::EventRainSlantSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_SLANT, ev->GetString( 1 ) ); } @@ -1938,7 +1904,6 @@ void Level::EventRainSlantGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_SLANT ) ); } @@ -1947,7 +1912,6 @@ void Level::EventRainLengthSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_LENGTH, ev->GetString( 1 ) ); } @@ -1956,7 +1920,6 @@ void Level::EventRainLengthGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_LENGTH ) ); } @@ -1965,7 +1928,6 @@ void Level::EventRainMin_DistSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_MINDIST, ev->GetString( 1 ) ); } @@ -1974,7 +1936,6 @@ void Level::EventRainMin_DistGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_MINDIST ) ); } @@ -1983,7 +1944,6 @@ void Level::EventRainWidthSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_WIDTH, ev->GetString( 1 ) ); } @@ -1992,7 +1952,6 @@ void Level::EventRainWidthGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_WIDTH ) ); } @@ -2001,7 +1960,6 @@ void Level::EventRainShaderSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_SHADER, ev->GetString( 1 ) ); } @@ -2010,7 +1968,6 @@ void Level::EventRainShaderGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_SHADER ) ); } @@ -2019,7 +1976,6 @@ void Level::EventRainNumShadersSet ( Event *ev ) - { gi.SetConfigstring( CS_RAIN_NUMSHADERS, ev->GetString( 1 ) ); } @@ -2028,7 +1984,6 @@ void Level::EventRainNumShadersGet ( Event *ev ) - { ev->AddString( gi.GetConfigstring( CS_RAIN_NUMSHADERS ) ); } @@ -2037,7 +1992,6 @@ void Level::EventGetFlags ( Event *ev ) - { } diff --git a/code/fgame/level.h b/code/fgame/level.h index 7b1f6aa1..af006efc 100644 --- a/code/fgame/level.h +++ b/code/fgame/level.h @@ -286,7 +286,6 @@ qboolean Level::Reborn ( void ) - { return reborn; } diff --git a/code/fgame/lodthing.cpp b/code/fgame/lodthing.cpp index f1006840..4f7d3808 100644 --- a/code/fgame/lodthing.cpp +++ b/code/fgame/lodthing.cpp @@ -99,7 +99,6 @@ void LODMaster::Init ( void ) - { gi.AddCommand( "lod_spawn", NULL ); gi.AddCommand( "lod_yaw", NULL ); @@ -113,7 +112,6 @@ void LODMaster::Spawn ( Event *ev ) - { const char *mdl; Vector forward, up, delta; @@ -186,7 +184,6 @@ void LODMaster::PassEvent ( Event *ev ) - { if( !m_current ) { @@ -210,7 +207,6 @@ void LODSlave::UpdateCvars qboolean quiet, qboolean updateFrame ) - { } @@ -219,7 +215,6 @@ LODSlave::LODSlave ( void ) - { m_baseorigin = origin; LODModel.m_current = this; @@ -237,7 +232,6 @@ void LODSlave::ThinkEvent ( Event *ev ) - { cvar_t *cvar; Entity *ent; @@ -277,7 +271,6 @@ void LODSlave::SetModelEvent ( Event *ev ) - { str modelname = ev->GetString( 1 ); @@ -294,7 +287,6 @@ void LODSlave::Delete ( Event *ev ) - { ScriptError( "DELETE" ); } diff --git a/code/fgame/lodthing.h b/code/fgame/lodthing.h index d5c4ed2e..bba80123 100644 --- a/code/fgame/lodthing.h +++ b/code/fgame/lodthing.h @@ -41,7 +41,6 @@ inline void LODMaster::Archive ( Archiver& arc ) - { Listener::Archive( arc ); @@ -69,7 +68,6 @@ inline void LODSlave::Archive ( Archiver& arc ) - { Animate::Archive( arc ); diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp index 502ac80e..f5e6b907 100644 --- a/code/fgame/misc.cpp +++ b/code/fgame/misc.cpp @@ -2549,7 +2549,6 @@ void VehiclePoint::SetSpawnFlags ( Event *ev ) - { spawnflags = ev->GetInteger( 1 ); } @@ -3222,7 +3221,6 @@ void FallingRock::SetBounceSound ( str sound ) - { bouncesound = sound; // cache the sound in diff --git a/code/fgame/misc.h b/code/fgame/misc.h index ff0c8902..aa3762f7 100644 --- a/code/fgame/misc.h +++ b/code/fgame/misc.h @@ -364,7 +364,6 @@ inline void VehiclePoint::Archive ( Archiver &arc ) - { SimpleArchivedEntity::Archive( arc ); diff --git a/code/fgame/movegrid.cpp b/code/fgame/movegrid.cpp index ad59da2d..84f54c75 100644 --- a/code/fgame/movegrid.cpp +++ b/code/fgame/movegrid.cpp @@ -45,7 +45,6 @@ void cMoveGrid::SetOrientation ( float( *v )[ 3 ] ) - { for( int i = 0; i < 3; i++ ) { @@ -57,7 +56,6 @@ void cMoveGrid::SetMoveInfo ( vmove_t *vm ) - { memcpy( &v, vm, sizeof( vmove_t ) ); } @@ -66,7 +64,6 @@ void cMoveGrid::CalculateBoxPoints ( void ) - { int x, y, z; int rx, ry, rz; @@ -155,7 +152,6 @@ gridpoint_t *cMoveGrid::GetGridPoint int y, int z ) - { return &GridPoints[ x * m_iZRes + y * m_iXRes + z ]; } @@ -164,7 +160,6 @@ void cMoveGrid::Move ( void ) - { int x; int y; @@ -193,7 +188,6 @@ qboolean cMoveGrid::CheckStuck ( void ) - { int x; int y; @@ -223,7 +217,6 @@ void cMoveGrid::GetMoveInfo ( vmove_t *vm ) - { memcpy( vm, &v, sizeof( vmove_t ) ); } diff --git a/code/fgame/movegrid.h b/code/fgame/movegrid.h index 87640bce..2b8583e9 100644 --- a/code/fgame/movegrid.h +++ b/code/fgame/movegrid.h @@ -97,7 +97,6 @@ inline void cMoveGrid::Archive ( Archiver& arc ) - { arc.ArchiveInteger( &m_iXRes ); arc.ArchiveInteger( &m_iYRes ); diff --git a/code/fgame/mover.cpp b/code/fgame/mover.cpp index faf33475..47e31d40 100644 --- a/code/fgame/mover.cpp +++ b/code/fgame/mover.cpp @@ -55,7 +55,6 @@ void Mover::MoveDone ( Event *ev ) - { Event * event; Vector move; @@ -237,7 +236,6 @@ void Mover::LinearInterpolate float time, Event &event ) - { Vector vdestdelta; Vector angdestdelta; diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp index 29c8e536..443b13dc 100644 --- a/code/fgame/navigate.cpp +++ b/code/fgame/navigate.cpp @@ -119,7 +119,6 @@ void AI_AddNode ( PathNode *node ) - { int i = PathSearch::nodecount; @@ -147,7 +146,6 @@ qboolean CheckMove short int *path_fallheight, float size ) - { mmove_t mm; int i; @@ -348,7 +346,6 @@ void PathNode::Claim ( Entity *pClaimer ) - { pLastClaimer = pClaimer; iAvailableTime = 0; @@ -358,7 +355,6 @@ const_str PathNode::GetSpecialAttack ( Actor *pActor ) - { int iSpecialAttack; const_str csAnimation; @@ -446,7 +442,6 @@ Entity *PathNode::GetClaimHolder ( void ) const - { if( iAvailableTime ) return NULL; @@ -458,7 +453,6 @@ bool PathNode::IsClaimedByOther ( Entity *pPossibleClaimer ) const - { if( pLastClaimer == pPossibleClaimer ) return false; @@ -477,7 +471,6 @@ qboolean PathNode::IsTouching ( Entity *e1 ) - { return e1->absmin[ 0 ] <= origin[ 0 ] + 15.5f && e1->absmin[ 1 ] <= origin[ 1 ] + 15.5f && @@ -491,7 +484,6 @@ void PathNode::SetNodeFlags ( Event *ev ) - { nodeflags = ev->GetInteger( 1 ); } @@ -500,7 +492,6 @@ void PathNode::IsTouching ( Event *ev ) - { Entity *ent = ev->GetEntity( 1 ); @@ -516,7 +507,6 @@ void PathNode::Remove ( Event *ev ) - { // Pathnodes mustn't be removed ScriptError( "Not allowed to delete a path node" ); @@ -526,7 +516,6 @@ void PathNode::setOriginEvent ( Vector org ) - { if( !PathManager.m_bNodesloaded ) { @@ -539,7 +528,6 @@ void PathNode::Archive ( Archiver &arc ) - { } @@ -547,7 +535,6 @@ void PathNode::ArchiveDynamic ( Archiver &arc ) - { SimpleEntity::SimpleArchive( arc ); @@ -575,7 +562,6 @@ void PathNode::ArchiveStatic ( Archiver &arc ) - { arc.ArchiveVector( &origin ); arc.ArchiveVector( ¢roid ); @@ -608,7 +594,6 @@ void PathNode::ConnectChild ( int i ) - { int j; pathway_t child = Child[ i ]; @@ -626,7 +611,6 @@ void PathNode::DisconnectChild ( int i ) - { int j; pathway_t child = Child[ i ]; @@ -644,7 +628,6 @@ void PathNode::ConnectTo ( PathNode *node ) - { Child[ virtualNumChildren ].node = nodenum; Child[ virtualNumChildren ].numBlockers = 0; @@ -656,7 +639,6 @@ bool PathNode::CheckPathTo ( PathNode *node ) - { if( virtualNumChildren < NUM_PATHSPERNODE ) @@ -677,7 +659,6 @@ void PathNode::CheckPathToDefault PathNode *node, pathway_t *pathway ) - { float dist; float delta[ 2 ]; @@ -740,7 +721,6 @@ void PathNode::MarkTemporarilyBad ( void ) - { iAvailableTime = level.inttime + 5000; pLastClaimer = NULL; @@ -750,7 +730,6 @@ void PathNode::Relinquish ( void ) - { iAvailableTime = level.inttime + 4000; } @@ -759,7 +738,6 @@ void PathNode::DrawConnections ( void ) - { int i; pathway_t *path; @@ -778,7 +756,6 @@ static bool IsValidPathnode ( int spawnflags ) - { if( ( spawnflags & AI_DUCK ) && ( spawnflags & AI_COVERFLAGS2 ) ) return false; @@ -806,7 +783,6 @@ static void GetPathnodeColor int spawnflags, vec3_t color ) - { if( IsValidPathnode( spawnflags ) ) { @@ -853,7 +829,6 @@ void DrawNode ( int iNodeCount ) - { Vector down; Vector up; @@ -956,7 +931,6 @@ void DrawAllConnections ( void ) - { pathway_t *path; pathway_t *path2; @@ -1087,7 +1061,6 @@ qboolean MapCell::AddNode ( PathNode *node ) - { nodes[ numnodes ] = ( short )node->nodenum; numnodes++; @@ -1099,7 +1072,6 @@ int MapCell::NumNodes ( void ) - { return numnodes; } @@ -1174,7 +1146,6 @@ void PathSearch::AddToGrid int x, int y ) - { MapCell *cell; @@ -1196,7 +1167,6 @@ int PathSearch::NodeCoordinate ( float coord ) - { float c; @@ -1214,7 +1184,6 @@ int PathSearch::GridCoordinate ( float coord ) - { float c; @@ -1232,7 +1201,6 @@ void PathSearch::AddNode ( PathNode *node ) - { int x; int y; @@ -1253,7 +1221,6 @@ void PathSearch::LoadAddToGrid int x, int y ) - { MapCell *cell; @@ -1272,7 +1239,6 @@ void PathSearch::LoadAddToGrid2 int x, int y ) - { MapCell *cell; @@ -1290,7 +1256,6 @@ MapCell *PathSearch::GetNodesInCell int x, int y ) - { if( ( x < 0 ) || ( x >= PATHMAP_GRIDSIZE ) || ( y < 0 ) || ( y >= PATHMAP_GRIDSIZE ) ) { @@ -1304,7 +1269,6 @@ MapCell *PathSearch::GetNodesInCell ( float *pos ) - { int x; int y; @@ -1321,7 +1285,6 @@ PathNode *PathSearch::DebugNearestStartNode float *pos, Entity *ent ) - { PathNode *node = NULL; int i; @@ -1379,7 +1342,6 @@ PathNode *PathSearch::NearestStartNode float *pos, SimpleActor *ent ) - { PathNode *node = NULL; int i; @@ -1458,7 +1420,6 @@ PathNode *PathSearch::NearestEndNode ( float *pos ) - { PathNode *node = NULL; int i; @@ -1518,7 +1479,6 @@ int PathSearch::DebugNearestNodeList PathNode **nodelist, int iMaxNodes ) - { PathNode *node; int i; @@ -1586,7 +1546,6 @@ int PathSearch::DebugNearestNodeList2 PathNode **nodelist, int iMaxNodes ) - { vec3_t delta; PathNode *node; @@ -1636,7 +1595,6 @@ void PathSearch::ArchiveStaticLoad ( Archiver& arc ) - { int i; PathNode *node; @@ -1720,7 +1678,6 @@ void PathSearch::ArchiveStaticSave ( Archiver& arc ) - { int i; PathNode *node; @@ -1759,7 +1716,6 @@ void PathSearch::ArchiveLoadNodes ( void ) - { Archiver arc; qboolean success; @@ -1807,7 +1763,6 @@ qboolean PathSearch::ArchiveSaveNodes ( void ) - { Archiver arc; str maptime; @@ -1829,7 +1784,6 @@ void PathSearch::Connect ( PathNode *node ) - { int x; int y; @@ -1873,7 +1827,6 @@ bool PathSearch::Connect int x, int y ) - { MapCell *cell; int i; @@ -1910,7 +1863,6 @@ void PathSearch::ShowNodes ( void ) - { if( g_entities->client ) { @@ -1979,7 +1931,6 @@ void PathSearch::LoadNodes ( void ) - { ai_showroutes = gi.Cvar_Get( "ai_showroutes", "0", 0 ); ai_showroutes_distance = gi.Cvar_Get( "ai_showroutes_distance", "1000", 0 ); @@ -1999,7 +1950,6 @@ void PathSearch::CreatePaths ( void ) - { int i; int j; @@ -2136,7 +2086,6 @@ void *PathSearch::AllocPathNode ( void ) - { if( bulkNavMemory && !m_bNodesloaded ) { @@ -2153,7 +2102,6 @@ void PathSearch::FreePathNode ( void *ptr ) - { if( !bulkNavMemory || m_bNodesloaded ) { @@ -2165,7 +2113,6 @@ void PathSearch::ResetNodes ( void ) - { int i; int x; @@ -2222,7 +2169,6 @@ PathInfo *PathSearch::GeneratePath ( PathInfo *path ) - { PathNode *ParentNode; pathway_t *pathway; @@ -2312,7 +2258,6 @@ PathInfo *PathSearch::GeneratePathNear ( PathInfo *path ) - { PathInfo *current_path = path; pathway_t *pathway; @@ -2382,7 +2327,6 @@ PathInfo *PathSearch::GeneratePathAway ( PathInfo *path ) - { PathInfo *current_path = path; pathway_t *pathway; @@ -2449,7 +2393,6 @@ PathNode *PathSearch::GetSpawnNode ( ClassDef *cls ) - { if( m_bNodesloaded ) { @@ -2472,7 +2415,6 @@ int PathSearch::FindPath float fLeashDistSquared, int fallheight ) - { int i; int g; @@ -2674,7 +2616,6 @@ int PathSearch::FindPathAway float fLeashDistSquared, int fallheight ) - { int i; int g; @@ -2862,7 +2803,6 @@ int PathSearch::FindPathNear float fLeashDistSquared, int fallheight ) - { int i; int g; @@ -3058,7 +2998,6 @@ PathNode *PathSearch::FindCornerNodeForWall float maxPath, float *plane ) - { PathNode *ParentNode; PathNode *OpenNode; @@ -3256,7 +3195,6 @@ PathNode *PathSearch::FindCornerNodeForExactPath Sentient *enemy, float fMaxPath ) - { PathNode *pPathNode[4096]; @@ -3330,7 +3268,6 @@ int PathSearch::FindPotentialCover PathNode **ppFoundNodes, int iMaxFind ) - { Actor *pSelf = (Actor *)pEnt; PathNode *pNode; @@ -3387,7 +3324,6 @@ void PathSearch::PlayerCover ( Player *pPlayer ) - { int i; PathNode *node; @@ -3431,7 +3367,6 @@ PathNode *PathSearch::FindNearestCover Vector& vPos, Entity *pEnemy ) - { // not found in ida return NULL; @@ -3443,7 +3378,6 @@ PathNode *PathSearch::FindNearestSniperNode Vector& vPos, Entity *pEnemy ) - { Actor *pSelf = (Actor *)pEnt; PathNode *pNode; @@ -3506,7 +3440,6 @@ int PathSearch::NearestNodeSetup int *nodes, vec3_t *deltas ) - { vec3_t delta; PathNode *node; @@ -3558,7 +3491,6 @@ void PathSearch::Init ( void ) - { ai_showroutes = gi.Cvar_Get( "ai_showroutes", "0", 0 ); ai_showroutes_distance = gi.Cvar_Get( "ai_showroutes_distance", "1000", 0 ); @@ -3723,7 +3655,6 @@ bool AttractiveNode::CheckTeam ( Sentient *sent ) - { if( !m_iTeam ) { @@ -3759,7 +3690,6 @@ void AttractiveNode::setMaxDist ( float dist ) - { m_fMaxDistance = dist; @@ -3777,7 +3707,6 @@ void AttractiveNode::GetPriority ( Event *ev ) - { ev->AddInteger( m_iPriority ); } @@ -3786,7 +3715,6 @@ void AttractiveNode::SetPriority ( Event *ev ) - { m_iPriority = ev->GetInteger( 1 ); } @@ -3795,7 +3723,6 @@ void AttractiveNode::GetDistance ( Event *ev ) - { ev->AddFloat( m_fMaxDistance ); } @@ -3804,7 +3731,6 @@ void AttractiveNode::SetDistance ( Event *ev ) - { setMaxDist( ev->GetFloat( 1 ) ); } @@ -3813,7 +3739,6 @@ void AttractiveNode::GetStayTime ( Event *ev ) - { ev->AddFloat( m_fMaxStayTime ); } @@ -3822,7 +3747,6 @@ void AttractiveNode::SetStayTime ( Event *ev ) - { m_fMaxStayTime = ev->GetFloat( 1 ); } @@ -3831,7 +3755,6 @@ void AttractiveNode::GetRespawnTime ( Event *ev ) - { ev->AddFloat( m_fRespawnTime ); } @@ -3840,7 +3763,6 @@ void AttractiveNode::SetRespawnTime ( Event *ev ) - { m_fRespawnTime = ev->GetFloat( 1 ); if( m_fRespawnTime < 1.0f ) @@ -3853,7 +3775,6 @@ void AttractiveNode::GetTeam ( Event *ev ) - { ev->AddConstString( m_csTeam ); } @@ -3862,7 +3783,6 @@ void AttractiveNode::SetTeam ( Event *ev ) - { if( ev->IsNilAt( 1 ) ) { @@ -3902,7 +3822,6 @@ void AttractiveNode::SetUse ( Event *ev ) - { m_bUse = ev->GetBoolean( 1 ); } diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h index 381d7eff..e6b255b3 100644 --- a/code/fgame/navigate.h +++ b/code/fgame/navigate.h @@ -109,7 +109,6 @@ inline void PathInfo::Archive ( Archiver& arc ) - { arc.ArchiveBool( &bAccurate ); arc.ArchiveVec3( point ); @@ -360,7 +359,6 @@ inline void AttractiveNode::Archive ( Archiver& arc ) - { arc.ArchiveInteger( &m_iPriority ); arc.ArchiveBool( &m_bUse ); diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp index 474735dd..7d7a3302 100644 --- a/code/fgame/player.cpp +++ b/code/fgame/player.cpp @@ -1782,7 +1782,6 @@ qboolean Player::checkturnleft ( Conditional &condition ) - { float yaw; @@ -1795,7 +1794,6 @@ qboolean Player::checkturnright ( Conditional &condition ) - { float yaw; @@ -1808,7 +1806,6 @@ qboolean Player::checkforward ( Conditional &condition ) - { return last_ucmd.forwardmove > 0; } @@ -1817,7 +1814,6 @@ qboolean Player::checkbackward ( Conditional &condition ) - { return last_ucmd.forwardmove < 0; } @@ -1844,7 +1840,6 @@ qboolean Player::checkrise ( Conditional &condition ) - { return false; } @@ -1881,7 +1876,6 @@ qboolean Player::checkanimdone_legs ( Conditional &condition ) - { return animdone_Legs; } @@ -1890,7 +1884,6 @@ qboolean Player::checkanimdone_torso ( Conditional &condition ) - { return animdone_Torso; } @@ -1900,7 +1893,6 @@ qboolean Player::checkattackleft ( Conditional &condition ) - { if( level.playerfrozen || m_bFrozen || ( flags & FL_IMMOBILE ) || (g_gametype->integer && !m_bAllowFighting) ) { @@ -1932,7 +1924,6 @@ qboolean Player::checkattackbuttonleft ( Conditional &condition ) - { if( level.playerfrozen || m_bFrozen || ( flags & FL_IMMOBILE ) || !m_bAllowFighting ) { @@ -1947,7 +1938,6 @@ qboolean Player::checkattackright ( Conditional &condition ) - { if( level.playerfrozen || m_bFrozen || ( flags & FL_IMMOBILE ) || !m_bAllowFighting ) { @@ -1979,7 +1969,6 @@ qboolean Player::checkattackbuttonright ( Conditional &condition ) - { if( level.playerfrozen || m_bFrozen || ( flags & FL_IMMOBILE ) || !m_bAllowFighting ) { @@ -1993,7 +1982,6 @@ qboolean Player::checksneak ( Conditional &condition ) - { return ( last_ucmd.upmove ) < 0; } @@ -2002,7 +1990,6 @@ qboolean Player::checkrun ( Conditional &condition ) - { return ( last_ucmd.buttons & BUTTON_RUN ) != 0; } @@ -2218,7 +2205,6 @@ qboolean Player::checkonground ( Conditional &condition ) - { if( groundentity || client->ps.walking ) { @@ -2500,7 +2486,6 @@ qboolean Player::checkpaintype ( Conditional &condition ) - { if( pain_type == MOD_NameToNum( condition.getParm( 1 ) ) ) { @@ -2516,7 +2501,6 @@ qboolean Player::checkpaindirection ( Conditional &condition ) - { if( pain_dir == Pain_string_to_int( condition.getParm( 1 ) ) ) { @@ -2532,7 +2516,6 @@ qboolean Player::checkpainlocation ( Conditional &condition ) - { str sLocationName; int iLocationNum; @@ -2912,7 +2895,6 @@ qboolean Player::checkweaponreadytofire ( Conditional &condition ) - { firemode_t mode = FIRE_PRIMARY; str weaponName = "None"; @@ -2997,7 +2979,6 @@ qboolean Player::checkweaponreadytofire_nosound ( Conditional &condition ) - { firemode_t mode = FIRE_PRIMARY; str weaponName = "None"; @@ -3041,7 +3022,6 @@ qboolean Player::checkweaponsemiauto ( Conditional &condition ) - { firemode_t mode = FIRE_PRIMARY; str handname; @@ -3077,7 +3057,6 @@ qboolean Player::checkputawayright ( Conditional &condition ) - { Weapon *weapon = GetActiveWeapon( WEAPON_MAIN ); @@ -3184,7 +3163,6 @@ qboolean Player::checkladder ( Conditional &condition ) - { trace_t trace; Vector forward; @@ -3315,7 +3293,6 @@ qboolean Player::checkcanclimbupladder ( Conditional &condition ) - { trace_t trace; Vector fwd; @@ -3355,7 +3332,6 @@ qboolean Player::checkcanclimbdownladder ( Conditional &condition ) - { Vector vEnd = origin - Vector( 0, 0, 16 ); @@ -3481,7 +3457,6 @@ qboolean Player::checksolidforward ( Conditional &condition ) - { // Trace out forward to see if there is a solid ahead float dist = atof( condition.getParm( 1 ) ); @@ -3499,7 +3474,6 @@ qboolean Player::checkweaponsholstered ( Conditional &condition ) - { if( holsteredWeapon ) { @@ -4401,7 +4375,6 @@ void Player::InitState ( void ) - { gibbed = false; pain = 0; @@ -4444,7 +4417,6 @@ void Player::InitModel ( void ) - { gi.clearmodel( edict ); @@ -4565,7 +4537,6 @@ void Player::InitPhysics ( void ) - { // Physics stuff oldvelocity = vec_zero; @@ -4597,7 +4568,6 @@ void Player::InitWorldEffects ( void ) - { // world effects next_painsound_time = 0; @@ -4631,7 +4601,6 @@ void Player::InitView ( void ) - { // view stuff camera = NULL; @@ -4839,7 +4808,6 @@ void Player::InitMaxAmmo ( void ) - { GiveAmmo( "pistol", 0, 200 ); GiveAmmo( "rifle", 0, 200 ); @@ -4855,7 +4823,6 @@ void Player::InitStats ( void ) - { m_iNumObjectives = 0; m_iObjectivesCompleted = 0; @@ -4935,7 +4902,6 @@ void Player::Respawn ( Event *ev ) - { if( g_gametype->integer ) { @@ -4977,7 +4943,6 @@ Vector Player::GunTarget ( bool bNoCollision ) - { Vector vForward; Vector vOut; @@ -5438,7 +5403,6 @@ void Player::Dead ( Event *ev ) - { if( deadflag == DEAD_DEAD ) { return; @@ -5484,7 +5448,6 @@ void Player::Killed ( Event *ev ) - { Entity *attacker; Entity *inflictor; @@ -5618,7 +5581,6 @@ void Player::KilledPlayerInDeathmatch ( Player *killed ) - { DM_Team *pDMTeam; @@ -5648,7 +5610,6 @@ void Player::ArmorDamage ( Event *ev ) - { int mod = ev->GetInteger( 9 ); @@ -5706,7 +5667,6 @@ void Player::Pain ( Event *ev ) - { float damage, yawdiff; Entity *attacker; @@ -5956,7 +5916,6 @@ void Player::DoUse ( Event *ev ) - { gentity_t *hit; int touch[ MAX_GENTITIES ]; @@ -6028,7 +5987,6 @@ void Player::TouchStuff ( pmove_t *pm ) - { gentity_t *other; Event *event; @@ -6084,7 +6042,6 @@ void Player::GetMoveInfo ( pmove_t *pm ) - { moveresult = pm->moveresult; @@ -6160,7 +6117,6 @@ void Player::SetMoveInfo pmove_t *pm, usercmd_t *ucmd ) - { Vector move; @@ -6213,7 +6169,6 @@ pmtype_t Player::GetMovePlayerMoveType ( void ) - { if( getMoveType() == MOVETYPE_NOCLIP || IsSpectator() ) { @@ -6237,7 +6192,6 @@ void Player::CheckGround ( void ) - { pmove_t pm; @@ -6251,7 +6205,6 @@ qboolean Player::AnimMove Vector &move, Vector *endpos ) - { Vector up; Vector down; @@ -6394,7 +6347,6 @@ void Player::CheckMoveFlags ( void ) - { trace_t trace; Vector start; @@ -6493,7 +6445,6 @@ void Player::ClientMove ( usercmd_t *ucmd ) - { pmove_t pm; Vector move; @@ -6729,7 +6680,6 @@ void Player::VehicleMove ( usercmd_t *ucmd ) - { if( !m_pVehicle ) { return; @@ -6764,7 +6714,6 @@ void Player::TurretMove ( usercmd_t *ucmd ) - { if( !m_pTurret ) { return; @@ -6799,7 +6748,6 @@ void Player::ClientInactivityTimer ( void ) - { if( !g_gametype->integer ) return; @@ -6945,7 +6893,6 @@ void Player::ClientThink ( void ) - { // sanity check the command time to prevent speedup cheating if( current_ucmd->serverTime > level.svsTime ) @@ -7149,7 +7096,6 @@ void Player::UpdateEnemies ( void ) - { float fFov; float fMaxDist; @@ -7214,7 +7160,6 @@ void Player::Think ( void ) - { static cvar_t *g_aimLagTime = NULL; @@ -7603,7 +7548,6 @@ void Player::Postthink ( void ) - { if( bindmaster ) { @@ -7699,7 +7643,6 @@ void Player::ResetState ( Event *ev ) - { movecontrol = MOVECONTROL_LEGS; LoadStateTable(); @@ -7750,7 +7693,6 @@ void Player::StartUseAnim ( void ) - { UseAnim *ua; Vector neworg; @@ -8030,7 +7972,6 @@ void Player::EvaluateState State *forceTorso, State *forceLegs ) - { int count; State *laststate_Legs; @@ -8410,7 +8351,6 @@ void Player::FullHeal ( Event *ev ) - { if( IsDead() ) { @@ -8434,7 +8374,6 @@ void Player::EventFace ( Event *ev ) - { SetViewAngles( Vector( ev->GetFloat( 1 ), ev->GetFloat( 2 ), ev->GetFloat( 3 ) ) ); } @@ -8480,7 +8419,6 @@ void Player::NoclipCheat ( Event *ev ) - { const char *msg; @@ -8516,7 +8454,6 @@ void Player::EventTeleport ( Event *ev ) - { if( ev->NumArgs() == 1 ) { @@ -8541,7 +8478,6 @@ void Player::SetFov ( float newFov ) - { fov = newFov; @@ -8559,7 +8495,6 @@ void Player::EventSetSelectedFov ( Event *ev ) - { if( ev->NumArgs() < 1 ) { @@ -8575,7 +8510,6 @@ void Player::SetSelectedFov ( float newFov ) - { selectedfov = newFov; @@ -8607,7 +8541,6 @@ void Player::SafeZoomed ( Event *ev ) - { if( ev->GetInteger( 1 ) ) { @@ -8631,7 +8564,6 @@ void Player::ToggleZoom ( int iZoom ) - { if( iZoom && m_iInZoomMode == -1 ) { @@ -8649,7 +8581,6 @@ void Player::ZoomOff ( void ) - { SetFov( selectedfov ); m_iInZoomMode = 0; @@ -8659,7 +8590,6 @@ void Player::ZoomOffEvent ( Event *ev ) - { ZoomOff(); } @@ -8668,7 +8598,6 @@ qboolean Player::IsZoomed ( void ) - { return m_iInZoomMode == -1; } @@ -8716,7 +8645,6 @@ void Player::ProcessPmoveEvents ( int event ) - { float damage; @@ -8817,7 +8745,6 @@ void Player::WorldEffects ( void ) - { if( deadflag == DEAD_DEAD ) { @@ -8986,7 +8913,6 @@ void Player::DamageFeedback ( void ) - { float realcount; float count; @@ -9088,7 +9014,6 @@ void Player::GetPlayerView Vector *pos, Vector *angle ) - { if( pos ) { @@ -9112,7 +9037,6 @@ void Player::SetPlayerView float camerablend[ 4 ], float camerafov ) - { client->ps.viewangles[ 0 ] = ang[ 0 ]; client->ps.viewangles[ 1 ] = ang[ 1 ]; @@ -9395,7 +9319,6 @@ void Player::SetupView ( void ) - { // if we currently are not in a camera or the camera we are looking through is automatic, evaluate our camera choices @@ -9925,7 +9848,6 @@ void Player::AutoAim ( void ) - { } @@ -9939,7 +9861,6 @@ void Player::PlayerAngles ( void ) - { PmoveAdjustAngleSettings( v_angle, angles, &client->ps, &edict->s ); @@ -9996,7 +9917,6 @@ void Player::CopyStats ( Player *player ) - { gentity_t *ent; int i; @@ -10105,7 +10025,6 @@ void Player::UpdateStats ( void ) - { int i, count; Vector vObjectiveLocation; @@ -10579,7 +10498,6 @@ void Player::UpdateStatus ( const char *s ) - { gi.SendServerCommand( edict - g_entities, "status \"%s\"", s ); } @@ -10646,7 +10564,6 @@ void Player::EndAnim_Legs ( Event *ev ) - { animdone_Legs = true; @@ -10661,7 +10578,6 @@ void Player::EndAnim_Torso ( Event *ev ) - { animdone_Torso = true; @@ -10676,7 +10592,6 @@ void Player::EndActionAnim ( Event *ev ) - { m_bActionAnimDone = qtrue; EvaluateState(); @@ -10914,7 +10829,6 @@ void Player::PlayerAnimDelta ( float *vDelta ) - { float fTimeDelta; float fBackTime; @@ -10977,7 +10891,6 @@ void Player::CheckReloadWeapons ( void ) - { Weapon *weap; @@ -10998,7 +10911,6 @@ void Player::UpdateMisc ( void ) - { // // clear out the level exit flag @@ -11044,7 +10956,6 @@ void Player::EndFrame ( void ) - { FinishMove(); UpdateStats(); @@ -11158,7 +11069,6 @@ void Player::ChangeMusic const char * fallback, qboolean force ) - { int current_mood_num; int fallback_mood_num; @@ -11240,7 +11150,6 @@ void Player::JumpXY ( Event *ev ) - { float forwardmove; float sidemove; @@ -11268,7 +11177,6 @@ Vector Player::EyePosition ( void ) - { return m_vViewPos; } @@ -11277,7 +11185,6 @@ void Player::GetViewangles ( Event *ev ) - { ev->AddVector( v_angle ); } @@ -11286,7 +11193,6 @@ void Player::SetViewangles ( Event *ev ) - { SetViewAngles( ev->GetVector( 1 ) ); } @@ -11295,7 +11201,6 @@ void Player::SetViewAngles ( Vector newViewangles ) - { // set the delta angle client->ps.delta_angles[ 0 ] = ANGLE2SHORT( newViewangles.x - client->cmd_angles[ 0 ] ); @@ -11316,7 +11221,6 @@ Vector Player::GetViewAngles ( void ) - { return v_angle; } @@ -11334,7 +11238,6 @@ void Player::ForceLegsState ( Event *ev ) - { State *ls = statemap_Legs->FindState( ev->GetString( 1 ) ); EvaluateState( NULL, ls ); @@ -11344,7 +11247,6 @@ void Player::ForceTorsoState ( Event *ev ) - { State *ts = statemap_Torso->FindState( ev->GetString( 1 ) ); EvaluateState( ts ); @@ -11551,7 +11453,6 @@ void Player::Spectator ( Event *ev ) - { client->pers.weapon[ 0 ] = 0; SetTeam( TEAM_SPECTATOR ); @@ -11576,7 +11477,6 @@ void Player::EventGetUseHeld ( Event *ev ) - { ev->AddInteger( buttons & BUTTON_USE ? qtrue : qfalse ); } @@ -11585,7 +11485,6 @@ void Player::EventGetFireHeld ( Event *ev ) - { ev->AddInteger( buttons & ( BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT ) ? qtrue : qfalse ); } @@ -11594,7 +11493,6 @@ void Player::Score ( Event *ev ) - { dmManager.Score( this ); } @@ -11618,7 +11516,6 @@ void Player::GetIsDisguised ( Event *ev ) - { ev->AddInteger( m_bIsDisguised ); } @@ -11627,7 +11524,6 @@ void Player::GetHasDisguise ( Event *ev ) - { ev->AddInteger( m_bHasDisguise ); } @@ -11636,7 +11532,6 @@ void Player::SetHasDisguise ( Event *ev ) - { m_bHasDisguise = ev->GetBoolean( 1 ); } @@ -11645,7 +11540,6 @@ void Player::SetObjectiveCount ( Event *ev ) - { m_iObjectivesCompleted = ev->GetInteger( 1 ); m_iNumObjectives = ev->GetInteger( 2 ); @@ -11727,7 +11621,6 @@ void Player::CallVote ( Event *ev ) - { str arg1; str arg2; @@ -11845,7 +11738,6 @@ void Player::Vote ( Event *ev ) - { if( level.m_voteTime == 0.0f ) { @@ -11880,7 +11772,6 @@ void Player::EventCoord ( Event *ev ) - { const char *s = va( "location: %.2f %.2f %.2f\nangles: %.2f %.2f %.2f\n(use 'tele' or 'face' to set)\n", origin[ 0 ], origin[ 1 ], origin[ 2 ], v_angle[ 0 ], v_angle[ 1 ], v_angle[ 2 ] ); @@ -11893,7 +11784,6 @@ void Player::EventStuffText ( Event *ev ) - { if( level.spawning ) { @@ -11912,7 +11802,6 @@ void Player::EventSetVoiceType ( Event *ev ) - { str sVoiceName = ev->GetString( 1 ); @@ -11970,7 +11859,6 @@ void Player::EventEnterIntermission ( Event *ev ) - { if( !level.intermissiontime ) { return; @@ -12001,7 +11889,6 @@ void Player::EnterTurret ( Event *ev ) - { TurretGun *ent = ( TurretGun * )ev->GetEntity( 1 ); @@ -12020,7 +11907,6 @@ void Player::EnterTurret ( TurretGun *ent ) - { flags |= FL_PARTIAL_IMMOBILE; viewheight = DEFAULT_VIEWHEIGHT; @@ -12037,7 +11923,6 @@ void Player::ExitTurret ( Event *ev ) - { ExitTurret(); } @@ -12046,7 +11931,6 @@ void Player::ExitTurret ( void ) - { flags &= ~FL_PARTIAL_IMMOBILE; setMoveType( MOVETYPE_WALK ); @@ -12068,7 +11952,6 @@ void Player::NextPainTime ( Event *ev ) - { float time = ev->GetFloat( 1 ); @@ -12121,7 +12004,6 @@ void Player::EnterVehicle ( Event *ev ) - { Entity *ent; @@ -12145,7 +12027,6 @@ void Player::ExitVehicle ( Event *ev ) - { flags &= ~FL_PARTIAL_IMMOBILE; setMoveType( MOVETYPE_WALK ); @@ -12226,7 +12107,6 @@ void Player::setAngles ( Vector ang ) - { // set the angles normally @@ -12242,7 +12122,6 @@ void Player::PlayerDone ( Event *ev ) - { // This is used to let scripts know that the player is done doing something } @@ -12269,7 +12148,6 @@ void Player::ArchivePersistantData ( Archiver &arc ) - { str model_name; @@ -12319,7 +12197,6 @@ void Player::SpawnDamageEffect ( meansOfDeath_t mod ) - { switch( mod ) { @@ -12339,7 +12216,6 @@ void Player::VelocityModified ( void ) - { } @@ -12349,7 +12225,6 @@ int Player::GetKnockback int original_knockback, qboolean blocked ) - { int new_knockback; @@ -12385,7 +12260,6 @@ int Player::GetMoveResult ( void ) - { return moveresult; } @@ -12410,7 +12284,6 @@ void Player::Join_DM_Team ( Event *ev ) - { teamtype_t team; str teamname; @@ -12494,7 +12367,6 @@ void Player::Auto_Join_DM_Team ( Event *ev ) - { Event *event = new Event( EV_Player_JoinDMTeam ); @@ -12514,7 +12386,6 @@ void Player::Leave_DM_Team ( Event *ev ) - { // FIXME: should it stays disabled ? #if 0 @@ -12533,7 +12404,6 @@ void Player::EventPrimaryDMWeapon ( Event *ev ) - { str dm_weapon = ev->GetString( 1 ); @@ -12568,7 +12438,6 @@ void Player::PlayerReload ( Event *ev ) - { Weapon *weapon; @@ -12588,7 +12457,6 @@ void Player::EventCorrectWeaponAttachments ( Event *ev ) - { int iChild; int iNumChildren; @@ -12642,7 +12510,6 @@ void Player::SelectNextItem ( Event *ev ) - { if( deadflag ) { @@ -12663,7 +12530,6 @@ void Player::SelectPreviousItem ( Event *ev ) - { if( deadflag ) { @@ -12684,7 +12550,6 @@ void Player::SelectNextWeapon ( Event *ev ) - { if( deadflag ) { @@ -12721,7 +12586,6 @@ void Player::SelectPreviousWeapon ( Event *ev ) - { if( deadflag ) { @@ -12758,7 +12622,6 @@ void Player::DropCurrentWeapon ( Event *ev ) - { Weapon *weapon; Vector forward; @@ -12825,7 +12688,6 @@ void Player::ModifyHeight ( Event *ev ) - { str height = ev->GetString( 1 ); @@ -12866,7 +12728,6 @@ void Player::SetMovePosFlags ( Event *ev ) - { str sParm; @@ -12920,7 +12781,6 @@ void Player::GetPositionForScript ( Event *ev ) - { if( m_iMovePosFlags & MPF_POSITION_CROUCHING ) { @@ -12944,7 +12804,6 @@ void Player::GetMovementForScript ( Event *ev ) - { if( m_iMovePosFlags & MPF_MOVEMENT_WALKING ) { @@ -12968,7 +12827,6 @@ void Player::EventSetViewModelAnim ( Event *ev ) - { str anim; int force_restart = 0; @@ -12991,7 +12849,6 @@ void Player::EventDMMessage ( Event *ev ) - { int mode; str stuffstrings; @@ -13270,7 +13127,6 @@ void Player::EventIPrint ( Event *ev ) - { str sString = ev->GetString( 1 ); qboolean iBold = qfalse; @@ -13389,7 +13245,6 @@ bool Player::IsReady ( void ) const - { return m_bReady; } @@ -13398,7 +13253,6 @@ void Player::EventGetReady ( Event *ev ) - { ev->AddInteger( m_bReady ); } @@ -13407,7 +13261,6 @@ void Player::EventSetReady ( Event *ev ) - { if( m_bReady ) return; @@ -13420,7 +13273,6 @@ void Player::EventSetNotReady ( Event *ev ) - { if( !m_bReady ) return; @@ -13433,7 +13285,6 @@ void Player::EventGetDMTeam ( Event *ev ) - { if( dm_team == TEAM_FREEFORALL ) { @@ -13461,7 +13312,6 @@ void Player::EventSetPerferredWeapon ( Event *ev ) - { m_sPerferredWeaponOverride = ev->GetString( 1 ); } @@ -13470,7 +13320,6 @@ void Player::ReceivedItem ( Item * item ) - { } @@ -13479,7 +13328,6 @@ void Player::RemovedItem ( Item * item ) - { } @@ -13489,7 +13337,6 @@ void Player::AmmoAmountChanged Ammo * ammo, int ammo_in_clip ) - { str fullname; ScriptVariable * var; @@ -13514,7 +13361,6 @@ void Player::PhysicsOff ( Event *ev ) - { flags |= FL_IMMOBILE; } @@ -13523,7 +13369,6 @@ void Player::PhysicsOn ( Event *ev ) - { flags &= ~FL_IMMOBILE; } @@ -13532,7 +13377,6 @@ void Player::AttachToLadder ( Event *ev ) - { Vector vStart, vEnd, vOffset; trace_t trace; @@ -13574,7 +13418,6 @@ void Player::UnattachFromLadder ( Event *ev ) - { m_pLadder = NULL; } @@ -13583,7 +13426,6 @@ void Player::TweakLadderPos ( Event *ev ) - { FuncLadder *pLadder = ( FuncLadder * )m_pLadder.Pointer(); @@ -13596,7 +13438,6 @@ void Player::EnsureOverLadder ( Event *ev ) - { FuncLadder *pLadder = ( FuncLadder * )m_pLadder.Pointer(); @@ -13609,7 +13450,6 @@ void Player::EnsureForwardOffLadder ( Event *ev ) - { FuncLadder *pLadder = ( FuncLadder * )m_pLadder.Pointer(); @@ -13622,7 +13462,6 @@ void Player::RemoveFromVehiclesAndTurrets ( void ) - { if( m_pVehicle && m_pVehicle->isLocked() ) { @@ -13676,7 +13515,6 @@ void Player::WaitForState ( Event *ev ) - { waitForState = ev->GetString( 1 ); } @@ -13686,7 +13524,6 @@ void Player::SetDamageMultiplier ( Event *ev ) - { damage_multiplier = ev->GetFloat( 1 ); } @@ -13695,7 +13532,6 @@ void Player::SetTakePain ( Event *ev ) - { take_pain = ev->GetBoolean( 1 ); } @@ -13704,7 +13540,6 @@ void Player::Loaded ( void ) - { UpdateWeapons(); } @@ -13713,7 +13548,6 @@ void Player::PlayerShowModel ( Event *ev ) - { Entity::showModel(); UpdateWeapons(); @@ -13723,7 +13557,6 @@ void Player::showModel ( void ) - { Entity::showModel(); UpdateWeapons(); @@ -13733,7 +13566,6 @@ void Player::Spawned ( void ) - { Event *ev = new Event; @@ -13746,7 +13578,6 @@ void Player::AddKills ( Event *ev ) - { AddKills( ev->GetInteger( 1 ) ); } @@ -13755,7 +13586,6 @@ void Player::AddDeaths ( Event *ev ) - { AddDeaths( ev->GetInteger( 1 ) ); } @@ -13764,7 +13594,6 @@ void Player::AdminRights ( Event *ev ) - { // FIXME: Admin manager ? ev->AddInteger( 0 ); @@ -13774,7 +13603,6 @@ void Player::BindWeap ( Event *ev ) - { // FIXME: TODO } @@ -13783,7 +13611,6 @@ void Player::CanSwitchTeams ( Event *ev ) - { qboolean bAllow = ev->GetBoolean( 1 ); @@ -13800,7 +13627,6 @@ void Player::ClearCommand ( Event *ev ) - { str command; int clientNum = G_GetClientNumber( this ); @@ -13816,7 +13642,6 @@ void Player::Dive ( Event *ev ) - { float height, airborne_duration, speed; @@ -13841,7 +13666,6 @@ void Player::EventEarthquake ( Event *ev ) - { float duration = ev->GetFloat( 1 ); float magnitude = ev->GetFloat( 2 ); @@ -13870,7 +13694,6 @@ void Player::EventIsSpectator ( Event *ev ) - { ev->AddInteger( IsSpectator() ); } @@ -13879,7 +13702,6 @@ void Player::EventSetTeam ( Event *ev ) - { str team_name; teamtype_t teamType; @@ -13916,7 +13738,6 @@ void Player::EventGetViewModelAnim ( Event *ev ) - { ev->AddString( m_sVMcurrent ); } @@ -13925,7 +13746,6 @@ void Player::EventGetViewModelAnimFinished ( Event *ev ) - { ev->AddInteger( animDoneVM ); } @@ -13934,7 +13754,6 @@ void Player::EventGetViewModelAnimValid ( Event *ev ) - { str anim_name = ev->GetString( 1 ); str fullanim; @@ -13983,7 +13802,6 @@ void Player::FreezeControls ( Event *ev ) - { m_bFrozen = ev->GetBoolean( 1 ); } @@ -13992,7 +13810,6 @@ void Player::GetConnState ( Event *ev ) - { ScriptDeprecated( "Player::GetConnState" ); } @@ -14001,7 +13818,6 @@ void Player::GetDamageMultiplier ( Event *ev ) - { ev->AddFloat( damage_multiplier ); } @@ -14010,7 +13826,6 @@ void Player::GetDeaths ( Event *ev ) - { ev->AddInteger( num_deaths ); } @@ -14019,7 +13834,6 @@ void Player::GetKillHandler ( Event *ev ) - { if( m_pKilledEvent ) { ev->AddValue( m_pKilledEvent->GetValue( 1 ) ); @@ -14033,7 +13847,6 @@ void Player::GetKills ( Event *ev ) - { ev->AddInteger( num_kills ); } @@ -14042,7 +13855,6 @@ void Player::GetMoveSpeedScale ( Event *ev ) - { ev->AddFloat( speed_multiplier[ 0 ] ); } @@ -14051,7 +13863,6 @@ void Player::GetLegsState ( Event *ev ) - { const char *name; @@ -14069,7 +13880,6 @@ void Player::GetStateFile ( Event *ev ) - { int clientNum = G_GetClientNumber( this ); @@ -14087,7 +13897,6 @@ void Player::GetTorsoState ( Event *ev ) - { const char *name; @@ -14105,7 +13914,6 @@ void Player::HideEntity ( Event *ev ) - { // FIXME: todo } @@ -14114,7 +13922,6 @@ void Player::ShowEntity ( Event *ev ) - { // FIXME: REDO } @@ -14123,7 +13930,6 @@ void Player::Inventory ( Event *ev ) - { Entity *ent = NULL; ScriptVariable *ref = new ScriptVariable, *array = new ScriptVariable; @@ -14154,7 +13960,6 @@ void Player::InventorySet ( Event *ev ) - { ScriptVariable array; ScriptVariable * value; @@ -14210,7 +14015,6 @@ void Player::IsAdmin ( Event *ev ) - { // FIXME: Admin manager ? ev->AddInteger( 0 ); @@ -14220,7 +14024,6 @@ void Player::LeanLeftHeld ( Event *ev ) - { Player *player = NULL; int buttonheld = 0; @@ -14236,7 +14039,6 @@ void Player::LeanRightHeld ( Event *ev ) - { Player *player = NULL; int buttonheld = 0; @@ -14253,7 +14055,6 @@ void Player::ModifyHeightFloat ( Event *ev ) - { // params int height; @@ -14296,7 +14097,6 @@ void Player::PlayLocalSound ( Event *ev ) - { str soundName = ev->GetString( 1 ); qboolean loop = false; @@ -14364,7 +14164,6 @@ void Player::RunHeld ( Event *ev ) - { Player *player = NULL; int buttonheld = 0; @@ -14380,7 +14179,6 @@ void Player::SecFireHeld ( Event *ev ) - { Player *player = NULL; int buttonheld = 0; @@ -14396,7 +14194,6 @@ void Player::SetAnimSpeed ( Event *ev ) - { float speed; Player * player = ( Player * )this; @@ -14413,7 +14210,6 @@ void Player::SetClientFlag ( Event *ev ) - { str name = ev->GetString( 1 ); @@ -14424,7 +14220,6 @@ void Player::SetEntityShader ( Event *ev ) - { Entity *entity = ev->GetEntity( 1 ); str shadername = ev->GetString( 2 ); @@ -14447,7 +14242,6 @@ void Player::SetKillHandler ( Event *ev ) - { if( ev->IsNilAt( 1 ) || ( ev->IsStringAt( 1 ) && !ev->GetString( 1 ).icmp( "none" ) ) ) { @@ -14468,7 +14262,6 @@ void Player::SetLocalSoundRate ( Event *ev ) - { str name = ev->GetString( 1 ); float rate = ev->GetFloat( 2 ); @@ -14506,7 +14299,6 @@ void Player::SetSpeed ( Event *ev ) - { float speed; Player * player = ( Player * )this; @@ -14537,7 +14329,6 @@ void Player::SetStateFile ( Event *ev ) - { int clientNum = G_GetClientNumber( this ); qboolean bRemove = false; @@ -14566,7 +14357,6 @@ void Player::SetVMASpeed ( Event *ev ) - { str name = ev->GetString( 1 ); float speed = ev->GetFloat( 2 ); @@ -14599,7 +14389,6 @@ void Player::StopLocalSound ( Event *ev ) - { str soundName = ev->GetString( 1 ); float time; @@ -14628,7 +14417,6 @@ void Player::UseHeld ( Event *ev ) - { int buttonheld = 0; @@ -14641,7 +14429,6 @@ void Player::Userinfo ( Event *ev ) - { if( !client ) { @@ -14657,7 +14444,6 @@ void Player::VisionGetNaked ( Event *ev ) - { // return the global vision if( !m_sVision.length() ) { @@ -14672,7 +14458,6 @@ void Player::VisionSetBlur ( Event *ev ) - { float blur_level = ev->GetFloat( 1 ); float fade_time; @@ -14691,7 +14476,6 @@ void Player::VisionSetNaked ( Event *ev ) - { str vision = ev->GetString( 1 ); float fade_time; diff --git a/code/fgame/player.h b/code/fgame/player.h index 7607eacb..8526cc11 100644 --- a/code/fgame/player.h +++ b/code/fgame/player.h @@ -866,7 +866,6 @@ inline void Player::Archive ( Archiver &arc ) - { str tempStr; @@ -1143,7 +1142,6 @@ inline void Player::SetCamera Camera *ent, float switchTime ) - { camera = ent; client->ps.camera_time = switchTime; diff --git a/code/fgame/player_combat.cpp b/code/fgame/player_combat.cpp index c797f1d3..55dd0743 100644 --- a/code/fgame/player_combat.cpp +++ b/code/fgame/player_combat.cpp @@ -197,7 +197,6 @@ void Player::useWeapon Weapon *weapon, weaponhand_t hand ) - { Weapon * activeWeapon; @@ -258,7 +257,6 @@ void Player::AcquireHeadTarget ( void ) - { } diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp index 010d165b..a71edaa1 100644 --- a/code/fgame/player_util.cpp +++ b/code/fgame/player_util.cpp @@ -598,7 +598,6 @@ void Player::Stats ( Event *ev ) - { // FIXME: stub } @@ -607,7 +606,6 @@ void ClosePlayerLogFile ( void ) - { if( logfile ) { @@ -620,7 +618,6 @@ void Player::SkipCinematic ( Event *ev ) - { if( level.cinematic && ( level.RegisterSize( STRING_SKIP ) ) ) { diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp index 4376f880..d1a18800 100644 --- a/code/fgame/playerbot.cpp +++ b/code/fgame/playerbot.cpp @@ -91,7 +91,6 @@ void PlayerBot::Init ( void ) - { bot_manualmove = gi.Cvar_Get( "bot_manualmove", "0", 0 ); @@ -125,7 +124,6 @@ void PlayerBot::TurnThink ( void ) - { float diff, factor, maxchange, anglespeed, desired_speed; int i; @@ -185,7 +183,6 @@ void PlayerBot::CheckAttractiveNodes ( void ) - { for( int i = m_attractList.NumObjects(); i > 0; i-- ) { @@ -203,7 +200,6 @@ void PlayerBot::MoveThink ( void ) - { Vector vDir; Vector vAngles; @@ -344,7 +340,6 @@ void PlayerBot::CheckJump ( void ) - { Vector start; Vector end; @@ -412,7 +407,6 @@ void PlayerBot::CheckEndPos ( void ) - { Vector start; Vector end; @@ -441,7 +435,6 @@ void PlayerBot::CheckUse ( void ) - { Vector dir; Vector start; @@ -474,7 +467,6 @@ void PlayerBot::GetUsercmd ( usercmd_t *ucmd ) - { *ucmd = m_botCmd; } @@ -483,7 +475,6 @@ void PlayerBot::GetEyeInfo ( usereyes_t *eyeinfo ) - { *eyeinfo = m_botEyes; } @@ -492,7 +483,6 @@ void PlayerBot::UpdateBotStates ( void ) - { if( bot_manualmove->integer ) { @@ -528,7 +518,6 @@ void PlayerBot::SendCommand ( const char *text ) - { char *buffer; char *data; @@ -593,7 +582,6 @@ void PlayerBot::setAngles ( Vector ang ) - { Entity::setAngles( ang ); SetTargetAngles( angles ); @@ -603,7 +591,6 @@ void PlayerBot::updateOrigin ( void ) - { Entity::updateOrigin(); @@ -633,7 +620,6 @@ void PlayerBot::SetTargetAngles ( Vector vAngles ) - { m_vTargetAng = vAngles; } @@ -649,7 +635,6 @@ void PlayerBot::AimAt ( Vector vPos ) - { Vector vDelta = vPos - centroid; @@ -668,7 +653,6 @@ void PlayerBot::AimAtAimNode ( void ) - { if( m_Path.CurrentDelta() ) { @@ -693,7 +677,6 @@ void PlayerBot::CheckReload ( void ) - { Weapon *weap = GetActiveWeapon( WEAPON_MAIN ); @@ -716,7 +699,6 @@ Vector vPos, float *vLeashHome, float fLeashRadius ) - { m_bPathing = true; m_vTargetPos = vPos; @@ -743,7 +725,6 @@ bool PlayerBot::MoveToBestAttractivePoint ( int iMinPriority ) - { Container< AttractiveNode * > list; AttractiveNode *bestNode; @@ -866,7 +847,6 @@ bool PlayerBot::CanMoveTo ( Vector vPos ) - { return m_Path.DoesTheoreticPathExist( origin, vPos, NULL, 0, NULL, 0 ); } @@ -882,7 +862,6 @@ bool PlayerBot::MoveDone ( void ) - { return m_Path.Complete( origin ); } @@ -898,7 +877,6 @@ bool PlayerBot::IsMoving ( void ) - { return m_bPathing; } @@ -914,7 +892,6 @@ void PlayerBot::ClearMove ( void ) - { m_Path.Clear(); m_bPathing = false; @@ -934,7 +911,6 @@ void PlayerBot::MoveNear float *vLeashHome, float fLeashRadius ) - { m_bPathing = true; m_Path.FindPathNear( origin, vNear, this, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius ); @@ -963,7 +939,6 @@ void PlayerBot::AvoidPath float *vLeashHome, float fLeashRadius ) - { Vector vDir; @@ -1004,7 +979,6 @@ void PlayerBot::NoticeEvent float fDistanceSquared, float fRadiusSquared ) - { // Ignore teammates if( pEnt->IsSubclassOfPlayer() ) @@ -1063,7 +1037,6 @@ void PlayerBot::ClearEnemy ( void ) - { m_iAttackTime = 0; m_pEnemy = NULL; @@ -1089,7 +1062,6 @@ void PlayerBot::CheckStates ( void ) - { m_StateCount = 0; @@ -1159,7 +1131,6 @@ void PlayerBot::State_DefaultBegin ( void ) - { ClearMove(); } @@ -1168,7 +1139,6 @@ void PlayerBot::State_DefaultEnd ( void ) - { } @@ -1177,7 +1147,6 @@ void PlayerBot::State_Reset ( void ) - { m_iCuriousTime = 0; m_iAttackTime = 0; @@ -1199,7 +1168,6 @@ void PlayerBot::InitState_Idle ( botfunc_t *func ) - { func->CheckCondition = &PlayerBot::CheckCondition_Idle; func->ThinkState = &PlayerBot::State_Idle; @@ -1209,7 +1177,6 @@ bool PlayerBot::CheckCondition_Idle ( void ) - { if( m_iCuriousTime ) return false; @@ -1224,7 +1191,6 @@ void PlayerBot::State_Idle ( void ) - { AimAtAimNode(); CheckReload(); @@ -1258,7 +1224,6 @@ void PlayerBot::InitState_Curious ( botfunc_t *func ) - { func->CheckCondition = &PlayerBot::CheckCondition_Curious; func->ThinkState = &PlayerBot::State_Curious; @@ -1268,7 +1233,6 @@ bool PlayerBot::CheckCondition_Curious ( void ) - { if( m_iAttackTime ) { @@ -1294,7 +1258,6 @@ void PlayerBot::State_Curious ( void ) - { //AimAt( m_vLastCuriousPos ); AimAtAimNode(); @@ -1321,7 +1284,6 @@ void PlayerBot::InitState_Attack ( botfunc_t *func ) - { func->CheckCondition = &PlayerBot::CheckCondition_Attack; func->EndState = &PlayerBot::State_EndAttack; @@ -1359,7 +1321,6 @@ bool PlayerBot::CheckCondition_Attack ( void ) - { Container< Sentient * > sents = SentientList; @@ -1417,7 +1378,6 @@ void PlayerBot::State_EndAttack ( void ) - { m_botCmd.buttons &= ~( BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT ); } @@ -1426,7 +1386,6 @@ void PlayerBot::State_Attack ( void ) - { Player *p = ( Player * )m_pEnemy.Pointer(); bool bMelee = false; @@ -1545,7 +1504,6 @@ void PlayerBot::InitState_Grenade ( botfunc_t *func ) - { func->CheckCondition = &PlayerBot::CheckCondition_Grenade; func->ThinkState = &PlayerBot::State_Grenade; @@ -1555,7 +1513,6 @@ bool PlayerBot::CheckCondition_Grenade ( void ) - { // FIXME: TODO return false; @@ -1565,7 +1522,6 @@ void PlayerBot::State_Grenade ( void ) - { // FIXME: TODO } @@ -1581,7 +1537,6 @@ void PlayerBot::InitState_Weapon ( botfunc_t *func ) - { func->CheckCondition = &PlayerBot::CheckCondition_Weapon; func->BeginState = &PlayerBot::State_BeginWeapon; @@ -1591,7 +1546,6 @@ bool PlayerBot::CheckCondition_Weapon ( void ) - { return GetActiveWeapon( WEAPON_MAIN ) != BestWeapon( NULL, false, WEAPON_CLASS_THROWABLE ); } @@ -1600,7 +1554,6 @@ void PlayerBot::State_BeginWeapon ( void ) - { Weapon *weap = BestWeapon( NULL, false, WEAPON_CLASS_THROWABLE ); @@ -1617,7 +1570,6 @@ void PlayerBot::Spawned ( void ) - { ClearEnemy(); m_iCuriousTime = 0; @@ -1629,7 +1581,6 @@ void PlayerBot::Killed ( Event *ev ) - { Player::Killed( ev ); @@ -1652,7 +1603,6 @@ void PlayerBot::GotKill ( Event *ev ) - { Player::GotKill( ev ); @@ -1664,7 +1614,6 @@ void PlayerBot::EventStuffText ( Event *ev ) - { SendCommand( ev->GetString( 1 ) ); } diff --git a/code/fgame/playerstart.cpp b/code/fgame/playerstart.cpp index 1d0d6855..14b2badc 100644 --- a/code/fgame/playerstart.cpp +++ b/code/fgame/playerstart.cpp @@ -94,7 +94,6 @@ void PlayerStart::SetAngle ( Event *ev ) - { angles = Vector( 0, ev->GetFloat( 1 ), 0 ); } @@ -103,7 +102,6 @@ void PlayerStart::EventEnableSpawn ( Event *ev ) - { m_bForbidSpawns = false; } @@ -112,7 +110,6 @@ void PlayerStart::EventDisableSpawn ( Event *ev ) - { m_bForbidSpawns = true; } @@ -121,7 +118,6 @@ void PlayerStart::EventDeleteOnSpawn ( Event *ev ) - { m_bDeleteOnSpawn = true; } @@ -130,7 +126,6 @@ void PlayerStart::EventKeepOnSpawn ( Event *ev ) - { m_bDeleteOnSpawn = false; } diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp index 8c47c392..7214296c 100644 --- a/code/fgame/scriptmaster.cpp +++ b/code/fgame/scriptmaster.cpp @@ -954,7 +954,6 @@ void ScriptMaster::RegisterAliasInternal Event *ev, bool bCache ) - { #ifdef GAME_DLL int i; @@ -1027,7 +1026,6 @@ void ScriptMaster::RegisterAlias ( Event *ev ) - { RegisterAliasInternal( ev ); } @@ -1036,7 +1034,6 @@ void ScriptMaster::RegisterAliasAndCache ( Event *ev ) - { RegisterAliasInternal( ev, true ); } @@ -1045,7 +1042,6 @@ void ScriptMaster::Cache ( Event *ev ) - { #ifdef GAME_DLL if( !precache->integer ) diff --git a/code/fgame/scriptmaster.h b/code/fgame/scriptmaster.h index b8590189..2ca5e065 100644 --- a/code/fgame/scriptmaster.h +++ b/code/fgame/scriptmaster.h @@ -190,7 +190,6 @@ inline void ScriptEvent::Archive ( Archiver& arc ) - { label.Archive( arc ); } @@ -199,7 +198,6 @@ inline bool ScriptEvent::IsRegistered ( void ) - { return label.IsSet(); } @@ -208,7 +206,6 @@ inline void ScriptEvent::Trigger ( Event *ev ) - { if( label.IsSet() ) { diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp index b3cc9738..cf1a988f 100644 --- a/code/fgame/scriptslave.cpp +++ b/code/fgame/scriptslave.cpp @@ -720,7 +720,6 @@ void ScriptSlave::CheckNewOrders ( void ) - { // make sure position and angles are current if( !commandswaiting ) @@ -735,7 +734,6 @@ void ScriptSlave::NewMove ( void ) - { float dist; @@ -808,7 +806,6 @@ void ScriptSlave::DoMove ( Event *ev ) - { NewMove(); } @@ -862,7 +859,6 @@ void ScriptSlave::SetModelEvent ( Event *ev ) - { const char *m; @@ -944,7 +940,6 @@ void ScriptSlave::JumpTo ( Event *ev ) - { Entity *part; @@ -1045,7 +1040,6 @@ void ScriptSlave::MoveUp ( Event *ev ) - { CheckNewOrders(); NewPos[ 2 ] += ev->GetFloat( 1 ); @@ -1055,7 +1049,6 @@ void ScriptSlave::MoveDown ( Event *ev ) - { CheckNewOrders(); NewPos[ 2 ] -= ev->GetFloat( 1 ); @@ -1065,7 +1058,6 @@ void ScriptSlave::MoveNorth ( Event *ev ) - { CheckNewOrders(); NewPos[ 1 ] += ev->GetFloat( 1 ); @@ -1075,7 +1067,6 @@ void ScriptSlave::MoveSouth ( Event *ev ) - { CheckNewOrders(); NewPos[ 1 ] -= ev->GetFloat( 1 ); @@ -1085,7 +1076,6 @@ void ScriptSlave::MoveEast ( Event *ev ) - { CheckNewOrders(); NewPos[ 0 ] += ev->GetFloat( 1 ); @@ -1095,7 +1085,6 @@ void ScriptSlave::MoveWest ( Event *ev ) - { CheckNewOrders(); NewPos[ 0 ] -= ev->GetFloat( 1 ); @@ -1105,7 +1094,6 @@ void ScriptSlave::MoveForward ( Event *ev ) - { Vector v; Vector t; @@ -1122,7 +1110,6 @@ void ScriptSlave::MoveBackward ( Event *ev ) - { Vector v; Vector t; @@ -1139,7 +1126,6 @@ void ScriptSlave::MoveLeft ( Event *ev ) - { Vector v; Vector t; @@ -1156,7 +1142,6 @@ void ScriptSlave::MoveRight ( Event *ev ) - { Vector t; Vector v; @@ -1175,7 +1160,6 @@ void ScriptSlave::RotateXdownto ( Event *ev ) - { CheckNewOrders(); @@ -1190,7 +1174,6 @@ void ScriptSlave::RotateYdownto ( Event *ev ) - { CheckNewOrders(); @@ -1205,7 +1188,6 @@ void ScriptSlave::RotateZdownto ( Event *ev ) - { CheckNewOrders(); @@ -1220,7 +1202,6 @@ void ScriptSlave::RotateAxisdownto ( Event *ev ) - { int axis; CheckNewOrders(); @@ -1237,7 +1218,6 @@ void ScriptSlave::RotateXupto ( Event *ev ) - { CheckNewOrders(); @@ -1252,7 +1232,6 @@ void ScriptSlave::RotateYupto ( Event *ev ) - { CheckNewOrders(); @@ -1267,7 +1246,6 @@ void ScriptSlave::RotateZupto ( Event *ev ) - { CheckNewOrders(); @@ -1282,7 +1260,6 @@ void ScriptSlave::RotateAxisupto ( Event *ev ) - { int axis; CheckNewOrders(); @@ -1301,7 +1278,6 @@ void ScriptSlave::Rotatedownto ( Event *ev ) - { Vector ang; @@ -1330,7 +1306,6 @@ void ScriptSlave::Rotateupto ( Event *ev ) - { Vector ang; @@ -1359,7 +1334,6 @@ void ScriptSlave::Rotateto ( Event *ev ) - { Vector ang; @@ -1376,7 +1350,6 @@ void ScriptSlave::RotateXdown ( Event *ev ) - { CheckNewOrders(); NewAngles[ 0 ] = localangles[ 0 ] - ev->GetFloat( 1 ); @@ -1386,7 +1359,6 @@ void ScriptSlave::RotateYdown ( Event *ev ) - { CheckNewOrders(); NewAngles[ 1 ] = localangles[ 1 ] - ev->GetFloat( 1 ); @@ -1396,7 +1368,6 @@ void ScriptSlave::RotateZdown ( Event *ev ) - { CheckNewOrders(); NewAngles[ 2 ] = localangles[ 2 ] - ev->GetFloat( 1 ); @@ -1406,7 +1377,6 @@ void ScriptSlave::RotateAxisdown ( Event *ev ) - { int axis; CheckNewOrders(); @@ -1419,7 +1389,6 @@ void ScriptSlave::RotateXup ( Event *ev ) - { CheckNewOrders(); NewAngles[ 0 ] = localangles[ 0 ] + ev->GetFloat( 1 ); @@ -1429,7 +1398,6 @@ void ScriptSlave::RotateYup ( Event *ev ) - { CheckNewOrders(); NewAngles[ 1 ] = localangles[ 1 ] + ev->GetFloat( 1 ); @@ -1439,7 +1407,6 @@ void ScriptSlave::RotateZup ( Event *ev ) - { CheckNewOrders(); NewAngles[ 2 ] = localangles[ 2 ] + ev->GetFloat( 1 ); @@ -1449,7 +1416,6 @@ void ScriptSlave::RotateAxisup ( Event *ev ) - { int axis; CheckNewOrders(); @@ -1501,7 +1467,6 @@ void ScriptSlave::DamageFunc ( Event *ev ) - { Unregister( STRING_DAMAGE ); } @@ -1558,7 +1523,6 @@ void ScriptSlave::FollowPath ( Event *ev ) - { int i, argnum; Entity * ent; @@ -1637,7 +1601,6 @@ void ScriptSlave::FollowingPath ( Event *ev ) - { Vector pos; Vector orient; @@ -1978,7 +1941,6 @@ void ScriptSlave::EventFlyPath ( Event *ev ) - { SimpleEntity *path; @@ -2018,7 +1980,6 @@ void ScriptSlave::EventModifyFlyPath ( Event *ev ) - { m_fIdealDistance = 100.0f; @@ -2040,7 +2001,6 @@ void ScriptSlave::SetupPath cSpline< 4, 512 > *pPath, SimpleEntity *se ) - { str name; //int iObjNum; diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h index 160af630..be35d25a 100644 --- a/code/fgame/scriptslave.h +++ b/code/fgame/scriptslave.h @@ -162,7 +162,6 @@ inline void ScriptSlave::Archive ( Archiver &arc ) - { int tempInt; diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp index 13cae52e..88a2651e 100644 --- a/code/fgame/scriptthread.cpp +++ b/code/fgame/scriptthread.cpp @@ -2345,7 +2345,6 @@ void ScriptThread::Execute ( Event& ev ) - { Execute(&ev); } @@ -2354,7 +2353,6 @@ void ScriptThread::Execute ( Event* ev ) - { assert(m_ScriptVM); @@ -2393,7 +2391,6 @@ void ScriptThread::Execute ScriptVariable* data, int dataSize ) - { ScriptExecuteInternal(data, dataSize); } @@ -2402,7 +2399,6 @@ void ScriptThread::DelayExecute ( Event& ev ) - { DelayExecute(&ev); } @@ -2411,7 +2407,6 @@ void ScriptThread::DelayExecute ( Event* ev ) - { assert(m_ScriptVM); @@ -2584,7 +2579,6 @@ void ScriptThread::CreateReturnThread ( Event *ev ) - { m_ScriptVM->GetScriptClass()->CreateReturnThread( ev ); } @@ -2593,7 +2587,6 @@ void ScriptThread::CreateThread ( Event *ev ) - { m_ScriptVM->GetScriptClass()->CreateThread( ev ); } @@ -2602,7 +2595,6 @@ void ScriptThread::ExecuteReturnScript ( Event *ev ) - { m_ScriptVM->GetScriptClass()->ExecuteReturnScript( ev ); } @@ -2611,7 +2603,6 @@ void ScriptThread::ExecuteScript ( Event *ev ) - { m_ScriptVM->GetScriptClass()->ExecuteScript( ev ); } @@ -2620,7 +2611,6 @@ void ScriptThread::EventCreateListener ( Event *ev ) - { ev->AddListener( new Listener ); } @@ -2629,7 +2619,6 @@ void ScriptThread::CancelWaiting ( Event *ev ) - { CancelWaitingAll(); } @@ -2650,7 +2639,6 @@ void ScriptThread::GetAbs ( Event *ev ) - { ScriptVariable& val = ev->GetValue(1); if (val.GetType() == VARIABLE_INTEGER) @@ -2671,7 +2659,6 @@ void ScriptThread::ServerStufftext ( Event *ev ) - { gi.SendConsoleCommand( ev->GetString( 1 ) ); } @@ -2680,7 +2667,6 @@ void ScriptThread::RemoveArchivedClass ( Event *ev ) - { str classname; int except_entity_number = -1; @@ -2713,7 +2699,6 @@ void ScriptThread::SetTimer ( Event *ev ) - { int interval = -1; @@ -2743,7 +2728,6 @@ void ScriptThread::Angles_ToForward ( Event *ev ) - { Vector fwd; @@ -2755,7 +2739,6 @@ void ScriptThread::Angles_ToLeft ( Event *ev ) - { Vector left; @@ -2767,7 +2750,6 @@ void ScriptThread::Angles_ToUp ( Event *ev ) - { Vector up; @@ -2779,7 +2761,6 @@ void ScriptThread::Assert ( Event *ev ) - { assert( ev->GetFloat( 1 ) ); } @@ -2788,7 +2769,6 @@ void ScriptThread::Cache ( Event *ev ) - { #ifdef GAME_DLL CacheResource( ev->GetString( 1 ) ); @@ -2799,7 +2779,6 @@ void ScriptThread::CastBoolean ( Event *ev ) - { ev->AddInteger( ev->GetBoolean( 1 ) ); } @@ -2808,7 +2787,6 @@ void ScriptThread::CastEntity ( Event *ev ) - { ev->AddListener( ( Listener *)ev->GetEntity( 1 ) ); } @@ -2817,7 +2795,6 @@ void ScriptThread::CastFloat ( Event *ev ) - { ev->AddFloat( ev->GetFloat( 1 ) ); } @@ -2826,7 +2803,6 @@ void ScriptThread::CastInt ( Event *ev ) - { ev->AddInteger( ev->GetInteger( 1 ) ); } @@ -2835,7 +2811,6 @@ void ScriptThread::CastString ( Event *ev ) - { ev->AddString( ev->GetString( 1 ) ); } @@ -2845,7 +2820,6 @@ void ScriptThread::EventDelayThrow ( Event *ev ) - { if( !m_ScriptVM->m_PrevCodePos ) { return; @@ -2887,7 +2861,6 @@ void ScriptThread::EventEnd ( Event *ev ) - { if( ev->NumArgs() > 0 ) { @@ -2907,7 +2880,6 @@ void ScriptThread::EventTimeout ( Event *ev ) - { Director.maxTime = ev->GetFloat( 1 ) * 1000.0f + 0.5f; } @@ -2916,7 +2888,6 @@ void ScriptThread::EventError ( Event *ev ) - { if( ev->NumArgs() > 1 ) { @@ -2938,7 +2909,6 @@ void ScriptThread::EventGoto ( Event *ev ) - { m_ScriptVM->EventGoto( ev ); @@ -2957,7 +2927,6 @@ void ScriptThread::EventRegisterCommand ( Event *ev ) - { #ifdef CGAME_DLL ScriptThreadLabel scriptLabel; @@ -2972,7 +2941,6 @@ void ScriptThread::EventGetCvar ( Event *ev ) - { str s = gi.Cvar_Get( ev->GetString( 1 ), "", 0 )->string; @@ -2994,7 +2962,6 @@ void ScriptThread::EventSetCvar ( Event *ev ) - { gi.Cvar_Set( ev->GetString( 1 ), ev->GetString( 2 ) ); } @@ -3003,7 +2970,6 @@ void ScriptThread::EventThrow ( Event *ev ) - { if( !m_ScriptVM->m_PrevCodePos ) { return; @@ -3045,7 +3011,6 @@ void ScriptThread::EventWait ( Event *ev ) - { Wait( ev->GetFloat( 1 ) ); } @@ -3054,7 +3019,6 @@ void ScriptThread::EventWaitFrame ( Event *ev ) - { Wait( level.frametime ); } @@ -3063,7 +3027,6 @@ void ScriptThread::GetSelf ( Event *ev ) - { ev->AddListener( m_ScriptVM->GetScriptClass()->GetSelf() ); } @@ -3072,7 +3035,6 @@ void ScriptThread::Println ( Event *ev ) - { if( !developer->integer ) return; @@ -3085,7 +3047,6 @@ void ScriptThread::Print ( Event *ev ) - { if( !developer->integer ) return; @@ -3100,7 +3061,6 @@ void ScriptThread::MPrintln ( Event *ev ) - { SimpleEntity *m_Self = ( SimpleEntity * )m_ScriptVM->GetScriptClass()->GetSelf(); @@ -3117,7 +3077,6 @@ void ScriptThread::MPrint ( Event *ev ) - { SimpleEntity *m_Self = ( SimpleEntity * )m_ScriptVM->GetScriptClass()->GetSelf(); @@ -3136,7 +3095,6 @@ void ScriptThread::RandomFloat ( Event *ev ) - { ev->AddFloat( G_Random( ev->GetFloat( 1 ) ) ); } @@ -3145,7 +3103,6 @@ void ScriptThread::RandomInt ( Event *ev ) - { ev->AddInteger( G_Random( ev->GetInteger( 1 ) ) ); } @@ -3154,7 +3111,6 @@ void ScriptThread::Spawn ( Event *ev ) - { Listener *listener = SpawnInternal( ev ); @@ -3168,7 +3124,6 @@ Listener *ScriptThread::SpawnInternal ( Event *ev ) - { SpawnArgs args; str classname; @@ -3244,7 +3199,6 @@ void ScriptThread::SpawnReturn ( Event *ev ) - { Listener *listener = SpawnInternal( ev ); @@ -3260,7 +3214,6 @@ void ScriptThread::EventVectorAdd ( Event *ev ) - { ev->AddVector( ev->GetVector( 1 ) + ev->GetVector( 2 ) ); } @@ -3269,7 +3222,6 @@ void ScriptThread::EventVectorCloser ( Event *ev ) - { } @@ -3278,7 +3230,6 @@ void ScriptThread::EventVectorCross ( Event *ev ) - { ev->AddVector( Vector::Cross( ev->GetVector( 1 ), ev->GetVector( 2 ) ) ); } @@ -3287,7 +3238,6 @@ void ScriptThread::EventVectorDot ( Event *ev ) - { Vector vector1 = ev->GetVector( 1 ), vector2 = ev->GetVector( 2 ); @@ -3298,7 +3248,6 @@ void ScriptThread::EventVectorLength ( Event *ev ) - { ev->AddFloat( ev->GetVector( 1 ).length() ); } @@ -3307,7 +3256,6 @@ void ScriptThread::EventVectorNormalize ( Event *ev ) - { Vector vector = ev->GetVector( 1 ); @@ -3320,7 +3268,6 @@ void ScriptThread::EventVectorScale ( Event *ev ) - { Vector vector = ev->GetVector( 1 ); @@ -3333,7 +3280,6 @@ void ScriptThread::EventVectorSubtract ( Event *ev ) - { ev->AddVector( ev->GetVector( 1 ) - ev->GetVector( 2 ) ); } @@ -3342,7 +3288,6 @@ void ScriptThread::EventVectorToAngles ( Event *ev ) - { ev->AddVector( ev->GetVector( 1 ).toAngles() ); } @@ -3351,7 +3296,6 @@ void ScriptThread::EventVectorWithin ( Event *ev ) - { Vector delta; float dist = ev->GetFloat( 2 ); @@ -3366,7 +3310,6 @@ void ScriptThread::EventGetBoundKey1 ( Event *ev ) - { int iKey1; int iKey2; @@ -3383,7 +3326,6 @@ void ScriptThread::EventGetBoundKey2 ( Event *ev ) - { int iKey1; int iKey2; @@ -3400,7 +3342,6 @@ void ScriptThread::EventLocConvertString ( Event *ev ) - { ev->AddString( gi.LV_ConvertString( ev->GetString( 1 ) ) ); } @@ -3411,7 +3352,6 @@ void ScriptThread::MapEvent ( Event *ev ) - { if( level.mission_failed ) return; @@ -3423,7 +3363,6 @@ void ScriptThread::EventSightTrace ( Event *ev ) - { int content_mask = MASK_LINE; Vector start; @@ -3468,7 +3407,6 @@ void ScriptThread::EventTrace ( Event *ev ) - { int content_mask = MASK_LINE; Vector start; @@ -3515,7 +3453,6 @@ void ScriptThread::TriggerEvent ( Event *ev ) - { ScriptVariable var; Entity *ent; @@ -3541,7 +3478,6 @@ void ScriptThread::ServerEvent ( Event *ev ) - { Event *event = new Event( ev->GetString( 1 ) ); @@ -3557,7 +3493,6 @@ void ScriptThread::StuffCommand ( Event *ev ) - { gi.SendConsoleCommand( va( "%s\n", ev->GetString( 1 ).c_str() ) ); } @@ -3627,7 +3562,6 @@ void ScriptThread::CreateHUD ( Event *ev ) - { int clientNum = -1; @@ -3649,7 +3583,6 @@ void ScriptThread::IPrintln ( Event *ev ) - { G_PrintToAllClients( gi.LV_ConvertString( ev->GetString( 1 ) ), false ); } @@ -3658,7 +3591,6 @@ void ScriptThread::IPrintln_NoLoc ( Event *ev ) - { G_PrintToAllClients( ev->GetString( 1 ), false ); } @@ -3667,7 +3599,6 @@ void ScriptThread::IPrintlnBold ( Event *ev ) - { G_PrintToAllClients( gi.LV_ConvertString( ev->GetString( 1 ) ), true ); } @@ -3676,7 +3607,6 @@ void ScriptThread::IPrintlnBold_NoLoc ( Event *ev ) - { G_PrintToAllClients( ev->GetString( 1 ), true ); } @@ -3692,7 +3622,6 @@ void ScriptThread::Earthquake ( Event *ev ) - { float duration = ev->GetFloat( 1 ); float magnitude = ev->GetFloat( 2 ); @@ -3718,7 +3647,6 @@ void ScriptThread::EventIsAlive ( Event *ev ) - { Entity *ent = ev->GetEntity( 1 ); @@ -3737,7 +3665,6 @@ void ScriptThread::AddObjective ( Event* ev ) - { int index; int status; @@ -3835,7 +3762,6 @@ void ScriptThread::ClearObjectiveLocation ( Event* ev ) - { ClearObjectiveLocation(); } @@ -3849,7 +3775,6 @@ void ScriptThread::SetObjectiveLocation ( Event* ev ) - { SetObjectiveLocation(ev->GetVector(1)); } @@ -3863,7 +3788,6 @@ void ScriptThread::SetCurrentObjective ( Event* ev ) - { int iObjective = ev->GetInteger(1); @@ -3896,7 +3820,6 @@ void ScriptThread::AllAIOff ( Event* ev ) - { level.ai_on = qfalse; } @@ -3905,7 +3828,6 @@ void ScriptThread::AllAIOn ( Event* ev ) - { level.ai_on = qtrue; } @@ -3914,7 +3836,6 @@ void ScriptThread::EventTeamWin ( Event* ev ) - { const_str team; int teamnum; @@ -3945,7 +3866,6 @@ void ScriptThread::Angles_PointAt ( Event* ev ) - { Entity* pParent, * pEnt, * pTarget; Vector vDelta, vVec, vAngles; @@ -3976,7 +3896,6 @@ void ScriptThread::EventEarthquake ( Event* ev ) - { earthquake_t e; @@ -4002,7 +3921,6 @@ void ScriptThread::CueCamera ( Event* ev ) - { float switchTime; Entity* ent; @@ -4031,7 +3949,6 @@ void ScriptThread::CuePlayer ( Event* ev ) - { float switchTime; @@ -4051,7 +3968,6 @@ void ScriptThread::FreezePlayer ( Event* ev ) - { level.playerfrozen = true; } @@ -4060,7 +3976,6 @@ void ScriptThread::ReleasePlayer ( Event* ev ) - { level.playerfrozen = false; } @@ -4069,7 +3984,6 @@ void ScriptThread::EventDrawHud ( Event* ev ) - { int i; gentity_t* ent; @@ -4096,7 +4010,6 @@ void ScriptThread::EventRadiusDamage ( Event* ev ) - { Vector origin = ev->GetVector(1); float damage = ev->GetFloat(2); @@ -4119,7 +4032,6 @@ void ScriptThread::ForceMusicEvent ( Event* ev ) - { const char* current; const char* fallback; @@ -4139,7 +4051,6 @@ void ScriptThread::EventPrint3D ( Event* ev ) - { Vector origin; float scale; @@ -4156,7 +4067,6 @@ void ScriptThread::SoundtrackEvent ( Event* ev ) - { ChangeSoundtrack(ev->GetString(1)); } @@ -4165,7 +4075,6 @@ void ScriptThread::RestoreSoundtrackEvent ( Event* ev ) - { RestoreSoundtrack(); } @@ -4174,7 +4083,6 @@ void ScriptThread::EventBspTransition ( Event* ev ) - { str map = ev->GetString(1); @@ -4188,7 +4096,6 @@ void ScriptThread::EventLevelTransition ( Event* ev ) - { str map = ev->GetString(1); @@ -4202,7 +4109,6 @@ void ScriptThread::EventMissionTransition ( Event* ev ) - { str map = ev->GetString(1); @@ -4216,7 +4122,6 @@ void ScriptThread::Letterbox ( Event* ev ) - { level.m_letterbox_fraction = 1.0f / 8.0f; level.m_letterbox_time = ev->GetFloat(1); @@ -4231,7 +4136,6 @@ void ScriptThread::ClearLetterbox ( Event* ev ) - { level.m_letterbox_time = level.m_letterbox_time_start; level.m_letterbox_dir = letterbox_out; @@ -4241,7 +4145,6 @@ void ScriptThread::SetLightStyle ( Event* ev ) - { lightStyles.SetLightStyle(ev->GetInteger(1), ev->GetString(2)); } @@ -4250,7 +4153,6 @@ void ScriptThread::FadeIn ( Event* ev ) - { level.m_fade_time_start = ev->GetFloat(1); level.m_fade_time = ev->GetFloat(1); @@ -4271,7 +4173,6 @@ void ScriptThread::ClearFade ( Event* ev ) - { level.m_fade_time = -1; level.m_fade_type = fadein; @@ -4281,7 +4182,6 @@ void ScriptThread::FadeOut ( Event* ev ) - { level.m_fade_time_start = ev->GetFloat(1); level.m_fade_time = ev->GetFloat(1); @@ -4302,7 +4202,6 @@ void ScriptThread::MusicEvent ( Event* ev ) - { const char* current; const char* fallback; @@ -4321,7 +4220,6 @@ void ScriptThread::MusicVolumeEvent ( Event* ev ) - { float volume; float fade_time; @@ -4348,7 +4246,6 @@ void ScriptThread::SetCinematic ( Event* ev ) - { G_StartCinematic(); } @@ -4357,7 +4254,6 @@ void ScriptThread::SetNonCinematic ( Event* ev ) - { G_StopCinematic(); } @@ -4366,7 +4262,6 @@ void ScriptThread::CenterPrint ( Event* ev ) - { int j; gentity_t* other; @@ -4385,7 +4280,6 @@ void ScriptThread::LocationPrint ( Event* ev ) - { int j; gentity_t* other; @@ -4408,7 +4302,6 @@ void ScriptThread::KillEnt ( Event* ev ) - { int num; Entity* ent; @@ -4432,7 +4325,6 @@ void ScriptThread::RemoveEnt ( Event* ev ) - { int num; Entity* ent; @@ -4456,7 +4348,6 @@ void ScriptThread::KillClass ( Event* ev ) - { int except; str classname; @@ -4503,7 +4394,6 @@ void ScriptThread::RemoveClass ( Event* ev ) - { int except; str classname; @@ -4548,7 +4438,6 @@ void ScriptThread::CameraCommand ( Event* ev ) - { Event* e; const char* cmd; @@ -4583,7 +4472,6 @@ void ScriptThread::MissionFailed ( Event* ev ) - { G_MissionFailed(); } @@ -4592,7 +4480,6 @@ void ScriptThread::EventHudDrawShader ( Event *ev ) - { int index = -1; str shadername; @@ -4613,7 +4500,6 @@ void ScriptThread::EventHudDrawAlign ( Event *ev ) - { int index = -1; int h_alignement = -1; @@ -4673,7 +4559,6 @@ void ScriptThread::EventHudDrawRect ( Event *ev ) - { int index = -1; int x = 0; @@ -4700,7 +4585,6 @@ void ScriptThread::EventHudDrawVirtualSize ( Event *ev ) - { int index = -1; int virt = -1; @@ -4723,7 +4607,6 @@ void ScriptThread::EventHudDrawColor ( Event *ev ) - { int numArgs = -1; int index = -1; @@ -4751,7 +4634,6 @@ void ScriptThread::EventHudDrawAlpha ( Event *ev ) - { int index = -1; float alpha = 0.0f; @@ -4773,7 +4655,6 @@ void ScriptThread::EventHudDrawString ( Event *ev ) - { int index = -1; str string; @@ -4794,7 +4675,6 @@ void ScriptThread::EventHudDrawFont ( Event *ev ) - { int index = -1; str fontname; @@ -4815,7 +4695,6 @@ void ScriptThread::FadeSound ( Event *ev ) - { // params float delaytime; @@ -4847,7 +4726,6 @@ void ScriptThread::RestoreSound ( Event *ev ) - { // params float delaytime; @@ -4882,7 +4760,6 @@ void ScriptThread::EventHudDraw3d ( Event* ev ) - { int index; float* tmp; @@ -4911,7 +4788,6 @@ void ScriptThread::EventHudDrawTimer ( Event* ev ) - { int index; float duration; @@ -4934,7 +4810,6 @@ void ScriptThread::CanSwitchTeams ( Event* ev ) - { qboolean bAllow = ev->GetBoolean(1); @@ -4952,7 +4827,6 @@ void ScriptThread::GetEntity ( Event* ev ) - { int entnum = -1; Entity* ent; @@ -4971,7 +4845,6 @@ void ScriptThread::GetPlayerNetname ( Event* ev ) - { Entity* ent = NULL; @@ -4996,7 +4869,6 @@ void ScriptThread::GetPlayerIP ( Event* ev ) - { Entity* ent = NULL; char* ip = NULL; @@ -5026,7 +4898,6 @@ void ScriptThread::GetPlayerPing ( Event* ev ) - { Entity* ent = NULL; @@ -5053,7 +4924,6 @@ void ScriptThread::GetPlayerClientNum ( Event* ev ) - { Entity* ent = NULL; @@ -5079,7 +4949,6 @@ void ScriptThread::GetAreaEntities ( Event* ev ) - { Vector origin; Vector mins; @@ -5127,7 +4996,6 @@ void ScriptThread::GetEntArray ( Event* ev ) - { str name = ev->GetString(1); str key = ev->GetString(2); @@ -5226,7 +5094,6 @@ void ScriptThread::EventIHudDraw3d ( Event* ev ) - { Player* player; int index; @@ -5263,7 +5130,6 @@ void ScriptThread::EventIHudDrawTimer ( Event* ev ) - { Player* player; int index; @@ -5294,7 +5160,6 @@ void ScriptThread::EventIHudDrawShader ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5331,7 +5196,6 @@ void ScriptThread::EventIHudDrawAlign ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5419,7 +5283,6 @@ void ScriptThread::EventIHudDrawRect ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5462,7 +5325,6 @@ void ScriptThread::EventIHudDrawVirtualSize ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5501,7 +5363,6 @@ void ScriptThread::EventIHudDrawColor ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5541,7 +5402,6 @@ void ScriptThread::EventIHudDrawAlpha ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5576,7 +5436,6 @@ void ScriptThread::EventIHudDrawString ( Event* ev ) - { int numArgs = -1; int index = -1; @@ -5614,7 +5473,6 @@ void ScriptThread::EventIHudDrawFont ( Event* ev ) - { int index; Entity* player = NULL; @@ -5648,7 +5506,6 @@ void ScriptThread::EventIsOnGround ( Event* ev ) - { Entity* entity = ev->GetEntity(1); @@ -5659,7 +5516,6 @@ void ScriptThread::EventIsOutOfBounds ( Event* ev ) - { Entity* entity = ev->GetEntity(1); int areanum = gi.AreaForPoint(entity->origin); @@ -5676,7 +5532,6 @@ void ScriptThread::TeamGetScore ( Event *ev ) - { str teamname = ev->GetString( 1 ); DM_Team *team = dmManager.GetTeam( teamname ); @@ -5695,7 +5550,6 @@ void ScriptThread::TeamSetScore ( Event *ev ) - { str teamname; DM_Team *team; @@ -5740,7 +5594,6 @@ void ScriptThread::CharToInt ( Event* ev ) - { str c = ev->GetString(1); @@ -5751,7 +5604,6 @@ void ScriptThread::Conprintf ( Event* ev ) - { gi.Printf("%s", ev->GetString(1).c_str()); } @@ -5760,7 +5612,6 @@ void ScriptThread::FileOpen ( Event* ev ) - { int numArgs = -1; str filename; @@ -5803,7 +5654,6 @@ void ScriptThread::FileWrite ( Event* ev ) - { } @@ -5812,7 +5662,6 @@ void ScriptThread::FileRead ( Event* ev ) - { } @@ -5821,7 +5670,6 @@ void ScriptThread::FileClose ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -5888,7 +5736,6 @@ void ScriptThread::FileEof ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -5914,7 +5761,6 @@ void ScriptThread::FileSeek ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -5956,7 +5802,6 @@ void ScriptThread::FileTell ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -5982,7 +5827,6 @@ void ScriptThread::FileRewind ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6007,7 +5851,6 @@ void ScriptThread::FilePutc ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6036,7 +5879,6 @@ void ScriptThread::FilePuts ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6065,7 +5907,6 @@ void ScriptThread::FileGetc ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6091,7 +5932,6 @@ void ScriptThread::FileGets ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6140,7 +5980,6 @@ void ScriptThread::FileError ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6166,7 +6005,6 @@ void ScriptThread::FileFlush ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6193,7 +6031,6 @@ void ScriptThread::FileExists ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6227,7 +6064,6 @@ void ScriptThread::FileReadAll ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6272,7 +6108,6 @@ void ScriptThread::FileSaveAll ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6306,7 +6141,6 @@ void ScriptThread::FileRemove ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6335,7 +6169,6 @@ void ScriptThread::FileRename ( Event* ev ) - { int id = 0; int numArgs = 0; @@ -6369,7 +6202,6 @@ void ScriptThread::FileCopy ( Event* ev ) - { size_t n = 0; int numArgs = 0; @@ -6438,7 +6270,6 @@ void ScriptThread::FileReadPak ( Event* ev ) - { str filename; char* content = NULL; @@ -6474,7 +6305,6 @@ void ScriptThread::FileList ( Event* ev ) - { int i = 0, numArgs = 0; const char* path = NULL; @@ -6529,7 +6359,6 @@ void ScriptThread::FileNewDirectory ( Event* ev ) - { str path; int numArgs = 0; @@ -6563,7 +6392,6 @@ void ScriptThread::FileRemoveDirectory ( Event* ev ) - { str path; int numArgs = 0; @@ -6597,7 +6425,6 @@ void ScriptThread::GetArrayKeys ( Event* ev ) - { Entity* ent = NULL; ScriptVariable array; @@ -6646,7 +6473,6 @@ void ScriptThread::GetArrayValues ( Event* ev ) - { Entity* ent = NULL; ScriptVariable array; @@ -6691,7 +6517,6 @@ void ScriptThread::GetDate ( Event* ev ) - { char buff[1024]; @@ -6710,7 +6535,6 @@ void ScriptThread::GetTimeZone ( Event* ev ) - { int gmttime; int local; @@ -6744,7 +6568,6 @@ void ScriptThread::PregMatch ( Event* ev ) - { slre_cap sl_cap[32]; int i, j; @@ -6799,7 +6622,6 @@ void ScriptThread::EventIsArray ( Event* ev ) - { ScriptVariable* value = &ev->GetValue(1); @@ -6814,7 +6636,6 @@ void ScriptThread::EventIsDefined ( Event* ev ) - { ev->AddInteger(!ev->IsNilAt(1)); } @@ -6823,7 +6644,6 @@ void ScriptThread::FlagClear ( Event* ev ) - { str name; Flag* flag; @@ -6843,7 +6663,6 @@ void ScriptThread::FlagInit ( Event* ev ) - { str name; Flag* flag; @@ -6867,7 +6686,6 @@ void ScriptThread::FlagSet ( Event* ev ) - { str name; Flag* flag; @@ -6887,7 +6705,6 @@ void ScriptThread::FlagWait ( Event* ev ) - { str name; Flag* flag; @@ -6907,7 +6724,6 @@ void ScriptThread::MathCos ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -6929,7 +6745,6 @@ void ScriptThread::MathSin ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -6951,7 +6766,6 @@ void ScriptThread::MathTan ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -6973,7 +6787,6 @@ void ScriptThread::MathACos ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -6995,7 +6808,6 @@ void ScriptThread::MathASin ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7017,7 +6829,6 @@ void ScriptThread::MathATan ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7039,7 +6850,6 @@ void ScriptThread::MathATan2 ( Event* ev ) - { int numArgs = 0; double x = 0.0f, y = 0.0f, res = 0.0f; @@ -7063,7 +6873,6 @@ void ScriptThread::MathCosH ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7085,7 +6894,6 @@ void ScriptThread::MathSinH ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7107,7 +6915,6 @@ void ScriptThread::MathTanH ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7129,7 +6936,6 @@ void ScriptThread::MathExp ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7151,7 +6957,6 @@ void ScriptThread::MathFrexp ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7191,7 +6996,6 @@ void ScriptThread::MathLdexp ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7216,7 +7020,6 @@ void ScriptThread::MathLog ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7238,7 +7041,6 @@ void ScriptThread::MathLog10 ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7260,7 +7062,6 @@ void ScriptThread::MathModf ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7300,7 +7101,6 @@ void ScriptThread::MathPow ( Event* ev ) - { int numArgs = 0; double base = 0.0f, res = 0.0f; @@ -7324,7 +7124,6 @@ void ScriptThread::MathSqrt ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7346,7 +7145,6 @@ void ScriptThread::MathCeil ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7368,7 +7166,6 @@ void ScriptThread::MathFloor ( Event* ev ) - { int numArgs = 0; double x = 0.0f, res = 0.0f; @@ -7390,7 +7187,6 @@ void ScriptThread::MathFmod ( Event* ev ) - { int numArgs = 0; double numerator = 0.0f, denominator = 0.0f, res = 0.0f; @@ -7506,7 +7302,6 @@ void ScriptThread::Md5File ( Event* ev ) - { char hash[64]; str filename; @@ -7534,7 +7329,6 @@ void ScriptThread::StringBytesCopy ( Event* ev ) - { int bytes = ev->GetInteger(1); str source = ev->GetString(2); @@ -7554,7 +7348,6 @@ void ScriptThread::Md5String ( Event* ev ) - { char hash[64]; str text; @@ -7634,7 +7427,6 @@ void ScriptThread::RegisterEvent ( Event* ev ) - { str eventname; char eventname_full[64]; @@ -7673,7 +7465,6 @@ void ScriptThread::UnregisterEvent ( Event* ev ) - { str eventname; int numArgs = 0; @@ -7719,7 +7510,6 @@ void ScriptThread::TypeOfVariable ( Event* ev ) - { int numArgs = 0; char* type = NULL; @@ -7742,7 +7532,6 @@ void ScriptThread::VisionGetNaked ( Event* ev ) - { ev->AddString(vision_current); } @@ -7751,7 +7540,6 @@ void ScriptThread::VisionSetNaked ( Event* ev ) - { str vision = ev->GetString(1); float fade_time; @@ -7786,7 +7574,6 @@ void ScriptThread::GetTime ( Event* ev ) - { int timearray[3], gmttime; char buff[1024]; @@ -7818,7 +7605,6 @@ void ScriptThread::TraceDetails ( Event* ev ) - { int numArgs = 0; diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp index 8aa4dae9..433aa3b8 100644 --- a/code/fgame/sentient.cpp +++ b/code/fgame/sentient.cpp @@ -744,7 +744,6 @@ Vector Sentient::GunPosition ( void ) - { Vector vPos; @@ -764,7 +763,6 @@ Vector Sentient::GunTarget ( bool bNoCollision ) - { Vector vPos; @@ -848,7 +846,6 @@ void Sentient::ChargeWeapon ( Event *ev ) - { firemode_t mode = FIRE_PRIMARY; weaponhand_t hand = WEAPON_MAIN; @@ -883,7 +880,6 @@ void Sentient::ChargeWeapon weaponhand_t hand, firemode_t mode ) - { Weapon * activeWeapon; @@ -911,7 +907,6 @@ void Sentient::FireWeapon ( Event *ev ) - { firemode_t mode = FIRE_PRIMARY; int number = 0; @@ -965,7 +960,6 @@ void Sentient::FireWeapon int number, firemode_t mode ) - { Weapon *activeWeapon = activeWeaponList[ number ]; @@ -994,7 +988,6 @@ void Sentient::StopFireWeapon ( Event *ev ) - { Weapon *activeWeapon; int number = 0; @@ -1031,7 +1024,6 @@ void Sentient::ReleaseFireWeapon int number, firemode_t mode ) - { float charge_time = level.time - charge_start_time; @@ -1055,7 +1047,6 @@ void Sentient::ReleaseFireWeapon ( Event *ev ) - { firemode_t mode = FIRE_PRIMARY; int number = 0; @@ -1108,7 +1099,6 @@ void Sentient::AddItem ( Item *object ) - { inventory.AddObject( object->entnum ); } @@ -1117,7 +1107,6 @@ void Sentient::RemoveItem ( Item *object ) - { if( !inventory.IndexOfObject( object->entnum ) ) { return; @@ -1138,7 +1127,6 @@ void Sentient::RemoveWeapons ( void ) - { for( int i = inventory.NumObjects(); i > 0; i-- ) { @@ -1156,7 +1144,6 @@ Weapon *Sentient::GetWeapon ( int index ) - { for( int i = inventory.NumObjects(); i > 0; i-- ) { @@ -1181,7 +1168,6 @@ Item *Sentient::FindItemByExternalName ( const char *itemname ) - { int num; int i; @@ -1205,7 +1191,6 @@ Item *Sentient::FindItemByModelname ( const char *mdl ) - { int num; int i; @@ -1236,7 +1221,6 @@ Item *Sentient::FindItemByClassName ( const char *classname ) - { int num; int i; @@ -1260,7 +1244,6 @@ Item *Sentient::FindItem ( const char *itemname ) - { Item *item; @@ -1280,7 +1263,6 @@ void Sentient::AttachAllActiveWeapons ( void ) - { int i; @@ -1303,7 +1285,6 @@ void Sentient::DetachAllActiveWeapons ( void ) - { int i; @@ -1320,7 +1301,6 @@ void Sentient::FreeInventory ( void ) - { int num; int i; @@ -1358,7 +1338,6 @@ qboolean Sentient::HasItem ( const char *itemname ) - { return ( FindItem( itemname ) != NULL ); } @@ -1367,7 +1346,6 @@ qboolean Sentient::HasWeaponClass ( int iWeaponClass ) - { int i; Weapon *weapon; @@ -1394,7 +1372,6 @@ qboolean Sentient::HasPrimaryWeapon ( void ) - { int i; Weapon *weapon; @@ -1421,7 +1398,6 @@ qboolean Sentient::HasSecondaryWeapon ( void ) - { int i; Weapon *weapon; @@ -1474,7 +1450,6 @@ void Sentient::PutawayWeapon ( Event *ev ) - { Weapon * weapon; weaponhand_t hand; @@ -1499,7 +1474,6 @@ void Sentient::WeaponCommand ( Event *ev ) - { weaponhand_t hand; Weapon *weap; @@ -1528,7 +1502,6 @@ void Sentient::ChangeWeapon Weapon *weapon, weaponhand_t hand ) - { if( ( hand > MAX_ACTIVE_WEAPONS ) || ( hand < 0 ) ) { @@ -1547,7 +1520,6 @@ void Sentient::DeactivateWeapon ( weaponhand_t hand ) - { int i; @@ -1589,7 +1561,6 @@ void Sentient::DeactivateWeapon ( Weapon *weapon ) - { int i; @@ -1609,7 +1580,6 @@ void Sentient::ActivateWeapon Weapon *weapon, weaponhand_t hand ) - { int i; @@ -1710,7 +1680,6 @@ Weapon *Sentient::NextWeapon ( Weapon *weapon ) - { Item *item; int i; @@ -1776,7 +1745,6 @@ Weapon *Sentient::PreviousWeapon ( Weapon *weapon ) - { Item *item; int i; @@ -1927,7 +1895,6 @@ Item *Sentient::giveItem str itemname, int amount ) - { ClassDef *cls; Item *item; @@ -2007,7 +1974,6 @@ void Sentient::takeItem ( const char *name ) - { Item * item; @@ -2034,7 +2000,6 @@ void Sentient::takeAmmoType ( const char *name ) - { Ammo *ammo; @@ -2052,7 +2017,6 @@ void Sentient::useWeapon const char *weaponname, weaponhand_t hand ) - { Weapon *weapon; @@ -2080,7 +2044,6 @@ void Sentient::useWeapon Weapon *weapon, weaponhand_t hand ) - { assert( weapon ); @@ -2122,7 +2085,6 @@ void Sentient::EventTake ( Event *ev ) - { takeItem( ev->GetString( 1 ) ); } @@ -2131,7 +2093,6 @@ void Sentient::EventFreeInventory ( Event *ev ) - { FreeInventory(); } @@ -2229,7 +2190,6 @@ void Sentient::ArmorDamage ( Event *ev ) - { Entity *inflictor; Sentient *attacker; @@ -2898,7 +2858,6 @@ void Sentient::DropInventoryItems ( void ) - { int num; int i; @@ -2972,7 +2931,6 @@ void Sentient::Archive ( Archiver &arc ) - { int i; int num; @@ -3310,7 +3268,6 @@ int Sentient::AmmoCount ( str type ) - { Ammo *ammo; @@ -3329,7 +3286,6 @@ int Sentient::MaxAmmoCount ( str type ) - { Ammo *ammo; @@ -3347,7 +3303,6 @@ void Sentient::GiveAmmo int amount, int maxamount ) - { Ammo *ammo; @@ -3417,7 +3372,6 @@ void Sentient::AmmoAmountInClipChanged str type, int amount_in_clip ) - { int count, i; @@ -3568,7 +3522,6 @@ void Sentient::TryLightOnFire int meansofdeath, Entity *attacker ) - { gi.Printf( "Sentient::TryLightOnFire not implemented. Needs fixed" ); } @@ -3577,7 +3530,6 @@ void Sentient::OnFire ( Event *ev ) - { gi.Printf( "Sentient::OnFire not implemented. Needs fixed" ); } @@ -3586,7 +3538,6 @@ void Sentient::StopOnFire ( Event *ev ) - { gi.Printf( "Sentient::StopOnFire not implemented. Needs fixed" ); } @@ -3761,7 +3712,6 @@ void Sentient::Holster ( qboolean putaway ) - { Weapon *rightWeap; @@ -3832,7 +3782,6 @@ void Sentient::ActivateNewWeapon ( Event *ev ) - { if( deadflag ) { return; @@ -3853,7 +3802,6 @@ void Sentient::ActivateNewWeapon ( void ) - { // Change the weapon to the currently active weapon as specified by useWeapon ChangeWeapon( newActiveWeapon.weapon, newActiveWeapon.hand ); @@ -3869,7 +3817,6 @@ void Sentient::UpdateWeapons ( void ) - { GetActiveWeapon( WEAPON_MAIN ); } @@ -3881,7 +3828,6 @@ void Sentient::DeactivateWeapon ( Event *ev ) - { // Deactivate the weapon weaponhand_t hand; @@ -3902,7 +3848,6 @@ void Sentient::EventUseItem ( Event *ev ) - { str name; weaponhand_t hand = WEAPON_MAIN; @@ -3941,7 +3886,6 @@ void Sentient::EventDontDropWeapons ( Event *ev ) - { if( ev->NumArgs() > 0 ) { @@ -4092,7 +4036,6 @@ void Sentient::ReceivedItem ( Item * item ) - { } @@ -4100,7 +4043,6 @@ void Sentient::RemovedItem ( Item *item ) - { } @@ -4109,7 +4051,6 @@ void Sentient::AmmoAmountChanged Ammo *ammo, int ammo_in_clip ) - { } @@ -4117,7 +4058,6 @@ void Sentient::EventGerman ( Event *ev ) - { bool bRejoinSquads = false; @@ -4170,7 +4110,6 @@ void Sentient::EventAmerican ( Event *ev ) - { bool bRejoinSquads = false; @@ -4231,7 +4170,6 @@ void Sentient::EventGetTeam ( Event *ev ) - { if( m_Team == TEAM_AMERICAN ) { @@ -4256,7 +4194,6 @@ void Sentient::EventGetThreatBias ( Event *ev ) - { ev->AddInteger( m_iThreatBias ); } @@ -4265,7 +4202,6 @@ void Sentient::EventSetThreatBias ( Event *ev ) - { str sBias; @@ -4287,7 +4223,6 @@ void Sentient::SetDamageMult ( Event *ev ) - { int index = ev->GetInteger( 1 ); if( index < 0 || index >= MAX_DAMAGE_MULTIPLIERS ) @@ -4306,7 +4241,6 @@ void Sentient::SetupHelmet str sHelmetSurface1, str sHelmetSurface2 ) - { m_sHelmetTiki = sHelmetTiki; m_sHelmetSurface1 = sHelmetSurface1; @@ -4320,7 +4254,6 @@ void Sentient::EventSetupHelmet ( Event *ev ) - { // FIXME } @@ -4329,7 +4262,6 @@ void Sentient::EventPopHelmet ( Event *ev ) - { // FIXME } @@ -4338,7 +4270,6 @@ bool Sentient::WearingHelmet ( void ) - { if( !m_sHelmetSurface1.length() ) { return false; @@ -4359,7 +4290,6 @@ int Sentient::CheckHitLocation ( int iLocation ) - { if( iLocation == 1 ) { @@ -4380,7 +4310,6 @@ bool Sentient::IsTeamMate ( Sentient *pOther ) - { return ( pOther->m_bIsDisguised || pOther->m_Team == m_Team ); } @@ -4389,7 +4318,6 @@ void Sentient::JoinNearbySquads ( float fJoinRadius ) - { float fJoinRadiusSquared = Square(fJoinRadius); @@ -4412,7 +4340,6 @@ void Sentient::MergeWithSquad ( Sentient *pFriendly ) - { Sentient *pFriendNext; Sentient *pSelfPrev; @@ -4435,7 +4362,6 @@ void Sentient::DisbandSquadMate ( Sentient *pExFriendly ) - { Sentient *pPrev; Sentient *pNext; @@ -4454,7 +4380,6 @@ bool Sentient::IsSquadMate ( Sentient *pFriendly ) - { Sentient *pSquadMate = this; @@ -4479,7 +4404,6 @@ bool Sentient::CanSee float fov, float vision_distance ) - { float delta[ 2 ]; @@ -4534,7 +4458,6 @@ void Sentient::SetViewAngles ( Vector angles ) - { } @@ -4543,7 +4466,6 @@ Vector Sentient::GetViewAngles ( void ) - { return angles; } @@ -4567,7 +4489,6 @@ void Sentient::UpdateFootsteps ( void ) - { //FIXME: macros int iTagNum, iAnimFlags = 0, iAnimNum; diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp index d4094109..3d1ce293 100644 --- a/code/fgame/simpleactor.cpp +++ b/code/fgame/simpleactor.cpp @@ -105,7 +105,6 @@ void SimpleActor::Archive ( Archiver& arc ) - { Sentient::Archive( arc ); @@ -220,7 +219,6 @@ void SimpleActor::SetMoveInfo ( mmove_t * ) - { OVERLOADED_ERROR(); } @@ -229,7 +227,6 @@ void SimpleActor::GetMoveInfo ( mmove_t * ) - { OVERLOADED_ERROR(); } @@ -238,7 +235,6 @@ void SimpleActor::StopAnimating ( int slot ) - { int index = 0; @@ -264,7 +260,6 @@ void SimpleActor::AnimFinished ( int slot ) - { assert( !DumpCallTrace("") ); } @@ -273,7 +268,6 @@ bool SimpleActor::CanTarget ( void ) - { OVERLOADED_ERROR(); return false; @@ -283,7 +277,6 @@ bool SimpleActor::IsImmortal ( void ) - { OVERLOADED_ERROR(); return false; @@ -294,7 +287,6 @@ bool SimpleActor::DoesTheoreticPathExist Vector vDestPos, float fMaxPath ) - { return m_Path.DoesTheoreticPathExist( origin, vDestPos, this, fMaxPath, NULL, 0 ); } @@ -307,7 +299,6 @@ void SimpleActor::SetPath float *vLeashHome, float fLeashDistSquared ) - { if (!PathExists() || ( ( level.inttime >= m_Path.Time() + iMaxDirtyTime @@ -362,7 +353,6 @@ void SimpleActor::SetPath const char *description, int iMaxDirtyTime ) - { if (pDestNode) { @@ -396,7 +386,6 @@ void SimpleActor::SetPathWithinDistance float fMaxPath, int iMaxDirtyTime ) - { SetPath(vDestPos, description, iMaxDirtyTime, NULL, 0); } @@ -407,7 +396,6 @@ void SimpleActor::FindPathAway vec_t *vDirPreferred, float fMinSafeDist ) - { m_Path.FindPathAway(origin, vAwayFrom, vDirPreferred, this, fMinSafeDist, NULL, 0); @@ -418,7 +406,6 @@ void SimpleActor::ClearPath ( void ) - { m_Path.Clear(); } @@ -427,7 +414,6 @@ bool SimpleActor::PathComplete ( void ) const - { if( level.time >= m_fPathGoalTime ) { @@ -442,7 +428,6 @@ bool SimpleActor::PathExists ( void ) const - { return m_Path.CurrentNode() != NULL; } @@ -451,7 +436,6 @@ bool SimpleActor::PathIsValid ( void ) const - { //Called by SetPath... return true; @@ -461,7 +445,6 @@ bool SimpleActor::PathAvoidsSquadMates ( void ) const - { Entity* player; float fDelta; @@ -637,7 +620,6 @@ void SimpleActor::ShortenPathToAvoidSquadMates ( void ) - { if (PathExists() && !PathComplete()) { @@ -686,7 +668,6 @@ PathInfo *SimpleActor::CurrentPathNode ( void ) const - { return m_Path.CurrentNode(); } @@ -695,7 +676,6 @@ PathInfo *SimpleActor::LastPathNode ( void ) const - { return m_Path.LastNode(); } @@ -704,7 +684,6 @@ float SimpleActor::PathDist ( void ) const - { return m_Path.TotalDist(); } @@ -713,7 +692,6 @@ bool SimpleActor::PathHasCompleteLookahead ( void ) const - { return m_Path.HasCompleteLookahead(); } @@ -722,7 +700,6 @@ Vector SimpleActor::PathGoal ( void ) const - { return LastPathNode()->point; } @@ -731,7 +708,6 @@ float *SimpleActor::PathDelta ( void ) const - { return m_Path.CurrentDelta(); } @@ -740,7 +716,6 @@ bool SimpleActor::PathGoalSlowdownStarted ( void ) const - { return m_fPathGoalTime >= level.time; } @@ -749,7 +724,6 @@ void SimpleActor::SetDest ( vec3_t dest ) - { VectorCopy(dest, m_Dest); } @@ -758,7 +732,6 @@ void SimpleActor::StopTurning ( void ) - { m_YawAchieved = true; } @@ -767,7 +740,6 @@ void SimpleActor::SetDesiredYaw ( float yaw ) - { m_YawAchieved = false; m_DesiredYaw = yaw; @@ -777,7 +749,6 @@ void SimpleActor::SetDesiredYawDir ( vec3_t vec ) - { m_YawAchieved = false; m_DesiredYaw = vectoyaw(vec); @@ -787,7 +758,6 @@ void SimpleActor::SetDesiredYawDest ( vec3_t vec ) - { float facedir[2]; VectorSub2D(vec, origin, facedir); @@ -802,7 +772,6 @@ void SimpleActor::UpdateEmotion ( void ) - { int anim; if (IsDead()) @@ -831,7 +800,6 @@ int SimpleActor::GetEmotionAnim ( void ) - { const char *emotionanim = NULL; int anim; @@ -929,7 +897,6 @@ int SimpleActor::GetMotionSlot ( int slot ) - { if( m_AnimMotionHigh ) return slot + 3; @@ -941,7 +908,6 @@ int SimpleActor::GetActionSlot ( int slot ) - { if( m_AnimActionHigh ) return slot + 9; @@ -953,7 +919,6 @@ int SimpleActor::GetSaySlot ( void ) - { return m_AnimDialogHigh ? 13 : 12; } @@ -962,7 +927,6 @@ void SimpleActor::StartCrossBlendAnimSlot ( int slot ) - { if (m_weightType[slot] == 1) { @@ -987,7 +951,6 @@ void SimpleActor::StartMotionAnimSlot int anim, float weight ) - { int iSlot = GetMotionSlot(slot); @@ -1008,7 +971,6 @@ void SimpleActor::StartAimMotionAnimSlot int slot, int anim ) - { int iSlot = GetMotionSlot(slot); @@ -1027,7 +989,6 @@ void SimpleActor::StartActionAnimSlot ( int anim ) - { int iSlot = GetActionSlot(0); @@ -1046,7 +1007,6 @@ void SimpleActor::StartSayAnimSlot ( int anim ) - { int iSlot = GetSaySlot(); @@ -1066,7 +1026,6 @@ void SimpleActor::StartAimAnimSlot int slot, int anim ) - { int iSlot = GetActionSlot(slot); @@ -1084,7 +1043,6 @@ void SimpleActor::SetBlendedWeight ( int slot ) - { m_bUpdateAnimDoneFlags |= 1 << slot; if (m_weightCrossBlend[slot] < 1.0) @@ -1104,7 +1062,6 @@ void SimpleActor::EventSetAnimLength ( Event *ev ) - { int slot; float length; @@ -1154,7 +1111,6 @@ void SimpleActor::UpdateNormalAnimSlot ( int slot ) - { m_weightCrossBlend[slot] += m_fCrossblendTime == 0.0 ? 1.0 : level.frametime / m_fCrossblendTime; @@ -1165,7 +1121,6 @@ void SimpleActor::UpdateCrossBlendAnimSlot ( int slot ) - { m_weightCrossBlend[slot] -= m_fCrossblendTime == 0.0 ? 1.0 : level.frametime / m_fCrossblendTime; @@ -1184,7 +1139,6 @@ void SimpleActor::UpdateCrossBlendDialogAnimSlot ( int slot ) - { m_weightCrossBlend[slot] -= m_iSaySlot < 0 ? level.frametime + level.frametime : level.frametime / 0.1; @@ -1203,7 +1157,6 @@ void SimpleActor::UpdateSayAnimSlot ( int slot ) - { m_weightCrossBlend[slot] += m_iSaySlot < 0 ? level.frametime + level.frametime : level.frametime / 0.1; @@ -1214,7 +1167,6 @@ void SimpleActor::UpdateLastFrameSlot ( int slot ) - { StopAnimating(slot); } @@ -1223,7 +1175,6 @@ void SimpleActor::UpdateAnimSlot ( int slot ) - { int weightType = m_weightType[slot]; switch (weightType) @@ -1258,7 +1209,6 @@ void SimpleActor::StopAllAnimating ( void ) - { SetSyncTime(0); @@ -1272,7 +1222,6 @@ void SimpleActor::ChangeMotionAnim ( void ) - { //int lastMotionSlot; //int firstMotionSlot; @@ -1306,7 +1255,6 @@ void SimpleActor::ChangeActionAnim ( void ) - { int iSlot; int i; @@ -1343,7 +1291,6 @@ void SimpleActor::ChangeSayAnim ( void ) - { int iSlot; @@ -1372,7 +1319,6 @@ void SimpleActor::UpdateAim ( void ) - { float dir; @@ -1421,7 +1367,6 @@ void SimpleActor::UpdateAimMotion ( void ) - { int slot = GetMotionSlot(0); @@ -1443,7 +1388,6 @@ void SimpleActor::EventAIOn ( Event *ev ) - { m_bDoAI = true; } @@ -1452,7 +1396,6 @@ void SimpleActor::EventAIOff ( Event *ev ) - { m_bDoAI = false; } @@ -1461,7 +1404,6 @@ void SimpleActor::EventGetWeaponGroup ( Event *ev ) - { const_str csWeaponGroup; Weapon *weapon = GetActiveWeapon(WEAPON_MAIN); @@ -1484,7 +1426,6 @@ void SimpleActor::EventGetWeaponType ( Event *ev ) - { Weapon *weapon; const_str csWeaponType; @@ -1551,7 +1492,6 @@ void SimpleActor::EventGetPainHandler ( Event *ev ) - { ScriptVariable var; @@ -1564,7 +1504,6 @@ void SimpleActor::EventSetPainHandler ( Event *ev ) - { if (ev->IsFromScript()) { @@ -1583,7 +1522,6 @@ void SimpleActor::EventGetDeathHandler ( Event *ev ) - { ScriptVariable var; @@ -1596,7 +1534,6 @@ void SimpleActor::EventSetDeathHandler ( Event *ev ) - { if (ev->IsFromScript()) { @@ -1615,7 +1552,6 @@ void SimpleActor::EventGetAttackHandler ( Event *ev ) - { ScriptVariable var; @@ -1628,7 +1564,6 @@ void SimpleActor::EventSetAttackHandler ( Event *ev ) - { if (ev->IsFromScript()) { @@ -1647,7 +1582,6 @@ void SimpleActor::EventGetSniperHandler ( Event *ev ) - { ScriptVariable var; @@ -1660,7 +1594,6 @@ void SimpleActor::EventSetSniperHandler ( Event *ev ) - { if (ev->IsFromScript()) { @@ -1679,7 +1612,6 @@ void SimpleActor::EventSetCrossblendTime ( Event *ev ) - { m_fCrossblendTime = ev->GetFloat(1); } @@ -1688,7 +1620,6 @@ void SimpleActor::EventGetCrossblendTime ( Event *ev ) - { ev->AddFloat(m_fCrossblendTime); } @@ -1697,7 +1628,6 @@ void SimpleActor::EventSetEmotion ( Event *ev ) - { switch (ev->GetConstString(1)) { @@ -1744,7 +1674,6 @@ void SimpleActor::EventGetPosition ( Event *ev ) - { ev->AddConstString(m_csCurrentPosition); } @@ -1753,7 +1682,6 @@ void SimpleActor::EventSetPosition ( Event *ev ) - { m_csCurrentPosition = ev->GetConstString(1); } @@ -1762,7 +1690,6 @@ void SimpleActor::EventGetAnimMode ( Event *ev ) - { // not found in ida } @@ -1771,7 +1698,6 @@ void SimpleActor::EventSetAnimMode ( Event *ev ) - { // not found in ida } @@ -1780,7 +1706,6 @@ void SimpleActor::EventSetAnimFinal ( Event *ev ) - { ScriptError("animfinal is obsolete"); } @@ -1790,7 +1715,6 @@ void SimpleActor::DesiredAnimation int eAnimMode, const_str csAnimString ) - { //fixme: this is an inline function. m_eNextAnimMode = eAnimMode; @@ -1803,7 +1727,6 @@ void SimpleActor::StartAnimation int eAnimMode, const_str csAnimString ) - { //fixme: this is an inline function. m_eNextAnimMode = eAnimMode; @@ -1816,7 +1739,6 @@ void SimpleActor::DesiredAnimation int eAnimMode, ScriptThreadLabel AnimLabel ) - { //fixme: this is an inline function. m_eNextAnimMode = eAnimMode; @@ -1830,7 +1752,6 @@ void SimpleActor::StartAnimation int eAnimMode, ScriptThreadLabel AnimLabel ) - { //fixme: this is an inline function. m_eNextAnimMode = eAnimMode; @@ -1843,7 +1764,6 @@ void SimpleActor::ContinueAnimationAllowNoPath ( void ) - { if (m_eNextAnimMode < 0) { @@ -1858,7 +1778,6 @@ void SimpleActor::ContinueAnimation ( void ) - { int eAnimMode = m_eNextAnimMode; if (eAnimMode < 0) @@ -1881,7 +1800,6 @@ void SimpleActor::SetPathGoalEndAnim ( const_str csEndAnim ) - { //fixme: this is an inline function m_csPathGoalEndAnimScript = csEndAnim; @@ -1891,7 +1809,6 @@ bool SimpleActor::UpdateSelectedAnimation ( void ) - { if (m_csNextAnimString == STRING_NULL) { @@ -1984,7 +1901,6 @@ const char *SimpleActor::DumpCallTrace const char *pszFmt, ... ) const - { OVERLOADED_ERROR(); return "overloaded version should always get called"; diff --git a/code/fgame/spline.h b/code/fgame/spline.h index 0f3fe92b..77f11968 100644 --- a/code/fgame/spline.h +++ b/code/fgame/spline.h @@ -56,7 +56,6 @@ void cSpline< cGrids, cPoints >::Archive ( Archiver& arc ) - { arc.ArchiveInteger( &m_iPoints ); @@ -76,7 +75,6 @@ void cSpline< cGrids, cPoints >::Reset ( void ) - { m_iPoints = 0; } @@ -87,7 +85,6 @@ int cSpline< cGrids, cPoints >::Add float *fAdd, int flags ) - { int i; int ii; @@ -125,7 +122,6 @@ void cSpline< cGrids, cPoints >::UniformAdd ( float *pos ) - { int i; int ii; @@ -144,7 +140,6 @@ int cSpline< cGrids, cPoints >::Right ( float x ) - { int i; @@ -164,7 +159,6 @@ float *cSpline< cGrids, cPoints >::Get float x, int *flags ) - { if( !m_iPoints ) { @@ -232,7 +226,6 @@ float *cSpline< cGrids, cPoints >::GetByNode float x, int *flags ) - { if( !m_iPoints ) { @@ -296,7 +289,6 @@ int cSpline< cGrids, cPoints >::Append ( cSpline< cGrids, cPoints > *pNew ) - { float *i_fTmp; float o_fTmp[ 4 ]; diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp index 186bff22..018d6af8 100644 --- a/code/fgame/trigger.cpp +++ b/code/fgame/trigger.cpp @@ -396,7 +396,6 @@ void Trigger::StartThread ( Event *ev ) - { SafePtr< Trigger > This = this; @@ -439,7 +438,6 @@ void Trigger::TriggerStuff ( Event *ev ) - { Entity *other; Entity *activator; @@ -780,7 +778,6 @@ void Trigger::EventSetThread ( Event *ev ) - { if( ev->IsFromScript() ) { @@ -796,7 +793,6 @@ void Trigger::EventSetHealth ( Event *ev ) - { health = ev->GetFloat( 1 ); max_health = health; @@ -1209,7 +1205,6 @@ void TriggerSave::SaveGame ( Event *ev ) - { gi.SetConfigstring( CS_SAVENAME, m_sSaveName ); gi.SendConsoleCommand( "savegame" ); @@ -1219,7 +1214,6 @@ void TriggerSave::EventSaveName ( Event *ev ) - { m_sSaveName = ev->GetString( 1 ); } @@ -1972,7 +1966,6 @@ void TriggerChangeLevel::SetSpawnSpot ( Event *ev ) - { spawnspot = ev->GetConstString(1); } @@ -1981,7 +1974,6 @@ void TriggerChangeLevel::ChangeLevel ( Event *ev ) - { SafePtr safeThis = this; Entity* other; @@ -2429,7 +2421,6 @@ void TriggerCameraUse::TriggerCamera ( Event *ev ) - { ScriptThreadLabel camthread; Entity *other; @@ -3214,7 +3205,6 @@ void TriggerClickItem::SetClickItemModelEvent ( Event *ev ) - { SetModelEvent( ev ); setContents( CONTENTS_UNKNOWN3 ); diff --git a/code/fgame/trigger.h b/code/fgame/trigger.h index c39e915c..676e55ab 100644 --- a/code/fgame/trigger.h +++ b/code/fgame/trigger.h @@ -192,7 +192,6 @@ inline void TriggerAll::Archive ( Archiver& arc ) - { Trigger::Archive( arc ); @@ -251,7 +250,6 @@ inline void TriggerSave::Archive ( Archiver &arc ) - { Trigger::Archive( arc ); arc.ArchiveString( &m_sSaveName ); @@ -677,7 +675,6 @@ inline void TriggerGivePowerup::Archive ( Archiver &arc ) - { Trigger::Archive( arc ); @@ -700,7 +697,6 @@ inline void TriggerClickItem::Archive ( Archiver &arc ) - { Trigger::Archive( arc ); } diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp index 1e4d8484..4c14df50 100644 --- a/code/fgame/vehicle.cpp +++ b/code/fgame/vehicle.cpp @@ -985,7 +985,6 @@ void Vehicle::VehicleStart ( Event *ev ) - { Entity *ent; VehicleBase *last; @@ -1063,7 +1062,6 @@ void Vehicle::Drivable ( Event *ev ) - { setMoveType( MOVETYPE_VEHICLE ); drivable = true; @@ -1078,7 +1076,6 @@ void Vehicle::UnDrivable ( Event *ev ) - { setMoveType( MOVETYPE_PUSH ); drivable = false; @@ -1093,7 +1090,6 @@ void Vehicle::Jumpable ( Event *ev ) - { jumpable = true; } @@ -1107,7 +1103,6 @@ void Vehicle::Lock ( Event *ev ) - { Lock(); } @@ -1121,7 +1116,6 @@ void Vehicle::UnLock ( Event *ev ) - { UnLock(); } @@ -1135,7 +1129,6 @@ void Vehicle::SteerInPlace ( Event *ev ) - { steerinplace = true; } @@ -1149,7 +1142,6 @@ void Vehicle::SeatAnglesOffset ( Event *ev ) - { seatangles = ev->GetVector( 1 ); } @@ -1163,7 +1155,6 @@ void Vehicle::SeatOffset ( Event *ev ) - { seatoffset = ev->GetVector( 1 ); } @@ -1177,7 +1168,6 @@ void Vehicle::SetWeapon ( Event *ev ) - { showweapon = true; hasweapon = true; @@ -1193,7 +1183,6 @@ void Vehicle::ShowWeaponEvent ( Event *ev ) - { showweapon = true; } @@ -1207,7 +1196,6 @@ qboolean Vehicle::HasWeapon ( void ) - { return hasweapon; } @@ -1221,7 +1209,6 @@ qboolean Vehicle::ShowWeapon ( void ) - { return showweapon; } @@ -1235,7 +1222,6 @@ void Vehicle::SetDriverAngles ( Vector angles ) - { int i; @@ -1257,7 +1243,6 @@ void Vehicle::CheckWater ( void ) - { Vector point; int cont; @@ -1334,7 +1319,6 @@ void Vehicle::WorldEffects ( void ) - { // // Check for earthquakes @@ -1367,7 +1351,6 @@ void Vehicle::DriverUse ( Event *ev ) - { int slot; Vector pos; @@ -1574,7 +1557,6 @@ qboolean Vehicle::Drive ( usercmd_t *ucmd ) - { Vector i, j, k; @@ -1624,7 +1606,6 @@ void Vehicle::Think ( void ) - { flags |= FL_POSTTHINK; } @@ -1638,7 +1619,6 @@ void Vehicle::Postthink ( void ) - { float turn; Vector i; @@ -2112,7 +2092,6 @@ void Vehicle::SetMoveInfo ( vmove_t *vm ) - { memset( vm, 0, sizeof( vmove_t ) ); @@ -2142,7 +2121,6 @@ void Vehicle::GetMoveInfo ( vmove_t *vm ) - { Vector newOrigin = vm->vs->origin; @@ -2169,7 +2147,6 @@ void Vehicle::SetCEMoveInfo ( vmove_t *vm ) - { SetMoveInfo( vm ); @@ -2190,7 +2167,6 @@ void Vehicle::GetCEMoveInfo ( vmove_t *vm ) - { GetMoveInfo( vm ); } @@ -2204,7 +2180,6 @@ void Vehicle::SetViewAngles ( Vector newViewangles ) - { client->ps.delta_angles[ 0 ] = ANGLE2SHORT( newViewangles.x ); client->ps.delta_angles[ 1 ] = ANGLE2SHORT( newViewangles.y ); @@ -2322,7 +2297,6 @@ float Vehicle::TorqueLookup ( int rpm ) - { if( rpm > 4999 ) { @@ -2356,7 +2330,6 @@ void Vehicle::UpdateVariables Vector *t_vup, Vector *t_vright ) - { } @@ -3140,7 +3113,6 @@ void Vehicle::EventDriveInternal Event *ev, bool wait ) - { SimpleEntity *path; SimpleEntity *alternate_path = NULL; @@ -3680,7 +3652,6 @@ void Vehicle::TouchStuff ( vmove_t *vm ) - { int i, j; gentity_t *other; @@ -4188,7 +4159,6 @@ bool Vehicle::AssertMove Vector vNewOrigin, Vector vOldOrigin ) - { Entity *check; gentity_t *edict; @@ -4241,7 +4211,6 @@ bool Vehicle::AssertRotation Vector vNewAngles, Vector vOldAngles ) - { Vector i; Vector j; @@ -4290,7 +4259,6 @@ void Vehicle::SlidePush ( Vector vPush ) - { vmove_t vm; int i; @@ -4399,7 +4367,6 @@ void Vehicle::SetupPath cSpline<4, 512> *pPath, SimpleEntity *se ) - { Vector vLastOrigin; SimpleEntity *ent; @@ -4929,7 +4896,6 @@ void Vehicle::UpdateTurretSlot ( int iSlot ) - { orientation_t orient; @@ -4984,7 +4950,6 @@ void Vehicle::UpdatePassengerSlot ( int iSlot ) - { orientation_t orient; @@ -5035,7 +5000,6 @@ void Vehicle::UpdateDriverSlot ( int iSlot ) - { orientation_t orient; @@ -5089,7 +5053,6 @@ void Vehicle::UpdateSkidAngle ( void ) - { if( m_bEnableSkidding ) { @@ -5120,7 +5083,6 @@ float Vehicle::GetPathPosition cSpline<4, 512> *pPath, int iNode ) - { float *vTmp; float vPrev[ 3 ]; @@ -5306,7 +5268,6 @@ void Vehicle::FactorInAnglesOffset ( Vector *vAddedAngles ) - { ( *vAddedAngles ) += m_vAnglesOffset; ( *vAddedAngles )[ 1 ] += m_fSkidAngle; @@ -5321,7 +5282,6 @@ void Vehicle::CalculateAnglesOffset ( Vector acceleration ) - { if( level.time <= 1200 ) { @@ -5384,7 +5344,6 @@ qboolean Vehicle::GetTagPositionAndOrientation str tagname, orientation_t *new_or ) - { int tagnum = gi.Tag_NumForName( edict->tiki, tagname.c_str() ); @@ -5409,7 +5368,6 @@ qboolean Vehicle::GetTagPositionAndOrientation int tagnum, orientation_t *new_or ) - { int i; orientation_t tag_or; @@ -5440,7 +5398,6 @@ void Vehicle::CalculateAnimationData Vector vAngles, Vector vOrigin ) - { float fLeft = fEpsilon(); float fRight = fEpsilon(); @@ -5495,7 +5452,6 @@ bool Vehicle::IsDamagedBy ( Entity *ent ) - { int i = FindDriverSlotByEntity( ent ); @@ -5541,7 +5497,6 @@ void Vehicle::AutoPilot ( void ) - { float *vTmp; @@ -5601,7 +5556,6 @@ str Vehicle::GetSoundSet ( void ) - { return m_sSoundSet; } @@ -5615,7 +5569,6 @@ int Vehicle::QueryFreePassengerSlot ( void ) - { for( int i = 0; i < numPassengers; i++ ) { @@ -5637,7 +5590,6 @@ int Vehicle::QueryFreeDriverSlot ( void ) - { return ( driver.flags & SLOT_FREE ) ? 0 : -1; } @@ -5651,7 +5603,6 @@ int Vehicle::QueryFreeTurretSlot ( void ) - { for( int i = 0; i < numTurrets; i++ ) { @@ -5674,7 +5625,6 @@ void Vehicle::QueryPassengerSlotPosition int slot, float *pos ) - { orientation_t orient; @@ -5699,7 +5649,6 @@ void Vehicle::QueryDriverSlotPosition int slot, float *pos ) - { orientation_t orient; @@ -5724,7 +5673,6 @@ void Vehicle::QueryTurretSlotPosition int slot, float *pos ) - { orientation_t orient; @@ -5749,7 +5697,6 @@ void Vehicle::QueryPassengerSlotAngles int slot, float *ang ) - { orientation_t orient; @@ -5767,7 +5714,6 @@ void Vehicle::QueryDriverSlotAngles int slot, float *ang ) - { orientation_t orient; @@ -5785,7 +5731,6 @@ void Vehicle::QueryTurretSlotAngles int slot, float *ang ) - { orientation_t orient; @@ -5802,7 +5747,6 @@ int Vehicle::QueryPassengerSlotStatus ( int slot ) - { return Passengers[ slot ].flags; } @@ -5816,7 +5760,6 @@ int Vehicle::QueryDriverSlotStatus ( int slot ) - { return driver.flags; } @@ -5830,7 +5773,6 @@ int Vehicle::QueryTurretSlotStatus ( int slot ) - { return Turrets[ slot ].flags; } @@ -5844,7 +5786,6 @@ Entity *Vehicle::QueryPassengerSlotEntity ( int slot ) - { return Passengers[ slot ].ent; } @@ -5858,7 +5799,6 @@ Entity *Vehicle::QueryDriverSlotEntity ( int slot ) - { return driver.ent; } @@ -5872,7 +5812,6 @@ Entity *Vehicle::QueryTurretSlotEntity ( int slot ) - { return Turrets[ slot ].ent; } @@ -5888,7 +5827,6 @@ void Vehicle::AttachPassengerSlot Entity *ent, Vector vExitPosition ) - { Entity *passenger; str sName; @@ -5933,7 +5871,6 @@ void Vehicle::AttachDriverSlot Entity *ent, Vector vExitPosition ) - { Entity *d; str sName; @@ -5985,7 +5922,6 @@ void Vehicle::AttachTurretSlot Vector vExitPosition, Vector *vExitAngles ) - { TurretGun *pTurret; VehicleTurretGun *pVehicleTurret; @@ -6184,7 +6120,6 @@ void Vehicle::DetachPassengerSlot Vector vExitPosition, Vector *vExitAngles ) - { Entity *passenger = Passengers[ slot ].ent; @@ -6271,7 +6206,6 @@ void Vehicle::DetachDriverSlot Vector vExitPosition, Vector *vExitAngles ) - { Entity *other = driver.ent; @@ -6378,7 +6312,6 @@ void Vehicle::DetachTurretSlot Vector vExitPosition, Vector *vExitAngles ) - { Entity *passenger = Turrets[ slot ].ent; @@ -6474,7 +6407,6 @@ int Vehicle::FindPassengerSlotByEntity ( Entity *ent ) - { for( int i = 0; i < MAX_PASSENGERS; i++ ) { @@ -6496,7 +6428,6 @@ int Vehicle::FindDriverSlotByEntity ( Entity *ent ) - { return driver.ent == ent ? 0 : -1; } @@ -6510,7 +6441,6 @@ int Vehicle::FindTurretSlotByEntity ( Entity *ent ) - { for( int i = 0; i < MAX_TURRETS; i++ ) { @@ -6532,7 +6462,6 @@ void Vehicle::SetSlotsNonSolid ( void ) - { for( int i = 0; i < MAX_PASSENGERS; i++ ) { @@ -6561,7 +6490,6 @@ void Vehicle::SetSlotsSolid ( void ) - { for( int i = 0; i < MAX_PASSENGERS; i++ ) { @@ -6591,7 +6519,6 @@ void Vehicle::KickSuspension Vector vDirection, float fForce ) - { VectorNormalizeFast( vDirection ); @@ -6608,7 +6535,6 @@ qboolean Vehicle::isLocked ( void ) - { return locked; } @@ -6622,7 +6548,6 @@ void Vehicle::Lock ( void ) - { locked = true; } @@ -6636,7 +6561,6 @@ void Vehicle::UnLock ( void ) - { locked = false; } @@ -6650,7 +6574,6 @@ VehicleCollisionEntity *Vehicle::GetCollisionEntity ( void ) - { return m_pCollisionEntity; } @@ -6689,7 +6612,6 @@ void DrivableVehicle::Killed ( Event *ev ) - { Entity * ent; Entity * attacker; diff --git a/code/fgame/vehicle.h b/code/fgame/vehicle.h index 3b2a004f..368e00c1 100644 --- a/code/fgame/vehicle.h +++ b/code/fgame/vehicle.h @@ -98,7 +98,6 @@ inline void VehicleBase::Archive ( Archiver &arc ) - { Animate::Archive( arc ); @@ -488,7 +487,6 @@ inline void Vehicle::Archive ( Archiver &arc ) - { VehicleBase::Archive( arc ); diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp index 6dd02d5e..731d0266 100644 --- a/code/fgame/vehicleturret.cpp +++ b/code/fgame/vehicleturret.cpp @@ -187,7 +187,6 @@ void VehicleTurretGun::Think ( void ) - { // FIXME: stub } @@ -197,7 +196,6 @@ void VehicleTurretGun::SetBaseOrientation float( *borientation )[ 3 ], float *bangles ) - { m_bBOIsSet = true; @@ -221,7 +219,6 @@ void VehicleTurretGun::SetBaseEntity ( Entity *e ) - { m_pBaseEntity = e; m_vLastBaseAngles = m_vBaseAngles; @@ -242,7 +239,6 @@ void VehicleTurretGun::SetVehicleOwner ( Entity *e ) - { m_pVehicleOwner = e; } @@ -251,7 +247,6 @@ void VehicleTurretGun::SetRemoteOwner ( Sentient *e ) - { m_bUseRemoteControl = true; m_pRemoteOwner = e; @@ -262,7 +257,6 @@ void VehicleTurretGun::RemoteControl usercmd_t *ucmd, Sentient *owner ) - { } @@ -271,7 +265,6 @@ void VehicleTurretGun::CollisionCorrect ( trace_t *pTr ) - { } @@ -280,7 +273,6 @@ void VehicleTurretGun::UpdateOrientation ( bool bCollisionCheck ) - { } @@ -289,7 +281,6 @@ void VehicleTurretGun::UpdateSound ( void ) - { if( level.time < m_fNextSoundState ) { @@ -341,7 +332,6 @@ void VehicleTurretGun::UpdateOwner ( Sentient *pOwner ) - { // FIXME: stub STUB(); @@ -394,7 +384,6 @@ void VehicleTurretGun::TurretBeginUsed ( Sentient *pEnt ) - { if( m_pVehicleOwner ) { @@ -445,7 +434,6 @@ void VehicleTurretGun::TurretEndUsed ( void ) - { if( owner->IsSubclassOfPlayer() ) { @@ -474,7 +462,6 @@ void VehicleTurretGun::TurretUsed ( Sentient *pEnt ) - { if( owner ) { @@ -693,7 +680,6 @@ bool VehicleTurretGun::isLocked ( void ) - { return m_bLocked; } @@ -702,7 +688,6 @@ void VehicleTurretGun::Lock ( void ) - { m_bLocked = true; } @@ -711,7 +696,6 @@ void VehicleTurretGun::UnLock ( void ) - { m_bLocked = false; } @@ -720,7 +704,6 @@ bool VehicleTurretGun::UseRemoteControl ( void ) - { return m_bUseRemoteControl; } @@ -729,7 +712,6 @@ Sentient* VehicleTurretGun::GetRemoteOwner ( void ) - { return m_pRemoteOwner; } diff --git a/code/fgame/vehicleturret.h b/code/fgame/vehicleturret.h index ceb4d432..1c3e34fe 100644 --- a/code/fgame/vehicleturret.h +++ b/code/fgame/vehicleturret.h @@ -100,7 +100,6 @@ inline void VehicleTurretGun::Archive ( Archiver& arc ) - { } diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp index 5d83e5be..cfc62dc8 100644 --- a/code/fgame/weapon.cpp +++ b/code/fgame/weapon.cpp @@ -1015,7 +1015,6 @@ void Weapon::Delete ( void ) - { if( g_iInThinks ) { @@ -1039,7 +1038,6 @@ Listener *Weapon::GetScriptOwner ( void ) - { return owner; } @@ -1076,7 +1074,6 @@ void Weapon::SetRank int order, int rank ) - { this->order = order; this->rank = rank; @@ -1089,7 +1086,6 @@ void Weapon::SetRankEvent ( Event *ev ) - { SetRank( ev->GetInteger( 1 ), ev->GetInteger( 2 ) ); } @@ -1101,7 +1097,6 @@ void Weapon::SetAutoPutaway ( Event *ev ) - { auto_putaway = ev->GetBoolean( 1 ); } @@ -1113,7 +1108,6 @@ void Weapon::SetUseNoAmmo ( Event *ev ) - { use_no_ammo = ev->GetBoolean( 1 ); } @@ -1125,7 +1119,6 @@ void Weapon::SetStartAmmo ( Event *ev ) - { if( g_gametype->integer ) return; @@ -1141,7 +1134,6 @@ void Weapon::SetDMStartAmmo ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -1170,7 +1162,6 @@ void Weapon::SetMinChargeTime ( Event *ev ) - { assert( ( firemodeindex >= 0 ) && ( firemodeindex < MAX_FIREMODES ) ); min_charge_time[ firemodeindex ] = ev->GetFloat( 1 ); @@ -1183,7 +1174,6 @@ float Weapon::GetMinChargeTime ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); return min_charge_time[ mode ]; @@ -1196,7 +1186,6 @@ float Weapon::GetMaxChargeTime ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); return max_charge_time[ mode ]; @@ -1209,7 +1198,6 @@ void Weapon::SetAmmoRequired ( Event *ev ) - { if( g_gametype->integer ) return; @@ -1225,7 +1213,6 @@ void Weapon::SetDMAmmoRequired ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -1241,7 +1228,6 @@ int Weapon::GetStartAmmo ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); return startammo[ mode ]; @@ -1254,7 +1240,6 @@ str Weapon::GetAmmoType ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -1290,7 +1275,6 @@ void Weapon::SetAmmoAmount int amount, firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -1308,7 +1292,6 @@ int Weapon::GetClipSize ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -1331,7 +1314,6 @@ void Weapon::UseAmmo int amount, firemode_t mode ) - { mode = m_bShareClip ? FIRE_PRIMARY : mode; @@ -1511,7 +1493,6 @@ void Weapon::GetMuzzlePosition Vector *up, Vector *vBarrelPos ) - { orientation_t weap_or, barrel_or, orient; //orientation_t view_or; @@ -1774,7 +1755,6 @@ void Weapon::SetShareClip ( Event * ev ) - { m_bShareClip = qtrue; } @@ -1786,7 +1766,6 @@ void Weapon::Shoot ( Event *ev ) - { Vector pos, forward, right, up, vBarrel, delta; firemode_t mode = FIRE_PRIMARY; @@ -2195,7 +2174,6 @@ void Weapon::SetCantPartialReload ( Event *ev ) - { if( g_gametype->integer ) return; @@ -2210,7 +2188,6 @@ void Weapon::SetDMCantPartialReload ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -2225,7 +2202,6 @@ int Weapon::AmmoAvailable ( firemode_t mode ) - { // Returns the amount of ammo the owner has that is available for use assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -2258,7 +2234,6 @@ qboolean Weapon::UnlimitedAmmo ( firemode_t mode ) - { if( !owner ) { @@ -2284,7 +2259,6 @@ qboolean Weapon::HasAmmo ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -2320,7 +2294,6 @@ qboolean Weapon::HasAmmoInClip ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -2352,7 +2325,6 @@ qboolean Weapon::IsSemiAuto ( void ) - { return m_bSemiAuto; } @@ -2364,7 +2336,6 @@ weaponstate_t Weapon::GetState ( void ) - { return weaponstate; } @@ -2376,7 +2347,6 @@ void Weapon::ForceState ( weaponstate_t state ) - { weaponstate = state; } @@ -2388,7 +2358,6 @@ qboolean Weapon::MuzzleClear ( void ) - { return qtrue; } @@ -2401,7 +2370,6 @@ qboolean Weapon::ReadyToFire firemode_t mode, qboolean playsound ) - { if( m_iZoom && mode == FIRE_SECONDARY ) { return qtrue; @@ -2430,7 +2398,6 @@ void Weapon::PutAway ( void ) - { // set the putaway flag to true, so the state machine know to put this weapon away putaway = true; @@ -2443,7 +2410,6 @@ void Weapon::DetachFromOwner ( void ) - { DetachGun(); weaponstate = WEAPON_HOLSTERED; @@ -2456,7 +2422,6 @@ void Weapon::AttachToOwner ( weaponhand_t hand ) - { AttachGun( hand ); ForceIdle(); @@ -2469,7 +2434,6 @@ void Weapon::AttachToHolster ( weaponhand_t hand ) - { AttachGun( hand, qtrue ); SetWeaponAnim( "holster", EV_Weapon_Idle ); @@ -2482,7 +2446,6 @@ qboolean Weapon::Drop ( void ) - { Vector temp; @@ -2633,7 +2596,6 @@ void Weapon::Charge ( firemode_t mode ) - { } @@ -2645,7 +2607,6 @@ void Weapon::ReleaseFire firemode_t mode, float charge_time ) - { // Calculate and store off the charge fraction to use when the weapon actually shoots @@ -2673,7 +2634,6 @@ void Weapon::Fire ( firemode_t mode ) - { Event *done_event = NULL; Vector pos; @@ -2738,7 +2698,6 @@ void Weapon::DetachGun ( void ) - { if( attached ) { @@ -2762,7 +2721,6 @@ void Weapon::AttachGun weaponhand_t hand, qboolean holstering ) - { int tag_num; @@ -2859,7 +2817,6 @@ void Weapon::GiveStartingAmmoToOwner ( Event *ev ) - { str ammotype; int mode; @@ -2913,7 +2870,6 @@ void Weapon::PickupWeapon ( Event *ev ) - { Sentient *sen; Entity *other; @@ -3048,7 +3004,6 @@ qboolean Weapon::IsSecondaryWeapon ( void ) - { return ( weapon_class & WEAPON_CLASS_SECONDARY ); } @@ -3060,7 +3015,6 @@ void Weapon::ForceIdle ( void ) - { SetWeaponIdleAnim(); @@ -3076,7 +3030,6 @@ qboolean Weapon::SetWeaponAnim const char *anim, Event *ev ) - { int animnum = gi.Anim_NumForName( edict->tiki, anim ); @@ -3121,7 +3074,6 @@ qboolean Weapon::SetWeaponAnim const char *anim, Event& ev ) - { Event *event = new Event( ev ); @@ -3135,7 +3087,6 @@ void Weapon::SetWeaponAnimEvent ( Event *ev ) - { SetWeaponAnim( ev->GetString( 1 ) ); } @@ -3147,7 +3098,6 @@ void Weapon::SetWeaponIdleAnim ( void ) - { if( ammo_clip_size[ FIRE_PRIMARY ] && !ammo_in_clip[ FIRE_PRIMARY ] ) { @@ -3167,7 +3117,6 @@ void Weapon::SetWeaponIdleAnimEvent ( Event *ev ) - { SetWeaponIdleAnim(); } @@ -3179,7 +3128,6 @@ void Weapon::StopWeaponAnim ( void ) - { SetTime( m_iAnimSlot ); StopAnimating( m_iAnimSlot ); @@ -3200,7 +3148,6 @@ void Weapon::DoneRaising ( Event *ev ) - { weaponstate = WEAPON_READY; ForceIdle(); @@ -3231,7 +3178,6 @@ void Weapon::DoneFiring ( Event *ev ) - { // This is called when the weapon's firing animation is done ForceIdle(); @@ -3251,7 +3197,6 @@ void Weapon::DoneReloading ( Event *ev ) - { SetShouldReload( qfalse ); weaponstate = WEAPON_READY; @@ -3264,7 +3209,6 @@ qboolean Weapon::CheckReload ( firemode_t mode ) - { // Check to see if the weapon needs to be reloaded assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -3287,7 +3231,6 @@ void Weapon::Idle ( Event *ev ) - { ForceIdle(); } @@ -3299,7 +3242,6 @@ void Weapon::IdleInit ( Event *ev ) - { for( int i = 7; i >= 0; i-- ) { @@ -3400,7 +3342,6 @@ void Weapon::WeaponSound ( Event *ev ) - { Event *e; @@ -3508,7 +3449,6 @@ int Weapon::ClipAmmo ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -3592,7 +3532,6 @@ void Weapon::SetFireType ( Event *ev ) - { str ftype; @@ -3644,7 +3583,6 @@ void Weapon::SetProjectile ( Event *ev ) - { if( g_gametype->integer ) return; @@ -3661,7 +3599,6 @@ void Weapon::SetDMProjectile ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3691,7 +3628,6 @@ void Weapon::SetDMBulletDamage ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3720,7 +3656,6 @@ void Weapon::SetDMBulletKnockback ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3736,7 +3671,6 @@ void Weapon::SetBulletRange ( Event *ev ) - { if( g_gametype->integer ) return; @@ -3752,7 +3686,6 @@ void Weapon::SetDMBulletRange ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3768,7 +3701,6 @@ void Weapon::SetRange ( Event *ev ) - { SetBulletRange( ev ); } @@ -3780,7 +3712,6 @@ void Weapon::SetBulletCount ( Event *ev ) - { if( g_gametype->integer ) return; @@ -3796,7 +3727,6 @@ void Weapon::SetDMBulletCount ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3812,7 +3742,6 @@ void Weapon::SetBulletSpread ( Event *ev ) - { if( g_gametype->integer ) return; @@ -3835,7 +3764,6 @@ void Weapon::SetDMBulletSpread ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3858,7 +3786,6 @@ void Weapon::SetZoomSpreadMult ( Event *ev ) - { if( g_gametype->integer ) return; @@ -3873,7 +3800,6 @@ void Weapon::SetDMZoomSpreadMult ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3889,7 +3815,6 @@ void Weapon::SetFireSpreadMult ( Event *ev ) - { if( g_gametype->integer ) return; @@ -3908,7 +3833,6 @@ void Weapon::SetDMFireSpreadMult ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -3927,7 +3851,6 @@ void Weapon::SetTracerFrequency ( Event *ev ) - { assert( ( firemodeindex >= 0 ) && ( firemodeindex < MAX_FIREMODES ) ); tracerfrequency[ firemodeindex ] = ev->GetInteger( 1 ); @@ -3940,7 +3863,6 @@ void Weapon::Secondary ( Event *ev ) - { int i; @@ -3976,7 +3898,6 @@ void Weapon::Crosshair ( Event *ev ) - { crosshair = ev->GetBoolean( 1 ); } @@ -3988,7 +3909,6 @@ void Weapon::DMCrosshair ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -4003,7 +3923,6 @@ void Weapon::OffHandAttachToTag ( Event *ev ) - { attachToTag_offhand = ev->GetString( 1 ); } @@ -4015,7 +3934,6 @@ void Weapon::MainAttachToTag ( Event *ev ) - { attachToTag_main = ev->GetString( 1 ); } @@ -4027,7 +3945,6 @@ void Weapon::HolsterAttachToTag ( Event *ev ) - { holster_attachToTag = ev->GetString( 1 ); } @@ -4039,7 +3956,6 @@ void Weapon::SetHolsterOffset ( Event *ev ) - { holsterOffset = ev->GetVector( 1 ); } @@ -4051,7 +3967,6 @@ void Weapon::SetHolsterAngles ( Event *ev ) - { holsterAngles = ev->GetVector( 1 ); } @@ -4075,7 +3990,6 @@ void Weapon::SetQuiet ( Event *ev ) - { quiet[ firemodeindex ] = true; } @@ -4129,7 +4043,6 @@ meansOfDeath_t Weapon::GetMeansOfDeath ( firemode_t mode ) - { assert( ( mode >= 0 ) && ( mode < MAX_FIREMODES ) ); @@ -4205,7 +4118,6 @@ void Weapon::WorldHitSpawn Vector angles, float life ) - { } @@ -4331,7 +4243,6 @@ float Weapon::FireDelay ( firemode_t mode ) - { return firedelay[ mode ]; } @@ -4340,7 +4251,6 @@ void Weapon::EventSetFireDelay ( Event *ev ) - { if( g_gametype->integer ) return; @@ -4352,7 +4262,6 @@ void Weapon::EventSetDMFireDelay ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -4364,7 +4273,6 @@ void Weapon::MakeNoise ( Event *ev ) - { float radius = 500; qboolean force = false; @@ -4386,7 +4294,6 @@ void Weapon::FallingAngleAdjust ( Event *ev ) - { Vector vTmp; Vector vDir; @@ -4481,7 +4388,6 @@ void Weapon::SetAIRange ( Event *ev ) - { str s = ev->GetString( 1 ); @@ -4511,7 +4417,6 @@ void Weapon::SetViewKick ( Event *ev ) - { float pitchmin, pitchmax; float yawmin, yawmax; @@ -4554,7 +4459,6 @@ void Weapon::SetMovementSpeed ( Event *ev ) - { if( g_gametype->integer ) return; @@ -4566,7 +4470,6 @@ void Weapon::SetDMMovementSpeed ( Event *ev ) - { if( !g_gametype->integer ) return; @@ -4578,7 +4481,6 @@ void Weapon::EventAmmoPickupSound ( Event *ev ) - { m_sAmmoPickupSound = ev->GetString( 1 ); } @@ -4587,7 +4489,6 @@ void Weapon::EventNoAmmoSound ( Event *ev ) - { m_NoAmmoSound = ev->GetString( 1 ); } @@ -4596,7 +4497,6 @@ float Weapon::GetBulletRange ( firemode_t mode ) - { return bulletrange[ mode ]; } diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h index 3d728733..1cc30b0a 100644 --- a/code/fgame/weapon.h +++ b/code/fgame/weapon.h @@ -363,7 +363,6 @@ inline void Weapon::Archive ( Archiver &arc ) - { Item::Archive( arc ); diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp index 3f3bc14c..5d806e2c 100644 --- a/code/fgame/weapturret.cpp +++ b/code/fgame/weapturret.cpp @@ -298,7 +298,6 @@ void TurretGun::Archive ( Archiver& arc ) - { Weapon::Archive( arc ); @@ -349,7 +348,6 @@ void TurretGun::SetTargetAngles ( Vector& vTargAngles ) - { float fDiff; float fTurnAmount; @@ -444,7 +442,6 @@ void TurretGun::ThinkActive ( void ) - { Vector vTarg; Vector vTargAngles; @@ -639,7 +636,6 @@ void TurretGun::ThinkIdle ( void ) - { Vector vDir, vNewAngles, vEnd; trace_t trace; @@ -736,7 +732,6 @@ void TurretGun::Think ( void ) - { if (owner || (!m_bHadOwner && aim_target)) { @@ -752,7 +747,6 @@ qboolean TurretGun::UserAim ( usercmd_s *ucmd ) - { Vector vNewCmdAng; @@ -792,7 +786,6 @@ void TurretGun::PlaceTurret ( Event *ev ) - { // Don't make the turret solid setSolidType( SOLID_NOT ); @@ -816,7 +809,6 @@ void TurretGun::TurretBeginUsed ( Sentient *pEnt ) - { owner = pEnt; @@ -853,7 +845,6 @@ void TurretGun::TurretEndUsed ( void ) - { if( owner->IsSubclassOfPlayer() ) { @@ -893,7 +884,6 @@ void TurretGun::TurretUsed ( Sentient *pEnt ) - { if( ( pEnt->IsSubclassOfPlayer() ) && ( pEnt == owner ) ) { @@ -935,7 +925,6 @@ void TurretGun::SetAimTarget ( Entity *ent ) - { aim_target = ent; } @@ -944,7 +933,6 @@ void TurretGun::SetAimOffset ( const Vector& offset ) - { m_Aim_offset = offset; } @@ -953,7 +941,6 @@ void TurretGun::ClearAimTarget ( void ) - { aim_target = NULL; @@ -966,7 +953,6 @@ void TurretGun::StartFiring ( void ) - { m_iFiring = 1; } @@ -975,7 +961,6 @@ void TurretGun::StopFiring ( void ) - { m_iFiring = 0; } @@ -984,7 +969,6 @@ bool TurretGun::IsFiring ( void ) - { return m_iFiring == 2; } @@ -993,7 +977,6 @@ void TurretGun::CalcFiringViewJitter ( void ) - { if( owner && owner->IsSubclassOfPlayer() ) { @@ -1005,7 +988,6 @@ void TurretGun::ApplyFiringViewJitter ( Vector& vAng ) - { } @@ -1013,7 +995,6 @@ void TurretGun::TurnSpeed ( float speed ) - { m_fTurnSpeed = speed; } @@ -1023,7 +1004,6 @@ void TurretGun::PitchCaps float upcap, float downcap ) - { m_fPitchUpCap = upcap; m_fPitchDownCap = downcap; @@ -1039,7 +1019,6 @@ void TurretGun::MaxYawOffset ( float max ) - { m_fMaxYawOffset = max; if( max < 0.0f ) @@ -1056,7 +1035,6 @@ void TurretGun::YawCenter ( float center ) - { m_fStartYaw = center; } @@ -1065,7 +1043,6 @@ void TurretGun::UserDistance ( float dist ) - { m_fUserDistance = dist; } @@ -1077,7 +1054,6 @@ void TurretGun::BurstFireSettings float min_burstdelay, float max_burstdelay ) - { m_fMinBurstTime = min_bursttime; m_fMaxBurstTime = max_bursttime; @@ -1089,7 +1065,6 @@ void TurretGun::CreateViewModel ( void ) - { char newmodel[ MAX_STRING_TOKENS ]; int tagnum; @@ -1148,7 +1123,6 @@ void TurretGun::DeleteViewModel ( void ) - { delete m_pViewModel; m_pViewModel = NULL; @@ -1161,7 +1135,6 @@ qboolean TurretGun::SetWeaponAnim const char *anim, Event *ev ) - { int slot; int animnum; @@ -1200,7 +1173,6 @@ void TurretGun::StopWeaponAnim ( void ) - { if( m_pViewModel ) { @@ -1219,7 +1191,6 @@ bool TurretGun::CanTarget ( float *pos ) - { Vector vAngles; float ang; @@ -1255,7 +1226,6 @@ float TurretGun::FireDelay ( firemode_t mode ) - { if( owner && owner->IsSubclassOfPlayer() ) { @@ -1272,7 +1242,6 @@ void TurretGun::ShowInfo float fDot, float fDist ) - { if( fDot <= 0.90f && ( fDot <= 0.0f || fDist >= 256.0f ) ) { return; @@ -1291,7 +1260,6 @@ void TurretGun::TurretUsed ( Event *ev ) - { Entity *pEnt = ev->GetEntity( 1 ); @@ -1319,7 +1287,6 @@ void TurretGun::SetPlayerUsable ( Event *ev ) - { m_bPlayerUsable = ( ev->GetInteger( 1 ) != 0 ); } @@ -1328,7 +1295,6 @@ void TurretGun::SetViewOffset ( Event *ev ) - { m_vViewOffset = ev->GetVector( 1 ); } @@ -1337,7 +1303,6 @@ void TurretGun::SetIdleCheckOffset ( Event *ev ) - { m_vIdleCheckOffset = ev->GetVector( 1 ); } @@ -1346,7 +1311,6 @@ void TurretGun::EventSetAimTarget ( Event *ev ) - { SetAimTarget( ev->GetEntity( 1 ) ); } @@ -1355,7 +1319,6 @@ void TurretGun::EventSetAimOffset ( Event *ev ) - { SetAimOffset( ev->GetVector( 1 ) ); } @@ -1364,7 +1327,6 @@ void TurretGun::EventClearAimTarget ( Event *ev ) - { ClearAimTarget(); } @@ -1373,7 +1335,6 @@ void TurretGun::EventStartFiring ( Event *ev ) - { StartFiring(); } @@ -1382,7 +1343,6 @@ void TurretGun::EventStopFiring ( Event *ev ) - { StopFiring(); } @@ -1391,7 +1351,6 @@ void TurretGun::EventTurnSpeed ( Event *ev ) - { TurnSpeed( ev->GetFloat( 1 ) ); } @@ -1400,7 +1359,6 @@ void TurretGun::EventPitchCaps ( Event *ev ) - { Vector caps = ev->GetVector( 1 ); PitchCaps( caps[ 0 ], caps[ 1 ] ); @@ -1410,7 +1368,6 @@ void TurretGun::EventMaxYawOffset ( Event *ev ) - { MaxYawOffset( ev->GetFloat( 1 ) ); } @@ -1419,7 +1376,6 @@ void TurretGun::EventYawCenter ( Event *ev ) - { YawCenter( ev->GetFloat( 1 ) ); } @@ -1428,7 +1384,6 @@ void TurretGun::EventUserDistance ( Event *ev ) - { UserDistance( ev->GetFloat( 1 ) ); } @@ -1437,7 +1392,6 @@ void TurretGun::EventViewJitter ( Event *ev ) - { m_fViewJitter = ev->GetFloat( 1 ); } @@ -1446,7 +1400,6 @@ void TurretGun::EventBurstFireSettings ( Event *ev ) - { if( ev->NumArgs() <= 3 ) { return; @@ -1459,7 +1412,6 @@ void TurretGun::EventSetThread ( Event *ev ) - { if( ev->IsFromScript() ) { @@ -1475,7 +1427,6 @@ void TurretGun::SetViewangles ( Event *ev ) - { m_vUserViewAng = ev->GetVector( 1 ); } @@ -1484,7 +1435,6 @@ void TurretGun::GetViewangles ( Event *ev ) - { ev->AddVector( m_vUserViewAng ); } diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp index c4024c9f..e9dc01ec 100644 --- a/code/fgame/weaputils.cpp +++ b/code/fgame/weaputils.cpp @@ -64,7 +64,6 @@ qboolean MeleeAttack qboolean hit_dead, Container*victimlist ) - { trace_t trace; Entity *victim; @@ -726,7 +725,6 @@ void Projectile::Drunk ( Event *ev ) - { if( fDrunk ) { return; @@ -799,7 +797,6 @@ void Projectile::Prethink ( Event *ev ) - { Vector end; @@ -904,7 +901,6 @@ void Projectile::Explode ( Event *ev ) - { Entity *owner; Entity *ignoreEnt = NULL; @@ -964,7 +960,6 @@ void Projectile::SetBounceTouch ( Event *ev ) - { projFlags |= P_BOUNCE_TOUCH; setMoveType( MOVETYPE_BOUNCE ); @@ -974,7 +969,6 @@ void Projectile::SetNoTouchDamage ( Event *ev ) - { projFlags |= P_NO_TOUCH_DAMAGE; } @@ -983,7 +977,6 @@ void Projectile::SetSmashThroughGlass ( Event *ev ) - { m_iSmashThroughGlass = ev->GetInteger( 1 ); @@ -994,7 +987,6 @@ void Projectile::SmashThroughGlassThink ( Event *ev ) - { if( velocity.length() > m_iSmashThroughGlass ) { @@ -1081,7 +1073,6 @@ void Projectile::SetBounceSound ( Event *ev ) - { bouncesound = ev->GetString( 1 ); } @@ -1090,7 +1081,6 @@ void Projectile::SetBounceSoundMetal ( Event *ev ) - { bouncesound_metal = ev->GetString( 1 ); } @@ -1099,7 +1089,6 @@ void Projectile::SetBounceSoundHard ( Event *ev ) - { bouncesound_hard = ev->GetString( 1 ); } @@ -1108,7 +1097,6 @@ void Projectile::SetBounceSoundWater ( Event *ev ) - { bouncesound_water = ev->GetString( 1 ); } @@ -1136,7 +1124,6 @@ void Projectile::SetLife ( Event *ev ) - { life = ev->GetFloat( 1 ); } @@ -1145,7 +1132,6 @@ void Projectile::SetDMLife ( Event *ev ) - { dmlife = ev->GetFloat( 1 ); } @@ -1254,7 +1240,6 @@ void Projectile::DoDecal ( void ) - { if( impactmarkshader.length() ) { @@ -1271,7 +1256,6 @@ void Projectile::Touch ( Event *ev ) - { Entity *other; Entity *owner; @@ -1478,7 +1462,6 @@ void Projectile::RemoveWhenStopped ( Event *ev ) - { remove_when_stopped = true; } @@ -1487,7 +1470,6 @@ void Projectile::ExplodeOnTouch ( Event *ev ) - { m_bExplodeOnTouch = true; } @@ -1518,7 +1500,6 @@ bool Projectile::CheckTeams ( void ) - { Player *pOwner = ( Player * )m_pOwnerPtr.Pointer(); @@ -1557,7 +1538,6 @@ void Projectile::SetOwner ( Entity *owner ) - { this->owner = owner->entnum; m_pOwnerPtr = owner; @@ -1735,7 +1715,6 @@ void Explosion::DamageAgain ( Event *ev ) - { Entity *owner_ent; Weapon *weapon; @@ -1777,7 +1756,6 @@ void Explosion::MakeExplosionEffect ( Event *ev ) - { str sEffect = ev->GetString( 1 ); @@ -1808,7 +1786,6 @@ Projectile *ProjectileAttack float real_speed, Weapon *weap ) - { Event *ev; Projectile *proj = NULL; @@ -1964,7 +1941,6 @@ float BulletAttack int *piTracerCount, Weapon *weap ) - { Vector vDir; Vector vTmpEnd; @@ -2326,7 +2302,6 @@ void FakeBulletAttack int iTracerFrequency, int *piTracerCount ) - { Vector vDir; Vector vTraceEnd; @@ -2383,7 +2358,6 @@ void ClickItemAttack float fRange, Entity *pOwner ) - { Vector vEnd; trace_t trace; @@ -2429,7 +2403,6 @@ Projectile *HeavyAttack Entity *owner, Weapon *weap ) - { Event *ev; Projectile *proj = NULL; @@ -2561,7 +2534,6 @@ void ExplosionAttack Weapon *weap, bool hurtOwnerOnly ) - { Explosion *explosion; Event *ev; @@ -2726,7 +2698,6 @@ void RadiusDamage Weapon *weap, bool hurtOwnerOnly ) - { float points; Entity *ent; diff --git a/code/fgame/weaputils.h b/code/fgame/weaputils.h index 2e8d1b67..73e79275 100644 --- a/code/fgame/weaputils.h +++ b/code/fgame/weaputils.h @@ -143,7 +143,6 @@ inline void Projectile::Archive ( Archiver &arc ) - { Animate::Archive( arc ); @@ -217,7 +216,6 @@ inline void Explosion::Archive ( Archiver &arc ) - { Projectile::Archive( arc ); diff --git a/code/parser/generated/yyLexer.cpp b/code/parser/generated/yyLexer.cpp index fd42d18a..297f2abf 100644 --- a/code/parser/generated/yyLexer.cpp +++ b/code/parser/generated/yyLexer.cpp @@ -2054,7 +2054,6 @@ static int yy_get_next_buffer (void) #else static int input (void) #endif - { int c; @@ -2242,7 +2241,6 @@ static void yy_load_buffer_state (void) * such as during a yyrestart() or at EOF. */ static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { int oerrno = errno; diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp index d8c559e8..c5a7cf89 100644 --- a/code/qcommon/class.cpp +++ b/code/qcommon/class.cpp @@ -128,7 +128,6 @@ ClassDef *getClassList ( void ) - { return ClassDef::classlist; } @@ -137,7 +136,6 @@ void listAllClasses ( void ) - { ClassDef *c; ClassDef *list = ClassDef::classlist; @@ -152,7 +150,6 @@ void listInheritanceOrder ( const char *classname ) - { ClassDef *cls; ClassDef *c; @@ -336,7 +333,6 @@ void Class::error const char *fmt, ... ) - { va_list argptr; char text[ 1024 ]; @@ -620,7 +616,6 @@ void ClassEvents const char *classname, qboolean print_to_disk ) - { ClassDef *c; ResponseDef *r; @@ -729,7 +724,6 @@ void DumpClass FILE * class_file, const char * className ) - { ClassDef *c; ResponseDef *r; @@ -805,7 +799,6 @@ void DumpAllClasses ( void ) - { int i, num; ClassDef *c; diff --git a/code/qcommon/container.h b/code/qcommon/container.h index 8c99f06f..51ffa036 100644 --- a/code/qcommon/container.h +++ b/code/qcommon/container.h @@ -436,7 +436,6 @@ void Container::SetObjectAt(int index, const Type& obj) template void Container::Sort(int (*compare)(const void* elem1, const void* elem2)) - { if (!objlist) { return; diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp index d7e3bd5c..0735a1ac 100644 --- a/code/qcommon/listener.cpp +++ b/code/qcommon/listener.cpp @@ -371,7 +371,6 @@ void ArchiveListenerPtr Archiver& arc, SafePtr< Listener > *obj ) - { arc.ArchiveSafePointer( obj ); } @@ -381,7 +380,6 @@ void ConList::Archive ( Archiver& arc ) - { value.Archive( arc, ArchiveListenerPtr ); } @@ -391,7 +389,6 @@ void Entry< const_str, ConList >::Archive ( Archiver& arc ) - { Director.ArchiveString( arc, key ); value.Archive( arc ); @@ -428,7 +425,6 @@ void L_ArchiveEvents ( Archiver& arc ) - { EventQueueNode* event; int num; @@ -485,7 +481,6 @@ void L_UnarchiveEvents ( Archiver& arc ) - { EventQueueNode* node; Event* e; @@ -1229,7 +1224,6 @@ void Event::ListCommands ( const char *mask ) - { command_t *command; int eventnum; @@ -1317,7 +1311,6 @@ void Event::ListDocumentation const char *mask, qboolean print_to_disk ) - { int num; int n; @@ -1405,7 +1398,6 @@ void Event::PendingEvents ( const char *mask ) - { EventQueueNode *event; size_t l; @@ -1817,7 +1809,6 @@ Event::Event const char *documentation, uchar type ) - { eventInfo_t *evi = ( eventInfo_t * )malloc( sizeof( eventInfo_t ) ); diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h index d9dd7020..d7019805 100644 --- a/code/qcommon/listener.h +++ b/code/qcommon/listener.h @@ -176,7 +176,6 @@ inline int EventArgDef::getType ( void ) - { return type; } @@ -185,7 +184,6 @@ inline const char *EventArgDef::getName ( void ) - { return name.c_str(); } @@ -194,7 +192,6 @@ inline qboolean EventArgDef::isOptional ( void ) - { return optional; } diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c index 44787f77..badccac8 100644 --- a/code/qcommon/q_math.c +++ b/code/qcommon/q_math.c @@ -1568,7 +1568,6 @@ void QuatToMat const float q[ 4 ], float m[ 3 ][ 3 ] ) - { float wx, wy, wz; float xx, yy, yz; @@ -1609,7 +1608,6 @@ void MatToQuat float srcMatrix[ 3 ][ 3 ], float destQuat[ 4 ] ) - { double trace, s; int i, j, k; @@ -1657,7 +1655,6 @@ void SlerpQuaternion float t, float res[4] ) - { float to1[4]; double omega, cosom, sinom, scale0, scale1; @@ -1718,7 +1715,6 @@ void EulerToQuat float ang[ 3 ], float q[ 4 ] ) - { float mat[ 3 ][ 3 ]; int *i; @@ -1745,7 +1741,6 @@ float ProjectPointOnLine vec_t *i_vPoint, vec_t *o_vProj ) - { float fDot; vec3_t vDir; @@ -1771,7 +1766,6 @@ float ProjectLineOnPlane vec_t *vEnd, vec_t *vProj ) - { float d1; float d2; @@ -1981,7 +1975,6 @@ void MatrixTransformVector const float mat[ 3 ][ 3 ], vec3_t out ) - { out[ 0 ] = ( in[ 0 ] * mat[ 0 ][ 0 ] ) + ( in[ 1 ] * mat[ 1 ][ 0 ] ) + ( in[ 2 ] * mat[ 2 ][ 0 ] ); out[ 1 ] = ( in[ 0 ] * mat[ 0 ][ 1 ] ) + ( in[ 1 ] * mat[ 1 ][ 1 ] ) + ( in[ 2 ] * mat[ 2 ][ 1 ] ); @@ -1999,7 +1992,6 @@ const float mat[ 3 ][ 3 ], const vec3_t in, vec3_t out ) - { out[ 0 ] = ( in[ 0 ] * mat[ 0 ][ 0 ] ) + ( in[ 1 ] * mat[ 0 ][ 1 ] ) + ( in[ 2 ] * mat[ 0 ][ 2 ] ); out[ 1 ] = ( in[ 0 ] * mat[ 1 ][ 0 ] ) + ( in[ 1 ] * mat[ 1 ][ 1 ] ) + ( in[ 2 ] * mat[ 1 ][ 2 ] ); @@ -4025,7 +4017,6 @@ void MatrixToEulerAngles const float mat[ 3 ][ 3 ], vec3_t ang ) - { double theta; double cp; diff --git a/code/qcommon/queue.h b/code/qcommon/queue.h index 92063b9d..40d8f408 100644 --- a/code/qcommon/queue.h +++ b/code/qcommon/queue.h @@ -68,7 +68,6 @@ qboolean Queue::Empty ( void ) - { if (head == NULL) { @@ -85,7 +84,6 @@ void Queue::Enqueue ( T data ) - { QueueNode *tmp; @@ -113,7 +111,6 @@ T Queue::Dequeue ( void ) - { T ptr; QueueNode *node; @@ -144,7 +141,6 @@ void Queue::Clear ( void ) - { while (!Empty()) { @@ -170,7 +166,6 @@ void Queue::Remove ( T data ) - { QueueNode *node; QueueNode *prev; @@ -228,7 +223,6 @@ qboolean Queue::Inqueue ( T data ) - { QueueNode *node; diff --git a/code/qcommon/stack.h b/code/qcommon/stack.h index e4c952ef..b6719cae 100644 --- a/code/qcommon/stack.h +++ b/code/qcommon/stack.h @@ -104,7 +104,6 @@ inline void Stack::Clear ( void ) - { while( !Empty() ) { @@ -117,7 +116,6 @@ inline qboolean Stack::Empty ( void ) - { if( head == NULL ) { @@ -131,7 +129,6 @@ inline void Stack::Push ( Type data ) - { StackNode *tmp; @@ -151,7 +148,6 @@ inline Type Stack::Pop ( void ) - { Type ret; StackNode *node; @@ -175,7 +171,6 @@ inline Type Stack::Head ( void ) - { if( !head ) { diff --git a/code/qcommon/str.cpp b/code/qcommon/str.cpp index 33bf744f..3ad246d8 100644 --- a/code/qcommon/str.cpp +++ b/code/qcommon/str.cpp @@ -377,7 +377,6 @@ str& str::operator-= ( int c ) - { if( !m_data ) { @@ -429,7 +428,6 @@ void str::EnsureDataWritable ( void ) - { strdata *olddata; size_t len; @@ -457,7 +455,6 @@ void str::EnsureAlloced size_t amount, bool keepold ) - { if( !m_data ) { diff --git a/code/qcommon/str.h b/code/qcommon/str.h index d2b9925e..1511a674 100644 --- a/code/qcommon/str.h +++ b/code/qcommon/str.h @@ -211,7 +211,6 @@ inline str::str ( const char *text ) : m_data( NULL ) - { size_t len; @@ -233,7 +232,6 @@ inline str::str ( const str& text ) : m_data( NULL ) - { if( text.m_data ) text.m_data->AddRef(); @@ -250,7 +248,6 @@ inline str::str size_t start, size_t end ) : m_data(NULL) - { size_t i; size_t len; @@ -365,7 +362,6 @@ inline void str::append ( const char *text ) - { size_t len; @@ -386,7 +382,6 @@ inline void str::append ( const str& text ) - { size_t len; @@ -433,7 +428,6 @@ inline void str::operator= ( const str& text ) - { // adding the reference before deleting our current reference prevents // us from deleting our string if we are copying from ourself @@ -450,7 +444,6 @@ inline void str::operator= ( const char *text ) - { size_t len; @@ -779,7 +772,6 @@ inline str::operator const char * ( void ) const - { return c_str(); } diff --git a/code/qcommon/vector.h b/code/qcommon/vector.h index ebb241c4..5acfe0a1 100644 --- a/code/qcommon/vector.h +++ b/code/qcommon/vector.h @@ -212,7 +212,6 @@ inline Vector::Vector( const float init_x, const float init_y, const float init_ } inline Vector::Vector( const char *text ): x( 0 ), y( 0 ), z( 0 ) - { if ( text ) { @@ -416,7 +415,6 @@ inline int Vector::FuzzyEqual( vec3_t b, const float epsilon ) const } inline int operator==( const Vector &a, const Vector &b ) - { return ( ( a.x == b.x ) && ( a.y == b.y ) && ( a.z == b.z ) ); } diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp index a854ab32..8673913f 100644 --- a/code/script/scriptvariable.cpp +++ b/code/script/scriptvariable.cpp @@ -77,7 +77,6 @@ void Entry< ScriptVariable, ScriptVariable >::Archive ( Archiver& arc ) - { key.ArchiveInternal( arc ); value.ArchiveInternal( arc ); @@ -88,7 +87,6 @@ void Entry< short3, ScriptVariable >::Archive ( Archiver& arc ) - { if( arc.Loading() ) { @@ -2567,7 +2565,6 @@ void ScriptVariableList::Archive ( Archiver &arc ) - { Class::Archive( arc ); list.Archive( arc );