From 40b4f0f281e65f8d989ca6496a3eb48c805f2d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Wed, 15 May 2024 22:33:51 +0200 Subject: [PATCH 01/22] compiler warnings --- 0.83/Omnibot/Common/Bezier.h | 2 +- 0.83/Omnibot/Common/BotBaseStates.cpp | 228 +++++++++--------- 0.83/Omnibot/Common/BotBaseStates.h | 52 ++-- 0.83/Omnibot/Common/BotBaseStates_GM.cpp | 2 +- 0.83/Omnibot/Common/BotGlobalStates.cpp | 2 +- 0.83/Omnibot/Common/BotGlobalStates.h | 2 +- 0.83/Omnibot/Common/BotSensoryMemory.cpp | 4 +- 0.83/Omnibot/Common/BotSensoryMemory.h | 2 +- 0.83/Omnibot/Common/BotSteeringSystem.cpp | 2 +- 0.83/Omnibot/Common/BotSteeringSystem.h | 2 +- 0.83/Omnibot/Common/BotTargetingSystem.cpp | 2 +- 0.83/Omnibot/Common/BotTargetingSystem.h | 2 +- 0.83/Omnibot/Common/BotWeaponSystem.cpp | 2 +- 0.83/Omnibot/Common/BotWeaponSystem.h | 2 +- 0.83/Omnibot/Common/Client.cpp | 10 +- 0.83/Omnibot/Common/Criteria.h | 2 +- 0.83/Omnibot/Common/DebugWindow.cpp | 8 +- 0.83/Omnibot/Common/EngineFuncs.cpp | 2 +- 0.83/Omnibot/Common/EngineFuncs.h | 2 +- 0.83/Omnibot/Common/FileSystem.cpp | 6 +- 0.83/Omnibot/Common/IGame.cpp | 2 +- 0.83/Omnibot/Common/InterfaceFuncs.cpp | 2 +- 0.83/Omnibot/Common/InterfaceFuncs.h | 2 +- 0.83/Omnibot/Common/Interprocess.cpp | 2 +- 0.83/Omnibot/Common/Interprocess.h | 2 +- 0.83/Omnibot/Common/KeyValueIni.cpp | 5 +- 0.83/Omnibot/Common/Logger.cpp | 10 +- 0.83/Omnibot/Common/MapGoal.cpp | 4 +- 0.83/Omnibot/Common/MapGoal.h | 36 +-- 0.83/Omnibot/Common/MovementCaps.h | 2 +- 0.83/Omnibot/Common/NameManager.cpp | 15 -- 0.83/Omnibot/Common/PathPlannerNavMesh.cpp | 2 +- 0.83/Omnibot/Common/PathPlannerNavMesh.h | 2 +- 0.83/Omnibot/Common/PathPlannerWaypoint.h | 2 +- .../Common/PathPlannerWaypointCmds.cpp | 2 +- 0.83/Omnibot/Common/PropertyBinding.h | 2 +- 0.83/Omnibot/Common/RenderOverlayGame.cpp | 2 +- 0.83/Omnibot/Common/ScriptGoal.cpp | 2 +- 0.83/Omnibot/Common/ScriptGoal.h | 2 +- 0.83/Omnibot/Common/ScriptManager.cpp | 2 +- 0.83/Omnibot/Common/StateMachine.cpp | 22 +- 0.83/Omnibot/Common/StateMachine.h | 2 +- 0.83/Omnibot/Common/Trajectory.cpp | 2 +- 0.83/Omnibot/Common/Trajectory.h | 2 +- 0.83/Omnibot/Common/Utilities.cpp | 10 +- 0.83/Omnibot/Common/Utilities.h | 4 +- 0.83/Omnibot/Common/Waypoint.h | 4 +- 0.83/Omnibot/Common/common.h | 4 +- 0.83/Omnibot/Common/gmAABB.cpp | 6 +- 0.83/Omnibot/Common/gmBind.h | 8 +- 0.83/Omnibot/Common/gmBot.cpp | 9 +- 0.83/Omnibot/Common/gmBotLibrary.cpp | 2 +- 0.83/Omnibot/Common/gmMatrix3.cpp | 2 +- 0.83/Omnibot/Common/gmScriptGoal.cpp | 2 +- 0.83/Omnibot/Common/gmSystemLibApp.cpp | 2 +- 0.83/Omnibot/Common/gmTargetInfo.cpp | 2 +- 0.83/Omnibot/Common/gmTimer.cpp | 6 +- 0.83/Omnibot/Common/gmUtilityLib.cpp | 6 +- 0.83/Omnibot/Common/gmUtilityLib.h | 2 +- 0.83/Omnibot/Common/mdump.cpp | 4 +- 0.83/Omnibot/ET/ET_Game.cpp | 4 +- 0.83/Omnibot/ET/ET_InterfaceFuncs.cpp | 4 +- 0.83/Omnibot/ET/ET_InterfaceFuncs.h | 4 +- 0.83/Omnibot/ET/ET_Messages.h | 2 +- 0.83/Omnibot/RTCW/RTCW_Game.cpp | 2 +- 0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.cpp | 6 +- 0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.h | 4 +- 0.83/Omnibot/RTCW/RTCW_Messages.h | 2 +- 68 files changed, 267 insertions(+), 298 deletions(-) diff --git a/0.83/Omnibot/Common/Bezier.h b/0.83/Omnibot/Common/Bezier.h index f085fc86c..5a9c1cc42 100644 --- a/0.83/Omnibot/Common/Bezier.h +++ b/0.83/Omnibot/Common/Bezier.h @@ -100,7 +100,7 @@ class Bezier3 Vector3 m_P1, m_P2, m_P3, m_P4; }; -}; +} typedef Wm3::Bezier2 Bezier2f; typedef Wm3::Bezier2 Bezier2d; diff --git a/0.83/Omnibot/Common/BotBaseStates.cpp b/0.83/Omnibot/Common/BotBaseStates.cpp index 2c2f4e249..5e7b61c59 100644 --- a/0.83/Omnibot/Common/BotBaseStates.cpp +++ b/0.83/Omnibot/Common/BotBaseStates.cpp @@ -1029,10 +1029,10 @@ namespace AiState , m_PathStatus(PathFinished) , m_PtOnPath(Vector3f::ZERO) , m_LookAheadPt(Vector3f::ZERO) - , m_PassThroughState(0) - , m_RayDistance(-1.0f) , m_JumpTime(0) , m_LastStuckTime(0) + , m_PassThroughState(0) + , m_RayDistance(-1.0f) { } @@ -1739,8 +1739,8 @@ namespace AiState } if( 2 * fHeight * fHeight > fDistSq2d //climb only if next waypoint is above or below player - || m_LadderDirection > 0 && fHeight > -g_fTopWaypointOffset - || m_LadderDirection < 0 && -fHeight > g_fTopWaypointOffset) + || (m_LadderDirection > 0 && fHeight > -g_fTopWaypointOffset) + || (m_LadderDirection < 0 && -fHeight > g_fTopWaypointOffset)) { Vector3f vEye = GetClient()->GetEyePosition(); Vector3f vLook = pt.m_Pt - vEye; @@ -2444,120 +2444,120 @@ namespace AiState ////////////////////////////////////////////////////////////////////////// - TrackTargetZone::TrackTargetZone() - : m_Radius(0.f) - { - Restart(0.f); - } - void TrackTargetZone::Restart(float _radius) - { - m_Radius = _radius; - m_ValidAim = false; + //TrackTargetZone::TrackTargetZone() + // : m_Radius(0.f) + //{ + // Restart(0.f); + //} + //void TrackTargetZone::Restart(float _radius) + //{ + // m_Radius = _radius; + // m_ValidAim = false; - m_LastTarget.Reset(); - for(int i = 0; i < MaxTargetZones; ++i) - { - m_TargetZones[i].m_InUse = false; - m_TargetZones[i].m_TargetCount = 0; - m_TargetZones[i].m_Position = Vector3f::ZERO; - } - } + // m_LastTarget.Reset(); + // for(int i = 0; i < MaxTargetZones; ++i) + // { + // m_TargetZones[i].m_InUse = false; + // m_TargetZones[i].m_TargetCount = 0; + // m_TargetZones[i].m_Position = Vector3f::ZERO; + // } + //} - void TrackTargetZone::UpdateAimPosition() - { - int iNumZones = 0; - float fTotalWeight = 0.f; - for(int i = 0; i < MaxTargetZones; ++i) - { - if(m_TargetZones[i].m_InUse) - { - fTotalWeight += (float)m_TargetZones[i].m_TargetCount; - iNumZones++; - } - } + //void TrackTargetZone::UpdateAimPosition() + //{ + // int iNumZones = 0; + // float fTotalWeight = 0.f; + // for(int i = 0; i < MaxTargetZones; ++i) + // { + // if(m_TargetZones[i].m_InUse) + // { + // fTotalWeight += (float)m_TargetZones[i].m_TargetCount; + // iNumZones++; + // } + // } - float fRand = Mathf::IntervalRandom(0.f, fTotalWeight); - for(int i = 0; i < MaxTargetZones; ++i) - { - if(m_TargetZones[i].m_InUse) - { - fRand -= (float)m_TargetZones[i].m_TargetCount; - if(fRand < 0.f) - { - m_AimPosition = m_TargetZones[i].m_Position; - m_ValidAim = true; - return; - } - } - } - m_ValidAim = false; - } + // float fRand = Mathf::IntervalRandom(0.f, fTotalWeight); + // for(int i = 0; i < MaxTargetZones; ++i) + // { + // if(m_TargetZones[i].m_InUse) + // { + // fRand -= (float)m_TargetZones[i].m_TargetCount; + // if(fRand < 0.f) + // { + // m_AimPosition = m_TargetZones[i].m_Position; + // m_ValidAim = true; + // return; + // } + // } + // } + // m_ValidAim = false; + //} - void TrackTargetZone::RenderDebug() - { - for(int i = 0; i < MaxTargetZones; ++i) - { - if(m_TargetZones[i].m_InUse) - { - Utils::DrawRadius( - m_TargetZones[i].m_Position, - m_Radius, - COLOR::MAGENTA, - MIN_RENDER_TIME); - - Utils::PrintText( - m_TargetZones[i].m_Position, - COLOR::WHITE, - 1.f, - "%d", - m_TargetZones[i].m_TargetCount); - } - } - } + //void TrackTargetZone::RenderDebug() + //{ + // for(int i = 0; i < MaxTargetZones; ++i) + // { + // if(m_TargetZones[i].m_InUse) + // { + // Utils::DrawRadius( + // m_TargetZones[i].m_Position, + // m_Radius, + // COLOR::MAGENTA, + // MIN_RENDER_TIME); + + // Utils::PrintText( + // m_TargetZones[i].m_Position, + // COLOR::WHITE, + // 1.f, + // "%d", + // m_TargetZones[i].m_TargetCount); + // } + // } + //} - void TrackTargetZone::Update(Client *_client) - { - const MemoryRecord *pTargetRec = _client->GetTargetingSystem()->GetCurrentTargetRecord(); - if(pTargetRec != NULL && pTargetRec->GetEntity() != m_LastTarget) - { - for(int i = 0; i < MaxTargetZones; ++i) - { - // if new target, add it to the zone counter - bool bFound = false; - TargetZone *pFreeZone = 0; - for(int z = 0; z < MaxTargetZones; ++z) - { - if(m_TargetZones[z].m_InUse) - { - const float fSqDistance = SquaredLength(m_TargetZones[z].m_Position,pTargetRec->GetLastSensedPosition()); + //void TrackTargetZone::Update(Client *_client) + //{ + // const MemoryRecord *pTargetRec = _client->GetTargetingSystem()->GetCurrentTargetRecord(); + // if(pTargetRec != NULL && pTargetRec->GetEntity() != m_LastTarget) + // { + // for(int i = 0; i < MaxTargetZones; ++i) + // { + // // if new target, add it to the zone counter + // bool bFound = false; + // TargetZone *pFreeZone = 0; + // for(int z = 0; z < MaxTargetZones; ++z) + // { + // if(m_TargetZones[z].m_InUse) + // { + // const float fSqDistance = SquaredLength(m_TargetZones[z].m_Position,pTargetRec->GetLastSensedPosition()); - if(fSqDistance < Mathf::Sqr(m_Radius)) - { - m_TargetZones[z].m_TargetCount++; - bFound = true; - } - } - else - { - if(!pFreeZone) - pFreeZone = &m_TargetZones[z]; - } - } + // if(fSqDistance < Mathf::Sqr(m_Radius)) + // { + // m_TargetZones[z].m_TargetCount++; + // bFound = true; + // } + // } + // else + // { + // if(!pFreeZone) + // pFreeZone = &m_TargetZones[z]; + // } + // } - if(!bFound && pFreeZone) - { - pFreeZone->m_InUse = true; - pFreeZone->m_Position = pTargetRec->GetLastSensedPosition(); - pFreeZone->m_TargetCount = 1; - } - } + // if(!bFound && pFreeZone) + // { + // pFreeZone->m_InUse = true; + // pFreeZone->m_Position = pTargetRec->GetLastSensedPosition(); + // pFreeZone->m_TargetCount = 1; + // } + // } - m_LastTarget = pTargetRec->GetEntity(); - } + // m_LastTarget = pTargetRec->GetEntity(); + // } - if(m_LastTarget.IsValid() && !InterfaceFuncs::IsAlive(m_LastTarget)) - m_LastTarget.Reset(); - } + // if(m_LastTarget.IsValid() && !InterfaceFuncs::IsAlive(m_LastTarget)) + // m_LastTarget.Reset(); + //} ////////////////////////////////////////////////////////////////////////// @@ -3219,10 +3219,10 @@ namespace AiState if(pNearestSector) { - int iNumConnections = 0; - for(int d = 0; d < DIR_NUM; ++d) - if(pNearestSector->Connections[d].Destination) - ++iNumConnections; + //int iNumConnections = 0; + //for(int d = 0; d < DIR_NUM; ++d) + // if(pNearestSector->Connections[d].Destination) + // ++iNumConnections; Vector3f vNodePos = _GetNodePosition(*pNearestSector); Utils::PrintText( vNodePos+Vector3f(0,0,32), @@ -3364,4 +3364,4 @@ namespace AiState } ////////////////////////////////////////////////////////////////////////// -}; +} diff --git a/0.83/Omnibot/Common/BotBaseStates.h b/0.83/Omnibot/Common/BotBaseStates.h index 17bfba8aa..c0958fcbc 100644 --- a/0.83/Omnibot/Common/BotBaseStates.h +++ b/0.83/Omnibot/Common/BotBaseStates.h @@ -20,37 +20,37 @@ class gmScriptGoal; namespace AiState { ////////////////////////////////////////////////////////////////////////// - class TrackTargetZone - { - public: - enum { MaxTargetZones = 8 }; - struct TargetZone - { - Vector3f m_Position; - obint32 m_TargetCount; - bool m_InUse : 1; - }; + //class TrackTargetZone + //{ + //public: + // enum { MaxTargetZones = 8 }; + // struct TargetZone + // { + // Vector3f m_Position; + // obint32 m_TargetCount; + // bool m_InUse : 1; + // }; - void Restart(float _radius); + // void Restart(float _radius); - void UpdateAimPosition(); + // void UpdateAimPosition(); - bool HasAim() const { return m_ValidAim; } + // bool HasAim() const { return m_ValidAim; } - const Vector3f &GetAimPosition() { return m_AimPosition; } + // const Vector3f &GetAimPosition() { return m_AimPosition; } - void RenderDebug(); + // void RenderDebug(); - void Update(Client *_client); + // void Update(Client *_client); - TrackTargetZone(); - private: - float m_Radius; - Vector3f m_AimPosition; - GameEntity m_LastTarget; - TargetZone m_TargetZones[MaxTargetZones]; - bool m_ValidAim; - }; + // TrackTargetZone(); + //private: + // float m_Radius; + // Vector3f m_AimPosition; + // GameEntity m_LastTarget; + // TargetZone m_TargetZones[MaxTargetZones]; + // bool m_ValidAim; + //}; ////////////////////////////////////////////////////////////////////////// class AimerUser { @@ -638,7 +638,7 @@ namespace AiState CastInput CastInputs[MaxCasts]; CastOutput CastOutputs[MaxCasts]; int GroupId[MaxCasts]; - const char *UserName[MaxCasts];; + const char *UserName[MaxCasts]; int CastReadPosition; int CastWritePosition; @@ -749,6 +749,6 @@ namespace AiState ////////////////////////////////////////////////////////////////////////// -}; +} #endif diff --git a/0.83/Omnibot/Common/BotBaseStates_GM.cpp b/0.83/Omnibot/Common/BotBaseStates_GM.cpp index f62d2320c..824442dd0 100644 --- a/0.83/Omnibot/Common/BotBaseStates_GM.cpp +++ b/0.83/Omnibot/Common/BotBaseStates_GM.cpp @@ -250,4 +250,4 @@ namespace AiState ; } -}; +} diff --git a/0.83/Omnibot/Common/BotGlobalStates.cpp b/0.83/Omnibot/Common/BotGlobalStates.cpp index 0374881c7..6c777c99a 100644 --- a/0.83/Omnibot/Common/BotGlobalStates.cpp +++ b/0.83/Omnibot/Common/BotGlobalStates.cpp @@ -23,4 +23,4 @@ namespace AiState AppendState(new RegionTriggers); } -}; \ No newline at end of file +} diff --git a/0.83/Omnibot/Common/BotGlobalStates.h b/0.83/Omnibot/Common/BotGlobalStates.h index 29ae10044..cf113e0f1 100644 --- a/0.83/Omnibot/Common/BotGlobalStates.h +++ b/0.83/Omnibot/Common/BotGlobalStates.h @@ -30,6 +30,6 @@ namespace AiState GlobalRoot(); private: }; -}; +} #endif diff --git a/0.83/Omnibot/Common/BotSensoryMemory.cpp b/0.83/Omnibot/Common/BotSensoryMemory.cpp index 64739245c..65ed87043 100644 --- a/0.83/Omnibot/Common/BotSensoryMemory.cpp +++ b/0.83/Omnibot/Common/BotSensoryMemory.cpp @@ -192,7 +192,6 @@ namespace AiState { Prof(UpdateSight); - int iUpdated = 0; for(int i = 0; i < NumRecords; ++i) { if(m_Records[i].GetEntity().IsValid()) @@ -203,7 +202,6 @@ namespace AiState continue; } UpdateRecord(m_Records[i]); - ++iUpdated; } } } @@ -591,4 +589,4 @@ namespace AiState return State_Busy; } -}; \ No newline at end of file +} diff --git a/0.83/Omnibot/Common/BotSensoryMemory.h b/0.83/Omnibot/Common/BotSensoryMemory.h index c3b73540d..39bb317d8 100644 --- a/0.83/Omnibot/Common/BotSensoryMemory.h +++ b/0.83/Omnibot/Common/BotSensoryMemory.h @@ -206,5 +206,5 @@ namespace AiState static pfnCanSensoreEntity m_pfnCanSensoreEntity; private: }; -}; +} #endif diff --git a/0.83/Omnibot/Common/BotSteeringSystem.cpp b/0.83/Omnibot/Common/BotSteeringSystem.cpp index 2fcf90cc3..941e3157e 100644 --- a/0.83/Omnibot/Common/BotSteeringSystem.cpp +++ b/0.83/Omnibot/Common/BotSteeringSystem.cpp @@ -142,4 +142,4 @@ namespace AiState } return State_Busy; } -}; +} diff --git a/0.83/Omnibot/Common/BotSteeringSystem.h b/0.83/Omnibot/Common/BotSteeringSystem.h index 040ac021a..658ad47b2 100644 --- a/0.83/Omnibot/Common/BotSteeringSystem.h +++ b/0.83/Omnibot/Common/BotSteeringSystem.h @@ -93,5 +93,5 @@ namespace AiState enum Deceleration{slow = 3, normal = 2, fast = 1}; float _Arrive(const Vector3f &_targetPos, Deceleration _deceleration); }; -}; +} #endif diff --git a/0.83/Omnibot/Common/BotTargetingSystem.cpp b/0.83/Omnibot/Common/BotTargetingSystem.cpp index dbdb0590f..aa8eb0c45 100644 --- a/0.83/Omnibot/Common/BotTargetingSystem.cpp +++ b/0.83/Omnibot/Common/BotTargetingSystem.cpp @@ -98,4 +98,4 @@ namespace AiState return State_Busy; } -}; \ No newline at end of file +} diff --git a/0.83/Omnibot/Common/BotTargetingSystem.h b/0.83/Omnibot/Common/BotTargetingSystem.h index f27a02d1d..8121b230b 100644 --- a/0.83/Omnibot/Common/BotTargetingSystem.h +++ b/0.83/Omnibot/Common/BotTargetingSystem.h @@ -71,5 +71,5 @@ namespace AiState GameEntity m_ForceTarget; }; -}; +} #endif diff --git a/0.83/Omnibot/Common/BotWeaponSystem.cpp b/0.83/Omnibot/Common/BotWeaponSystem.cpp index 5a24b7769..ee46ae60e 100644 --- a/0.83/Omnibot/Common/BotWeaponSystem.cpp +++ b/0.83/Omnibot/Common/BotWeaponSystem.cpp @@ -794,4 +794,4 @@ namespace AiState return NumWeaponIds ? (WeaponIds[rand() % NumWeaponIds]) : 0; } -}; +} diff --git a/0.83/Omnibot/Common/BotWeaponSystem.h b/0.83/Omnibot/Common/BotWeaponSystem.h index 984d2df0b..5108af5cb 100644 --- a/0.83/Omnibot/Common/BotWeaponSystem.h +++ b/0.83/Omnibot/Common/BotWeaponSystem.h @@ -271,5 +271,5 @@ namespace AiState // Chooses the current weapon based on the result of <_UpdateWeaponFromGame> void _UpdateCurrentWeapon(FireMode _mode); }; -}; +} #endif diff --git a/0.83/Omnibot/Common/Client.cpp b/0.83/Omnibot/Common/Client.cpp index 4b984ebe3..83d98563d 100644 --- a/0.83/Omnibot/Common/Client.cpp +++ b/0.83/Omnibot/Common/Client.cpp @@ -29,6 +29,7 @@ Client::HoldButtons::HoldButtons() Client::Client() : m_DesiredTeam (RANDOM_TEAM_IF_NO_TEAM) , m_DesiredClass (RANDOM_CLASS_IF_NO_CLASS) + , m_SpawnTime(0) , m_StepHeight (0.0f) , m_StateRoot (NULL) , m_Position (Vector3f::ZERO) @@ -53,7 +54,6 @@ Client::Client() , m_AimDamping (10.0f) , m_AimTolerance (48.0f) , m_ProfileType (PROFILE_NONE) - , m_SpawnTime(0) { memset(&m_ClientInput, 0, sizeof(m_ClientInput)); memset(&m_HealthArmor, 0, sizeof(m_HealthArmor)); @@ -89,11 +89,6 @@ void Client::Update() { Prof(Interface_Functions); - // for remote syncing - const Vector3f oldPosition = m_Position; - const Vector3f oldFacing = m_FacingVector; - const Msg_HealthArmor oldHealthArmor = m_HealthArmor; - // update my locally properties with the one the game has for me. EngineFuncs::EntityPosition(m_GameEntity, m_Position); EngineFuncs::EntityWorldOBB(m_GameEntity, m_WorldBounds); @@ -312,8 +307,7 @@ void Client::ProcessEvent(const MessageHelper &_message, CallbackParameters &_cb } HANDLER(MESSAGE_SPECTATED) { - const Event_Spectated *m = _message.Get(); - m; + //const Event_Spectated *m = _message.Get(); if(IsDebugEnabled(BOT_DEBUG_FPINFO)) { StringStr strOutString; diff --git a/0.83/Omnibot/Common/Criteria.h b/0.83/Omnibot/Common/Criteria.h index c44169f37..0ea97787d 100644 --- a/0.83/Omnibot/Common/Criteria.h +++ b/0.83/Omnibot/Common/Criteria.h @@ -61,7 +61,7 @@ namespace Criteria OP_GREATERTHAN, OP_EQUALS, }; -}; +} ////////////////////////////////////////////////////////////////////////// diff --git a/0.83/Omnibot/Common/DebugWindow.cpp b/0.83/Omnibot/Common/DebugWindow.cpp index 5ff75dd3e..8f0ba34c6 100644 --- a/0.83/Omnibot/Common/DebugWindow.cpp +++ b/0.83/Omnibot/Common/DebugWindow.cpp @@ -127,7 +127,7 @@ namespace DrawBuffer Lines.clear(); Points.clear(); } -}; +} ////////////////////////////////////////////////////////////////////////// @@ -397,7 +397,7 @@ namespace Listeners int mOffsetX, mOffsetY; bool mShiftHeld; }; -}; +} Listeners::Console consoleListener; Listeners::GenericActionListener dwActionListener; @@ -498,7 +498,7 @@ namespace ListModels case GoalAvailability1: return m_GoalList[i]->IsAvailable(OB_TEAM_1) ? "1":"0"; case GoalAvailability2: - return m_GoalList[i]->IsAvailable(OB_TEAM_2) ? "1":"0";; + return m_GoalList[i]->IsAvailable(OB_TEAM_2) ? "1":"0"; case GoalAvailability3: return m_GoalList[i]->IsAvailable(OB_TEAM_3) ? "1":"0"; case GoalAvailability4: @@ -562,7 +562,7 @@ namespace ListModels } StringVector m_Completions; }; -}; +} ListModels::ClientListModel clientList; ListModels::GoalsListModel goalList; diff --git a/0.83/Omnibot/Common/EngineFuncs.cpp b/0.83/Omnibot/Common/EngineFuncs.cpp index 3068903f0..7146c8ceb 100644 --- a/0.83/Omnibot/Common/EngineFuncs.cpp +++ b/0.83/Omnibot/Common/EngineFuncs.cpp @@ -233,7 +233,7 @@ namespace EngineFuncs g_EngineFuncs->PrintError(_msg); //ThreadAddError(_msg); } -}; +} diff --git a/0.83/Omnibot/Common/EngineFuncs.h b/0.83/Omnibot/Common/EngineFuncs.h index 6965e688f..dde4bde07 100644 --- a/0.83/Omnibot/Common/EngineFuncs.h +++ b/0.83/Omnibot/Common/EngineFuncs.h @@ -38,7 +38,7 @@ namespace EngineFuncs void ConsoleMessage(const char* _msg); void ConsoleError(const char* _msg); -}; +} namespace Constants { enum Internal { MAX_PLAYERS = 64, MAX_ENTITIES = 4096, MAX_TEAMS = 4 }; diff --git a/0.83/Omnibot/Common/FileSystem.cpp b/0.83/Omnibot/Common/FileSystem.cpp index f747e77cb..68ccdaf80 100644 --- a/0.83/Omnibot/Common/FileSystem.cpp +++ b/0.83/Omnibot/Common/FileSystem.cpp @@ -917,15 +917,11 @@ bool File::ReadLine(String &_str) OBASSERT(m_TextMode, "Function Only for Text Mode"); if(m_TextMode) { - const obuint8 cr = 0x0D; - const obuint8 lf = 0x0A; - lf; - if(EndOfFile()) return false; char ch; - while(Read(&ch, sizeof(ch), 1) && !EndOfFile() && ch != cr && ch != '\n') + while(Read(&ch, sizeof(ch), 1) && !EndOfFile() && ch != '\r' && ch != '\n') _str.push_back(ch); // eat white space. diff --git a/0.83/Omnibot/Common/IGame.cpp b/0.83/Omnibot/Common/IGame.cpp index d4a44f0b7..27aba7237 100644 --- a/0.83/Omnibot/Common/IGame.cpp +++ b/0.83/Omnibot/Common/IGame.cpp @@ -52,8 +52,8 @@ IGame::IGame() : m_StateRoot(0) , m_NumDeletedThreads(0) , m_WeaponClassIdStart(0) - , m_bDrawBlockableTests (false) , m_PlayersChanged(true) + , m_bDrawBlockableTests (false) { } diff --git a/0.83/Omnibot/Common/InterfaceFuncs.cpp b/0.83/Omnibot/Common/InterfaceFuncs.cpp index 3dad6dc35..84844321d 100644 --- a/0.83/Omnibot/Common/InterfaceFuncs.cpp +++ b/0.83/Omnibot/Common/InterfaceFuncs.cpp @@ -339,4 +339,4 @@ namespace InterfaceFuncs } -}; +} diff --git a/0.83/Omnibot/Common/InterfaceFuncs.h b/0.83/Omnibot/Common/InterfaceFuncs.h index fb46e00c3..237597a48 100644 --- a/0.83/Omnibot/Common/InterfaceFuncs.h +++ b/0.83/Omnibot/Common/InterfaceFuncs.h @@ -64,6 +64,6 @@ namespace InterfaceFuncs MessageHelper msg(GEN_MSG_SETLOADOUT, &_info, sizeof(T)); return SUCCESS(InterfaceMsg(msg,_ent)); } -}; +} #endif diff --git a/0.83/Omnibot/Common/Interprocess.cpp b/0.83/Omnibot/Common/Interprocess.cpp index cab0b3e73..411aa410a 100644 --- a/0.83/Omnibot/Common/Interprocess.cpp +++ b/0.83/Omnibot/Common/Interprocess.cpp @@ -367,4 +367,4 @@ namespace InterProcess #endif // INTERPROCESS } } -}; +} diff --git a/0.83/Omnibot/Common/Interprocess.h b/0.83/Omnibot/Common/Interprocess.h index de7383f4c..9c0c6535f 100644 --- a/0.83/Omnibot/Common/Interprocess.h +++ b/0.83/Omnibot/Common/Interprocess.h @@ -14,6 +14,6 @@ namespace InterProcess void DrawBounds(const AABB &_aabb, obColor _color, float _time, AABB::Direction _dir); void DrawPolygon(const Vector3List &_vertices, obColor _color, float _time); void DrawText(const Vector3f &_a, const char *_txt, obColor _color, float _time); -}; +} #endif diff --git a/0.83/Omnibot/Common/KeyValueIni.cpp b/0.83/Omnibot/Common/KeyValueIni.cpp index 7c687d2cf..41ce6b22b 100644 --- a/0.83/Omnibot/Common/KeyValueIni.cpp +++ b/0.83/Omnibot/Common/KeyValueIni.cpp @@ -74,9 +74,6 @@ namespace KEYVALUEINI #if defined(__linux__) || ((defined __MACH__) && (defined __APPLE__)) # define _stricmp(a,b) strcasecmp((a),(b)) -#endif - -#if defined(__linux__) || ((defined __MACH__) && (defined __APPLE__)) # define _vsnprintf(a,b,c,d) vsnprintf((a),(b),(c),(d)) #endif @@ -862,7 +859,7 @@ namespace KEYVALUEINI } -}; // END KEYVALUE INI NAMESPACE +} // END KEYVALUE INI NAMESPACE using namespace KEYVALUEINI; diff --git a/0.83/Omnibot/Common/Logger.cpp b/0.83/Omnibot/Common/Logger.cpp index 052c29ebf..353ac79d0 100644 --- a/0.83/Omnibot/Common/Logger.cpp +++ b/0.83/Omnibot/Common/Logger.cpp @@ -1,12 +1,12 @@ // --------------------------------------------------------------------------------------------------------------------------------- // _ // | | -// | | ___ __ _ __ _ ___ _ __ ___ _ __ _ __ -// | |/ _ \ / _` |/ _` |/ _ \ '__| / __| '_ \| '_ \ +// | | ___ __ _ __ _ ___ _ __ ___ _ __ _ __ +// | |/ _ \ / _` |/ _` |/ _ \ '__| / __| '_ \| '_ \ // | | (_) | (_| | (_| | __/ | _ | (__| |_) | |_) | -// |_|\___/ \__, |\__, |\___|_| (_) \___| .__/| .__/ -// __/ | __/ | | | | | -// |___/ |___/ |_| |_| +// |_|\___/ \__, |\__, |\___|_| (_) \___| .__/| .__/ +// __/ | __/ | | | | | +// |___/ |___/ |_| |_| // // Generic informational logging class // diff --git a/0.83/Omnibot/Common/MapGoal.cpp b/0.83/Omnibot/Common/MapGoal.cpp index 2b41e3050..95e3176ef 100644 --- a/0.83/Omnibot/Common/MapGoal.cpp +++ b/0.83/Omnibot/Common/MapGoal.cpp @@ -298,7 +298,7 @@ void MapGoal::GenerateName(int _instance, bool _skipdupecheck) for(const char *s = m_Name.c_str(); *s; s++) { char c = *s; - if(!(c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' || c >= '0' && c <= '9' || c == '_')) + if(!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '_')) { static boost::regex re("[^A-Za-z0-9_]"); m_Name = boost::regex_replace(m_Name, re, ""); @@ -1633,7 +1633,7 @@ bool MapGoal::SaveToTable(gmMachine *_machine, gmGCRoot &_savetab if(!GetGroupName().empty()) GoalTable->Set(_machine, "GroupName", GetGroupName().c_str()); GoalTable->Set(_machine,"Position",gmVariable(m_InterfacePosition.IsZero() ? m_Position : m_InterfacePosition)); if(m_Radius!=0.0f) GoalTable->Set(_machine, "Radius", gmVariable(m_Radius)); - if(m_MinRadius < m_MinRadiusInit && m_Radius < m_MinRadiusInit || m_MinRadius > m_MinRadiusInit && m_Radius < m_MinRadius) + if((m_MinRadius < m_MinRadiusInit && m_Radius < m_MinRadiusInit) || (m_MinRadius > m_MinRadiusInit && m_Radius < m_MinRadius)) GoalTable->Set(_machine, "MinRadius", gmVariable(m_MinRadius)); if(!m_CreateOnLoad) GoalTable->Set(_machine, "CreateOnLoad", gmVariable(m_CreateOnLoad)); diff --git a/0.83/Omnibot/Common/MapGoal.h b/0.83/Omnibot/Common/MapGoal.h index af172c162..2fe3a3f31 100644 --- a/0.83/Omnibot/Common/MapGoal.h +++ b/0.83/Omnibot/Common/MapGoal.h @@ -67,24 +67,24 @@ private: \ #define PROPERTY_PROPOGATE(name) m_##name = _other->m_##name; ////////////////////////////////////////////////////////////////////////// - PROPERTY_BITFLAG64(DisableWithEntityFlag); - PROPERTY_BITFLAG64(DeleteWithEntityFlag); - PROPERTY_FLOAT(RenderHeight); - PROPERTY_FLOAT(DefaultRenderRadius); - PROPERTY_INT(DefaultDrawFlags); - PROPERTY_BOOL(DeleteMe); - PROPERTY_BOOL(DynamicPosition); - PROPERTY_BOOL(DynamicOrientation); - PROPERTY_BOOL(PropertiesBound); - PROPERTY_BOOL(RemoveWithEntity); - PROPERTY_BOOL(InterfaceGoal); - PROPERTY_BOOL(Disabled); - PROPERTY_BOOL(InUse); - PROPERTY_BOOL(DisableForControllingTeam); - PROPERTY_BOOL(DontSave); - PROPERTY_BOOL(RenderGoal); - PROPERTY_BOOL(RenderRoutes); - PROPERTY_BOOL(CreateOnLoad); + PROPERTY_BITFLAG64(DisableWithEntityFlag) + PROPERTY_BITFLAG64(DeleteWithEntityFlag) + PROPERTY_FLOAT(RenderHeight) + PROPERTY_FLOAT(DefaultRenderRadius) + PROPERTY_INT(DefaultDrawFlags) + PROPERTY_BOOL(DeleteMe) + PROPERTY_BOOL(DynamicPosition) + PROPERTY_BOOL(DynamicOrientation) + PROPERTY_BOOL(PropertiesBound) + PROPERTY_BOOL(RemoveWithEntity) + PROPERTY_BOOL(InterfaceGoal) + PROPERTY_BOOL(Disabled) + PROPERTY_BOOL(InUse) + PROPERTY_BOOL(DisableForControllingTeam) + PROPERTY_BOOL(DontSave) + PROPERTY_BOOL(RenderGoal) + PROPERTY_BOOL(RenderRoutes) + PROPERTY_BOOL(CreateOnLoad) enum DefaultDrawFlags { diff --git a/0.83/Omnibot/Common/MovementCaps.h b/0.83/Omnibot/Common/MovementCaps.h index 216cf8c56..9caed83a1 100644 --- a/0.83/Omnibot/Common/MovementCaps.h +++ b/0.83/Omnibot/Common/MovementCaps.h @@ -11,6 +11,6 @@ namespace Movement MOVE_MAX, }; -}; +} #endif diff --git a/0.83/Omnibot/Common/NameManager.cpp b/0.83/Omnibot/Common/NameManager.cpp index 5d3d2c841..aeaaad2e7 100644 --- a/0.83/Omnibot/Common/NameManager.cpp +++ b/0.83/Omnibot/Common/NameManager.cpp @@ -9,21 +9,6 @@ #include "PrecompCommon.h" #include "NameManager.h" -////////////////////////////////////////////////////////////////////////// -class BotIdentity -{ -public: - - BotIdentity() - : m_DesiredClassId(RANDOM_CLASS_IF_NO_CLASS) - , m_DesiredTeamId(RANDOM_TEAM_IF_NO_TEAM) - { - } -private: - String m_Name; - obint32 m_DesiredClassId; - obint32 m_DesiredTeamId; -}; ////////////////////////////////////////////////////////////////////////// NameReference::NameReference(const String &_name, const String &_profile) : diff --git a/0.83/Omnibot/Common/PathPlannerNavMesh.cpp b/0.83/Omnibot/Common/PathPlannerNavMesh.cpp index 6afe45073..84b64ad78 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMesh.cpp +++ b/0.83/Omnibot/Common/PathPlannerNavMesh.cpp @@ -28,7 +28,7 @@ const float k_fGroundExtent = 10.0f; namespace NavigationMeshOptions { float CharacterHeight = 64.f; -}; +} ////////////////////////////////////////////////////////////////////////// PathPlannerNavMesh *g_PlannerNavMesh = 0; diff --git a/0.83/Omnibot/Common/PathPlannerNavMesh.h b/0.83/Omnibot/Common/PathPlannerNavMesh.h index c6ec1ede5..d09e0dfe2 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMesh.h +++ b/0.83/Omnibot/Common/PathPlannerNavMesh.h @@ -36,7 +36,7 @@ enum ToolStateNavMesh namespace NavigationMeshOptions { extern float CharacterHeight; -}; +} // class: PathPlannerNavMesh // Path planner interface for the navmesh system for hl2 diff --git a/0.83/Omnibot/Common/PathPlannerWaypoint.h b/0.83/Omnibot/Common/PathPlannerWaypoint.h index 1845628e4..a27c007fd 100644 --- a/0.83/Omnibot/Common/PathPlannerWaypoint.h +++ b/0.83/Omnibot/Common/PathPlannerWaypoint.h @@ -287,7 +287,7 @@ class PathPlannerWaypoint : public PathPlannerBase void cmdWaypointClearConnections(const StringVector &_args); void cmdWaypointSetName(const StringVector &_args); void cmdWaypointSetProperty(const StringVector &_args); - void cmdWaypointShowProperty(const StringVector &_args);; + void cmdWaypointShowProperty(const StringVector &_args); void cmdWaypointClearProperty(const StringVector &_args); void cmdWaypointAutoRadius(const StringVector &_args); void cmdWaypointMove(const StringVector &_args); diff --git a/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp b/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp index d2ef838b4..d3b75bb7f 100644 --- a/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp +++ b/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp @@ -571,7 +571,7 @@ void PathPlannerWaypoint::cmdWaypointView(const StringVector &_args) { if(_args.size() >= 2) { - if(Utils::StringToTrue(_args[1]) || _args[1] == "toggle" && !m_PlannerFlags.CheckFlag(NAV_VIEW)) + if(Utils::StringToTrue(_args[1]) || (_args[1] == "toggle" && !m_PlannerFlags.CheckFlag(NAV_VIEW))) { m_PlannerFlags.SetFlag(NAV_VIEW); const char * msg = IGameManager::GetInstance()->GetGame()->IsDebugDrawSupported(); diff --git a/0.83/Omnibot/Common/PropertyBinding.h b/0.83/Omnibot/Common/PropertyBinding.h index 2b7ae5bc0..4b26652ea 100644 --- a/0.83/Omnibot/Common/PropertyBinding.h +++ b/0.83/Omnibot/Common/PropertyBinding.h @@ -43,7 +43,7 @@ namespace Prop { PF_FULLTRANS= (PF_VEC_LAST<<0), }; -}; +} ////////////////////////////////////////////////////////////////////////// diff --git a/0.83/Omnibot/Common/RenderOverlayGame.cpp b/0.83/Omnibot/Common/RenderOverlayGame.cpp index e2c2672d9..745dc043b 100644 --- a/0.83/Omnibot/Common/RenderOverlayGame.cpp +++ b/0.83/Omnibot/Common/RenderOverlayGame.cpp @@ -41,7 +41,7 @@ namespace GameContext if(mGuiContext && mGuiDC) wglMakeCurrent(mGuiDC,mGuiContext); } -}; +} ////////////////////////////////////////////////////////////////////////// diff --git a/0.83/Omnibot/Common/ScriptGoal.cpp b/0.83/Omnibot/Common/ScriptGoal.cpp index 9da6b4d0b..23b069cd1 100644 --- a/0.83/Omnibot/Common/ScriptGoal.cpp +++ b/0.83/Omnibot/Common/ScriptGoal.cpp @@ -897,4 +897,4 @@ namespace AiState } } } -}; +} diff --git a/0.83/Omnibot/Common/ScriptGoal.h b/0.83/Omnibot/Common/ScriptGoal.h index f79eb2208..082a6cad1 100644 --- a/0.83/Omnibot/Common/ScriptGoal.h +++ b/0.83/Omnibot/Common/ScriptGoal.h @@ -272,7 +272,7 @@ namespace AiState ScriptGoal(); }; -}; +} #endif diff --git a/0.83/Omnibot/Common/ScriptManager.cpp b/0.83/Omnibot/Common/ScriptManager.cpp index d4da75250..538775a7f 100644 --- a/0.83/Omnibot/Common/ScriptManager.cpp +++ b/0.83/Omnibot/Common/ScriptManager.cpp @@ -489,7 +489,7 @@ gmTableObject *ScriptManager::GetBotTable(const Client *_client) if(botVar.m_type == gmBot::GetType()) { - return gmBot::GetUserTable(botVar.GetUserObjectSafe(gmBot::GetType()));; + return gmBot::GetUserTable(botVar.GetUserObjectSafe(gmBot::GetType())); } else { diff --git a/0.83/Omnibot/Common/StateMachine.cpp b/0.83/Omnibot/Common/StateMachine.cpp index fbc4e2a38..734aa1ed8 100644 --- a/0.83/Omnibot/Common/StateMachine.cpp +++ b/0.83/Omnibot/Common/StateMachine.cpp @@ -16,6 +16,7 @@ State::State(const char * _name, const UpdateDelay &_ur) , m_Parent(0) , m_FirstChild(0) , m_Root(0) + , m_NumThreads(0) , m_Client(0) , m_NextUpdate(0) , m_LastUpdateTime(0) @@ -27,7 +28,6 @@ State::State(const char * _name, const UpdateDelay &_ur) , m_NameHash(0) , m_DebugIcon(Ico_Default) , m_SyncCrc( 0 ) - , m_NumThreads(0) { SetName(_name); DebugExpand(true); @@ -1111,12 +1111,12 @@ State::StateStatus StatePrioritized::UpdateState(float fDt) int iBestRand = 0; #ifdef _DEBUG - const int N = 64; // cs: was 32 - float STATES_PRIO[N] = {}; - State *STATES_P[N] = {}; int NumPriorities = 0; - State *STATES_X[N] = {}; int NumExited = 0; - State *OLD_BEST = m_CurrentState; OLD_BEST; - const char *BOT_NAME = GetClient() ? GetClient()->GetName() : 0; BOT_NAME; + //const int N = 64; // cs: was 32 + //float STATES_PRIO[N] = {}; + //State *STATES_P[N] = {}; int NumPriorities = 0; + //State *STATES_X[N] = {}; int NumExited = 0; + //State *OLD_BEST = m_CurrentState; OLD_BEST; + //const char *BOT_NAME = GetClient() ? GetClient()->GetName() : 0; BOT_NAME; #endif for(State *pState = m_FirstChild; pState; pState = pState->m_Sibling) @@ -1127,9 +1127,9 @@ State::StateStatus StatePrioritized::UpdateState(float fDt) float fPriority = pState->InternalGetPriority(); #ifdef _DEBUG - STATES_PRIO[NumPriorities] = fPriority; - STATES_P[NumPriorities] = pState; - NumPriorities++; + //STATES_PRIO[NumPriorities] = fPriority; + //STATES_P[NumPriorities] = pState; + //NumPriorities++; #endif if(fPriority >= fBestPriority) @@ -1168,7 +1168,7 @@ State::StateStatus StatePrioritized::UpdateState(float fDt) if(pBestState != pState && pState->IsActive()) { #ifdef _DEBUG - STATES_X[NumExited++] = pState; + //STATES_X[NumExited++] = pState; #endif pState->InternalExit(); } diff --git a/0.83/Omnibot/Common/StateMachine.h b/0.83/Omnibot/Common/StateMachine.h index 908696184..9f816dbce 100644 --- a/0.83/Omnibot/Common/StateMachine.h +++ b/0.83/Omnibot/Common/StateMachine.h @@ -19,7 +19,7 @@ class CallbackParameters; namespace gcn { class Widget; -}; +} class UpdateDelay { diff --git a/0.83/Omnibot/Common/Trajectory.cpp b/0.83/Omnibot/Common/Trajectory.cpp index 3c3e6ff3e..e13db38bb 100644 --- a/0.83/Omnibot/Common/Trajectory.cpp +++ b/0.83/Omnibot/Common/Trajectory.cpp @@ -203,4 +203,4 @@ namespace Trajectory break; } } -}; +} diff --git a/0.83/Omnibot/Common/Trajectory.h b/0.83/Omnibot/Common/Trajectory.h index 9b50d7464..691dcdec0 100644 --- a/0.83/Omnibot/Common/Trajectory.h +++ b/0.83/Omnibot/Common/Trajectory.h @@ -48,6 +48,6 @@ namespace Trajectory TrajectorySim(); }; -}; +} #endif diff --git a/0.83/Omnibot/Common/Utilities.cpp b/0.83/Omnibot/Common/Utilities.cpp index d4e00b38a..2c665d88e 100644 --- a/0.83/Omnibot/Common/Utilities.cpp +++ b/0.83/Omnibot/Common/Utilities.cpp @@ -50,7 +50,7 @@ namespace Priority return str[n]; return ""; } -}; +} ////////////////////////////////////////////////////////////////////////// @@ -73,7 +73,7 @@ namespace Utils if(e - ('a' - 'A') == s) continue; return false; } - if(e == '_' || e >= '0' && e <= '9') return false; + if(e == '_' || (e >= '0' && e <= '9')) return false; break; } @@ -1561,7 +1561,7 @@ namespace Utils }; return gmVariable::s_null; } -}; +} ////////////////////////////////////////////////////////////////////////// @@ -1751,8 +1751,8 @@ std::ostream& operator <<(std::ostream& _o, const obUserData_t& _bud) std::ostream& operator <<(std::ostream& _o, const TriggerInfo_t& _ti) { _o << "Trigger:"; - if(_ti.m_TagName) _o << " TagName: " << _ti.m_TagName; - if(_ti.m_Action) _o << " Action: " << _ti.m_Action; + if(*_ti.m_TagName) _o << " TagName: " << _ti.m_TagName; + if(*_ti.m_Action) _o << " Action: " << _ti.m_Action; if(_ti.m_Entity.IsValid()) _o << " Entity: (" << _ti.m_Entity.GetIndex() << ":" << _ti.m_Entity.GetSerial() << ")"; else diff --git a/0.83/Omnibot/Common/Utilities.h b/0.83/Omnibot/Common/Utilities.h index eb3cf1362..6bba85e16 100644 --- a/0.83/Omnibot/Common/Utilities.h +++ b/0.83/Omnibot/Common/Utilities.h @@ -38,7 +38,7 @@ namespace Priority NumPriority }; const char *AsString(int n); -}; +} ////////////////////////////////////////////////////////////////////////// // file: Utils @@ -313,7 +313,7 @@ namespace Utils Vector3f *_linePt = NULL); int intersect2D_Segments(const Segment3f &S1,const Segment3f &S2, Vector3f* I0 = 0, Vector3f* I1 = 0); -}; +} ////////////////////////////////////////////////////////////////////////// class PropertyMap diff --git a/0.83/Omnibot/Common/Waypoint.h b/0.83/Omnibot/Common/Waypoint.h index 8a82d0ab4..bdccd037d 100644 --- a/0.83/Omnibot/Common/Waypoint.h +++ b/0.83/Omnibot/Common/Waypoint.h @@ -36,7 +36,7 @@ class Waypoint // Represents a connection to another waypoint. // Contains a pointer to the other waypoint, as well as a // variable to hold flags for the connection. - typedef struct { + struct ConnectionInfo { Waypoint *m_Connection; obuint32 m_ConnectionFlags; bool CheckFlag(unsigned int _flag) const { return CheckBitT(m_ConnectionFlags, _flag); } @@ -47,7 +47,7 @@ class Waypoint typedef RemoteLib::SyncSnapshot<12> ConnectionSnapShot; ConnectionSnapShot snapShot; #endif - } ConnectionInfo; + }; typedef std::list ConnectionList; PropertyMap &GetPropertyMap() { return m_PropertyList; } diff --git a/0.83/Omnibot/Common/common.h b/0.83/Omnibot/Common/common.h index 97fffdbb2..13037169b 100644 --- a/0.83/Omnibot/Common/common.h +++ b/0.83/Omnibot/Common/common.h @@ -96,7 +96,7 @@ namespace stdext using std::unordered_map; using std::hash; using std::equal_to; -}; +} #ifdef WIN32 //#define ENABLE_REMOTE_DEBUGGER @@ -334,7 +334,7 @@ enum MoveMode bShowAssert = Utils::AssertFunction((bool)((f)!=0), #f, __FILE__, __LINE__, __VA_ARGS__); \ } } #else // !DEBUG -#define OBASSERT(f, sz, ...) (f) +#define OBASSERT(f, sz, ...) (void)(f) #endif // !DEBUG #endif diff --git a/0.83/Omnibot/Common/gmAABB.cpp b/0.83/Omnibot/Common/gmAABB.cpp index ab8768d58..facc9f80f 100644 --- a/0.83/Omnibot/Common/gmAABB.cpp +++ b/0.83/Omnibot/Common/gmAABB.cpp @@ -30,7 +30,7 @@ GMBIND_FUNCTION_MAP_BEGIN( gmAABB ) GMBIND_FUNCTION( "FindIntersection", gmfFindIntersection ) GMBIND_FUNCTION( "GetAxisLength", gmfGetAxisLength ) GMBIND_FUNCTION( "Render", gmfRenderAABB ) -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() GMBIND_PROPERTY_MAP_BEGIN( gmAABB ) // var: Mins @@ -47,7 +47,7 @@ GMBIND_PROPERTY_MAP_END(); AABB *gmAABB::Constructor(gmThread *a_thread) { AABB *pNewAABB = new AABB; - memset(pNewAABB, 0, sizeof(pNewAABB)); + memset(pNewAABB, 0, sizeof(AABB)); if(a_thread) { @@ -391,7 +391,7 @@ bool gmAABB::setMaxs( AABB *a_native, gmThread *a_thread, gmVariable *a_operands int Bounds_Constructor(gmThread *a_thread) { BoundingBox *pNewAABB = new BoundingBox; - memset(pNewAABB, 0, sizeof(pNewAABB)); + memset(pNewAABB, 0, sizeof(BoundingBox)); if(a_thread) { diff --git a/0.83/Omnibot/Common/gmBind.h b/0.83/Omnibot/Common/gmBind.h index 146aea8a9..68564371d 100644 --- a/0.83/Omnibot/Common/gmBind.h +++ b/0.83/Omnibot/Common/gmBind.h @@ -281,7 +281,7 @@ Declaration: GMBIND_DECLARE_FUNCTIONS( ); GMBIND_FUNCTION_MAP_BEGIN( a_class ); // Function declarations -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() a_class - The gmBind derived class to use for this proxy @@ -511,7 +511,7 @@ GMBIND_FUNCTION_MAP_BEGIN( gmBomb ) // GMBIND_FUNCTION( "explode", gmExplode ) // -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() // Implement the property map for this type GMBIND_PROPERTY_MAP_BEGIN( gmBomb ) @@ -2709,7 +2709,7 @@ gmMemFixed gmBind< T_NATIVE, T_API >::m_gmUserObjects( 8+2*sizeof(void*), 1024 ) // public section of the proxy API class // #define GMBIND_DECLARE_FUNCTIONS() \ - static void registerFunctions( gmMachine *a_machine ); + static void registerFunctions( gmMachine *a_machine ) /////////////////////////////////////////////////// // Method: GMBIND_FUNCTION_MAP_BEGIN // @@ -2760,7 +2760,7 @@ gmMemFixed gmBind< T_NATIVE, T_API >::m_gmUserObjects( 8+2*sizeof(void*), 1024 ) // class. Overrides the default implementation // #define GMBIND_DECLARE_PROPERTIES() \ - static void registerProperties(); + static void registerProperties() // /////////////////////////////////////////////////////// // Method: GMBIND_PROPERTY_MAP_BEGIN diff --git a/0.83/Omnibot/Common/gmBot.cpp b/0.83/Omnibot/Common/gmBot.cpp index 5041704bf..d4a64774d 100644 --- a/0.83/Omnibot/Common/gmBot.cpp +++ b/0.83/Omnibot/Common/gmBot.cpp @@ -35,10 +35,9 @@ GMBIND_INIT_TYPE(gmBot, "Bot"); GMBIND_FUNCTION_MAP_BEGIN(gmBot) - GMBIND_FUNCTION( "CanSnipe", gmfCanSnipe ); - - GMBIND_FUNCTION( "ChangeTeam", gmfChangeTeam ); - GMBIND_FUNCTION( "ChangeClass", gmfChangeClass ); + GMBIND_FUNCTION( "CanSnipe", gmfCanSnipe ) + GMBIND_FUNCTION( "ChangeTeam", gmfChangeTeam ) + GMBIND_FUNCTION( "ChangeClass", gmfChangeClass ) GMBIND_FUNCTION( "ExecCommand", gmfExecCommand ) GMBIND_FUNCTION( "FireWeapon", gmfFireWeapon ) GMBIND_FUNCTION( "GetCurrentAmmo", gmfGetAmmo ) @@ -137,7 +136,7 @@ GMBIND_FUNCTION_MAP_BEGIN(gmBot) GMBIND_FUNCTION( "IsCarryingFlag", gmfIsCarryingFlag ) GMBIND_FUNCTION( "CanGrabItem", gmfCanGrabItem ) -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() // property: Field Of View // is the angle(in degrees) that the bot can 'see' in front of them. diff --git a/0.83/Omnibot/Common/gmBotLibrary.cpp b/0.83/Omnibot/Common/gmBotLibrary.cpp index e8a0926d8..7794bb37d 100644 --- a/0.83/Omnibot/Common/gmBotLibrary.cpp +++ b/0.83/Omnibot/Common/gmBotLibrary.cpp @@ -211,7 +211,7 @@ static int GM_CDECL gmfRunScript(gmThread *a_thread) } catch(const std::exception& e) { - e; + _UNUSED(e); OBASSERT(0, e.what()); } a_thread->PushInt(0); diff --git a/0.83/Omnibot/Common/gmMatrix3.cpp b/0.83/Omnibot/Common/gmMatrix3.cpp index eb3ffd540..c421e88ea 100644 --- a/0.83/Omnibot/Common/gmMatrix3.cpp +++ b/0.83/Omnibot/Common/gmMatrix3.cpp @@ -25,7 +25,7 @@ GMBIND_FUNCTION_MAP_BEGIN( gmMatrix3 ) // function: Inverse // Inverts this matrix. GMBIND_FUNCTION( "Inverse", gmfInverse ) -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() GMBIND_PROPERTY_MAP_BEGIN( gmMatrix3 ) GMBIND_PROPERTY("ZERO", gmfGetZero, NULL ) diff --git a/0.83/Omnibot/Common/gmScriptGoal.cpp b/0.83/Omnibot/Common/gmScriptGoal.cpp index 3a969ec4e..431ddadf6 100644 --- a/0.83/Omnibot/Common/gmScriptGoal.cpp +++ b/0.83/Omnibot/Common/gmScriptGoal.cpp @@ -91,7 +91,7 @@ GMBIND_FUNCTION_MAP_BEGIN( gmScriptGoal ) GMBIND_FUNCTION( "MarkInProgress", gmfMarkInProgress ) GMBIND_FUNCTION( "MarkInUse", gmfMarkInUse ) -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() GMBIND_PROPERTY_MAP_BEGIN( gmScriptGoal ) GMBIND_PROPERTY( "Name", getName, setName ) diff --git a/0.83/Omnibot/Common/gmSystemLibApp.cpp b/0.83/Omnibot/Common/gmSystemLibApp.cpp index 20a82c37e..e4d98bd61 100644 --- a/0.83/Omnibot/Common/gmSystemLibApp.cpp +++ b/0.83/Omnibot/Common/gmSystemLibApp.cpp @@ -47,7 +47,7 @@ GMBIND_FUNCTION_MAP_BEGIN( gmFile ) GMBIND_FUNCTION( "ReadLine", gmfReadLine ) GMBIND_FUNCTION( "Write", gmfWrite ) -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() GMBIND_PROPERTY_MAP_BEGIN( gmFile ) GMBIND_PROPERTY_MAP_END(); diff --git a/0.83/Omnibot/Common/gmTargetInfo.cpp b/0.83/Omnibot/Common/gmTargetInfo.cpp index ca213398f..06fd79bb1 100644 --- a/0.83/Omnibot/Common/gmTargetInfo.cpp +++ b/0.83/Omnibot/Common/gmTargetInfo.cpp @@ -16,7 +16,7 @@ GMBIND_INIT_TYPE( gmTargetInfo, "TargetInfo" ); GMBIND_FUNCTION_MAP_BEGIN( gmTargetInfo ) GMBIND_FUNCTION( "IsA", gmIsA ) -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION_MAP_END() // property: Distance // The distance this target is from the bot. diff --git a/0.83/Omnibot/Common/gmTimer.cpp b/0.83/Omnibot/Common/gmTimer.cpp index 41119fd01..f81feccfa 100644 --- a/0.83/Omnibot/Common/gmTimer.cpp +++ b/0.83/Omnibot/Common/gmTimer.cpp @@ -11,9 +11,9 @@ GMBIND_INIT_TYPE( gmTimer, "Timer" ); GMBIND_FUNCTION_MAP_BEGIN( gmTimer ) -GMBIND_FUNCTION( "Reset", gmfResetTimer ); -GMBIND_FUNCTION( "GetElapsedTime", gmfGetElapsedTime ); -GMBIND_FUNCTION_MAP_END(); +GMBIND_FUNCTION( "Reset", gmfResetTimer ) +GMBIND_FUNCTION( "GetElapsedTime", gmfGetElapsedTime ) +GMBIND_FUNCTION_MAP_END() ////////////////////////////////////////////////////////////////////////// diff --git a/0.83/Omnibot/Common/gmUtilityLib.cpp b/0.83/Omnibot/Common/gmUtilityLib.cpp index e20427067..9192c036e 100644 --- a/0.83/Omnibot/Common/gmUtilityLib.cpp +++ b/0.83/Omnibot/Common/gmUtilityLib.cpp @@ -47,7 +47,7 @@ namespace gmUtility { char tmpName[256] = {}; const char * str = pNode->m_key.AsString(_machine,tmpName,256); - OBASSERT(*str != NULL && str != NULL,"Error getting key string of gm var"); + OBASSERT(str && *str,"Error getting key string of gm var"); if(str != NULL) { TableInfo_t ti; @@ -259,7 +259,7 @@ namespace gmUtility gmTableObject *pTable = 0; gmType type = GM_USER; - while(pTable = _machine->GetTypeTable(type)) + while((pTable = _machine->GetTypeTable(type))) { const char *pTypeName = _machine->GetTypeName(type); if(pTypeName) @@ -425,7 +425,7 @@ namespace gmUtility } return GM_OK; } -}; +} ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// diff --git a/0.83/Omnibot/Common/gmUtilityLib.h b/0.83/Omnibot/Common/gmUtilityLib.h index e9e1b6c47..c51197932 100644 --- a/0.83/Omnibot/Common/gmUtilityLib.h +++ b/0.83/Omnibot/Common/gmUtilityLib.h @@ -37,7 +37,7 @@ namespace gmUtility bool DumpTable(gmMachine *_machine, const String &_file, const String &_name, int _flags); bool DumpTable(gmMachine *_machine, File &outFile, const String &_name, gmTableObject *_tbl, int _flags); void DumpTableInfo(gmMachine *_machine, const int _flags, gmTableObject *_table, char *_buffer, int _buflen, int _lvl, File &_file); -}; +} class gmMachine; void gmBindUtilityLib(gmMachine * a_machine); diff --git a/0.83/Omnibot/Common/mdump.cpp b/0.83/Omnibot/Common/mdump.cpp index edb8fc823..e23a8aae4 100644 --- a/0.83/Omnibot/Common/mdump.cpp +++ b/0.83/Omnibot/Common/mdump.cpp @@ -170,7 +170,7 @@ namespace MiniDumper { g_AppName.clear(); } -}; +} ////////////////////////////////////////////////////////////////////////// @@ -188,7 +188,7 @@ namespace MiniDumper { g_AppName.clear(); } -}; +} #endif diff --git a/0.83/Omnibot/ET/ET_Game.cpp b/0.83/Omnibot/ET/ET_Game.cpp index 937331991..2cc181cf3 100644 --- a/0.83/Omnibot/ET/ET_Game.cpp +++ b/0.83/Omnibot/ET/ET_Game.cpp @@ -702,9 +702,9 @@ const bool ET_Game::ET_CanSensoreEntity(const EntityInstance &_ent) return false; int c =_ent.m_EntityClass - ET_Game::CLASSEXoffset; - return cGetGameEntity()); } -}; \ No newline at end of file +} diff --git a/0.83/Omnibot/ET/ET_InterfaceFuncs.h b/0.83/Omnibot/ET/ET_InterfaceFuncs.h index ce415bd28..12fa0b8e3 100644 --- a/0.83/Omnibot/ET/ET_InterfaceFuncs.h +++ b/0.83/Omnibot/ET/ET_InterfaceFuncs.h @@ -47,9 +47,9 @@ namespace InterfaceFuncs bool FireTeamGetInfo(Client *_bot, ET_FireTeamInfo&data); bool SetCvar(char *_cvar, char *_value); - int GetCvar(char *_cvar); + int GetCvar(const char *_cvar); int GetGameType(); void DisableBotPush(Client *_bot, int _push); -}; +} #endif diff --git a/0.83/Omnibot/ET/ET_Messages.h b/0.83/Omnibot/ET/ET_Messages.h index d3bbc5009..9894bbffc 100644 --- a/0.83/Omnibot/ET/ET_Messages.h +++ b/0.83/Omnibot/ET/ET_Messages.h @@ -233,7 +233,7 @@ struct ET_CvarSet struct ET_CvarGet { - char * m_Cvar; + const char * m_Cvar; int m_Value; }; diff --git a/0.83/Omnibot/RTCW/RTCW_Game.cpp b/0.83/Omnibot/RTCW/RTCW_Game.cpp index b1aebcbef..f8fc0c3c1 100644 --- a/0.83/Omnibot/RTCW/RTCW_Game.cpp +++ b/0.83/Omnibot/RTCW/RTCW_Game.cpp @@ -515,7 +515,7 @@ const bool RTCW_Game::RTCW_CanSensoreEntity(const EntityInstance &_ent) return false; int c =_ent.m_EntityClass; - return c Date: Wed, 15 May 2024 22:45:51 +0200 Subject: [PATCH 02/22] cleanup of CMakeLists, Jamfile, project files --- .../ET/src/game/game.vcxproj.filters | 2 +- 0.83/Omnibot/Common/CMakeLists.txt | 21 +-- 0.83/Omnibot/Common/Jamfile | 27 ++- 0.83/Omnibot/ET/CMakeLists.txt | 2 +- 0.83/Omnibot/ET/Jamfile | 13 +- 0.83/Omnibot/Jamfile | 36 ++-- 0.83/Omnibot/RTCW/CMakeLists.txt | 2 +- 0.83/Omnibot/RTCW/Jamfile | 13 +- 0.83/Omnibot/dependencies/physfs/physfs.h | 12 +- .../projects/msvc12/Common/Common.vcxproj | 81 ++++++++- 0.83/Omnibot/projects/msvc12/Omni-bot.sln | 166 +----------------- 11 files changed, 121 insertions(+), 254 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/game/game.vcxproj.filters b/0.83/GameInterfaces/ET/src/game/game.vcxproj.filters index 7dfc5732f..3d1739041 100644 --- a/0.83/GameInterfaces/ET/src/game/game.vcxproj.filters +++ b/0.83/GameInterfaces/ET/src/game/game.vcxproj.filters @@ -201,7 +201,7 @@ omnibot - Source Files + omnibot diff --git a/0.83/Omnibot/Common/CMakeLists.txt b/0.83/Omnibot/Common/CMakeLists.txt index 039538150..532fde515 100644 --- a/0.83/Omnibot/Common/CMakeLists.txt +++ b/0.83/Omnibot/Common/CMakeLists.txt @@ -18,13 +18,11 @@ file(GLOB COMMON_SRC CONFIGURE_DEPENDS ${DEPENDENCIES_PATH}/physfs/zlib123/*.c ${DEPENDENCIES_PATH}/physfs/platform/*.c - ${DEPENDENCIES_PATH}/Recast/Recast/Source/*.cpp - ${DEPENDENCIES_PATH}/Recast/Detour/Source/*.cpp - # ${DEPENDENCIES_PATH}/Recast/DetourTileCache/Source/*.cpp - ${DEPENDENCIES_PATH}/Recast/DebugUtils/Source/*.cpp + # ${DEPENDENCIES_PATH}/Recast/Recast/Source/*.cpp + # ${DEPENDENCIES_PATH}/Recast/Detour/Source/*.cpp + # ${DEPENDENCIES_PATH}/Recast/DebugUtils/Source/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ObstacleManager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/RecastInterfaces.cpp + # ${CMAKE_CURRENT_SOURCE_DIR}/RecastInterfaces.cpp ${CMAKE_CURRENT_SOURCE_DIR}/BatchBuild.cpp ) @@ -46,18 +44,15 @@ target_include_directories(omnibot-common PUBLIC "${DEPENDENCIES_PATH}/wildmagic" PUBLIC "${DEPENDENCIES_PATH}/iprof" - PUBLIC "${DEPENDENCIES_PATH}/Recast/Common/include" - PUBLIC "${DEPENDENCIES_PATH}/Recast/Recast/Include" - PUBLIC "${DEPENDENCIES_PATH}/Recast/DebugUtils/Include" - PUBLIC "${DEPENDENCIES_PATH}/Recast/Detour/Include" - PUBLIC "${DEPENDENCIES_PATH}/Recast/DetourTileCache/Include" + # PUBLIC "${DEPENDENCIES_PATH}/Recast/Recast/Include" + # PUBLIC "${DEPENDENCIES_PATH}/Recast/DebugUtils/Include" + # PUBLIC "${DEPENDENCIES_PATH}/Recast/Detour/Include" PUBLIC "${DEPENDENCIES_PATH}/physfs" PUBLIC "${DEPENDENCIES_PATH}/physfs/lzma/C" PUBLIC "${DEPENDENCIES_PATH}/physfs/zlib123" PUBLIC "${DEPENDENCIES_PATH}/physfs/lzma/C/Archive/7z" PUBLIC "${DEPENDENCIES_PATH}/physfs/lzma/C/Compress/Lzma" PUBLIC "${DEPENDENCIES_PATH}/physfs/lzma/C/Compress/Branch" - # PUBLIC "${DEPENDENCIES_PATH}/Remotery/lib" ) if (WIN32) @@ -68,7 +63,7 @@ if (WIN32) endif() elseif(APPLE) target_include_directories(omnibot-common PUBLIC "${DEPENDENCIES_PATH}/gmscriptex/gmsrc_ex/src/platform/osx") -elseif(LINUX) +else() target_include_directories(omnibot-common PUBLIC "${DEPENDENCIES_PATH}/gmscriptex/gmsrc_ex/src/platform/win32gcc") endif() diff --git a/0.83/Omnibot/Common/Jamfile b/0.83/Omnibot/Common/Jamfile index 3b3c433ca..73a20ed74 100644 --- a/0.83/Omnibot/Common/Jamfile +++ b/0.83/Omnibot/Common/Jamfile @@ -1,15 +1,11 @@ -# $LastChangedBy$ -# $LastChangedDate$ -# $LastChangedRevision$ - # The Omni-bot Common Static Library. project Common : requirements ./ - ../dependencies/Recast/Recast/Include - ../dependencies/Recast/DebugUtils/Include - ../dependencies/Recast/Detour/Include +# ../dependencies/Recast/Recast/Include +# ../dependencies/Recast/DebugUtils/Include +# ../dependencies/Recast/Detour/Include ../dependencies/physfs ../dependencies/physfs/lzma/C ../dependencies/physfs/zlib123 @@ -36,14 +32,15 @@ SOURCES = [ glob ../dependencies/gmscriptex/gmsrc_ex/src/gm/*.cpp ] # [ glob ../dependencies/Recast/Recast/Source/*.cpp ] # [ glob ../dependencies/Recast/Detour/Source/*.cpp ] # [ glob ../dependencies/Recast/DebugUtils/Source/*.cpp ] - [ glob ../dependencies/iprof/*.c ] - [ glob ../dependencies/pcre-8.10/*.c ] - [ glob ../dependencies/pcre-8.10/*.cpp ] -# [ glob ../dependencies/sqlite3/*.c ] +# [ glob ../dependencies/iprof/*.c ] # [ glob RecastInterfaces.cpp ] - [ glob BatchBuild.cpp ] + BatchBuild.cpp ; -lib Common : $(SOURCES) - : static gcc:-w -pthread -DPHYSFS_SUPPORTS_ZIP=1 -DPHYSFS_SUPPORTS_7Z=1 -DPHYSFS_NO_CDROM_SUPPORT -fno-strict-aliasing -std=c++11 - ; +if darwin +{ + SOURCES += ../dependencies/physfs/platform/macosx.c ; +} + +lib Common : $(SOURCES) + : static -DPHYSFS_SUPPORTS_ZIP=1 -DPHYSFS_SUPPORTS_7Z=1 -DPHYSFS_NO_CDROM_SUPPORT ; diff --git a/0.83/Omnibot/ET/CMakeLists.txt b/0.83/Omnibot/ET/CMakeLists.txt index c29fd162a..4a772d18a 100644 --- a/0.83/Omnibot/ET/CMakeLists.txt +++ b/0.83/Omnibot/ET/CMakeLists.txt @@ -16,5 +16,5 @@ if (WIN32) LIBRARY_OUTPUT_DIRECTORY_DEBUG "" LIBRARY_OUTPUT_DIRECTORY_RELEASE "" ) - + target_sources(omnibot-et PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../projects/msvc12/Common/Common.rc) endif () diff --git a/0.83/Omnibot/ET/Jamfile b/0.83/Omnibot/ET/Jamfile index 6a66b6bf1..b4b4ec32f 100644 --- a/0.83/Omnibot/ET/Jamfile +++ b/0.83/Omnibot/ET/Jamfile @@ -1,19 +1,10 @@ -# $LastChangedBy$ -# $LastChangedDate$ -# $LastChangedRevision$ - # The ET Library. project ET - : requirements ./ : requirements ../Common ; -# Declare an alias to the common library -alias common_lib : ..//Common : static ; - # Compile ALL .cpp files and link to Common.lib to create our dll -SOURCES = [ glob ET_BatchBuild.cpp ] ..//boost_fs ..//boost_regx ..//boost_dt ..//boost_sys common_lib ; - -lib omnibot_et : $(SOURCES) : @tag gcc:-w -fno-strict-aliasing -lrt -std=c++11 ; +lib omnibot_et : ET_BatchBuild.cpp ..//boost_all ..//Common + : @tag ; diff --git a/0.83/Omnibot/Jamfile b/0.83/Omnibot/Jamfile index fbdc849e6..52d3ce74a 100644 --- a/0.83/Omnibot/Jamfile +++ b/0.83/Omnibot/Jamfile @@ -1,7 +1,3 @@ -# $LastChangedBy$ -# $LastChangedDate$ -# $LastChangedRevision$ - # Root jam file for Omni-bot. import modules ; @@ -18,19 +14,22 @@ project Omnibot dependencies/iprof dependencies/wildmagic dependencies/gmscriptex/gmsrc_ex/src/3rdParty - dependencies/gmscriptex/gmsrc_ex/src/platform/win32gcc dependencies/gmscriptex/gmsrc_ex/src/gm dependencies/gmscriptex/gmsrc_ex/src/binds dependencies/gmscriptex/gmsrc_ex/src/3rdParty/gmbinder2 msvc:dependencies/gmscriptex/gmsrc_ex/src/platform/win32msvc gcc:dependencies/gmscriptex/gmsrc_ex/src/platform/win32gcc - darwin:dependencies/gmscriptex/gmsrc_ex/src/platform/osx + darwin:dependencies/gmscriptex/gmsrc_ex/src/platform/osx + darwin:"-framework IOKit -framework Carbon" msvc:WIN32 gcc:__linux__ darwin:__osx__ debug:_DEBUG release:NDEBUG 64:-fPIC + -std=c++11 + -fno-strict-aliasing + off ; # define external libs @@ -39,37 +38,26 @@ lib boost_regex : : release $(BOOST_LIB)/libboost_regex$(BOOST_SU lib boost_date_time : : release $(BOOST_LIB)/libboost_date_time$(BOOST_SUFFIX).a ; lib boost_system : : release $(BOOST_LIB)/libboost_system$(BOOST_SUFFIX).a ; -# define aliases for convenience and to force static linking -alias boost_fs : boost_filesystem : static ; -alias boost_regx : boost_regex : static ; -alias boost_dt : boost_date_time : static ; -alias boost_sys : boost_system : static ; +# define alias for convenience and to force static linking +alias boost_all : boost_filesystem boost_regex boost_date_time boost_system : static ; # target suffix rule tag ( name : type ? : property-set ) { if $(type) = SHARED_LIB { - if [ $(property-set).get ] = 64 + if [ $(property-set).get ] = darwin { - return $(name).x86_64.so ; + return $(name)_mac.so ; } - else + if [ $(property-set).get ] = 64 { - return $(name).so ; + return $(name).x86_64.so ; } + return $(name).so ; } } - build-project Common ; -#build-project MC ; build-project ET ; build-project RTCW ; -#build-project TeamFortressLib ; -#build-project FF ; -#build-project D3 ; -#build-project Q4 ; -#build-project HL2DM ; -#build-project SKELETON ; - diff --git a/0.83/Omnibot/RTCW/CMakeLists.txt b/0.83/Omnibot/RTCW/CMakeLists.txt index ea463cde3..8c3ef064d 100644 --- a/0.83/Omnibot/RTCW/CMakeLists.txt +++ b/0.83/Omnibot/RTCW/CMakeLists.txt @@ -14,5 +14,5 @@ if (WIN32) LIBRARY_OUTPUT_DIRECTORY_DEBUG "" LIBRARY_OUTPUT_DIRECTORY_RELEASE "" ) - + target_sources(omnibot-rtcw PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../projects/msvc12/Common/Common.rc) endif () diff --git a/0.83/Omnibot/RTCW/Jamfile b/0.83/Omnibot/RTCW/Jamfile index 7d169ab55..b910c0382 100644 --- a/0.83/Omnibot/RTCW/Jamfile +++ b/0.83/Omnibot/RTCW/Jamfile @@ -1,19 +1,10 @@ -# $LastChangedBy$ -# $LastChangedDate$ -# $LastChangedRevision$ - # The RTCW Library. project RTCW - : requirements ./ : requirements ../Common ; -# Declare an alias to the common library -alias common_lib : ..//Common : static ; - # Compile ALL .cpp files and link to Common.lib to create our dll -SOURCES = [ glob RTCW_BatchBuild.cpp ] ..//boost_fs ..//boost_regx ..//boost_dt ..//boost_sys common_lib ; - -lib omnibot_rtcw : $(SOURCES) : @tag gcc:-w -fno-strict-aliasing -lrt -std=c++11 ; +lib omnibot_rtcw : RTCW_BatchBuild.cpp ..//boost_all ..//Common + : @tag ; diff --git a/0.83/Omnibot/dependencies/physfs/physfs.h b/0.83/Omnibot/dependencies/physfs/physfs.h index c9978e42e..0fb7205a4 100644 --- a/0.83/Omnibot/dependencies/physfs/physfs.h +++ b/0.83/Omnibot/dependencies/physfs/physfs.h @@ -227,13 +227,13 @@ extern "C" { #endif #ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if (defined _MSC_VER) -#define __EXPORT__ __declspec(dllexport) -#elif (__GNUC__ >= 3) -#define __EXPORT__ __attribute__((visibility("default"))) -#else +//#if (defined _MSC_VER) +//#define __EXPORT__ __declspec(dllexport) +//#elif (__GNUC__ >= 3) +//#define __EXPORT__ __attribute__((visibility("default"))) +//#else #define __EXPORT__ -#endif +//#endif #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ /** diff --git a/0.83/Omnibot/projects/msvc12/Common/Common.vcxproj b/0.83/Omnibot/projects/msvc12/Common/Common.vcxproj index aea3b2092..be93c8699 100644 --- a/0.83/Omnibot/projects/msvc12/Common/Common.vcxproj +++ b/0.83/Omnibot/projects/msvc12/Common/Common.vcxproj @@ -207,24 +207,40 @@ NotUsing NotUsing NotUsing + true + true + true + true NotUsing NotUsing NotUsing NotUsing + true + true + true + true NotUsing NotUsing NotUsing NotUsing + true + true + true + true NotUsing NotUsing NotUsing NotUsing + true + true + true + true @@ -1235,6 +1251,10 @@ + true + true + true + true @@ -1245,6 +1265,10 @@ + true + true + true + true @@ -1255,6 +1279,10 @@ + true + true + true + true @@ -1265,6 +1293,10 @@ + true + true + true + true @@ -2509,13 +2541,48 @@ - - - - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + diff --git a/0.83/Omnibot/projects/msvc12/Omni-bot.sln b/0.83/Omnibot/projects/msvc12/Omni-bot.sln index 09d5ff417..937127c56 100644 --- a/0.83/Omnibot/projects/msvc12/Omni-bot.sln +++ b/0.83/Omnibot/projects/msvc12/Omni-bot.sln @@ -1,11 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{085B6E4F-789A-4B33-84B6-5F1E064E6549}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmCompiler", "gmCompiler\gmCompiler.vcxproj", "{9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gm_ex", "..\..\dependencies\gmscriptex\gmsrc_ex\src\gm\gm2013.vcxproj", "{8C9CC332-D582-453A-AF10-20B100857587}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_ET", "ET\ET.vcxproj", "{0C712472-8447-4088-87EE-E9FAF72E31E7}" @@ -14,46 +10,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_ET", "ET\ET.vcxproj", " {2740AA5F-AB52-4D24-AE5A-97033AAECD7A} = {2740AA5F-AB52-4D24-AE5A-97033AAECD7A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_BM", "BM\BM.vcxproj", "{02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_D3", "D3\D3.vcxproj", "{86097434-DABE-44B4-80C7-3A9080658D90}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_DOD", "DOD\DOD.vcxproj", "{570D745D-72A2-49D7-A9E0-6B9E6A6E723B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_ETQW", "ETQW\ETQW.vcxproj", "{96663B1C-B18B-4584-A2C9-CEDD0D68F63D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_FF", "FF\FF.vcxproj", "{32158C60-EC59-441C-983C-BDEBF60301BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_HL2DM", "HL2DM\HL2DM.vcxproj", "{D516917C-A18F-4F7C-809E-413D452F2B8E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_JA", "JA\JA.vcxproj", "{9FD02C12-92F8-416D-B018-BDCC23B6B041}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_MC", "MC\MC.vcxproj", "{63029D15-013C-4801-B0B9-D686AD8D38D6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_OF", "OF\OF.vcxproj", "{38A35E24-9C5B-4FF8-B90A-9E260534DB85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_Q4", "Q4\Q4.vcxproj", "{C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_RTCW", "RTCW\rtcw.vcxproj", "{C98A7EDB-55CF-4109-8231-928CB6304FA2}" ProjectSection(ProjectDependencies) = postProject {2740AA5F-AB52-4D24-AE5A-97033AAECD7A} = {2740AA5F-AB52-4D24-AE5A-97033AAECD7A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_SKELETON", "SKELETON\Skeleton.vcxproj", "{D2EF4822-9D49-437B-8941-F384CC169CD8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_TF2", "TF2\TF2.vcxproj", "{CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOD_WOLF", "WOLF\WOLF.vcxproj", "{F117D55B-79F5-4591-9739-EE421782C01D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{2740AA5F-AB52-4D24-AE5A-97033AAECD7A}" ProjectSection(ProjectDependencies) = postProject {8C9CC332-D582-453A-AF10-20B100857587} = {8C9CC332-D582-453A-AF10-20B100857587} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fibers", "fibers\fibers.vcxproj", "{AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TeamFortressLib", "TeamFortressLib\TeamFortressLib.vcxproj", "{E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -62,14 +28,6 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Debug|Win32.ActiveCfg = Debug|Win32 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Debug|Win32.Build.0 = Debug|Win32 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Debug|x64.ActiveCfg = Debug|x64 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Debug|x64.Build.0 = Debug|x64 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Release|Win32.ActiveCfg = Release|Win32 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Release|Win32.Build.0 = Release|Win32 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Release|x64.ActiveCfg = Release|x64 - {9DF97DCF-84F4-4D9E-BA74-CED386DB6E16}.Release|x64.Build.0 = Release|x64 {8C9CC332-D582-453A-AF10-20B100857587}.Debug|Win32.ActiveCfg = Debug|Win32 {8C9CC332-D582-453A-AF10-20B100857587}.Debug|Win32.Build.0 = Debug|Win32 {8C9CC332-D582-453A-AF10-20B100857587}.Debug|x64.ActiveCfg = Debug|x64 @@ -86,86 +44,6 @@ Global {0C712472-8447-4088-87EE-E9FAF72E31E7}.Release|Win32.Build.0 = Release|Win32 {0C712472-8447-4088-87EE-E9FAF72E31E7}.Release|x64.ActiveCfg = Release|x64 {0C712472-8447-4088-87EE-E9FAF72E31E7}.Release|x64.Build.0 = Release|x64 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Debug|Win32.ActiveCfg = Debug|Win32 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Debug|Win32.Build.0 = Debug|Win32 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Debug|x64.ActiveCfg = Debug|x64 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Debug|x64.Build.0 = Debug|x64 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Release|Win32.ActiveCfg = Release|Win32 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Release|Win32.Build.0 = Release|Win32 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Release|x64.ActiveCfg = Release|x64 - {02F30EB7-F9F8-4837-824D-3AEB9B79BFF5}.Release|x64.Build.0 = Release|x64 - {86097434-DABE-44B4-80C7-3A9080658D90}.Debug|Win32.ActiveCfg = Debug|Win32 - {86097434-DABE-44B4-80C7-3A9080658D90}.Debug|Win32.Build.0 = Debug|Win32 - {86097434-DABE-44B4-80C7-3A9080658D90}.Debug|x64.ActiveCfg = Debug|x64 - {86097434-DABE-44B4-80C7-3A9080658D90}.Debug|x64.Build.0 = Debug|x64 - {86097434-DABE-44B4-80C7-3A9080658D90}.Release|Win32.ActiveCfg = Release|Win32 - {86097434-DABE-44B4-80C7-3A9080658D90}.Release|Win32.Build.0 = Release|Win32 - {86097434-DABE-44B4-80C7-3A9080658D90}.Release|x64.ActiveCfg = Release|x64 - {86097434-DABE-44B4-80C7-3A9080658D90}.Release|x64.Build.0 = Release|x64 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Debug|Win32.ActiveCfg = Debug|Win32 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Debug|Win32.Build.0 = Debug|Win32 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Debug|x64.ActiveCfg = Debug|x64 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Debug|x64.Build.0 = Debug|x64 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Release|Win32.ActiveCfg = Release|Win32 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Release|Win32.Build.0 = Release|Win32 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Release|x64.ActiveCfg = Release|x64 - {570D745D-72A2-49D7-A9E0-6B9E6A6E723B}.Release|x64.Build.0 = Release|x64 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Debug|Win32.ActiveCfg = Debug|Win32 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Debug|Win32.Build.0 = Debug|Win32 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Debug|x64.ActiveCfg = Debug|x64 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Debug|x64.Build.0 = Debug|x64 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Release|Win32.ActiveCfg = Release|Win32 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Release|Win32.Build.0 = Release|Win32 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Release|x64.ActiveCfg = Release|x64 - {96663B1C-B18B-4584-A2C9-CEDD0D68F63D}.Release|x64.Build.0 = Release|x64 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Debug|Win32.Build.0 = Debug|Win32 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Debug|x64.ActiveCfg = Debug|x64 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Debug|x64.Build.0 = Debug|x64 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Release|Win32.ActiveCfg = Release|Win32 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Release|Win32.Build.0 = Release|Win32 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Release|x64.ActiveCfg = Release|x64 - {32158C60-EC59-441C-983C-BDEBF60301BE}.Release|x64.Build.0 = Release|x64 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Debug|Win32.ActiveCfg = Debug|Win32 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Debug|Win32.Build.0 = Debug|Win32 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Debug|x64.ActiveCfg = Debug|x64 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Debug|x64.Build.0 = Debug|x64 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Release|Win32.ActiveCfg = Release|Win32 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Release|Win32.Build.0 = Release|Win32 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Release|x64.ActiveCfg = Release|x64 - {D516917C-A18F-4F7C-809E-413D452F2B8E}.Release|x64.Build.0 = Release|x64 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Debug|Win32.ActiveCfg = Debug|Win32 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Debug|Win32.Build.0 = Debug|Win32 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Debug|x64.ActiveCfg = Debug|x64 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Debug|x64.Build.0 = Debug|x64 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Release|Win32.ActiveCfg = Release|Win32 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Release|Win32.Build.0 = Release|Win32 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Release|x64.ActiveCfg = Release|x64 - {9FD02C12-92F8-416D-B018-BDCC23B6B041}.Release|x64.Build.0 = Release|x64 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Debug|Win32.ActiveCfg = Debug|Win32 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Debug|Win32.Build.0 = Debug|Win32 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Debug|x64.ActiveCfg = Debug|x64 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Debug|x64.Build.0 = Debug|x64 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Release|Win32.ActiveCfg = Release|Win32 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Release|Win32.Build.0 = Release|Win32 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Release|x64.ActiveCfg = Release|x64 - {63029D15-013C-4801-B0B9-D686AD8D38D6}.Release|x64.Build.0 = Release|x64 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Debug|Win32.ActiveCfg = Debug|Win32 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Debug|Win32.Build.0 = Debug|Win32 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Debug|x64.ActiveCfg = Debug|x64 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Debug|x64.Build.0 = Debug|x64 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Release|Win32.ActiveCfg = Release|Win32 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Release|Win32.Build.0 = Release|Win32 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Release|x64.ActiveCfg = Release|x64 - {38A35E24-9C5B-4FF8-B90A-9E260534DB85}.Release|x64.Build.0 = Release|x64 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Debug|Win32.ActiveCfg = Debug|Win32 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Debug|Win32.Build.0 = Debug|Win32 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Debug|x64.ActiveCfg = Debug|x64 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Debug|x64.Build.0 = Debug|x64 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Release|Win32.ActiveCfg = Release|Win32 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Release|Win32.Build.0 = Release|Win32 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Release|x64.ActiveCfg = Release|x64 - {C0BFBAAB-BA48-4061-B366-BAA1F4E33FC8}.Release|x64.Build.0 = Release|x64 {C98A7EDB-55CF-4109-8231-928CB6304FA2}.Debug|Win32.ActiveCfg = Debug|Win32 {C98A7EDB-55CF-4109-8231-928CB6304FA2}.Debug|x64.ActiveCfg = Debug|x64 {C98A7EDB-55CF-4109-8231-928CB6304FA2}.Debug|x64.Build.0 = Debug|x64 @@ -173,30 +51,6 @@ Global {C98A7EDB-55CF-4109-8231-928CB6304FA2}.Release|Win32.Build.0 = Release|Win32 {C98A7EDB-55CF-4109-8231-928CB6304FA2}.Release|x64.ActiveCfg = Release|x64 {C98A7EDB-55CF-4109-8231-928CB6304FA2}.Release|x64.Build.0 = Release|x64 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Debug|Win32.ActiveCfg = Debug|Win32 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Debug|Win32.Build.0 = Debug|Win32 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Debug|x64.ActiveCfg = Debug|x64 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Debug|x64.Build.0 = Debug|x64 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Release|Win32.ActiveCfg = Release|Win32 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Release|Win32.Build.0 = Release|Win32 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Release|x64.ActiveCfg = Release|x64 - {D2EF4822-9D49-437B-8941-F384CC169CD8}.Release|x64.Build.0 = Release|x64 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Debug|Win32.ActiveCfg = Debug|Win32 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Debug|Win32.Build.0 = Debug|Win32 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Debug|x64.ActiveCfg = Debug|x64 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Debug|x64.Build.0 = Debug|x64 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Release|Win32.ActiveCfg = Release|Win32 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Release|Win32.Build.0 = Release|Win32 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Release|x64.ActiveCfg = Release|x64 - {CFCD30BD-B95F-4DAA-9697-1812FE9C0BD4}.Release|x64.Build.0 = Release|x64 - {F117D55B-79F5-4591-9739-EE421782C01D}.Debug|Win32.ActiveCfg = Debug|Win32 - {F117D55B-79F5-4591-9739-EE421782C01D}.Debug|Win32.Build.0 = Debug|Win32 - {F117D55B-79F5-4591-9739-EE421782C01D}.Debug|x64.ActiveCfg = Debug|x64 - {F117D55B-79F5-4591-9739-EE421782C01D}.Debug|x64.Build.0 = Debug|x64 - {F117D55B-79F5-4591-9739-EE421782C01D}.Release|Win32.ActiveCfg = Release|Win32 - {F117D55B-79F5-4591-9739-EE421782C01D}.Release|Win32.Build.0 = Release|Win32 - {F117D55B-79F5-4591-9739-EE421782C01D}.Release|x64.ActiveCfg = Release|x64 - {F117D55B-79F5-4591-9739-EE421782C01D}.Release|x64.Build.0 = Release|x64 {2740AA5F-AB52-4D24-AE5A-97033AAECD7A}.Debug|Win32.ActiveCfg = Debug|Win32 {2740AA5F-AB52-4D24-AE5A-97033AAECD7A}.Debug|Win32.Build.0 = Debug|Win32 {2740AA5F-AB52-4D24-AE5A-97033AAECD7A}.Debug|x64.ActiveCfg = Debug|x64 @@ -205,22 +59,6 @@ Global {2740AA5F-AB52-4D24-AE5A-97033AAECD7A}.Release|Win32.Build.0 = Release|Win32 {2740AA5F-AB52-4D24-AE5A-97033AAECD7A}.Release|x64.ActiveCfg = Release|x64 {2740AA5F-AB52-4D24-AE5A-97033AAECD7A}.Release|x64.Build.0 = Release|x64 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Debug|Win32.ActiveCfg = Debug|Win32 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Debug|Win32.Build.0 = Debug|Win32 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Debug|x64.ActiveCfg = Debug|x64 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Debug|x64.Build.0 = Debug|x64 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Release|Win32.ActiveCfg = Release|Win32 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Release|Win32.Build.0 = Release|Win32 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Release|x64.ActiveCfg = Release|x64 - {AB7E2AA4-7248-42D6-BD36-C1B9C4FF3045}.Release|x64.Build.0 = Release|x64 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Debug|Win32.Build.0 = Debug|Win32 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Debug|x64.ActiveCfg = Debug|x64 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Debug|x64.Build.0 = Debug|x64 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Release|Win32.ActiveCfg = Release|Win32 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Release|Win32.Build.0 = Release|Win32 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Release|x64.ActiveCfg = Release|x64 - {E39BFBEE-1060-42B3-BFF4-8693EDEF65C1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 6c24ccfe3e67dab9a8e5c5e9a98bbf31e14317f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Wed, 15 May 2024 22:46:37 +0200 Subject: [PATCH 03/22] suffix .aarch64 --- 0.83/Omnibot/Common/BotLoadLibrary.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/0.83/Omnibot/Common/BotLoadLibrary.cpp b/0.83/Omnibot/Common/BotLoadLibrary.cpp index a3483b6ff..0e2487b8f 100644 --- a/0.83/Omnibot/Common/BotLoadLibrary.cpp +++ b/0.83/Omnibot/Common/BotLoadLibrary.cpp @@ -254,7 +254,9 @@ eomnibot_error Omnibot_LoadLibrary(int version, const char *lib, const char *pat #else #ifdef __x86_64__ #define SUFFIX ".x86_64" -#else +#elif defined __aarch64__ +#define SUFFIX ".aarch64" +#else #define SUFFIX #endif #endif From 127e351bc1cbdaca31485b9bad093277c9fbf577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Wed, 15 May 2024 23:18:32 +0200 Subject: [PATCH 04/22] ignore CMakeCache --- .gitignore | 2 ++ 0.83/Omnibot/dependencies/gmscriptex | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f8981d42c..99a8701ba 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /0.83/Omnibot/projects/msvc12/build/ /0.83/GameInterfaces/*/src/build/ /0.83/Installer/Files/rtcw/scripts/rtcw_autoexec_user.gm +/0.83/Omnibot/CMakeFiles +/0.83/Omnibot/CMakeCache.txt diff --git a/0.83/Omnibot/dependencies/gmscriptex b/0.83/Omnibot/dependencies/gmscriptex index c86c962f5..410baf7ae 160000 --- a/0.83/Omnibot/dependencies/gmscriptex +++ b/0.83/Omnibot/dependencies/gmscriptex @@ -1 +1 @@ -Subproject commit c86c962f563c4f9515836e6af5e7ebfdfa637954 +Subproject commit 410baf7ae50acded61d435f7266d07e2da32d4b7 From 9a9c43a70b7562fa354621c56bb9a3bee1263bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Thu, 16 May 2024 06:40:53 +0200 Subject: [PATCH 05/22] removed $LastChangedBy$, $LastChangedDate$, $LastChangedRevision$ --- 0.83/Omnibot/Common/AStarSolver.h | 8 -------- 0.83/Omnibot/Common/Base_Messages.h | 8 -------- 0.83/Omnibot/Common/BatchBuild.cpp | 8 -------- 0.83/Omnibot/Common/BatchBuildWin.cpp | 8 -------- 0.83/Omnibot/Common/Bezier.h | 8 -------- 0.83/Omnibot/Common/BlackBoard.cpp | 8 -------- 0.83/Omnibot/Common/BlackBoard.h | 8 -------- 0.83/Omnibot/Common/BlackBoardItems.cpp | 8 -------- 0.83/Omnibot/Common/BlackBoardItems.h | 8 -------- 0.83/Omnibot/Common/BotBaseStates.cpp | 8 -------- 0.83/Omnibot/Common/BotBaseStates.h | 8 -------- 0.83/Omnibot/Common/BotBaseStates_GM.cpp | 8 -------- 0.83/Omnibot/Common/BotExports.cpp | 8 -------- 0.83/Omnibot/Common/BotExports.h | 14 ++------------ 0.83/Omnibot/Common/BotGlobalStates.cpp | 8 -------- 0.83/Omnibot/Common/BotGlobalStates.h | 8 -------- 0.83/Omnibot/Common/BotLoadLibrary.cpp | 8 -------- 0.83/Omnibot/Common/BotSensoryMemory.cpp | 8 -------- 0.83/Omnibot/Common/BotSensoryMemory.h | 8 -------- 0.83/Omnibot/Common/BotSteeringSystem.cpp | 8 -------- 0.83/Omnibot/Common/BotSteeringSystem.h | 8 -------- 0.83/Omnibot/Common/BotTargetingSystem.cpp | 8 -------- 0.83/Omnibot/Common/BotTargetingSystem.h | 8 -------- 0.83/Omnibot/Common/BotWeaponSystem.cpp | 8 -------- 0.83/Omnibot/Common/BotWeaponSystem.h | 8 -------- 0.83/Omnibot/Common/CallbackParameters.cpp | 8 -------- 0.83/Omnibot/Common/CallbackParameters.h | 8 -------- 0.83/Omnibot/Common/ChunkedFile.cpp | 7 ------- 0.83/Omnibot/Common/ChunkedFile.h | 8 -------- 0.83/Omnibot/Common/Client.cpp | 8 -------- 0.83/Omnibot/Common/Client.h | 8 -------- 0.83/Omnibot/Common/CommandFunctor.h | 8 -------- 0.83/Omnibot/Common/CommandReciever.cpp | 8 -------- 0.83/Omnibot/Common/CommandReciever.h | 8 -------- 0.83/Omnibot/Common/Criteria.cpp | 8 -------- 0.83/Omnibot/Common/Criteria.h | 8 -------- 0.83/Omnibot/Common/EngineFuncs.cpp | 8 -------- 0.83/Omnibot/Common/EngineFuncs.h | 8 -------- 0.83/Omnibot/Common/Error.cpp | 8 -------- 0.83/Omnibot/Common/Error.h | 8 -------- 0.83/Omnibot/Common/EventReciever.cpp | 8 -------- 0.83/Omnibot/Common/EventReciever.h | 8 -------- 0.83/Omnibot/Common/FileDownloader.cpp | 8 -------- 0.83/Omnibot/Common/FileDownloader.h | 8 -------- 0.83/Omnibot/Common/FileSystem.cpp | 8 -------- 0.83/Omnibot/Common/FileSystem.h | 8 -------- 0.83/Omnibot/Common/FilterAllType.cpp | 8 -------- 0.83/Omnibot/Common/FilterAllType.h | 8 -------- 0.83/Omnibot/Common/FilterBias.cpp | 8 -------- 0.83/Omnibot/Common/FilterBias.h | 8 -------- 0.83/Omnibot/Common/FilterClosest.cpp | 8 -------- 0.83/Omnibot/Common/FilterClosest.h | 8 -------- 0.83/Omnibot/Common/FilterMostHurt.cpp | 8 -------- 0.83/Omnibot/Common/FilterMostHurt.h | 8 -------- 0.83/Omnibot/Common/FilterSensory.cpp | 8 -------- 0.83/Omnibot/Common/FilterSensory.h | 8 -------- 0.83/Omnibot/Common/Functions_Bot.h | 8 -------- 0.83/Omnibot/Common/Functor.h | 8 -------- 0.83/Omnibot/Common/GoalManager.cpp | 8 -------- 0.83/Omnibot/Common/GoalManager.h | 8 -------- 0.83/Omnibot/Common/IEngineInterface.h | 8 -------- 0.83/Omnibot/Common/IGame.cpp | 8 -------- 0.83/Omnibot/Common/IGame.h | 8 -------- 0.83/Omnibot/Common/IGameManager.cpp | 8 -------- 0.83/Omnibot/Common/IGameManager.h | 8 -------- 0.83/Omnibot/Common/InterfaceFuncs.cpp | 8 -------- 0.83/Omnibot/Common/InterfaceFuncs.h | 8 -------- 0.83/Omnibot/Common/InternalFsm.h | 8 -------- 0.83/Omnibot/Common/MapGoal.cpp | 8 -------- 0.83/Omnibot/Common/MapGoal.h | 8 -------- 0.83/Omnibot/Common/MapGoalDatabase.cpp | 8 -------- 0.83/Omnibot/Common/MapGoalDatabase.h | 8 -------- 0.83/Omnibot/Common/MemoryRecord.cpp | 8 -------- 0.83/Omnibot/Common/MemoryRecord.h | 8 -------- 0.83/Omnibot/Common/MessageFunctor.h | 8 -------- 0.83/Omnibot/Common/MessageHelper.h | 8 -------- 0.83/Omnibot/Common/MessageManager.h | 8 -------- 0.83/Omnibot/Common/NameManager.cpp | 8 -------- 0.83/Omnibot/Common/NameManager.h | 8 -------- 0.83/Omnibot/Common/NavigationFlags.h | 10 ---------- 0.83/Omnibot/Common/NavigationManager.cpp | 8 -------- 0.83/Omnibot/Common/NavigationManager.h | 8 -------- 0.83/Omnibot/Common/ObjFunctor.h | 8 -------- 0.83/Omnibot/Common/ObstacleManager.cpp | 8 -------- 0.83/Omnibot/Common/ObstacleManager.h | 8 -------- 0.83/Omnibot/Common/Omni-Bot.cpp | 8 -------- 0.83/Omnibot/Common/Omni-Bot.h | 14 +++----------- 0.83/Omnibot/Common/Omni-Bot_BasicTypes.h | 8 -------- 0.83/Omnibot/Common/Omni-Bot_BitFlags.h | 8 -------- 0.83/Omnibot/Common/Omni-Bot_Color.h | 8 -------- 0.83/Omnibot/Common/Omni-Bot_Events.h | 10 ---------- 0.83/Omnibot/Common/Omni-Bot_Types.h | 8 -------- 0.83/Omnibot/Common/PIDController.h | 8 -------- 0.83/Omnibot/Common/Path.cpp | 8 -------- 0.83/Omnibot/Common/Path.h | 8 -------- 0.83/Omnibot/Common/PathPlannerBase.cpp | 10 ---------- 0.83/Omnibot/Common/PathPlannerBase.h | 10 ---------- 0.83/Omnibot/Common/PathPlannerFloodFill.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerFloodFill.h | 8 -------- .../Common/PathPlannerFloodFillBuilder.cpp | 8 -------- .../Common/PathPlannerFloodFillCmds.cpp | 8 -------- .../Common/PathPlannerFloodFillScript.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerNavMesh.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerNavMesh.h | 8 -------- .../Common/PathPlannerNavMeshBuilder.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerNavMeshCmds.cpp | 8 -------- .../Common/PathPlannerNavMeshScript.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerRecast.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerRecast.h | 8 -------- 0.83/Omnibot/Common/PathPlannerRecastCmds.cpp | 8 -------- .../Omnibot/Common/PathPlannerRecastScript.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerWaypoint.cpp | 8 -------- 0.83/Omnibot/Common/PathPlannerWaypoint.h | 8 -------- .../Omnibot/Common/PathPlannerWaypointCmds.cpp | 8 -------- .../Common/PathPlannerWaypointScript.cpp | 8 -------- 0.83/Omnibot/Common/PathQuery.cpp | 8 -------- 0.83/Omnibot/Common/PathQuery.h | 8 -------- 0.83/Omnibot/Common/PrecompCommon.cpp | 8 -------- 0.83/Omnibot/Common/PrecompCommon.h | 8 -------- 0.83/Omnibot/Common/PropertyBinding.cpp | 8 -------- 0.83/Omnibot/Common/PropertyBinding.h | 8 -------- 0.83/Omnibot/Common/QuadTree.cpp | 8 -------- 0.83/Omnibot/Common/QuadTree.h | 8 -------- 0.83/Omnibot/Common/RecastInterfaces.h | 8 -------- 0.83/Omnibot/Common/Regulator.cpp | 8 -------- 0.83/Omnibot/Common/Regulator.h | 8 -------- 0.83/Omnibot/Common/ResponseCurve.cpp | 8 -------- 0.83/Omnibot/Common/ResponseCurve.h | 8 -------- 0.83/Omnibot/Common/ScriptGoal.cpp | 8 -------- 0.83/Omnibot/Common/ScriptGoal.h | 8 -------- 0.83/Omnibot/Common/ScriptManager.cpp | 8 -------- 0.83/Omnibot/Common/ScriptManager.h | 8 -------- 0.83/Omnibot/Common/StateMachine.cpp | 8 -------- 0.83/Omnibot/Common/StateMachine.h | 8 -------- 0.83/Omnibot/Common/TargetInfo.cpp | 8 -------- 0.83/Omnibot/Common/TargetInfo.h | 8 -------- 0.83/Omnibot/Common/ThreatZone.cpp | 8 -------- 0.83/Omnibot/Common/ThreatZone.h | 8 -------- 0.83/Omnibot/Common/Timer.cpp | 8 -------- 0.83/Omnibot/Common/Timer.h | 8 -------- 0.83/Omnibot/Common/Trackable.cpp | 8 -------- 0.83/Omnibot/Common/Trackable.h | 8 -------- 0.83/Omnibot/Common/TrackablePtr.h | 8 -------- 0.83/Omnibot/Common/Trajectory.cpp | 8 -------- 0.83/Omnibot/Common/Trajectory.h | 8 -------- 0.83/Omnibot/Common/TriggerManager.cpp | 8 -------- 0.83/Omnibot/Common/TriggerManager.h | 8 -------- 0.83/Omnibot/Common/Utilities.cpp | 8 -------- 0.83/Omnibot/Common/Utilities.h | 8 -------- 0.83/Omnibot/Common/Waypoint.cpp | 8 -------- 0.83/Omnibot/Common/Waypoint.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializerImp.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V1.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V1.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V2.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V2.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V3.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V3.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V4.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V4.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V5.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V5.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V6.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V6.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V7.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V7.h | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V9.cpp | 8 -------- 0.83/Omnibot/Common/WaypointSerializer_V9.h | 8 -------- 0.83/Omnibot/Common/Weapon.cpp | 10 +--------- 0.83/Omnibot/Common/Weapon.h | 14 ++------------ 0.83/Omnibot/Common/WeaponDatabase.cpp | 8 -------- 0.83/Omnibot/Common/WeaponDatabase.h | 8 -------- 0.83/Omnibot/Common/common.h | 18 ++++-------------- 0.83/Omnibot/Common/gmAABB.cpp | 8 -------- 0.83/Omnibot/Common/gmAABB.h | 8 -------- 0.83/Omnibot/Common/gmBot.cpp | 8 -------- 0.83/Omnibot/Common/gmBot.h | 8 -------- 0.83/Omnibot/Common/gmBotLibrary.cpp | 8 -------- 0.83/Omnibot/Common/gmBotLibrary.h | 8 -------- 0.83/Omnibot/Common/gmDebugWindow.cpp | 8 -------- 0.83/Omnibot/Common/gmDebugWindow.h | 8 -------- 0.83/Omnibot/Common/gmGameEntity.cpp | 8 -------- 0.83/Omnibot/Common/gmGameEntity.h | 8 -------- 0.83/Omnibot/Common/gmMathLibrary.cpp | 8 -------- 0.83/Omnibot/Common/gmMathLibrary.h | 8 -------- 0.83/Omnibot/Common/gmMatrix3.cpp | 8 -------- 0.83/Omnibot/Common/gmMatrix3.h | 8 -------- 0.83/Omnibot/Common/gmNamesList.cpp | 8 -------- 0.83/Omnibot/Common/gmNamesList.h | 8 -------- 0.83/Omnibot/Common/gmScriptGoal.cpp | 8 -------- 0.83/Omnibot/Common/gmScriptGoal.h | 8 -------- 0.83/Omnibot/Common/gmSystemLibApp.cpp | 8 -------- 0.83/Omnibot/Common/gmSystemLibApp.h | 8 -------- 0.83/Omnibot/Common/gmTargetInfo.cpp | 8 -------- 0.83/Omnibot/Common/gmTargetInfo.h | 8 -------- 0.83/Omnibot/Common/gmTimer.cpp | 8 -------- 0.83/Omnibot/Common/gmTimer.h | 8 -------- 0.83/Omnibot/Common/gmTriggerInfo.cpp | 8 -------- 0.83/Omnibot/Common/gmTriggerInfo.h | 8 -------- 0.83/Omnibot/Common/gmUtilityLib.cpp | 8 -------- 0.83/Omnibot/Common/gmUtilityLib.h | 8 -------- 0.83/Omnibot/Common/gmWeapon.cpp | 8 -------- 0.83/Omnibot/Common/gmWeapon.h | 8 -------- 0.83/Omnibot/ET/ET_BaseStates.cpp | 8 -------- 0.83/Omnibot/ET/ET_BaseStates.h | 8 -------- 0.83/Omnibot/ET/ET_Client.cpp | 8 -------- 0.83/Omnibot/ET/ET_Client.h | 8 -------- 0.83/Omnibot/ET/ET_Config.h | 10 ---------- 0.83/Omnibot/ET/ET_FilterClosest.cpp | 8 -------- 0.83/Omnibot/ET/ET_FilterClosest.h | 8 -------- 0.83/Omnibot/ET/ET_Game.cpp | 8 -------- 0.83/Omnibot/ET/ET_Game.h | 8 -------- 0.83/Omnibot/ET/ET_GoalManager.cpp | 8 -------- 0.83/Omnibot/ET/ET_GoalManager.h | 8 -------- 0.83/Omnibot/ET/ET_InterfaceFuncs.cpp | 8 -------- 0.83/Omnibot/ET/ET_InterfaceFuncs.h | 8 -------- 0.83/Omnibot/ET/ET_Messages.h | 10 ---------- 0.83/Omnibot/ET/ET_NavigationFlags.h | 10 ---------- 0.83/Omnibot/ET/ET_VoiceMacros.cpp | 8 -------- 0.83/Omnibot/ET/ET_VoiceMacros.h | 8 -------- 0.83/Omnibot/ET/PrecompET.cpp | 8 -------- 0.83/Omnibot/ET/PrecompET.h | 8 -------- 0.83/Omnibot/ET/gmETBinds.cpp | 10 +--------- 0.83/Omnibot/ET/gmETBinds.h | 8 -------- 0.83/Omnibot/RTCW/PrecompRTCW.cpp | 8 -------- 0.83/Omnibot/RTCW/PrecompRTCW.h | 8 -------- 0.83/Omnibot/RTCW/RTCW_Client.cpp | 8 -------- 0.83/Omnibot/RTCW/RTCW_Client.h | 8 -------- 0.83/Omnibot/RTCW/RTCW_Config.h | 10 ---------- 0.83/Omnibot/RTCW/RTCW_FilterClosest.cpp | 8 -------- 0.83/Omnibot/RTCW/RTCW_FilterClosest.h | 8 -------- 0.83/Omnibot/RTCW/RTCW_Game.cpp | 8 -------- 0.83/Omnibot/RTCW/RTCW_Game.h | 8 -------- 0.83/Omnibot/RTCW/RTCW_GoalManager.cpp | 8 -------- 0.83/Omnibot/RTCW/RTCW_GoalManager.h | 8 -------- 0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.cpp | 8 -------- 0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.h | 8 -------- 0.83/Omnibot/RTCW/RTCW_Messages.h | 10 ---------- 0.83/Omnibot/RTCW/RTCW_NavigationFlags.h | 10 ---------- 0.83/Omnibot/RTCW/RTCW_VoiceMacros.cpp | 8 -------- 0.83/Omnibot/RTCW/RTCW_VoiceMacros.h | 8 -------- 0.83/Omnibot/RTCW/gmRTCWBinds.cpp | 8 -------- 0.83/Omnibot/RTCW/gmRTCWBinds.h | 8 -------- 0.83/Omnibot/project-root.jam | 4 ---- 244 files changed, 13 insertions(+), 1986 deletions(-) diff --git a/0.83/Omnibot/Common/AStarSolver.h b/0.83/Omnibot/Common/AStarSolver.h index 28109c7e5..b2ef95cb9 100644 --- a/0.83/Omnibot/Common/AStarSolver.h +++ b/0.83/Omnibot/Common/AStarSolver.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ASTARSOLVER_H__ #define __ASTARSOLVER_H__ diff --git a/0.83/Omnibot/Common/Base_Messages.h b/0.83/Omnibot/Common/Base_Messages.h index 033fa3d6b..62319f254 100644 --- a/0.83/Omnibot/Common/Base_Messages.h +++ b/0.83/Omnibot/Common/Base_Messages.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BASE_MESSAGES_H__ #define __BASE_MESSAGES_H__ diff --git a/0.83/Omnibot/Common/BatchBuild.cpp b/0.83/Omnibot/Common/BatchBuild.cpp index 3c1213e48..5230e2620 100644 --- a/0.83/Omnibot/Common/BatchBuild.cpp +++ b/0.83/Omnibot/Common/BatchBuild.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - //#ifndef __linux__ // Unity Build diff --git a/0.83/Omnibot/Common/BatchBuildWin.cpp b/0.83/Omnibot/Common/BatchBuildWin.cpp index 7fe10896e..ca7ae5ae2 100644 --- a/0.83/Omnibot/Common/BatchBuildWin.cpp +++ b/0.83/Omnibot/Common/BatchBuildWin.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy: ken.nickel $ -// $LastChangedDate: 2011-08-16 23:33:40 +0200 (út, 16 8 2011) $ -// $LastChangedRevision: 352 $ -// -//////////////////////////////////////////////////////////////////////////////// - //#ifndef __linux__ // Unity Build diff --git a/0.83/Omnibot/Common/Bezier.h b/0.83/Omnibot/Common/Bezier.h index 5a9c1cc42..3ccd195ff 100644 --- a/0.83/Omnibot/Common/Bezier.h +++ b/0.83/Omnibot/Common/Bezier.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BEZIER_H__ #define __BEZIER_H__ diff --git a/0.83/Omnibot/Common/BlackBoard.cpp b/0.83/Omnibot/Common/BlackBoard.cpp index cbef5c64a..58c1ca882 100644 --- a/0.83/Omnibot/Common/BlackBoard.cpp +++ b/0.83/Omnibot/Common/BlackBoard.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BlackBoard.h" diff --git a/0.83/Omnibot/Common/BlackBoard.h b/0.83/Omnibot/Common/BlackBoard.h index 76acf007f..3a950033a 100644 --- a/0.83/Omnibot/Common/BlackBoard.h +++ b/0.83/Omnibot/Common/BlackBoard.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BLACKBOARD_H__ #define __BLACKBOARD_H__ diff --git a/0.83/Omnibot/Common/BlackBoardItems.cpp b/0.83/Omnibot/Common/BlackBoardItems.cpp index 412321d20..66b471bc1 100644 --- a/0.83/Omnibot/Common/BlackBoardItems.cpp +++ b/0.83/Omnibot/Common/BlackBoardItems.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BlackBoardItems.h" diff --git a/0.83/Omnibot/Common/BlackBoardItems.h b/0.83/Omnibot/Common/BlackBoardItems.h index 696569cdc..380040806 100644 --- a/0.83/Omnibot/Common/BlackBoardItems.h +++ b/0.83/Omnibot/Common/BlackBoardItems.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BLACKBOARDITEMS_H__ #define __BLACKBOARDITEMS_H__ diff --git a/0.83/Omnibot/Common/BotBaseStates.cpp b/0.83/Omnibot/Common/BotBaseStates.cpp index 5e7b61c59..dbe560501 100644 --- a/0.83/Omnibot/Common/BotBaseStates.cpp +++ b/0.83/Omnibot/Common/BotBaseStates.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BotBaseStates.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/BotBaseStates.h b/0.83/Omnibot/Common/BotBaseStates.h index c0958fcbc..de4853c6b 100644 --- a/0.83/Omnibot/Common/BotBaseStates.h +++ b/0.83/Omnibot/Common/BotBaseStates.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BotBaseStates_H__ #define __BotBaseStates_H__ diff --git a/0.83/Omnibot/Common/BotBaseStates_GM.cpp b/0.83/Omnibot/Common/BotBaseStates_GM.cpp index 824442dd0..f390c9912 100644 --- a/0.83/Omnibot/Common/BotBaseStates_GM.cpp +++ b/0.83/Omnibot/Common/BotBaseStates_GM.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BotBaseStates.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/BotExports.cpp b/0.83/Omnibot/Common/BotExports.cpp index e2b5be526..87a7494a3 100644 --- a/0.83/Omnibot/Common/BotExports.cpp +++ b/0.83/Omnibot/Common/BotExports.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - //#include "vld.h" #include "BotExports.h" diff --git a/0.83/Omnibot/Common/BotExports.h b/0.83/Omnibot/Common/BotExports.h index 2f67b7e18..7fc2eaf23 100644 --- a/0.83/Omnibot/Common/BotExports.h +++ b/0.83/Omnibot/Common/BotExports.h @@ -1,15 +1,5 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: BotExports -// In order for the game to call functions from the bot, we must export -// the functions to the game itself and allow it to call them. -// -//////////////////////////////////////////////////////////////////////////////// - +//In order for the game to call functions from the bot, we must export +//the functions to the game itself and allow it to call them. #ifndef __BOTEXPORTS_H__ #define __BOTEXPORTS_H__ diff --git a/0.83/Omnibot/Common/BotGlobalStates.cpp b/0.83/Omnibot/Common/BotGlobalStates.cpp index 6c777c99a..830a2da67 100644 --- a/0.83/Omnibot/Common/BotGlobalStates.cpp +++ b/0.83/Omnibot/Common/BotGlobalStates.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BotGlobalStates.h" diff --git a/0.83/Omnibot/Common/BotGlobalStates.h b/0.83/Omnibot/Common/BotGlobalStates.h index cf113e0f1..c7e16b4a4 100644 --- a/0.83/Omnibot/Common/BotGlobalStates.h +++ b/0.83/Omnibot/Common/BotGlobalStates.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BotGlobalStates_H__ #define __BotGlobalStates_H__ diff --git a/0.83/Omnibot/Common/BotLoadLibrary.cpp b/0.83/Omnibot/Common/BotLoadLibrary.cpp index 0e2487b8f..dbf41e463 100644 --- a/0.83/Omnibot/Common/BotLoadLibrary.cpp +++ b/0.83/Omnibot/Common/BotLoadLibrary.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "BotExports.h" #if defined WIN32 || defined _WINDOWS || defined _WIN32 diff --git a/0.83/Omnibot/Common/BotSensoryMemory.cpp b/0.83/Omnibot/Common/BotSensoryMemory.cpp index 65ed87043..1c4200199 100644 --- a/0.83/Omnibot/Common/BotSensoryMemory.cpp +++ b/0.83/Omnibot/Common/BotSensoryMemory.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "IGameManager.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/BotSensoryMemory.h b/0.83/Omnibot/Common/BotSensoryMemory.h index 39bb317d8..2fba06260 100644 --- a/0.83/Omnibot/Common/BotSensoryMemory.h +++ b/0.83/Omnibot/Common/BotSensoryMemory.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BOTSENSORYMEMORY_H__ #define __BOTSENSORYMEMORY_H__ diff --git a/0.83/Omnibot/Common/BotSteeringSystem.cpp b/0.83/Omnibot/Common/BotSteeringSystem.cpp index 941e3157e..67483b30f 100644 --- a/0.83/Omnibot/Common/BotSteeringSystem.cpp +++ b/0.83/Omnibot/Common/BotSteeringSystem.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BotSteeringSystem.h" #include "Client.h" diff --git a/0.83/Omnibot/Common/BotSteeringSystem.h b/0.83/Omnibot/Common/BotSteeringSystem.h index 658ad47b2..2d4357dd9 100644 --- a/0.83/Omnibot/Common/BotSteeringSystem.h +++ b/0.83/Omnibot/Common/BotSteeringSystem.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BOTSTEERINGSYSTEM_H__ #define __BOTSTEERINGSYSTEM_H__ diff --git a/0.83/Omnibot/Common/BotTargetingSystem.cpp b/0.83/Omnibot/Common/BotTargetingSystem.cpp index aa8eb0c45..99b6ea9e1 100644 --- a/0.83/Omnibot/Common/BotTargetingSystem.cpp +++ b/0.83/Omnibot/Common/BotTargetingSystem.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Client.h" diff --git a/0.83/Omnibot/Common/BotTargetingSystem.h b/0.83/Omnibot/Common/BotTargetingSystem.h index 8121b230b..c136b6c04 100644 --- a/0.83/Omnibot/Common/BotTargetingSystem.h +++ b/0.83/Omnibot/Common/BotTargetingSystem.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BOTTARGETINGSYSTEM_H__ #define __BOTTARGETINGSYSTEM_H__ diff --git a/0.83/Omnibot/Common/BotWeaponSystem.cpp b/0.83/Omnibot/Common/BotWeaponSystem.cpp index ee46ae60e..329b114d3 100644 --- a/0.83/Omnibot/Common/BotWeaponSystem.cpp +++ b/0.83/Omnibot/Common/BotWeaponSystem.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BotWeaponSystem.h" #include "Client.h" diff --git a/0.83/Omnibot/Common/BotWeaponSystem.h b/0.83/Omnibot/Common/BotWeaponSystem.h index 5108af5cb..c81475624 100644 --- a/0.83/Omnibot/Common/BotWeaponSystem.h +++ b/0.83/Omnibot/Common/BotWeaponSystem.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __BOTWEAPONSYSTEM_H__ #define __BOTWEAPONSYSTEM_H__ diff --git a/0.83/Omnibot/Common/CallbackParameters.cpp b/0.83/Omnibot/Common/CallbackParameters.cpp index 21a045e0b..0c228eaea 100644 --- a/0.83/Omnibot/Common/CallbackParameters.cpp +++ b/0.83/Omnibot/Common/CallbackParameters.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "CallbackParameters.h" diff --git a/0.83/Omnibot/Common/CallbackParameters.h b/0.83/Omnibot/Common/CallbackParameters.h index 6a86e141e..4654ccb45 100644 --- a/0.83/Omnibot/Common/CallbackParameters.h +++ b/0.83/Omnibot/Common/CallbackParameters.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __CALLBACKPARAMETERS_H__ #define __CALLBACKPARAMETERS_H__ diff --git a/0.83/Omnibot/Common/ChunkedFile.cpp b/0.83/Omnibot/Common/ChunkedFile.cpp index bd47b2f7c..b63676717 100644 --- a/0.83/Omnibot/Common/ChunkedFile.cpp +++ b/0.83/Omnibot/Common/ChunkedFile.cpp @@ -1,10 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// #include "PrecompCommon.h" #include "ChunkedFile.h" diff --git a/0.83/Omnibot/Common/ChunkedFile.h b/0.83/Omnibot/Common/ChunkedFile.h index dd0e2f2cb..650ab219b 100644 --- a/0.83/Omnibot/Common/ChunkedFile.h +++ b/0.83/Omnibot/Common/ChunkedFile.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __CHUNKEDFILE_H__ #define __CHUNKEDFILE_H__ diff --git a/0.83/Omnibot/Common/Client.cpp b/0.83/Omnibot/Common/Client.cpp index 83d98563d..2b7291e88 100644 --- a/0.83/Omnibot/Common/Client.cpp +++ b/0.83/Omnibot/Common/Client.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Client.h" #include "IGameManager.h" diff --git a/0.83/Omnibot/Common/Client.h b/0.83/Omnibot/Common/Client.h index db852c2a3..2d0ea3178 100644 --- a/0.83/Omnibot/Common/Client.h +++ b/0.83/Omnibot/Common/Client.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __CLIENT_H__ #define __CLIENT_H__ diff --git a/0.83/Omnibot/Common/CommandFunctor.h b/0.83/Omnibot/Common/CommandFunctor.h index 257da423b..2bacb165b 100644 --- a/0.83/Omnibot/Common/CommandFunctor.h +++ b/0.83/Omnibot/Common/CommandFunctor.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __COMMAND_FUNCTOR_H__ #define __COMMAND_FUNCTOR_H__ diff --git a/0.83/Omnibot/Common/CommandReciever.cpp b/0.83/Omnibot/Common/CommandReciever.cpp index 42f90a67a..bd127f42c 100644 --- a/0.83/Omnibot/Common/CommandReciever.cpp +++ b/0.83/Omnibot/Common/CommandReciever.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "CommandReciever.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/CommandReciever.h b/0.83/Omnibot/Common/CommandReciever.h index 9c2d531c6..cdcca766c 100644 --- a/0.83/Omnibot/Common/CommandReciever.h +++ b/0.83/Omnibot/Common/CommandReciever.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __COMMANDRECIEVER_H__ #define __COMMANDRECIEVER_H__ diff --git a/0.83/Omnibot/Common/Criteria.cpp b/0.83/Omnibot/Common/Criteria.cpp index d9ac04c70..0fcf47b6d 100644 --- a/0.83/Omnibot/Common/Criteria.cpp +++ b/0.83/Omnibot/Common/Criteria.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Criteria.h" diff --git a/0.83/Omnibot/Common/Criteria.h b/0.83/Omnibot/Common/Criteria.h index 0ea97787d..dac177bfd 100644 --- a/0.83/Omnibot/Common/Criteria.h +++ b/0.83/Omnibot/Common/Criteria.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __CRITERIA_H__ #define __CRITERIA_H__ diff --git a/0.83/Omnibot/Common/EngineFuncs.cpp b/0.83/Omnibot/Common/EngineFuncs.cpp index 7146c8ceb..211dae9be 100644 --- a/0.83/Omnibot/Common/EngineFuncs.cpp +++ b/0.83/Omnibot/Common/EngineFuncs.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "EngineFuncs.h" #include "Utilities.h" diff --git a/0.83/Omnibot/Common/EngineFuncs.h b/0.83/Omnibot/Common/EngineFuncs.h index dde4bde07..d3dff6abe 100644 --- a/0.83/Omnibot/Common/EngineFuncs.h +++ b/0.83/Omnibot/Common/EngineFuncs.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ENGINEFUNCS_H__ #define __ENGINEFUNCS_H__ diff --git a/0.83/Omnibot/Common/Error.cpp b/0.83/Omnibot/Common/Error.cpp index 57d2ff86a..53ddfd467 100644 --- a/0.83/Omnibot/Common/Error.cpp +++ b/0.83/Omnibot/Common/Error.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Error.h" diff --git a/0.83/Omnibot/Common/Error.h b/0.83/Omnibot/Common/Error.h index d0d3a15e2..990a8c60d 100644 --- a/0.83/Omnibot/Common/Error.h +++ b/0.83/Omnibot/Common/Error.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ERROR_H__ #define __ERROR_H__ diff --git a/0.83/Omnibot/Common/EventReciever.cpp b/0.83/Omnibot/Common/EventReciever.cpp index 38277c8b9..5687224c2 100644 --- a/0.83/Omnibot/Common/EventReciever.cpp +++ b/0.83/Omnibot/Common/EventReciever.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "EventReciever.h" #include "IGame.h" diff --git a/0.83/Omnibot/Common/EventReciever.h b/0.83/Omnibot/Common/EventReciever.h index 62dfcf31c..08bf77a30 100644 --- a/0.83/Omnibot/Common/EventReciever.h +++ b/0.83/Omnibot/Common/EventReciever.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __EVENTRECIEVER_H__ #define __EVENTRECIEVER_H__ diff --git a/0.83/Omnibot/Common/FileDownloader.cpp b/0.83/Omnibot/Common/FileDownloader.cpp index 90adbacde..b900a9d3e 100644 --- a/0.83/Omnibot/Common/FileDownloader.cpp +++ b/0.83/Omnibot/Common/FileDownloader.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifdef ENABLE_FILE_DOWNLOADER #include "PrecompCommon.h" diff --git a/0.83/Omnibot/Common/FileDownloader.h b/0.83/Omnibot/Common/FileDownloader.h index d5c6def6f..0800cf2c2 100644 --- a/0.83/Omnibot/Common/FileDownloader.h +++ b/0.83/Omnibot/Common/FileDownloader.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILEDOWNLOADER__ #define __FILEDOWNLOADER__ diff --git a/0.83/Omnibot/Common/FileSystem.cpp b/0.83/Omnibot/Common/FileSystem.cpp index 68ccdaf80..c28b276d7 100644 --- a/0.83/Omnibot/Common/FileSystem.cpp +++ b/0.83/Omnibot/Common/FileSystem.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "FileSystem.h" diff --git a/0.83/Omnibot/Common/FileSystem.h b/0.83/Omnibot/Common/FileSystem.h index b7c0c5c3d..5f05f3958 100644 --- a/0.83/Omnibot/Common/FileSystem.h +++ b/0.83/Omnibot/Common/FileSystem.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILESYSTEM_H__ #define __FILESYSTEM_H__ diff --git a/0.83/Omnibot/Common/FilterAllType.cpp b/0.83/Omnibot/Common/FilterAllType.cpp index d7cb75d2d..616b90a6c 100644 --- a/0.83/Omnibot/Common/FilterAllType.cpp +++ b/0.83/Omnibot/Common/FilterAllType.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "FilterAllType.h" diff --git a/0.83/Omnibot/Common/FilterAllType.h b/0.83/Omnibot/Common/FilterAllType.h index 0e1976c66..96df7ed30 100644 --- a/0.83/Omnibot/Common/FilterAllType.h +++ b/0.83/Omnibot/Common/FilterAllType.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILTERALLTYPE_H__ #define __FILTERALLTYPE_H__ diff --git a/0.83/Omnibot/Common/FilterBias.cpp b/0.83/Omnibot/Common/FilterBias.cpp index 82e7ba048..c5412e985 100644 --- a/0.83/Omnibot/Common/FilterBias.cpp +++ b/0.83/Omnibot/Common/FilterBias.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "FilterBias.h" diff --git a/0.83/Omnibot/Common/FilterBias.h b/0.83/Omnibot/Common/FilterBias.h index 8273d35f1..d82664ba5 100644 --- a/0.83/Omnibot/Common/FilterBias.h +++ b/0.83/Omnibot/Common/FilterBias.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILTERBIAS_H__ #define __FILTERBIAS_H__ diff --git a/0.83/Omnibot/Common/FilterClosest.cpp b/0.83/Omnibot/Common/FilterClosest.cpp index 8573a7e37..af066eaed 100644 --- a/0.83/Omnibot/Common/FilterClosest.cpp +++ b/0.83/Omnibot/Common/FilterClosest.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "FilterClosest.h" diff --git a/0.83/Omnibot/Common/FilterClosest.h b/0.83/Omnibot/Common/FilterClosest.h index 31c5f78e2..6ff1c2904 100644 --- a/0.83/Omnibot/Common/FilterClosest.h +++ b/0.83/Omnibot/Common/FilterClosest.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILTERCLOSEST_H__ #define __FILTERCLOSEST_H__ diff --git a/0.83/Omnibot/Common/FilterMostHurt.cpp b/0.83/Omnibot/Common/FilterMostHurt.cpp index e80926a16..1e472141d 100644 --- a/0.83/Omnibot/Common/FilterMostHurt.cpp +++ b/0.83/Omnibot/Common/FilterMostHurt.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "FilterMostHurt.h" diff --git a/0.83/Omnibot/Common/FilterMostHurt.h b/0.83/Omnibot/Common/FilterMostHurt.h index 337e01042..9cdd4b748 100644 --- a/0.83/Omnibot/Common/FilterMostHurt.h +++ b/0.83/Omnibot/Common/FilterMostHurt.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILTERMOSTHURT_H__ #define __FILTERMOSTHURT_H__ diff --git a/0.83/Omnibot/Common/FilterSensory.cpp b/0.83/Omnibot/Common/FilterSensory.cpp index 7dfa6137e..25b0811b5 100644 --- a/0.83/Omnibot/Common/FilterSensory.cpp +++ b/0.83/Omnibot/Common/FilterSensory.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" int FilterSensory::ANYPLAYERCLASS = 0; diff --git a/0.83/Omnibot/Common/FilterSensory.h b/0.83/Omnibot/Common/FilterSensory.h index dee2ba485..a6150ed8e 100644 --- a/0.83/Omnibot/Common/FilterSensory.h +++ b/0.83/Omnibot/Common/FilterSensory.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FILTERSENSORY_H__ #define __FILTERSENSORY_H__ diff --git a/0.83/Omnibot/Common/Functions_Bot.h b/0.83/Omnibot/Common/Functions_Bot.h index 7264dcf54..e8e03e96d 100644 --- a/0.83/Omnibot/Common/Functions_Bot.h +++ b/0.83/Omnibot/Common/Functions_Bot.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FUNCTIONS_BOT_H__ #define __FUNCTIONS_BOT_H__ diff --git a/0.83/Omnibot/Common/Functor.h b/0.83/Omnibot/Common/Functor.h index 69d4dd229..cf9743247 100644 --- a/0.83/Omnibot/Common/Functor.h +++ b/0.83/Omnibot/Common/Functor.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __FUNCTOR_H__ #define __FUNCTOR_H__ diff --git a/0.83/Omnibot/Common/GoalManager.cpp b/0.83/Omnibot/Common/GoalManager.cpp index 45a0d6f54..858c28d24 100644 --- a/0.83/Omnibot/Common/GoalManager.cpp +++ b/0.83/Omnibot/Common/GoalManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "GoalManager.h" #include "NavigationFlags.h" diff --git a/0.83/Omnibot/Common/GoalManager.h b/0.83/Omnibot/Common/GoalManager.h index 06c4f725a..b8c548c98 100644 --- a/0.83/Omnibot/Common/GoalManager.h +++ b/0.83/Omnibot/Common/GoalManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GOALMANAGER_H__ #define __GOALMANAGER_H__ diff --git a/0.83/Omnibot/Common/IEngineInterface.h b/0.83/Omnibot/Common/IEngineInterface.h index 02fb41bf5..472e49838 100644 --- a/0.83/Omnibot/Common/IEngineInterface.h +++ b/0.83/Omnibot/Common/IEngineInterface.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ENGINE_INTERFACE_H__ #define __ENGINE_INTERFACE_H__ diff --git a/0.83/Omnibot/Common/IGame.cpp b/0.83/Omnibot/Common/IGame.cpp index 27aba7237..09ee8afd2 100644 --- a/0.83/Omnibot/Common/IGame.cpp +++ b/0.83/Omnibot/Common/IGame.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "NameManager.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/IGame.h b/0.83/Omnibot/Common/IGame.h index d7ef9747c..341cf175b 100644 --- a/0.83/Omnibot/Common/IGame.h +++ b/0.83/Omnibot/Common/IGame.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __IGAME_H__ #define __IGAME_H__ diff --git a/0.83/Omnibot/Common/IGameManager.cpp b/0.83/Omnibot/Common/IGameManager.cpp index bb0e33c02..4754d3876 100644 --- a/0.83/Omnibot/Common/IGameManager.cpp +++ b/0.83/Omnibot/Common/IGameManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "IGameManager.h" #include "IGame.h" diff --git a/0.83/Omnibot/Common/IGameManager.h b/0.83/Omnibot/Common/IGameManager.h index af8edb5c7..29d8839fd 100644 --- a/0.83/Omnibot/Common/IGameManager.h +++ b/0.83/Omnibot/Common/IGameManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __IGAMEMANAGER_H__ #define __IGAMEMANAGER_H__ diff --git a/0.83/Omnibot/Common/InterfaceFuncs.cpp b/0.83/Omnibot/Common/InterfaceFuncs.cpp index 84844321d..0fbc231f8 100644 --- a/0.83/Omnibot/Common/InterfaceFuncs.cpp +++ b/0.83/Omnibot/Common/InterfaceFuncs.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "InterfaceFuncs.h" diff --git a/0.83/Omnibot/Common/InterfaceFuncs.h b/0.83/Omnibot/Common/InterfaceFuncs.h index 237597a48..c8718aa71 100644 --- a/0.83/Omnibot/Common/InterfaceFuncs.h +++ b/0.83/Omnibot/Common/InterfaceFuncs.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __INTERFACEFUNCS_H__ #define __INTERFACEFUNCS_H__ diff --git a/0.83/Omnibot/Common/InternalFsm.h b/0.83/Omnibot/Common/InternalFsm.h index 26097b7e7..3d2f6369f 100644 --- a/0.83/Omnibot/Common/InternalFsm.h +++ b/0.83/Omnibot/Common/InternalFsm.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __INTERNALFSM_H__ #define __INTERNALFSM_H__ diff --git a/0.83/Omnibot/Common/MapGoal.cpp b/0.83/Omnibot/Common/MapGoal.cpp index 95e3176ef..e6c3b3079 100644 --- a/0.83/Omnibot/Common/MapGoal.cpp +++ b/0.83/Omnibot/Common/MapGoal.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "MapGoal.h" #include "gmbinder2_class.h" diff --git a/0.83/Omnibot/Common/MapGoal.h b/0.83/Omnibot/Common/MapGoal.h index 2fe3a3f31..f70ed5512 100644 --- a/0.83/Omnibot/Common/MapGoal.h +++ b/0.83/Omnibot/Common/MapGoal.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __MAPGOAL_H__ #define __MAPGOAL_H__ diff --git a/0.83/Omnibot/Common/MapGoalDatabase.cpp b/0.83/Omnibot/Common/MapGoalDatabase.cpp index 9d3502076..d8191571b 100644 --- a/0.83/Omnibot/Common/MapGoalDatabase.cpp +++ b/0.83/Omnibot/Common/MapGoalDatabase.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/MapGoalDatabase.h b/0.83/Omnibot/Common/MapGoalDatabase.h index 086c2b31d..9602036c8 100644 --- a/0.83/Omnibot/Common/MapGoalDatabase.h +++ b/0.83/Omnibot/Common/MapGoalDatabase.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __MAPGOALDATABASE_H__ #define __MAPGOALDATABASE_H__ diff --git a/0.83/Omnibot/Common/MemoryRecord.cpp b/0.83/Omnibot/Common/MemoryRecord.cpp index 41c45cec8..380025a3b 100644 --- a/0.83/Omnibot/Common/MemoryRecord.cpp +++ b/0.83/Omnibot/Common/MemoryRecord.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "MemoryRecord.h" diff --git a/0.83/Omnibot/Common/MemoryRecord.h b/0.83/Omnibot/Common/MemoryRecord.h index af2fc0f5d..56cc8d136 100644 --- a/0.83/Omnibot/Common/MemoryRecord.h +++ b/0.83/Omnibot/Common/MemoryRecord.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __MEMORYRECORD_H__ #define __MEMORYRECORD_H__ diff --git a/0.83/Omnibot/Common/MessageFunctor.h b/0.83/Omnibot/Common/MessageFunctor.h index 1383fcdcf..42637b8aa 100644 --- a/0.83/Omnibot/Common/MessageFunctor.h +++ b/0.83/Omnibot/Common/MessageFunctor.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __MESSAGE_FUNCTOR_H__ #define __MESSAGE_FUNCTOR_H__ diff --git a/0.83/Omnibot/Common/MessageHelper.h b/0.83/Omnibot/Common/MessageHelper.h index 2b9e8172b..17d9e8719 100644 --- a/0.83/Omnibot/Common/MessageHelper.h +++ b/0.83/Omnibot/Common/MessageHelper.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __MESSAGEHELPER_H__ #define __MESSAGEHELPER_H__ diff --git a/0.83/Omnibot/Common/MessageManager.h b/0.83/Omnibot/Common/MessageManager.h index f0d1e1a43..3abecbc92 100644 --- a/0.83/Omnibot/Common/MessageManager.h +++ b/0.83/Omnibot/Common/MessageManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __MESSAGEMANAGER_H__ #define __MESSAGEMANAGER_H__ diff --git a/0.83/Omnibot/Common/NameManager.cpp b/0.83/Omnibot/Common/NameManager.cpp index aeaaad2e7..89e4e56dc 100644 --- a/0.83/Omnibot/Common/NameManager.cpp +++ b/0.83/Omnibot/Common/NameManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "NameManager.h" diff --git a/0.83/Omnibot/Common/NameManager.h b/0.83/Omnibot/Common/NameManager.h index efdd1d580..a8de8fefa 100644 --- a/0.83/Omnibot/Common/NameManager.h +++ b/0.83/Omnibot/Common/NameManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __NAMEMANAGER_H__ #define __NAMEMANAGER_H__ diff --git a/0.83/Omnibot/Common/NavigationFlags.h b/0.83/Omnibot/Common/NavigationFlags.h index c0c17d22a..1702aa0d8 100644 --- a/0.83/Omnibot/Common/NavigationFlags.h +++ b/0.83/Omnibot/Common/NavigationFlags.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: Generic Navigation Flags -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __NAVIGATIONFLAGS_H__ #define __NAVIGATIONFLAGS_H__ diff --git a/0.83/Omnibot/Common/NavigationManager.cpp b/0.83/Omnibot/Common/NavigationManager.cpp index 70be8c4a7..cde26e699 100644 --- a/0.83/Omnibot/Common/NavigationManager.cpp +++ b/0.83/Omnibot/Common/NavigationManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "NavigationManager.h" #include "IGameManager.h" diff --git a/0.83/Omnibot/Common/NavigationManager.h b/0.83/Omnibot/Common/NavigationManager.h index 12ff98524..db6b23286 100644 --- a/0.83/Omnibot/Common/NavigationManager.h +++ b/0.83/Omnibot/Common/NavigationManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __NAVIGATIONMANAGER_H__ #define __NAVIGATIONMANAGER_H__ diff --git a/0.83/Omnibot/Common/ObjFunctor.h b/0.83/Omnibot/Common/ObjFunctor.h index a8a7d4b8b..38e70f524 100644 --- a/0.83/Omnibot/Common/ObjFunctor.h +++ b/0.83/Omnibot/Common/ObjFunctor.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __OBJFUNCTOR_H__ #define __OBJFUNCTOR_H__ diff --git a/0.83/Omnibot/Common/ObstacleManager.cpp b/0.83/Omnibot/Common/ObstacleManager.cpp index c9c86a816..84825ae40 100644 --- a/0.83/Omnibot/Common/ObstacleManager.cpp +++ b/0.83/Omnibot/Common/ObstacleManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ObstacleManager.h" diff --git a/0.83/Omnibot/Common/ObstacleManager.h b/0.83/Omnibot/Common/ObstacleManager.h index a9e2c8e7a..23401387f 100644 --- a/0.83/Omnibot/Common/ObstacleManager.h +++ b/0.83/Omnibot/Common/ObstacleManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __OBSTACLEMANAGER_H__ #define __OBSTACLEMANAGER_H__ diff --git a/0.83/Omnibot/Common/Omni-Bot.cpp b/0.83/Omnibot/Common/Omni-Bot.cpp index e522b1d92..e1e66b5e0 100644 --- a/0.83/Omnibot/Common/Omni-Bot.cpp +++ b/0.83/Omnibot/Common/Omni-Bot.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #ifdef WIN32 diff --git a/0.83/Omnibot/Common/Omni-Bot.h b/0.83/Omnibot/Common/Omni-Bot.h index a0b848b52..724359804 100644 --- a/0.83/Omnibot/Common/Omni-Bot.h +++ b/0.83/Omnibot/Common/Omni-Bot.h @@ -1,14 +1,6 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// about: Exported function definitions -// In order for the game to call functions from the bot, we must export -// the functions to the game itself and allow it to call them. -// -//////////////////////////////////////////////////////////////////////////////// +//Exported function definitions +//In order for the game to call functions from the bot, we must export +//the functions to the game itself and allow it to call them. #ifndef __OMNIBOT_H__ #define __OMNIBOT_H__ diff --git a/0.83/Omnibot/Common/Omni-Bot_BasicTypes.h b/0.83/Omnibot/Common/Omni-Bot_BasicTypes.h index 55684074c..5be322bca 100644 --- a/0.83/Omnibot/Common/Omni-Bot_BasicTypes.h +++ b/0.83/Omnibot/Common/Omni-Bot_BasicTypes.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __OMNIBOT_BASICTYPES_WIN32_H__ #define __OMNIBOT_BASICTYPES_WIN32_H__ diff --git a/0.83/Omnibot/Common/Omni-Bot_BitFlags.h b/0.83/Omnibot/Common/Omni-Bot_BitFlags.h index 8a9ff5147..d9ab8e5a8 100644 --- a/0.83/Omnibot/Common/Omni-Bot_BitFlags.h +++ b/0.83/Omnibot/Common/Omni-Bot_BitFlags.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __USERFLAGS_H__ #define __USERFLAGS_H__ diff --git a/0.83/Omnibot/Common/Omni-Bot_Color.h b/0.83/Omnibot/Common/Omni-Bot_Color.h index 7852ce716..6d3d3c6ec 100644 --- a/0.83/Omnibot/Common/Omni-Bot_Color.h +++ b/0.83/Omnibot/Common/Omni-Bot_Color.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __OMNICOLOR_H__ #define __OMNICOLOR_H__ diff --git a/0.83/Omnibot/Common/Omni-Bot_Events.h b/0.83/Omnibot/Common/Omni-Bot_Events.h index 1009d1d52..f2f33a765 100644 --- a/0.83/Omnibot/Common/Omni-Bot_Events.h +++ b/0.83/Omnibot/Common/Omni-Bot_Events.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// about: Generic Bot Events -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __OMNIBOT_EVENTS_H__ #define __OMNIBOT_EVENTS_H__ diff --git a/0.83/Omnibot/Common/Omni-Bot_Types.h b/0.83/Omnibot/Common/Omni-Bot_Types.h index 2bfd8875d..09a4e784a 100644 --- a/0.83/Omnibot/Common/Omni-Bot_Types.h +++ b/0.83/Omnibot/Common/Omni-Bot_Types.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __OMNIBOT_TYPES_H__ #define __OMNIBOT_TYPES_H__ diff --git a/0.83/Omnibot/Common/PIDController.h b/0.83/Omnibot/Common/PIDController.h index bc31192c7..c4d9d1233 100644 --- a/0.83/Omnibot/Common/PIDController.h +++ b/0.83/Omnibot/Common/PIDController.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PIDCONTROLLER_H__ #define __PIDCONTROLLER_H__ diff --git a/0.83/Omnibot/Common/Path.cpp b/0.83/Omnibot/Common/Path.cpp index 31cd45aee..cba4d5783 100644 --- a/0.83/Omnibot/Common/Path.cpp +++ b/0.83/Omnibot/Common/Path.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Path.h" diff --git a/0.83/Omnibot/Common/Path.h b/0.83/Omnibot/Common/Path.h index 2f79ef61b..2a78a0d50 100644 --- a/0.83/Omnibot/Common/Path.h +++ b/0.83/Omnibot/Common/Path.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATH_H__ #define __PATH_H__ diff --git a/0.83/Omnibot/Common/PathPlannerBase.cpp b/0.83/Omnibot/Common/PathPlannerBase.cpp index db519aefa..d3c5f1bda 100644 --- a/0.83/Omnibot/Common/PathPlannerBase.cpp +++ b/0.83/Omnibot/Common/PathPlannerBase.cpp @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// title: Path Planner Interface -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerBase.h" diff --git a/0.83/Omnibot/Common/PathPlannerBase.h b/0.83/Omnibot/Common/PathPlannerBase.h index 8fe377425..22d933c7f 100644 --- a/0.83/Omnibot/Common/PathPlannerBase.h +++ b/0.83/Omnibot/Common/PathPlannerBase.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// title: Path Planner Interface -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATHPLANNER_H__ #define __PATHPLANNER_H__ diff --git a/0.83/Omnibot/Common/PathPlannerFloodFill.cpp b/0.83/Omnibot/Common/PathPlannerFloodFill.cpp index 3a1cbd86a..e70522f4c 100644 --- a/0.83/Omnibot/Common/PathPlannerFloodFill.cpp +++ b/0.83/Omnibot/Common/PathPlannerFloodFill.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerFloodFill.h" #include "IGameManager.h" diff --git a/0.83/Omnibot/Common/PathPlannerFloodFill.h b/0.83/Omnibot/Common/PathPlannerFloodFill.h index e6eeeea7a..d3f1397b2 100644 --- a/0.83/Omnibot/Common/PathPlannerFloodFill.h +++ b/0.83/Omnibot/Common/PathPlannerFloodFill.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATHPLANNERFLOODFILL_H__ #define __PATHPLANNERFLOODFILL_H__ diff --git a/0.83/Omnibot/Common/PathPlannerFloodFillBuilder.cpp b/0.83/Omnibot/Common/PathPlannerFloodFillBuilder.cpp index 6a69bdbdb..c5efaf79d 100644 --- a/0.83/Omnibot/Common/PathPlannerFloodFillBuilder.cpp +++ b/0.83/Omnibot/Common/PathPlannerFloodFillBuilder.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerFloodFill.h" diff --git a/0.83/Omnibot/Common/PathPlannerFloodFillCmds.cpp b/0.83/Omnibot/Common/PathPlannerFloodFillCmds.cpp index 10aaa8c33..5bad28a87 100644 --- a/0.83/Omnibot/Common/PathPlannerFloodFillCmds.cpp +++ b/0.83/Omnibot/Common/PathPlannerFloodFillCmds.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include diff --git a/0.83/Omnibot/Common/PathPlannerFloodFillScript.cpp b/0.83/Omnibot/Common/PathPlannerFloodFillScript.cpp index e429c19c8..57df70e56 100644 --- a/0.83/Omnibot/Common/PathPlannerFloodFillScript.cpp +++ b/0.83/Omnibot/Common/PathPlannerFloodFillScript.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerFloodFill.h" #include "NavigationManager.h" diff --git a/0.83/Omnibot/Common/PathPlannerNavMesh.cpp b/0.83/Omnibot/Common/PathPlannerNavMesh.cpp index 84b64ad78..bfe30e032 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMesh.cpp +++ b/0.83/Omnibot/Common/PathPlannerNavMesh.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerNavMesh.h" #include "IGameManager.h" diff --git a/0.83/Omnibot/Common/PathPlannerNavMesh.h b/0.83/Omnibot/Common/PathPlannerNavMesh.h index d09e0dfe2..e5cecdff9 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMesh.h +++ b/0.83/Omnibot/Common/PathPlannerNavMesh.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATHPLANNERNAVMESH_H__ #define __PATHPLANNERNAVMESH_H__ diff --git a/0.83/Omnibot/Common/PathPlannerNavMeshBuilder.cpp b/0.83/Omnibot/Common/PathPlannerNavMeshBuilder.cpp index 08f1118c9..079be6b28 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMeshBuilder.cpp +++ b/0.83/Omnibot/Common/PathPlannerNavMeshBuilder.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerNavMesh.h" diff --git a/0.83/Omnibot/Common/PathPlannerNavMeshCmds.cpp b/0.83/Omnibot/Common/PathPlannerNavMeshCmds.cpp index 59dad2394..497ca18f4 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMeshCmds.cpp +++ b/0.83/Omnibot/Common/PathPlannerNavMeshCmds.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include diff --git a/0.83/Omnibot/Common/PathPlannerNavMeshScript.cpp b/0.83/Omnibot/Common/PathPlannerNavMeshScript.cpp index efac7878d..72fbd73dc 100644 --- a/0.83/Omnibot/Common/PathPlannerNavMeshScript.cpp +++ b/0.83/Omnibot/Common/PathPlannerNavMeshScript.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerNavMesh.h" #include "NavigationManager.h" diff --git a/0.83/Omnibot/Common/PathPlannerRecast.cpp b/0.83/Omnibot/Common/PathPlannerRecast.cpp index e9a6c263e..7c488cb79 100644 --- a/0.83/Omnibot/Common/PathPlannerRecast.cpp +++ b/0.83/Omnibot/Common/PathPlannerRecast.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerRecast.h" #include "IGameManager.h" diff --git a/0.83/Omnibot/Common/PathPlannerRecast.h b/0.83/Omnibot/Common/PathPlannerRecast.h index 2d42ab3ff..81091e0cb 100644 --- a/0.83/Omnibot/Common/PathPlannerRecast.h +++ b/0.83/Omnibot/Common/PathPlannerRecast.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATHPLANNERRECAST_H__ #define __PATHPLANNERRECAST_H__ diff --git a/0.83/Omnibot/Common/PathPlannerRecastCmds.cpp b/0.83/Omnibot/Common/PathPlannerRecastCmds.cpp index 896e0d152..b6d45bf70 100644 --- a/0.83/Omnibot/Common/PathPlannerRecastCmds.cpp +++ b/0.83/Omnibot/Common/PathPlannerRecastCmds.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include diff --git a/0.83/Omnibot/Common/PathPlannerRecastScript.cpp b/0.83/Omnibot/Common/PathPlannerRecastScript.cpp index f0bcf4c4f..14a4e9db0 100644 --- a/0.83/Omnibot/Common/PathPlannerRecastScript.cpp +++ b/0.83/Omnibot/Common/PathPlannerRecastScript.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerRecast.h" #include "NavigationManager.h" diff --git a/0.83/Omnibot/Common/PathPlannerWaypoint.cpp b/0.83/Omnibot/Common/PathPlannerWaypoint.cpp index f08324d64..695d4f9cc 100644 --- a/0.83/Omnibot/Common/PathPlannerWaypoint.cpp +++ b/0.83/Omnibot/Common/PathPlannerWaypoint.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include diff --git a/0.83/Omnibot/Common/PathPlannerWaypoint.h b/0.83/Omnibot/Common/PathPlannerWaypoint.h index a27c007fd..3823e11eb 100644 --- a/0.83/Omnibot/Common/PathPlannerWaypoint.h +++ b/0.83/Omnibot/Common/PathPlannerWaypoint.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATHPLANNERWAYPOINT_H__ #define __PATHPLANNERWAYPOINT_H__ diff --git a/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp b/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp index d3b75bb7f..f63d80604 100644 --- a/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp +++ b/0.83/Omnibot/Common/PathPlannerWaypointCmds.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include diff --git a/0.83/Omnibot/Common/PathPlannerWaypointScript.cpp b/0.83/Omnibot/Common/PathPlannerWaypointScript.cpp index 3f37105f5..8a0f4192c 100644 --- a/0.83/Omnibot/Common/PathPlannerWaypointScript.cpp +++ b/0.83/Omnibot/Common/PathPlannerWaypointScript.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerWaypoint.h" #include "NavigationManager.h" diff --git a/0.83/Omnibot/Common/PathQuery.cpp b/0.83/Omnibot/Common/PathQuery.cpp index 0dde3f52f..667e094e6 100644 --- a/0.83/Omnibot/Common/PathQuery.cpp +++ b/0.83/Omnibot/Common/PathQuery.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PathPlannerBase.h" #include "PathQuery.h" diff --git a/0.83/Omnibot/Common/PathQuery.h b/0.83/Omnibot/Common/PathQuery.h index 9423636b4..6d0fbd915 100644 --- a/0.83/Omnibot/Common/PathQuery.h +++ b/0.83/Omnibot/Common/PathQuery.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PATHQUERY_H__ #define __PATHQUERY_H__ diff --git a/0.83/Omnibot/Common/PrecompCommon.cpp b/0.83/Omnibot/Common/PrecompCommon.cpp index a3b0de1ba..f381324e1 100644 --- a/0.83/Omnibot/Common/PrecompCommon.cpp +++ b/0.83/Omnibot/Common/PrecompCommon.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" // Global variables. diff --git a/0.83/Omnibot/Common/PrecompCommon.h b/0.83/Omnibot/Common/PrecompCommon.h index 6d8f3c77a..bc89d14cb 100644 --- a/0.83/Omnibot/Common/PrecompCommon.h +++ b/0.83/Omnibot/Common/PrecompCommon.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "common.h" #include "MapGoal.h" diff --git a/0.83/Omnibot/Common/PropertyBinding.cpp b/0.83/Omnibot/Common/PropertyBinding.cpp index 15a370c1e..4467d559f 100644 --- a/0.83/Omnibot/Common/PropertyBinding.cpp +++ b/0.83/Omnibot/Common/PropertyBinding.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "PropertyBinding.h" diff --git a/0.83/Omnibot/Common/PropertyBinding.h b/0.83/Omnibot/Common/PropertyBinding.h index 4b26652ea..8262546da 100644 --- a/0.83/Omnibot/Common/PropertyBinding.h +++ b/0.83/Omnibot/Common/PropertyBinding.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __PROPERTYBINDING_H__ #define __PROPERTYBINDING_H__ diff --git a/0.83/Omnibot/Common/QuadTree.cpp b/0.83/Omnibot/Common/QuadTree.cpp index 821571ae4..59590f44c 100644 --- a/0.83/Omnibot/Common/QuadTree.cpp +++ b/0.83/Omnibot/Common/QuadTree.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "QuadTree.h" diff --git a/0.83/Omnibot/Common/QuadTree.h b/0.83/Omnibot/Common/QuadTree.h index 27a43b047..d2686c680 100644 --- a/0.83/Omnibot/Common/QuadTree.h +++ b/0.83/Omnibot/Common/QuadTree.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __QUADTREE_H__ #define __QUADTREE_H__ diff --git a/0.83/Omnibot/Common/RecastInterfaces.h b/0.83/Omnibot/Common/RecastInterfaces.h index 6863b63c9..c67f28c8b 100644 --- a/0.83/Omnibot/Common/RecastInterfaces.h +++ b/0.83/Omnibot/Common/RecastInterfaces.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy: jswigart $ -// $LastChangedDate: 2010-08-28 00:12:05 -0500 (Sat, 28 Aug 2010) $ -// $LastChangedRevision: 32 $ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RECAST_INTERFACES_H__ #define __RECAST_INTERFACES_H__ diff --git a/0.83/Omnibot/Common/Regulator.cpp b/0.83/Omnibot/Common/Regulator.cpp index 3ae97cf50..542220ece 100644 --- a/0.83/Omnibot/Common/Regulator.cpp +++ b/0.83/Omnibot/Common/Regulator.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Regulator.h" #include "IGame.h" diff --git a/0.83/Omnibot/Common/Regulator.h b/0.83/Omnibot/Common/Regulator.h index 33df67a48..9bc23dd4c 100644 --- a/0.83/Omnibot/Common/Regulator.h +++ b/0.83/Omnibot/Common/Regulator.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __REGULATOR_H__ #define __REGULATOR_H__ diff --git a/0.83/Omnibot/Common/ResponseCurve.cpp b/0.83/Omnibot/Common/ResponseCurve.cpp index ce7603aed..ea96894aa 100644 --- a/0.83/Omnibot/Common/ResponseCurve.cpp +++ b/0.83/Omnibot/Common/ResponseCurve.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ResponseCurve.h" diff --git a/0.83/Omnibot/Common/ResponseCurve.h b/0.83/Omnibot/Common/ResponseCurve.h index d1813a575..cab82503a 100644 --- a/0.83/Omnibot/Common/ResponseCurve.h +++ b/0.83/Omnibot/Common/ResponseCurve.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RESPONSECURVE_H__ #define __RESPONSECURVE_H__ diff --git a/0.83/Omnibot/Common/ScriptGoal.cpp b/0.83/Omnibot/Common/ScriptGoal.cpp index 23b069cd1..0750aaaa4 100644 --- a/0.83/Omnibot/Common/ScriptGoal.cpp +++ b/0.83/Omnibot/Common/ScriptGoal.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "BotBaseStates.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/ScriptGoal.h b/0.83/Omnibot/Common/ScriptGoal.h index 082a6cad1..405f5821f 100644 --- a/0.83/Omnibot/Common/ScriptGoal.h +++ b/0.83/Omnibot/Common/ScriptGoal.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ScriptGoal_H__ #define __ScriptGoal_H__ diff --git a/0.83/Omnibot/Common/ScriptManager.cpp b/0.83/Omnibot/Common/ScriptManager.cpp index 538775a7f..7976ebe52 100644 --- a/0.83/Omnibot/Common/ScriptManager.cpp +++ b/0.83/Omnibot/Common/ScriptManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/ScriptManager.h b/0.83/Omnibot/Common/ScriptManager.h index 1b203e8c8..9826e6f05 100644 --- a/0.83/Omnibot/Common/ScriptManager.h +++ b/0.83/Omnibot/Common/ScriptManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __SCRIPTMANAGER_H__ #define __SCRIPTMANAGER_H__ diff --git a/0.83/Omnibot/Common/StateMachine.cpp b/0.83/Omnibot/Common/StateMachine.cpp index 734aa1ed8..7cc3bd677 100644 --- a/0.83/Omnibot/Common/StateMachine.cpp +++ b/0.83/Omnibot/Common/StateMachine.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "StateMachine.h" #include "BotTargetingSystem.h" diff --git a/0.83/Omnibot/Common/StateMachine.h b/0.83/Omnibot/Common/StateMachine.h index 9f816dbce..eeba07919 100644 --- a/0.83/Omnibot/Common/StateMachine.h +++ b/0.83/Omnibot/Common/StateMachine.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __STATE_H__ #define __STATE_H__ diff --git a/0.83/Omnibot/Common/TargetInfo.cpp b/0.83/Omnibot/Common/TargetInfo.cpp index bc772154e..fe85ffb21 100644 --- a/0.83/Omnibot/Common/TargetInfo.cpp +++ b/0.83/Omnibot/Common/TargetInfo.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "TargetInfo.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/TargetInfo.h b/0.83/Omnibot/Common/TargetInfo.h index a5cabfe4e..90c16d85a 100644 --- a/0.83/Omnibot/Common/TargetInfo.h +++ b/0.83/Omnibot/Common/TargetInfo.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TARGETINFO_H__ #define __TARGETINFO_H__ diff --git a/0.83/Omnibot/Common/ThreatZone.cpp b/0.83/Omnibot/Common/ThreatZone.cpp index ef82ccd22..8c7b9d758 100644 --- a/0.83/Omnibot/Common/ThreatZone.cpp +++ b/0.83/Omnibot/Common/ThreatZone.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ThreatZone.h" diff --git a/0.83/Omnibot/Common/ThreatZone.h b/0.83/Omnibot/Common/ThreatZone.h index 5e0c9f538..bb629b5b8 100644 --- a/0.83/Omnibot/Common/ThreatZone.h +++ b/0.83/Omnibot/Common/ThreatZone.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __THREATZONE_H__ #define __THREATZONE_H__ diff --git a/0.83/Omnibot/Common/Timer.cpp b/0.83/Omnibot/Common/Timer.cpp index 1dc903b14..8743b68f6 100644 --- a/0.83/Omnibot/Common/Timer.cpp +++ b/0.83/Omnibot/Common/Timer.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Timer.h" diff --git a/0.83/Omnibot/Common/Timer.h b/0.83/Omnibot/Common/Timer.h index b258a7b0f..2d17777fb 100644 --- a/0.83/Omnibot/Common/Timer.h +++ b/0.83/Omnibot/Common/Timer.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TIMER_H__ #define __TIMER_H__ diff --git a/0.83/Omnibot/Common/Trackable.cpp b/0.83/Omnibot/Common/Trackable.cpp index b0121e908..56f47720b 100644 --- a/0.83/Omnibot/Common/Trackable.cpp +++ b/0.83/Omnibot/Common/Trackable.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Trackable.h" diff --git a/0.83/Omnibot/Common/Trackable.h b/0.83/Omnibot/Common/Trackable.h index af8f77835..705a6b890 100644 --- a/0.83/Omnibot/Common/Trackable.h +++ b/0.83/Omnibot/Common/Trackable.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TRACKABLE_H__ #define __TRACKABLE_H__ diff --git a/0.83/Omnibot/Common/TrackablePtr.h b/0.83/Omnibot/Common/TrackablePtr.h index 7ba467ea1..0953d78ce 100644 --- a/0.83/Omnibot/Common/TrackablePtr.h +++ b/0.83/Omnibot/Common/TrackablePtr.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TRACKABLEPTR_H__ #define __TRACKABLEPTR_H__ diff --git a/0.83/Omnibot/Common/Trajectory.cpp b/0.83/Omnibot/Common/Trajectory.cpp index e13db38bb..2c03f8deb 100644 --- a/0.83/Omnibot/Common/Trajectory.cpp +++ b/0.83/Omnibot/Common/Trajectory.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Trajectory.h" diff --git a/0.83/Omnibot/Common/Trajectory.h b/0.83/Omnibot/Common/Trajectory.h index 691dcdec0..a64c799e4 100644 --- a/0.83/Omnibot/Common/Trajectory.h +++ b/0.83/Omnibot/Common/Trajectory.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TRAJECTORY_H__ #define __TRAJECTORY_H__ diff --git a/0.83/Omnibot/Common/TriggerManager.cpp b/0.83/Omnibot/Common/TriggerManager.cpp index cd7af12fb..72ab92179 100644 --- a/0.83/Omnibot/Common/TriggerManager.cpp +++ b/0.83/Omnibot/Common/TriggerManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "TriggerManager.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/TriggerManager.h b/0.83/Omnibot/Common/TriggerManager.h index 313c5c60d..dc2f46761 100644 --- a/0.83/Omnibot/Common/TriggerManager.h +++ b/0.83/Omnibot/Common/TriggerManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TRIGGERMANAGER_H__ #define __TRIGGERMANAGER_H__ diff --git a/0.83/Omnibot/Common/Utilities.cpp b/0.83/Omnibot/Common/Utilities.cpp index 2c665d88e..2aeadbbe6 100644 --- a/0.83/Omnibot/Common/Utilities.cpp +++ b/0.83/Omnibot/Common/Utilities.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Interprocess.h" diff --git a/0.83/Omnibot/Common/Utilities.h b/0.83/Omnibot/Common/Utilities.h index 6bba85e16..737bfa530 100644 --- a/0.83/Omnibot/Common/Utilities.h +++ b/0.83/Omnibot/Common/Utilities.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __UTILS_H__ #define __UTILS_H__ diff --git a/0.83/Omnibot/Common/Waypoint.cpp b/0.83/Omnibot/Common/Waypoint.cpp index bbdc06d91..f528e3890 100644 --- a/0.83/Omnibot/Common/Waypoint.cpp +++ b/0.83/Omnibot/Common/Waypoint.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Waypoint.h" #include "NavigationFlags.h" diff --git a/0.83/Omnibot/Common/Waypoint.h b/0.83/Omnibot/Common/Waypoint.h index bdccd037d..a675c9b2c 100644 --- a/0.83/Omnibot/Common/Waypoint.h +++ b/0.83/Omnibot/Common/Waypoint.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINT_H__ #define __WAYPOINT_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializerImp.h b/0.83/Omnibot/Common/WaypointSerializerImp.h index 5f3d5fa07..1f924333d 100644 --- a/0.83/Omnibot/Common/WaypointSerializerImp.h +++ b/0.83/Omnibot/Common/WaypointSerializerImp.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZERIMP_H__ #define __WAYPOINTSERIALIZERIMP_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V1.cpp b/0.83/Omnibot/Common/WaypointSerializer_V1.cpp index dccc6704c..8b21c4cd9 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V1.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V1.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V1.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V1.h b/0.83/Omnibot/Common/WaypointSerializer_V1.h index 259eb6665..ffa20087a 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V1.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V1.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V1_H__ #define __WAYPOINTSERIALIZER_V1_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V2.cpp b/0.83/Omnibot/Common/WaypointSerializer_V2.cpp index 34ab7c84f..12071c147 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V2.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V2.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V2.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V2.h b/0.83/Omnibot/Common/WaypointSerializer_V2.h index ed6fd417c..1b48cadd5 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V2.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V2.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V2_H__ #define __WAYPOINTSERIALIZER_V2_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V3.cpp b/0.83/Omnibot/Common/WaypointSerializer_V3.cpp index a6e08d7b5..623edcf8f 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V3.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V3.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V3.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V3.h b/0.83/Omnibot/Common/WaypointSerializer_V3.h index 9e3893c8e..a918f8d5f 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V3.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V3.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V3_H__ #define __WAYPOINTSERIALIZER_V3_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V4.cpp b/0.83/Omnibot/Common/WaypointSerializer_V4.cpp index fc2815490..ffd19e000 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V4.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V4.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V4.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V4.h b/0.83/Omnibot/Common/WaypointSerializer_V4.h index e1510c699..d71bd9bb9 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V4.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V4.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V4_H__ #define __WAYPOINTSERIALIZER_V4_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V5.cpp b/0.83/Omnibot/Common/WaypointSerializer_V5.cpp index b46aa6ebf..a77b36336 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V5.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V5.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V5.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V5.h b/0.83/Omnibot/Common/WaypointSerializer_V5.h index 5ca163677..dbe587082 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V5.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V5.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V5_H__ #define __WAYPOINTSERIALIZER_V5_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V6.cpp b/0.83/Omnibot/Common/WaypointSerializer_V6.cpp index 0c9f93065..b8b45ca3e 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V6.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V6.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V6.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V6.h b/0.83/Omnibot/Common/WaypointSerializer_V6.h index 823783a31..ff800ece2 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V6.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V6.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V6_H__ #define __WAYPOINTSERIALIZER_V6_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V7.cpp b/0.83/Omnibot/Common/WaypointSerializer_V7.cpp index 19dadbfca..c46b1fced 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V7.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V7.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V7.h" #include "Waypoint.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V7.h b/0.83/Omnibot/Common/WaypointSerializer_V7.h index fe41c7216..51d93f206 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V7.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V7.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V7_H__ #define __WAYPOINTSERIALIZER_V7_H__ diff --git a/0.83/Omnibot/Common/WaypointSerializer_V9.cpp b/0.83/Omnibot/Common/WaypointSerializer_V9.cpp index 7a0b69213..c16b00f91 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V9.cpp +++ b/0.83/Omnibot/Common/WaypointSerializer_V9.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "WaypointSerializer_V9.h" diff --git a/0.83/Omnibot/Common/WaypointSerializer_V9.h b/0.83/Omnibot/Common/WaypointSerializer_V9.h index d5973279f..0db6d3063 100644 --- a/0.83/Omnibot/Common/WaypointSerializer_V9.h +++ b/0.83/Omnibot/Common/WaypointSerializer_V9.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WAYPOINTSERIALIZER_V9_H__ #define __WAYPOINTSERIALIZER_V9_H__ diff --git a/0.83/Omnibot/Common/Weapon.cpp b/0.83/Omnibot/Common/Weapon.cpp index ecbd363b4..ea6c6836a 100644 --- a/0.83/Omnibot/Common/Weapon.cpp +++ b/0.83/Omnibot/Common/Weapon.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Weapon.h" #include "gmWeapon.h" @@ -886,7 +878,7 @@ FireMode Weapon::GetBestFireMode(const TargetInfo &_targetinfo) obReal fDesir = fireMode.CalculateDesirability(m_Client, _targetinfo); if(fDesir > fBestDesir && - (fireMode.m_WeaponType != Melee || fDesir > fireMode.m_DefaultDesirability * fireMode.m_WeaponBias)) + (fireMode.m_WeaponType != Melee || fDesir > fireMode.m_DefaultDesirability * fireMode.m_WeaponBias)) { fBestDesir = fDesir; bestFireMode = m; diff --git a/0.83/Omnibot/Common/Weapon.h b/0.83/Omnibot/Common/Weapon.h index cee7e5bbf..87fba8e78 100644 --- a/0.83/Omnibot/Common/Weapon.h +++ b/0.83/Omnibot/Common/Weapon.h @@ -1,15 +1,5 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// file: Weapon -// This class represents a weapon as a whole, and a container for the -// various fire modes that it has. Some mods may only use 1 fire mod, while others -// may support many. -// -//////////////////////////////////////////////////////////////////////////////// +//This class represents a weapon as a whole, and a container for the +//various fire modes that it has. Some mods may only use 1 fire mod, while others may support many. #ifndef __WEAPON_H__ #define __WEAPON_H__ diff --git a/0.83/Omnibot/Common/WeaponDatabase.cpp b/0.83/Omnibot/Common/WeaponDatabase.cpp index dcb88fc3a..583284555 100644 --- a/0.83/Omnibot/Common/WeaponDatabase.cpp +++ b/0.83/Omnibot/Common/WeaponDatabase.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/WeaponDatabase.h b/0.83/Omnibot/Common/WeaponDatabase.h index de2234ee2..760235bef 100644 --- a/0.83/Omnibot/Common/WeaponDatabase.h +++ b/0.83/Omnibot/Common/WeaponDatabase.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __WEAPONDATABASE_H__ #define __WEAPONDATABASE_H__ diff --git a/0.83/Omnibot/Common/common.h b/0.83/Omnibot/Common/common.h index 13037169b..0dfc7e41e 100644 --- a/0.83/Omnibot/Common/common.h +++ b/0.83/Omnibot/Common/common.h @@ -1,23 +1,13 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// file: Commonly included headers -// In order to reduce the clutter in every file that commonly includes -// some headers, such as STL headers and utility headers, we put them -// in here so that those files can just include this and get access to -// all the common stuff. -// -//////////////////////////////////////////////////////////////////////////////// +//Commonly included headers +//In order to reduce the clutter in every file that commonly includes +//some headers, such as STL headers and utility headers, we put them +//in here so that those files can just include this and get access to all the common stuff. #ifndef __COMMON_H__ #define __COMMON_H__ //#include "CodeAnalysis.h" - // Disable some compiler warnings. #ifdef _MSC_VER #pragma warning( error: 4002 ) // Too many actual parameters for macro: promoted to be an error diff --git a/0.83/Omnibot/Common/gmAABB.cpp b/0.83/Omnibot/Common/gmAABB.cpp index facc9f80f..3b53a4bd2 100644 --- a/0.83/Omnibot/Common/gmAABB.cpp +++ b/0.83/Omnibot/Common/gmAABB.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmAABB.h" diff --git a/0.83/Omnibot/Common/gmAABB.h b/0.83/Omnibot/Common/gmAABB.h index bf1a1d3a9..c25174d45 100644 --- a/0.83/Omnibot/Common/gmAABB.h +++ b/0.83/Omnibot/Common/gmAABB.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_AABB_H__ #define __GM_AABB_H__ diff --git a/0.83/Omnibot/Common/gmBot.cpp b/0.83/Omnibot/Common/gmBot.cpp index d4a64774d..310c39d4d 100644 --- a/0.83/Omnibot/Common/gmBot.cpp +++ b/0.83/Omnibot/Common/gmBot.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmBotLibrary.h" diff --git a/0.83/Omnibot/Common/gmBot.h b/0.83/Omnibot/Common/gmBot.h index d8580b157..d462a060d 100644 --- a/0.83/Omnibot/Common/gmBot.h +++ b/0.83/Omnibot/Common/gmBot.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_BOT_H__ #define __GM_BOT_H__ diff --git a/0.83/Omnibot/Common/gmBotLibrary.cpp b/0.83/Omnibot/Common/gmBotLibrary.cpp index 7794bb37d..c48463c89 100644 --- a/0.83/Omnibot/Common/gmBotLibrary.cpp +++ b/0.83/Omnibot/Common/gmBotLibrary.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "Client.h" #include "CommandReciever.h" diff --git a/0.83/Omnibot/Common/gmBotLibrary.h b/0.83/Omnibot/Common/gmBotLibrary.h index bbb3aab92..1a472a898 100644 --- a/0.83/Omnibot/Common/gmBotLibrary.h +++ b/0.83/Omnibot/Common/gmBotLibrary.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GMBOTLIBRARY_H__ #define __GMBOTLIBRARY_H__ diff --git a/0.83/Omnibot/Common/gmDebugWindow.cpp b/0.83/Omnibot/Common/gmDebugWindow.cpp index e500c6d16..6e3875f50 100644 --- a/0.83/Omnibot/Common/gmDebugWindow.cpp +++ b/0.83/Omnibot/Common/gmDebugWindow.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #ifdef ENABLE_DEBUG_WINDOW diff --git a/0.83/Omnibot/Common/gmDebugWindow.h b/0.83/Omnibot/Common/gmDebugWindow.h index 39f5eca20..b924c9ad4 100644 --- a/0.83/Omnibot/Common/gmDebugWindow.h +++ b/0.83/Omnibot/Common/gmDebugWindow.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_DEBUGWINDOW_H__ #define __GM_DEBUGWINDOW_H__ diff --git a/0.83/Omnibot/Common/gmGameEntity.cpp b/0.83/Omnibot/Common/gmGameEntity.cpp index f095d1ac6..2dabea2b1 100644 --- a/0.83/Omnibot/Common/gmGameEntity.cpp +++ b/0.83/Omnibot/Common/gmGameEntity.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/gmGameEntity.h b/0.83/Omnibot/Common/gmGameEntity.h index 508b1a23c..277cd02e0 100644 --- a/0.83/Omnibot/Common/gmGameEntity.h +++ b/0.83/Omnibot/Common/gmGameEntity.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_GAMEENTITY_H__ #define __GM_GAMEENTITY_H__ diff --git a/0.83/Omnibot/Common/gmMathLibrary.cpp b/0.83/Omnibot/Common/gmMathLibrary.cpp index f77631917..af74c8187 100644 --- a/0.83/Omnibot/Common/gmMathLibrary.cpp +++ b/0.83/Omnibot/Common/gmMathLibrary.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmConfig.h" #include "gmThread.h" diff --git a/0.83/Omnibot/Common/gmMathLibrary.h b/0.83/Omnibot/Common/gmMathLibrary.h index 3ab0780f1..5bad247d0 100644 --- a/0.83/Omnibot/Common/gmMathLibrary.h +++ b/0.83/Omnibot/Common/gmMathLibrary.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GMMATHLIBRARY_H__ #define __GMMATHLIBRARY_H__ diff --git a/0.83/Omnibot/Common/gmMatrix3.cpp b/0.83/Omnibot/Common/gmMatrix3.cpp index c421e88ea..7c2e0f380 100644 --- a/0.83/Omnibot/Common/gmMatrix3.cpp +++ b/0.83/Omnibot/Common/gmMatrix3.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmMatrix3.h" #include "gmHelpers.h" diff --git a/0.83/Omnibot/Common/gmMatrix3.h b/0.83/Omnibot/Common/gmMatrix3.h index 26c8e02c6..12dc811d4 100644 --- a/0.83/Omnibot/Common/gmMatrix3.h +++ b/0.83/Omnibot/Common/gmMatrix3.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GMMATRIX3_H__ #define __GMMATRIX3_H__ diff --git a/0.83/Omnibot/Common/gmNamesList.cpp b/0.83/Omnibot/Common/gmNamesList.cpp index e73f1bb8d..10ef2dc41 100644 --- a/0.83/Omnibot/Common/gmNamesList.cpp +++ b/0.83/Omnibot/Common/gmNamesList.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmNamesList.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/Common/gmNamesList.h b/0.83/Omnibot/Common/gmNamesList.h index 1e3793a15..6f40f5ce4 100644 --- a/0.83/Omnibot/Common/gmNamesList.h +++ b/0.83/Omnibot/Common/gmNamesList.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_NAMELIST_H__ #define __GM_NAMELIST_H__ diff --git a/0.83/Omnibot/Common/gmScriptGoal.cpp b/0.83/Omnibot/Common/gmScriptGoal.cpp index 431ddadf6..1201058b8 100644 --- a/0.83/Omnibot/Common/gmScriptGoal.cpp +++ b/0.83/Omnibot/Common/gmScriptGoal.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmScriptGoal.h" #include "gmBotLibrary.h" diff --git a/0.83/Omnibot/Common/gmScriptGoal.h b/0.83/Omnibot/Common/gmScriptGoal.h index 9ded7fc96..615d8fd18 100644 --- a/0.83/Omnibot/Common/gmScriptGoal.h +++ b/0.83/Omnibot/Common/gmScriptGoal.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_SCRIPTGOAL_H__ #define __GM_SCRIPTGOAL_H__ diff --git a/0.83/Omnibot/Common/gmSystemLibApp.cpp b/0.83/Omnibot/Common/gmSystemLibApp.cpp index e4d98bd61..b47003904 100644 --- a/0.83/Omnibot/Common/gmSystemLibApp.cpp +++ b/0.83/Omnibot/Common/gmSystemLibApp.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmConfig.h" #include "gmSystemLibApp.h" diff --git a/0.83/Omnibot/Common/gmSystemLibApp.h b/0.83/Omnibot/Common/gmSystemLibApp.h index f83602d3b..a6d3aad08 100644 --- a/0.83/Omnibot/Common/gmSystemLibApp.h +++ b/0.83/Omnibot/Common/gmSystemLibApp.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef _GMSYSTEMLIB_H_ #define _GMSYSTEMLIB_H_ diff --git a/0.83/Omnibot/Common/gmTargetInfo.cpp b/0.83/Omnibot/Common/gmTargetInfo.cpp index 06fd79bb1..71159133b 100644 --- a/0.83/Omnibot/Common/gmTargetInfo.cpp +++ b/0.83/Omnibot/Common/gmTargetInfo.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmTargetInfo.h" diff --git a/0.83/Omnibot/Common/gmTargetInfo.h b/0.83/Omnibot/Common/gmTargetInfo.h index 76fcd4d6b..021d58af3 100644 --- a/0.83/Omnibot/Common/gmTargetInfo.h +++ b/0.83/Omnibot/Common/gmTargetInfo.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef _GM_TARGETINFO_H_ #define _GM_TARGETINFO_H_ diff --git a/0.83/Omnibot/Common/gmTimer.cpp b/0.83/Omnibot/Common/gmTimer.cpp index f81feccfa..2502c9a22 100644 --- a/0.83/Omnibot/Common/gmTimer.cpp +++ b/0.83/Omnibot/Common/gmTimer.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// -// #include "PrecompCommon.h" #include "gmTimer.h" diff --git a/0.83/Omnibot/Common/gmTimer.h b/0.83/Omnibot/Common/gmTimer.h index 43866002f..7f4627840 100644 --- a/0.83/Omnibot/Common/gmTimer.h +++ b/0.83/Omnibot/Common/gmTimer.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_TIMER_H__ #define __GM_TIMER_H__ diff --git a/0.83/Omnibot/Common/gmTriggerInfo.cpp b/0.83/Omnibot/Common/gmTriggerInfo.cpp index 19b0beafb..39c69110b 100644 --- a/0.83/Omnibot/Common/gmTriggerInfo.cpp +++ b/0.83/Omnibot/Common/gmTriggerInfo.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmTriggerInfo.h" #include "gmGameEntity.h" diff --git a/0.83/Omnibot/Common/gmTriggerInfo.h b/0.83/Omnibot/Common/gmTriggerInfo.h index 290fce427..c7aca214c 100644 --- a/0.83/Omnibot/Common/gmTriggerInfo.h +++ b/0.83/Omnibot/Common/gmTriggerInfo.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef _GM_TRIGGERINFO_H_ #define _GM_TRIGGERINFO_H_ diff --git a/0.83/Omnibot/Common/gmUtilityLib.cpp b/0.83/Omnibot/Common/gmUtilityLib.cpp index 9192c036e..7e5b6faed 100644 --- a/0.83/Omnibot/Common/gmUtilityLib.cpp +++ b/0.83/Omnibot/Common/gmUtilityLib.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "gmUtilityLib.h" diff --git a/0.83/Omnibot/Common/gmUtilityLib.h b/0.83/Omnibot/Common/gmUtilityLib.h index c51197932..f0de61d04 100644 --- a/0.83/Omnibot/Common/gmUtilityLib.h +++ b/0.83/Omnibot/Common/gmUtilityLib.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GMUTILITYLIBRARY_H__ #define __GMUTILITYLIBRARY_H__ diff --git a/0.83/Omnibot/Common/gmWeapon.cpp b/0.83/Omnibot/Common/gmWeapon.cpp index b5f04b39c..a0bcb4797 100644 --- a/0.83/Omnibot/Common/gmWeapon.cpp +++ b/0.83/Omnibot/Common/gmWeapon.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// -// #include "PrecompCommon.h" #include "gmWeapon.h" diff --git a/0.83/Omnibot/Common/gmWeapon.h b/0.83/Omnibot/Common/gmWeapon.h index 5e9aff9e7..4e138349a 100644 --- a/0.83/Omnibot/Common/gmWeapon.h +++ b/0.83/Omnibot/Common/gmWeapon.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GM_WEAPON_H__ #define __GM_WEAPON_H__ diff --git a/0.83/Omnibot/ET/ET_BaseStates.cpp b/0.83/Omnibot/ET/ET_BaseStates.cpp index 836597ef8..39b059f26 100644 --- a/0.83/Omnibot/ET/ET_BaseStates.cpp +++ b/0.83/Omnibot/ET/ET_BaseStates.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ET_BaseStates.h" #include "ET_FilterClosest.h" diff --git a/0.83/Omnibot/ET/ET_BaseStates.h b/0.83/Omnibot/ET/ET_BaseStates.h index 7e482054c..c787c28b7 100644 --- a/0.83/Omnibot/ET/ET_BaseStates.h +++ b/0.83/Omnibot/ET/ET_BaseStates.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ETBaseStates_H__ #define __ETBaseStates_H__ diff --git a/0.83/Omnibot/ET/ET_Client.cpp b/0.83/Omnibot/ET/ET_Client.cpp index 5a2c90e72..dcac18786 100644 --- a/0.83/Omnibot/ET/ET_Client.cpp +++ b/0.83/Omnibot/ET/ET_Client.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/ET/ET_Client.h b/0.83/Omnibot/ET/ET_Client.h index b32ab5f70..3c5a8eb57 100644 --- a/0.83/Omnibot/ET/ET_Client.h +++ b/0.83/Omnibot/ET/ET_Client.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_CLIENT_H__ #define __ET_CLIENT_H__ diff --git a/0.83/Omnibot/ET/ET_Config.h b/0.83/Omnibot/ET/ET_Config.h index 65d1b23f4..e5b1e376d 100644 --- a/0.83/Omnibot/ET/ET_Config.h +++ b/0.83/Omnibot/ET/ET_Config.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: ET Config -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_CONFIG_H__ #define __ET_CONFIG_H__ diff --git a/0.83/Omnibot/ET/ET_FilterClosest.cpp b/0.83/Omnibot/ET/ET_FilterClosest.cpp index a5a035106..95acff117 100644 --- a/0.83/Omnibot/ET/ET_FilterClosest.cpp +++ b/0.83/Omnibot/ET/ET_FilterClosest.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ET_FilterClosest.h" #include "ET_Game.h" diff --git a/0.83/Omnibot/ET/ET_FilterClosest.h b/0.83/Omnibot/ET/ET_FilterClosest.h index 5b39ddbcb..dbb112316 100644 --- a/0.83/Omnibot/ET/ET_FilterClosest.h +++ b/0.83/Omnibot/ET/ET_FilterClosest.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_FILTERCLOSEST_H__ #define __ET_FILTERCLOSEST_H__ diff --git a/0.83/Omnibot/ET/ET_Game.cpp b/0.83/Omnibot/ET/ET_Game.cpp index 2cc181cf3..818d4bedf 100644 --- a/0.83/Omnibot/ET/ET_Game.cpp +++ b/0.83/Omnibot/ET/ET_Game.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ET_Game.h" #include "ET_GoalManager.h" diff --git a/0.83/Omnibot/ET/ET_Game.h b/0.83/Omnibot/ET/ET_Game.h index 20409bcd0..45606d714 100644 --- a/0.83/Omnibot/ET/ET_Game.h +++ b/0.83/Omnibot/ET/ET_Game.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_GAME_H__ #define __ET_GAME_H__ diff --git a/0.83/Omnibot/ET/ET_GoalManager.cpp b/0.83/Omnibot/ET/ET_GoalManager.cpp index bf851475b..775581844 100644 --- a/0.83/Omnibot/ET/ET_GoalManager.cpp +++ b/0.83/Omnibot/ET/ET_GoalManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ET_GoalManager.h" #include "ET_NavigationFlags.h" diff --git a/0.83/Omnibot/ET/ET_GoalManager.h b/0.83/Omnibot/ET/ET_GoalManager.h index 496d19a7d..867d7f377 100644 --- a/0.83/Omnibot/ET/ET_GoalManager.h +++ b/0.83/Omnibot/ET/ET_GoalManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_GOALMANAGER_H__ #define __ET_GOALMANAGER_H__ diff --git a/0.83/Omnibot/ET/ET_InterfaceFuncs.cpp b/0.83/Omnibot/ET/ET_InterfaceFuncs.cpp index 6b2ab4412..5ee7ebd31 100644 --- a/0.83/Omnibot/ET/ET_InterfaceFuncs.cpp +++ b/0.83/Omnibot/ET/ET_InterfaceFuncs.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ET_InterfaceFuncs.h" diff --git a/0.83/Omnibot/ET/ET_InterfaceFuncs.h b/0.83/Omnibot/ET/ET_InterfaceFuncs.h index 12fa0b8e3..f50c6ef5f 100644 --- a/0.83/Omnibot/ET/ET_InterfaceFuncs.h +++ b/0.83/Omnibot/ET/ET_InterfaceFuncs.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_INTERFACEFUNCS_H__ #define __ET_INTERFACEFUNCS_H__ diff --git a/0.83/Omnibot/ET/ET_Messages.h b/0.83/Omnibot/ET/ET_Messages.h index 9894bbffc..675366f8f 100644 --- a/0.83/Omnibot/ET/ET_Messages.h +++ b/0.83/Omnibot/ET/ET_Messages.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: TF Message Structure Definitions -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __TF_MESSAGES_H__ #define __TF_MESSAGES_H__ diff --git a/0.83/Omnibot/ET/ET_NavigationFlags.h b/0.83/Omnibot/ET/ET_NavigationFlags.h index caef67de3..d0d33ecea 100644 --- a/0.83/Omnibot/ET/ET_NavigationFlags.h +++ b/0.83/Omnibot/ET/ET_NavigationFlags.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: ET Navigation Flags -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_NAVIGATIONFLAGS_H__ #define __ET_NAVIGATIONFLAGS_H__ diff --git a/0.83/Omnibot/ET/ET_VoiceMacros.cpp b/0.83/Omnibot/ET/ET_VoiceMacros.cpp index f9eb8bc3c..4e0fb4987 100644 --- a/0.83/Omnibot/ET/ET_VoiceMacros.cpp +++ b/0.83/Omnibot/ET/ET_VoiceMacros.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "ET_VoiceMacros.h" diff --git a/0.83/Omnibot/ET/ET_VoiceMacros.h b/0.83/Omnibot/ET/ET_VoiceMacros.h index 81ef28dcc..08a939e7c 100644 --- a/0.83/Omnibot/ET/ET_VoiceMacros.h +++ b/0.83/Omnibot/ET/ET_VoiceMacros.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __ET_VOICEMACROS_H__ #define __ET_VOICEMACROS_H__ diff --git a/0.83/Omnibot/ET/PrecompET.cpp b/0.83/Omnibot/ET/PrecompET.cpp index 9f553d726..b8c44a041 100644 --- a/0.83/Omnibot/ET/PrecompET.cpp +++ b/0.83/Omnibot/ET/PrecompET.cpp @@ -1,9 +1 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" diff --git a/0.83/Omnibot/ET/PrecompET.h b/0.83/Omnibot/ET/PrecompET.h index 8908d4272..5f456bdc1 100644 --- a/0.83/Omnibot/ET/PrecompET.h +++ b/0.83/Omnibot/ET/PrecompET.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "ET_Client.h" diff --git a/0.83/Omnibot/ET/gmETBinds.cpp b/0.83/Omnibot/ET/gmETBinds.cpp index 08b381581..d3c4e303b 100644 --- a/0.83/Omnibot/ET/gmETBinds.cpp +++ b/0.83/Omnibot/ET/gmETBinds.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompET.h" #include "gmETBinds.h" @@ -655,7 +647,7 @@ static int gmfTeamLandminesAvailable(gmThread *a_thread) { CHECK_THIS_BOT(); int currentMines, maxMines; - InterfaceFuncs::NumTeamMines(native, currentMines, maxMines); + InterfaceFuncs::NumTeamMines(native, currentMines, maxMines); a_thread->PushInt(maxMines - currentMines); return GM_OK; } diff --git a/0.83/Omnibot/ET/gmETBinds.h b/0.83/Omnibot/ET/gmETBinds.h index 6c0276a13..55fa60869 100644 --- a/0.83/Omnibot/ET/gmETBinds.h +++ b/0.83/Omnibot/ET/gmETBinds.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GMETBINDS_H__ #define __GMETBINDS_H__ diff --git a/0.83/Omnibot/RTCW/PrecompRTCW.cpp b/0.83/Omnibot/RTCW/PrecompRTCW.cpp index d99a0f498..ebb6eb04e 100644 --- a/0.83/Omnibot/RTCW/PrecompRTCW.cpp +++ b/0.83/Omnibot/RTCW/PrecompRTCW.cpp @@ -1,9 +1 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" diff --git a/0.83/Omnibot/RTCW/PrecompRTCW.h b/0.83/Omnibot/RTCW/PrecompRTCW.h index 7da58e1e4..43948d040 100644 --- a/0.83/Omnibot/RTCW/PrecompRTCW.h +++ b/0.83/Omnibot/RTCW/PrecompRTCW.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompCommon.h" #include "RTCW_Client.h" diff --git a/0.83/Omnibot/RTCW/RTCW_Client.cpp b/0.83/Omnibot/RTCW/RTCW_Client.cpp index 089464a22..2177a04ca 100644 --- a/0.83/Omnibot/RTCW/RTCW_Client.cpp +++ b/0.83/Omnibot/RTCW/RTCW_Client.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "ScriptManager.h" diff --git a/0.83/Omnibot/RTCW/RTCW_Client.h b/0.83/Omnibot/RTCW/RTCW_Client.h index 43fef3c8f..946697d24 100644 --- a/0.83/Omnibot/RTCW/RTCW_Client.h +++ b/0.83/Omnibot/RTCW/RTCW_Client.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_CLIENT_H__ #define __RTCW_CLIENT_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_Config.h b/0.83/Omnibot/RTCW/RTCW_Config.h index 049f7a014..338c507cc 100644 --- a/0.83/Omnibot/RTCW/RTCW_Config.h +++ b/0.83/Omnibot/RTCW/RTCW_Config.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: RTCW Config -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_CONFIG_H__ #define __RTCW_CONFIG_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_FilterClosest.cpp b/0.83/Omnibot/RTCW/RTCW_FilterClosest.cpp index 872446385..0d70dc6f9 100644 --- a/0.83/Omnibot/RTCW/RTCW_FilterClosest.cpp +++ b/0.83/Omnibot/RTCW/RTCW_FilterClosest.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "RTCW_FilterClosest.h" //#include "RTCW_Goal_MountMG42.h" diff --git a/0.83/Omnibot/RTCW/RTCW_FilterClosest.h b/0.83/Omnibot/RTCW/RTCW_FilterClosest.h index 0fc3ef65d..ba1852fb6 100644 --- a/0.83/Omnibot/RTCW/RTCW_FilterClosest.h +++ b/0.83/Omnibot/RTCW/RTCW_FilterClosest.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_FILTERCLOSEST_H__ #define __RTCW_FILTERCLOSEST_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_Game.cpp b/0.83/Omnibot/RTCW/RTCW_Game.cpp index f8fc0c3c1..d4d1684f1 100644 --- a/0.83/Omnibot/RTCW/RTCW_Game.cpp +++ b/0.83/Omnibot/RTCW/RTCW_Game.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "RTCW_Game.h" #include "RTCW_GoalManager.h" diff --git a/0.83/Omnibot/RTCW/RTCW_Game.h b/0.83/Omnibot/RTCW/RTCW_Game.h index 9e529f1a3..b7d1f808f 100644 --- a/0.83/Omnibot/RTCW/RTCW_Game.h +++ b/0.83/Omnibot/RTCW/RTCW_Game.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_GAME_H__ #define __RTCW_GAME_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_GoalManager.cpp b/0.83/Omnibot/RTCW/RTCW_GoalManager.cpp index 4e19f9ef7..54421bf1c 100644 --- a/0.83/Omnibot/RTCW/RTCW_GoalManager.cpp +++ b/0.83/Omnibot/RTCW/RTCW_GoalManager.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "RTCW_GoalManager.h" #include "RTCW_NavigationFlags.h" diff --git a/0.83/Omnibot/RTCW/RTCW_GoalManager.h b/0.83/Omnibot/RTCW/RTCW_GoalManager.h index f7bf0bc18..600baac7c 100644 --- a/0.83/Omnibot/RTCW/RTCW_GoalManager.h +++ b/0.83/Omnibot/RTCW/RTCW_GoalManager.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_GOALMANAGER_H__ #define __RTCW_GOALMANAGER_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.cpp b/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.cpp index c45b0a20e..f7d016d55 100644 --- a/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.cpp +++ b/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "RTCW_InterfaceFuncs.h" diff --git a/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.h b/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.h index d289f717a..fde731cc7 100644 --- a/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.h +++ b/0.83/Omnibot/RTCW/RTCW_InterfaceFuncs.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_INTERFACEFUNCS_H__ #define __RTCW_INTERFACEFUNCS_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_Messages.h b/0.83/Omnibot/RTCW/RTCW_Messages.h index 40624f73c..0c77c4270 100644 --- a/0.83/Omnibot/RTCW/RTCW_Messages.h +++ b/0.83/Omnibot/RTCW/RTCW_Messages.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// Title: RTCW Message Structure Definitions -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_MESSAGES_H__ #define __RTCW_MESSAGES_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_NavigationFlags.h b/0.83/Omnibot/RTCW/RTCW_NavigationFlags.h index 69b9972da..7851621d6 100644 --- a/0.83/Omnibot/RTCW/RTCW_NavigationFlags.h +++ b/0.83/Omnibot/RTCW/RTCW_NavigationFlags.h @@ -1,13 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -// File: RTCW Navigation Flags -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_NAVIGATIONFLAGS_H__ #define __RTCW_NAVIGATIONFLAGS_H__ diff --git a/0.83/Omnibot/RTCW/RTCW_VoiceMacros.cpp b/0.83/Omnibot/RTCW/RTCW_VoiceMacros.cpp index 4cf41135c..869f8b366 100644 --- a/0.83/Omnibot/RTCW/RTCW_VoiceMacros.cpp +++ b/0.83/Omnibot/RTCW/RTCW_VoiceMacros.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "RTCW_VoiceMacros.h" diff --git a/0.83/Omnibot/RTCW/RTCW_VoiceMacros.h b/0.83/Omnibot/RTCW/RTCW_VoiceMacros.h index f9328e5a5..d091336b2 100644 --- a/0.83/Omnibot/RTCW/RTCW_VoiceMacros.h +++ b/0.83/Omnibot/RTCW/RTCW_VoiceMacros.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __RTCW_VOICEMACROS_H__ #define __RTCW_VOICEMACROS_H__ diff --git a/0.83/Omnibot/RTCW/gmRTCWBinds.cpp b/0.83/Omnibot/RTCW/gmRTCWBinds.cpp index ad8bb45c6..a12828ef9 100644 --- a/0.83/Omnibot/RTCW/gmRTCWBinds.cpp +++ b/0.83/Omnibot/RTCW/gmRTCWBinds.cpp @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #include "PrecompRTCW.h" #include "gmRTCWBinds.h" diff --git a/0.83/Omnibot/RTCW/gmRTCWBinds.h b/0.83/Omnibot/RTCW/gmRTCWBinds.h index 33c134eb4..a0f8ab5f3 100644 --- a/0.83/Omnibot/RTCW/gmRTCWBinds.h +++ b/0.83/Omnibot/RTCW/gmRTCWBinds.h @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// $LastChangedBy$ -// $LastChangedDate$ -// $LastChangedRevision$ -// -//////////////////////////////////////////////////////////////////////////////// - #ifndef __GMRTCWBINDS_H__ #define __GMRTCWBINDS_H__ diff --git a/0.83/Omnibot/project-root.jam b/0.83/Omnibot/project-root.jam index d99a6a27e..542e0610e 100644 --- a/0.83/Omnibot/project-root.jam +++ b/0.83/Omnibot/project-root.jam @@ -1,5 +1 @@ -# $LastChangedBy$ -# $LastChangedDate$ -# $LastChangedRevision$ - # Project root for Omni-bot From 350f82513eafb13b864e11a2cef905853667de8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Sun, 19 May 2024 20:58:42 +0200 Subject: [PATCH 06/22] rtcw: http downloader does not work on 64bit --- 0.83/GameInterfaces/RTCW/src/ui/ui.vcxproj | 5 ++++- 0.83/GameInterfaces/RTCW/src/ui/ui_local.h | 6 +++--- 0.83/GameInterfaces/RTCW/src/ui/ui_main.c | 2 +- 0.83/GameInterfaces/RTCW/src/ui/ui_util.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/0.83/GameInterfaces/RTCW/src/ui/ui.vcxproj b/0.83/GameInterfaces/RTCW/src/ui/ui.vcxproj index cf0d4b6fb..847e058ec 100644 --- a/0.83/GameInterfaces/RTCW/src/ui/ui.vcxproj +++ b/0.83/GameInterfaces/RTCW/src/ui/ui.vcxproj @@ -341,7 +341,10 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + + true + true + %(PreprocessorDefinitions) %(PreprocessorDefinitions) diff --git a/0.83/GameInterfaces/RTCW/src/ui/ui_local.h b/0.83/GameInterfaces/RTCW/src/ui/ui_local.h index 5a2baef4e..5c1940981 100644 --- a/0.83/GameInterfaces/RTCW/src/ui/ui_local.h +++ b/0.83/GameInterfaces/RTCW/src/ui/ui_local.h @@ -1,9 +1,9 @@ #ifndef __UI_LOCAL_H__ #define __UI_LOCAL_H__ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_WIN64) #include -#include +#include "../detours/detours.h" #endif #include "../game/q_shared.h" @@ -1154,7 +1154,7 @@ void UI_SPUnlockMedals_f( void ); void UI_InitGameinfo( void ); //S4ND - HTTP Downloader -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_WIN64) void hook_BeginDownload( const char *localName, const char *remoteName ); extern void ( WINAPIV *orig_BeginDownload )( const char *localName, const char *remoteName ); void UI_DisplayMyDownloadInfo( const char *downloadName, float centerPoint, float yStart, float scale ); diff --git a/0.83/GameInterfaces/RTCW/src/ui/ui_main.c b/0.83/GameInterfaces/RTCW/src/ui/ui_main.c index 17e7cc3e3..42a90cead 100644 --- a/0.83/GameInterfaces/RTCW/src/ui/ui_main.c +++ b/0.83/GameInterfaces/RTCW/src/ui/ui_main.c @@ -6726,7 +6726,7 @@ void UI_DrawConnectScreen( qboolean overlay ) { break; case CA_CONNECTED: { if ( *downloadName ) { -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_WIN64) if ( httpdown.useHttp ) { UI_DisplayMyDownloadInfo( downloadName, centerPoint, yStart, scale ); } else { //do regular download function diff --git a/0.83/GameInterfaces/RTCW/src/ui/ui_util.c b/0.83/GameInterfaces/RTCW/src/ui/ui_util.c index f331e11ed..959467ae6 100644 --- a/0.83/GameInterfaces/RTCW/src/ui/ui_util.c +++ b/0.83/GameInterfaces/RTCW/src/ui/ui_util.c @@ -6,7 +6,7 @@ // memory, string alloc //S4NDM4NN - putting http download code and functions here to keep it seperate from everything else -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_WIN64) #include "../downlib/downlib.h" #include From 7c8abcc6f59c3c05c72edc2f22ac111d97cc1aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Sun, 19 May 2024 22:20:31 +0200 Subject: [PATCH 07/22] Jamfiles are supported on Mac and Windows --- 0.83/GameInterfaces/ET/src/Jamfile | 38 +++++--- 0.83/GameInterfaces/ET/src/cgame/Jamfile | 12 +-- 0.83/GameInterfaces/ET/src/game/Jamfile | 18 ++-- 0.83/GameInterfaces/ET/src/ui/Jamfile | 20 ++--- 0.83/GameInterfaces/RTCW/src/Jamfile | 40 ++++++--- 0.83/GameInterfaces/RTCW/src/cgame/Jamfile | 22 ++--- 0.83/GameInterfaces/RTCW/src/game/Jamfile | 24 ++--- 0.83/GameInterfaces/RTCW/src/ui/Jamfile | 16 ++-- 0.83/Omnibot/Common/Interprocess.cpp | 3 +- 0.83/Omnibot/Common/Jamfile | 38 +++----- 0.83/Omnibot/Common/Utilities.cpp | 1 + 0.83/Omnibot/ET/Jamfile | 3 +- 0.83/Omnibot/Jamfile | 88 +++++++++++++------ 0.83/Omnibot/RTCW/Jamfile | 3 +- .../dependencies/physfs/platform/windows.c | 2 + 15 files changed, 191 insertions(+), 137 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/Jamfile b/0.83/GameInterfaces/ET/src/Jamfile index 8d46f61d0..53e5ca2a8 100644 --- a/0.83/GameInterfaces/ET/src/Jamfile +++ b/0.83/GameInterfaces/ET/src/Jamfile @@ -1,30 +1,44 @@ -# Root project file for the ET interface. +# Root project file for the ET mod. # Builds the game libraries. - project omnibot_et : build-dir ./build - : requirements msvc:WIN32 - : requirements gcc:__linux__ - : requirements debug:_DEBUG - : requirements release:NDEBUG + : requirements + msvc:WIN32 + gcc:__linux__ + debug:_DEBUG + release:NDEBUG + -fno-strict-aliasing + off ; -# define external libs -lib dl_lib : : dl ; - # target suffix rule tag ( name : type ? : property-set ) { if $(type) = SHARED_LIB { - if [ $(property-set).get ] = 64 + if [ $(property-set).get ] = darwin + { + return $(name)_mac ; + } + else if [ $(property-set).get ] = windows + { + if [ $(property-set).get ] = 64 + { + return $(name)_mp_x64.dll ; + } + else + { + return $(name)_mp_x86.dll ; + } + } + else if [ $(property-set).get ] = 64 { - return $(name).x86_64.so ; + return $(name).mp.x86_64.so ; } else { - return $(name).i386.so ; + return $(name).mp.i386.so ; } } } diff --git a/0.83/GameInterfaces/ET/src/cgame/Jamfile b/0.83/GameInterfaces/ET/src/cgame/Jamfile index 204509c76..59d1888d8 100644 --- a/0.83/GameInterfaces/ET/src/cgame/Jamfile +++ b/0.83/GameInterfaces/ET/src/cgame/Jamfile @@ -1,10 +1,11 @@ # The client library. project cgame - : requirements CGAMEDLL - : requirements ../game - : requirements ../ui - : requirements ../../../../Omnibot/Common + : requirements + CGAMEDLL + ../game + ../ui + ../../../../Omnibot/Common ; SOURCES = [ glob ../game/bg_*.c ] @@ -15,5 +16,4 @@ SOURCES = [ glob ../game/bg_*.c ] ../ui/ui_shared.c ; -lib cgame.mp.so : $(SOURCES) : @tag gcc:-w -fno-strict-aliasing -pthread -lrt ; - +lib cgame : $(SOURCES) : @tag ; diff --git a/0.83/GameInterfaces/ET/src/game/Jamfile b/0.83/GameInterfaces/ET/src/game/Jamfile index 512783856..f3c637a63 100644 --- a/0.83/GameInterfaces/ET/src/game/Jamfile +++ b/0.83/GameInterfaces/ET/src/game/Jamfile @@ -1,22 +1,22 @@ # The server library. project game - : requirements GAMEDLL - : requirements NO_BOT_SUPPORT - : requirements debug:DEBUG - : requirements ../botai - : requirements ../../../../Omnibot/Common - : requirements ../../../../Omnibot/ET + : requirements + GAMEDLL + NO_BOT_SUPPORT + debug:DEBUG + ../botai + ../../../../Omnibot/Common + ../../../../Omnibot/ET ; SOURCES = [ glob ../botai/ai_*.c ] [ glob bg_*.c ] [ glob g_*.c ] [ glob g_*.cpp ] - [ glob ../../../../Omnibot/Common/BotLoadLibrary.cpp ] + ../../../../Omnibot/Common/BotLoadLibrary.cpp q_math.c q_shared.c ; -lib qagame.mp.so : $(SOURCES) ..//dl_lib : @tag gcc:-w -fno-strict-aliasing ; - +lib qagame : $(SOURCES) : @tag ; diff --git a/0.83/GameInterfaces/ET/src/ui/Jamfile b/0.83/GameInterfaces/ET/src/ui/Jamfile index afc378517..4e3ac2bb4 100644 --- a/0.83/GameInterfaces/ET/src/ui/Jamfile +++ b/0.83/GameInterfaces/ET/src/ui/Jamfile @@ -1,18 +1,18 @@ # The user interface library. project ui - : requirements UI_EXPORTS - : requirements ../game - : requirements ../../etmain/ui + : requirements + UI_EXPORTS + ../game + ../../etmain/ui ; SOURCES = [ glob ui_*.c ] - ../game/bg_campaign.c - ../game/bg_classes.c - ../game/bg_misc.c - ../game/q_math.c - ../game/q_shared.c + ../game/bg_campaign.c + ../game/bg_classes.c + ../game/bg_misc.c + ../game/q_math.c + ../game/q_shared.c ; -lib ui.mp.so : $(SOURCES) : @tag gcc:-w -fno-strict-aliasing ; - +lib ui : $(SOURCES) : @tag ; diff --git a/0.83/GameInterfaces/RTCW/src/Jamfile b/0.83/GameInterfaces/RTCW/src/Jamfile index 88895cd90..860cd8abf 100644 --- a/0.83/GameInterfaces/RTCW/src/Jamfile +++ b/0.83/GameInterfaces/RTCW/src/Jamfile @@ -1,30 +1,46 @@ # Root project file for the RTCW interface. -# Builds the game libraries. - +# Builds the game mod libraries. project omnibot_rtcw : build-dir ./build - : requirements msvc:WIN32 - : requirements gcc:__linux__ - : requirements debug:_DEBUG - : requirements release:NDEBUG + : requirements + msvc:WIN32 + gcc:__linux__ + debug:_DEBUG + release:NDEBUG + -fno-strict-aliasing + off ; -# define external libs -lib dl_lib : : dl ; - # target suffix rule tag ( name : type ? : property-set ) { if $(type) = SHARED_LIB { - if [ $(property-set).get ] = 64 + if [ $(property-set).get ] = windows { - return $(name).x86_64.so ; + if [ $(property-set).get ] = 64 + { + return $(name)_mp_x64.dll ; + } + else + { + return $(name)_mp_x86.dll ; + } } else { - return $(name).i386.so ; + local ext = so ; + if [ $(property-set).get ] = darwin + { + ext = dylib ; + } + local suffix = i386 ; + if [ $(property-set).get ] = 64 + { + suffix = x86_64 ; + } + return $(name).mp.$(suffix).$(ext) ; } } } diff --git a/0.83/GameInterfaces/RTCW/src/cgame/Jamfile b/0.83/GameInterfaces/RTCW/src/cgame/Jamfile index 1b719b4db..9dc78fb41 100644 --- a/0.83/GameInterfaces/RTCW/src/cgame/Jamfile +++ b/0.83/GameInterfaces/RTCW/src/cgame/Jamfile @@ -3,19 +3,19 @@ import modules ; project cgame - : requirements CGAMEDLL - : requirements ../game - : requirements ../ui - : requirements ../../../../Omnibot/Common + : requirements + CGAMEDLL + ../game + ../ui + ../../../../Omnibot/Common ; SOURCES = [ glob ../game/bg_*.c ] - [ glob cg_*.c ] - [ glob *.cpp ] - ../game/q_math.c - ../game/q_shared.c - ../ui/ui_shared.c + [ glob cg_*.c ] + [ glob *.cpp ] + ../game/q_math.c + ../game/q_shared.c + ../ui/ui_shared.c ; -lib cgame.mp.so : $(SOURCES) : @tag gcc:-Os -w -fno-strict-aliasing -pthread -lrt ; - +lib cgame : $(SOURCES) : @tag gcc:-Os ; diff --git a/0.83/GameInterfaces/RTCW/src/game/Jamfile b/0.83/GameInterfaces/RTCW/src/game/Jamfile index c364db526..7dfd52f6d 100644 --- a/0.83/GameInterfaces/RTCW/src/game/Jamfile +++ b/0.83/GameInterfaces/RTCW/src/game/Jamfile @@ -1,20 +1,20 @@ # The server library. project game - : requirements GAMEDLL - : requirements debug:DEBUG - : requirements ../../../../Omnibot/Common - : requirements ../../../../Omnibot/RTCW + : requirements + GAMEDLL + debug:DEBUG + ../../../../Omnibot/Common + ../../../../Omnibot/RTCW ; SOURCES = [ glob bg_*.c ] - [ glob g_*.c : g_lua.c g_sha1.c ] - [ glob et-*.c ] - [ glob g_*.cpp ] - [ glob ../../../../Omnibot/Common/BotLoadLibrary.cpp ] - q_math.c - q_shared.c + [ glob g_*.c : g_lua.c g_sha1.c ] + [ glob et-*.c ] + [ glob g_*.cpp ] + [ glob ../../../../Omnibot/Common/BotLoadLibrary.cpp ] + q_math.c + q_shared.c ; -lib qagame.mp.so : $(SOURCES) ..//dl_lib : @tag gcc:-Os -w -fno-strict-aliasing ; - +lib qagame : $(SOURCES) : @tag gcc:-Os ; diff --git a/0.83/GameInterfaces/RTCW/src/ui/Jamfile b/0.83/GameInterfaces/RTCW/src/ui/Jamfile index 4c9842951..c81687bdf 100644 --- a/0.83/GameInterfaces/RTCW/src/ui/Jamfile +++ b/0.83/GameInterfaces/RTCW/src/ui/Jamfile @@ -1,16 +1,16 @@ # The user interface library. project ui - : requirements UI_EXPORTS - : requirements ../game - : requirements ../../main/ui_mp + : requirements + UI_EXPORTS + ../game + ../../main/ui_mp ; SOURCES = [ glob ui_*.c ] - ../game/bg_misc.c - ../game/q_math.c - ../game/q_shared.c + ../game/bg_misc.c + ../game/q_math.c + ../game/q_shared.c ; -lib ui.mp.so : $(SOURCES) : @tag gcc:-Os -w -fno-strict-aliasing ; - +lib ui : $(SOURCES) : @tag gcc:-Os ; diff --git a/0.83/Omnibot/Common/Interprocess.cpp b/0.83/Omnibot/Common/Interprocess.cpp index 411aa410a..87f00a214 100644 --- a/0.83/Omnibot/Common/Interprocess.cpp +++ b/0.83/Omnibot/Common/Interprocess.cpp @@ -133,7 +133,8 @@ namespace InterProcess #else void *hmod = 0; #if defined __APPLE__ - hmod = dlopen(va("%s/omnibot/cgame_mac", g_EngineFuncs->GetLogPath()), RTLD_NOW|RTLD_NOLOAD); + hmod = dlopen(va("%s/omnibot/cgame_mac", g_EngineFuncs->GetLogPath()), RTLD_NOW|RTLD_NOLOAD); //ETLegacy + if(!hmod) hmod = dlopen("omnibot/cgame.mp.x86_64.dylib", RTLD_NOW|RTLD_NOLOAD); //ioRTCW #else dl_iterate_phdr(dl_iterate_callback, &hmod); #endif diff --git a/0.83/Omnibot/Common/Jamfile b/0.83/Omnibot/Common/Jamfile index 73a20ed74..6f35f3021 100644 --- a/0.83/Omnibot/Common/Jamfile +++ b/0.83/Omnibot/Common/Jamfile @@ -2,45 +2,31 @@ project Common : requirements - ./ -# ../dependencies/Recast/Recast/Include -# ../dependencies/Recast/DebugUtils/Include -# ../dependencies/Recast/Detour/Include - ../dependencies/physfs - ../dependencies/physfs/lzma/C - ../dependencies/physfs/zlib123 - ../dependencies/physfs/lzma/C/Archive/7z - ../dependencies/physfs/lzma/C/Compress/Lzma - ../dependencies/physfs/lzma/C/Compress/Branch + ./ + ../dependencies/physfs + ../dependencies/physfs/lzma/C + ../dependencies/physfs/zlib123 + PHYSFS_SUPPORTS_ZIP + PHYSFS_SUPPORTS_7Z + PHYSFS_NO_CDROM_SUPPORT ; SOURCES = [ glob ../dependencies/gmscriptex/gmsrc_ex/src/gm/*.cpp ] [ glob ../dependencies/gmscriptex/gmsrc_ex/src/platform/win32gcc/*.cpp ] - [ glob ../dependencies/gmscriptex/gmsrc_ex/src/binds/*.cpp : ../dependencies/gmscriptex/gmsrc_ex/src/binds/gmSqliteLib.cpp ] + [ glob ../dependencies/gmscriptex/gmsrc_ex/src/binds/*.cpp : ../dependencies/gmscriptex/gmsrc_ex/src/binds/gmSqliteLib.cpp ../dependencies/gmscriptex/gmsrc_ex/src/binds/gmSystemLib.cpp ] [ glob ../dependencies/gmscriptex/gmsrc_ex/src/3rdParty/mathlib/*.cpp ] [ glob ../dependencies/gmscriptex/gmsrc_ex/src/3rdParty/gmbinder2/*.cpp ] - [ glob ../dependencies/wildmagic/*.cpp ] + [ glob ../dependencies/wildmagic/*.cpp : ../dependencies/wildmagic/Wm3IntrPlane3Plane3.cpp ] [ glob ../dependencies/physfs/*.c ] [ glob ../dependencies/physfs/archivers/*.c ] [ glob ../dependencies/physfs/lzma/C/*.c ] [ glob ../dependencies/physfs/lzma/C/Archive/7z/*.c ] - [ glob ../dependencies/physfs/lzma/C/Compress/Lzma/*.c ] + [ glob ../dependencies/physfs/lzma/C/Compress/Lzma/*.c : ../dependencies/physfs/lzma/C/Compress/Lzma/LzmaDecodeSize.c ] [ glob ../dependencies/physfs/lzma/C/Compress/Branch/*.c ] [ glob ../dependencies/physfs/zlib123/*.c ] - [ glob ../dependencies/physfs/platform/unix.c ] - [ glob ../dependencies/physfs/platform/posix.c ] -# [ glob ../dependencies/Recast/Recast/Source/*.cpp ] -# [ glob ../dependencies/Recast/Detour/Source/*.cpp ] -# [ glob ../dependencies/Recast/DebugUtils/Source/*.cpp ] + [ glob ../dependencies/physfs/platform/*.c ] # [ glob ../dependencies/iprof/*.c ] -# [ glob RecastInterfaces.cpp ] BatchBuild.cpp ; -if darwin -{ - SOURCES += ../dependencies/physfs/platform/macosx.c ; -} - -lib Common : $(SOURCES) - : static -DPHYSFS_SUPPORTS_ZIP=1 -DPHYSFS_SUPPORTS_7Z=1 -DPHYSFS_NO_CDROM_SUPPORT ; +lib Common : $(SOURCES) : static ; diff --git a/0.83/Omnibot/Common/Utilities.cpp b/0.83/Omnibot/Common/Utilities.cpp index 2aeadbbe6..fb206ebaf 100644 --- a/0.83/Omnibot/Common/Utilities.cpp +++ b/0.83/Omnibot/Common/Utilities.cpp @@ -1825,6 +1825,7 @@ void Options::SaveConfigFileIfChanged() Linux ET 2.6: /home/username/.etwolf Linux RTCW: /home/username/.wolf Mac ETL: /Users/username/Library/Application Support/etlegacy + Mac ioRTCW: /Users/username/Library/Application Support/RTCW */ //If the config has been loaded from fs_homepath, save it to fs_homepath diff --git a/0.83/Omnibot/ET/Jamfile b/0.83/Omnibot/ET/Jamfile index b4b4ec32f..6435aa1fe 100644 --- a/0.83/Omnibot/ET/Jamfile +++ b/0.83/Omnibot/ET/Jamfile @@ -1,8 +1,7 @@ # The ET Library. project ET - : requirements ../Common - ; + : requirements ../Common ; # Compile ALL .cpp files and link to Common.lib to create our dll diff --git a/0.83/Omnibot/Jamfile b/0.83/Omnibot/Jamfile index 52d3ce74a..6f4f9270a 100644 --- a/0.83/Omnibot/Jamfile +++ b/0.83/Omnibot/Jamfile @@ -10,33 +10,55 @@ BOOST_SUFFIX = [ modules.peek : BOOST_SUFFIX ] ; project Omnibot : build-dir ./build : requirements - $(BOOST) - dependencies/iprof - dependencies/wildmagic - dependencies/gmscriptex/gmsrc_ex/src/3rdParty - dependencies/gmscriptex/gmsrc_ex/src/gm - dependencies/gmscriptex/gmsrc_ex/src/binds - dependencies/gmscriptex/gmsrc_ex/src/3rdParty/gmbinder2 - msvc:dependencies/gmscriptex/gmsrc_ex/src/platform/win32msvc - gcc:dependencies/gmscriptex/gmsrc_ex/src/platform/win32gcc - darwin:dependencies/gmscriptex/gmsrc_ex/src/platform/osx - darwin:"-framework IOKit -framework Carbon" - msvc:WIN32 - gcc:__linux__ - darwin:__osx__ - debug:_DEBUG - release:NDEBUG - 64:-fPIC - -std=c++11 - -fno-strict-aliasing - off + $(BOOST) + dependencies/iprof + dependencies/wildmagic + dependencies/gmscriptex/gmsrc_ex/src/3rdParty + dependencies/gmscriptex/gmsrc_ex/src/gm + dependencies/gmscriptex/gmsrc_ex/src/binds + dependencies/gmscriptex/gmsrc_ex/src/3rdParty/gmbinder2 + msvc:dependencies/gmscriptex/gmsrc_ex/src/platform/win32msvc + gcc:dependencies/gmscriptex/gmsrc_ex/src/platform/win32gcc + darwin:dependencies/gmscriptex/gmsrc_ex/src/platform/osx + @os-requirements + gcc:__linux__ + debug:_DEBUG + release:NDEBUG + off ; +rule os-requirements ( properties * ) +{ + local result ; + if windows in $(properties) + { + result = WIN32 static ; + } + else + { + result = -std=c++11 -fno-strict-aliasing ; + if 64 in $(properties) + { + result += -fPIC ; + } + } + if darwin in $(properties) + { + result += "-framework IOKit -framework Carbon" ; + } + return $(result) ; +} + # define external libs -lib boost_filesystem : : release $(BOOST_LIB)/libboost_filesystem$(BOOST_SUFFIX).a ; -lib boost_regex : : release $(BOOST_LIB)/libboost_regex$(BOOST_SUFFIX).a ; -lib boost_date_time : : release $(BOOST_LIB)/libboost_date_time$(BOOST_SUFFIX).a ; -lib boost_system : : release $(BOOST_LIB)/libboost_system$(BOOST_SUFFIX).a ; +lib boost_filesystem : : $(BOOST_LIB)/libboost_filesystem$(BOOST_SUFFIX).a ; +lib boost_regex : : $(BOOST_LIB)/libboost_regex$(BOOST_SUFFIX).a ; +lib boost_date_time : : $(BOOST_LIB)/libboost_date_time$(BOOST_SUFFIX).a ; +lib boost_system : : $(BOOST_LIB)/libboost_system$(BOOST_SUFFIX).a ; + +lib boost_filesystem : : windows $(BOOST_LIB)/libboost_filesystem$(BOOST_SUFFIX).lib ; +lib boost_regex : : windows $(BOOST_LIB)/libboost_regex$(BOOST_SUFFIX).lib ; +lib boost_date_time : : windows $(BOOST_LIB)/libboost_date_time$(BOOST_SUFFIX).lib ; +lib boost_system : : windows $(BOOST_LIB)/libboost_system$(BOOST_SUFFIX).lib ; # define alias for convenience and to force static linking alias boost_all : boost_filesystem boost_regex boost_date_time boost_system : static ; @@ -50,11 +72,25 @@ rule tag ( name : type ? : property-set ) { return $(name)_mac.so ; } - if [ $(property-set).get ] = 64 + else if [ $(property-set).get ] = windows + { + if [ $(property-set).get ] = 64 + { + return $(name)_x64.dll ; + } + else + { + return $(name).dll ; + } + } + else if [ $(property-set).get ] = 64 { return $(name).x86_64.so ; } - return $(name).so ; + else + { + return $(name).so ; + } } } diff --git a/0.83/Omnibot/RTCW/Jamfile b/0.83/Omnibot/RTCW/Jamfile index b910c0382..678c05342 100644 --- a/0.83/Omnibot/RTCW/Jamfile +++ b/0.83/Omnibot/RTCW/Jamfile @@ -1,8 +1,7 @@ # The RTCW Library. project RTCW - : requirements ../Common - ; + : requirements ../Common ; # Compile ALL .cpp files and link to Common.lib to create our dll diff --git a/0.83/Omnibot/dependencies/physfs/platform/windows.c b/0.83/Omnibot/dependencies/physfs/platform/windows.c index ff5fd3057..e35df20d0 100644 --- a/0.83/Omnibot/dependencies/physfs/platform/windows.c +++ b/0.83/Omnibot/dependencies/physfs/platform/windows.c @@ -11,6 +11,8 @@ #ifdef PHYSFS_PLATFORM_WINDOWS +#pragma comment(lib,"advapi32.lib") + /* Forcibly disable UNICODE, since we manage this ourselves. */ #ifdef UNICODE #undef UNICODE From 87114b9d6b1216596bc17be9d8e8191c9a26f05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Tue, 21 May 2024 16:13:29 +0200 Subject: [PATCH 08/22] et: fixed 64bit syscall --- 0.83/GameInterfaces/ET/src/cgame/cg_main.c | 2 +- 0.83/GameInterfaces/ET/src/cgame/cg_syscalls.c | 4 ++-- 0.83/GameInterfaces/ET/src/game/bg_animation.c | 2 +- 0.83/GameInterfaces/ET/src/game/g_main.c | 4 ++-- 0.83/GameInterfaces/ET/src/game/g_syscalls.c | 4 ++-- 0.83/GameInterfaces/ET/src/game/q_shared.h | 1 + 0.83/GameInterfaces/ET/src/ui/ui_main.c | 2 +- 0.83/GameInterfaces/ET/src/ui/ui_syscalls.c | 4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/cgame/cg_main.c b/0.83/GameInterfaces/ET/src/cgame/cg_main.c index da43382fa..1de62531e 100644 --- a/0.83/GameInterfaces/ET/src/cgame/cg_main.c +++ b/0.83/GameInterfaces/ET/src/cgame/cg_main.c @@ -31,7 +31,7 @@ This must be the very first function compiled into the .q3vm file #pragma export on #endif #endif -int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11 ) { +intptr_t vmMain( intptr_t command, intptr_t arg0, intptr_t arg1, intptr_t arg2, intptr_t arg3, intptr_t arg4, intptr_t arg5, intptr_t arg6, intptr_t arg7, intptr_t arg8, intptr_t arg9, intptr_t arg10, intptr_t arg11 ) { #if defined(__MACOS__) #ifndef __GNUC__ #pragma export off diff --git a/0.83/GameInterfaces/ET/src/cgame/cg_syscalls.c b/0.83/GameInterfaces/ET/src/cgame/cg_syscalls.c index 672f22d10..7d355525f 100644 --- a/0.83/GameInterfaces/ET/src/cgame/cg_syscalls.c +++ b/0.83/GameInterfaces/ET/src/cgame/cg_syscalls.c @@ -2,14 +2,14 @@ // cg_syscalls.asm is included instead when building a qvm #include "cg_local.h" -static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1; +static intptr_t (QDECL *syscall)( intptr_t arg, ... ) = (intptr_t (QDECL *)( intptr_t, ...))-1; #if defined(__MACOS__) #ifndef __GNUC__ #pragma export on #endif #endif -void dllEntry( int (QDECL *syscallptr)( int arg,... ) ) { +void dllEntry( intptr_t (QDECL *syscallptr)( intptr_t arg,... ) ) { syscall = syscallptr; } #if defined(__MACOS__) diff --git a/0.83/GameInterfaces/ET/src/game/bg_animation.c b/0.83/GameInterfaces/ET/src/game/bg_animation.c index cc96f6c94..8780239cd 100644 --- a/0.83/GameInterfaces/ET/src/game/bg_animation.c +++ b/0.83/GameInterfaces/ET/src/game/bg_animation.c @@ -1645,7 +1645,7 @@ int BG_GetConditionValue( int client, int condition, qboolean checkConversion ) } else // xkan, 1/14/2003 - must use COM_BitCheck on the result. - return (int)globalScriptData->clientConditions[client][condition]; + return (intptr_t)globalScriptData->clientConditions[client][condition]; //BG_AnimParseError( "BG_GetConditionValue: internal error" ); } else diff --git a/0.83/GameInterfaces/ET/src/game/g_main.c b/0.83/GameInterfaces/ET/src/game/g_main.c index bfd9ba303..4c9116126 100644 --- a/0.83/GameInterfaces/ET/src/game/g_main.c +++ b/0.83/GameInterfaces/ET/src/game/g_main.c @@ -487,7 +487,7 @@ This must be the very first function compiled into the .q3vm file #pragma export on #endif #endif -int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6 ) { +intptr_t vmMain( intptr_t command, intptr_t arg0, intptr_t arg1, intptr_t arg2, intptr_t arg3, intptr_t arg4, intptr_t arg5, intptr_t arg6 ) { #if defined(__MACOS__) #ifndef __GNUC__ #pragma export off @@ -513,7 +513,7 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a G_ShutdownGame( arg0 ); return 0; case GAME_CLIENT_CONNECT: - return (int)ClientConnect( arg0, arg1, arg2 ); + return (intptr_t)ClientConnect( arg0, arg1, arg2 ); case GAME_CLIENT_THINK: ClientThink( arg0 ); return 0; diff --git a/0.83/GameInterfaces/ET/src/game/g_syscalls.c b/0.83/GameInterfaces/ET/src/game/g_syscalls.c index 46645a586..9bc024c9d 100644 --- a/0.83/GameInterfaces/ET/src/game/g_syscalls.c +++ b/0.83/GameInterfaces/ET/src/game/g_syscalls.c @@ -5,14 +5,14 @@ // this file is only included when building a dll // g_syscalls.asm is included instead when building a qvm -static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1; +static intptr_t(QDECL * syscall)(intptr_t arg, ...) = (intptr_t(QDECL *)(intptr_t, ...)) - 1; #if defined(__MACOS__) #ifndef __GNUC__ #pragma export on #endif #endif -void dllEntry( int (QDECL *syscallptr)( int arg,... ) ) { +void dllEntry( intptr_t (QDECL *syscallptr)( intptr_t arg,... ) ) { syscall = syscallptr; } #if defined(__MACOS__) diff --git a/0.83/GameInterfaces/ET/src/game/q_shared.h b/0.83/GameInterfaces/ET/src/game/q_shared.h index 451e877c4..fdb668d93 100644 --- a/0.83/GameInterfaces/ET/src/game/q_shared.h +++ b/0.83/GameInterfaces/ET/src/game/q_shared.h @@ -94,6 +94,7 @@ #include #include // rain #include +#include #endif diff --git a/0.83/GameInterfaces/ET/src/ui/ui_main.c b/0.83/GameInterfaces/ET/src/ui/ui_main.c index 9d02ac286..d4b2bceb2 100644 --- a/0.83/GameInterfaces/ET/src/ui/ui_main.c +++ b/0.83/GameInterfaces/ET/src/ui/ui_main.c @@ -243,7 +243,7 @@ qboolean _UI_IsFullscreen( void ); #pragma export on #endif #endif -int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11 ) { +intptr_t vmMain( intptr_t command, intptr_t arg0, intptr_t arg1, intptr_t arg2, intptr_t arg3, intptr_t arg4, intptr_t arg5, intptr_t arg6, intptr_t arg7, intptr_t arg8, intptr_t arg9, intptr_t arg10, intptr_t arg11 ) { #if defined(__MACOS__) #ifndef __GNUC__ #pragma export off diff --git a/0.83/GameInterfaces/ET/src/ui/ui_syscalls.c b/0.83/GameInterfaces/ET/src/ui/ui_syscalls.c index fe35a80fb..af657b444 100644 --- a/0.83/GameInterfaces/ET/src/ui/ui_syscalls.c +++ b/0.83/GameInterfaces/ET/src/ui/ui_syscalls.c @@ -3,14 +3,14 @@ // this file is only included when building a dll // syscalls.asm is included instead when building a qvm -static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1; +static intptr_t (QDECL *syscall)( intptr_t arg, ... ) = (intptr_t (QDECL *)( intptr_t, ...))-1; #if defined(__MACOS__) #ifndef __GNUC__ #pragma export on #endif #endif -void dllEntry( int (QDECL *syscallptr)( int arg,... ) ) { +void dllEntry( intptr_t (QDECL *syscallptr)( intptr_t arg,... ) ) { syscall = syscallptr; } #if defined(__MACOS__) From ff0728b2c7d56646227ea8f7ec65681ec4060959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Tue, 21 May 2024 19:37:16 +0200 Subject: [PATCH 09/22] fixed rsqrt on Mac --- 0.83/GameInterfaces/ET/src/game/q_math.c | 30 ++++++++++---------- 0.83/GameInterfaces/RTCW/src/game/q_math.c | 30 +++++++++++--------- 0.83/GameInterfaces/RTCW/src/game/q_shared.h | 3 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/game/q_math.c b/0.83/GameInterfaces/ET/src/game/q_math.c index 7c1898579..c2c70edc7 100644 --- a/0.83/GameInterfaces/ET/src/game/q_math.c +++ b/0.83/GameInterfaces/ET/src/game/q_math.c @@ -549,23 +549,23 @@ void VectorRotate( vec3_t in, vec3_t matrix[3], vec3_t out ) //============================================================================ -/* -** float q_rsqrt( float number ) -*/ -float Q_rsqrt( float number ) +typedef union +{ + float f; + int32_t i; + uint32_t ui; +} floatint_t; + +// 1/sqrt(f), fast but inaccurate +float Q_rsqrt(float f) { - long i; - float x2, y; - const float threehalfs = 1.5F; - - x2 = number * 0.5F; - y = number; - i = * ( long * ) &y; // evil floating point bit level hacking - i = 0x5f3759df - ( i >> 1 ); // what the fuck? - y = * ( float * ) &i; - y = y * ( threehalfs - ( x2 * y * y ) ); // 1st iteration -// y = y * ( threehalfs - ( x2 * y * y ) ); // 2nd iteration, this can be removed + floatint_t t; + float y; + t.f = f; + t.i = 0x5f3759df - (t.i >> 1); // evil floating point bit level hacking + y = t.f; + y = y * (1.5F - (f * 0.5F * y * y)); // iteration return y; } diff --git a/0.83/GameInterfaces/RTCW/src/game/q_math.c b/0.83/GameInterfaces/RTCW/src/game/q_math.c index 32b98ee97..6b80c3f06 100644 --- a/0.83/GameInterfaces/RTCW/src/game/q_math.c +++ b/0.83/GameInterfaces/RTCW/src/game/q_math.c @@ -535,21 +535,23 @@ void VectorRotate( vec3_t in, vec3_t matrix[3], vec3_t out ) { //============================================================================ -/* -** float q_rsqrt( float number ) -*/ -float Q_rsqrt( float number ) { - long i; - float x2, y; - const float threehalfs = 1.5F; - - x2 = number * 0.5F; - y = number; - i = *( long * ) &y; // evil floating point bit level hacking - i = 0x5f3759df - ( i >> 1 ); // what the fuck? - y = *( float * ) &i; - y = y * ( threehalfs - ( x2 * y * y ) ); // 1st iteration +typedef union +{ + float f; + int32_t i; + uint32_t ui; +} floatint_t; + +// 1/sqrt(f), fast but inaccurate +float Q_rsqrt(float f) +{ + floatint_t t; + float y; + t.f = f; + t.i = 0x5f3759df - (t.i >> 1); // evil floating point bit level hacking + y = t.f; + y = y * (1.5F - (f * 0.5F * y * y)); // iteration return y; } diff --git a/0.83/GameInterfaces/RTCW/src/game/q_shared.h b/0.83/GameInterfaces/RTCW/src/game/q_shared.h index 3378d23e5..c5b16dfa7 100644 --- a/0.83/GameInterfaces/RTCW/src/game/q_shared.h +++ b/0.83/GameInterfaces/RTCW/src/game/q_shared.h @@ -80,6 +80,7 @@ typedef int intptr_t; #include #include #include +#include #endif @@ -87,8 +88,6 @@ typedef int intptr_t; //#pragma intrinsic( memset, memcpy ) -#else -#include #endif From fb600689d19ce01879551158db42c9ed5b483532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Fri, 14 Jun 2024 09:52:52 +0200 Subject: [PATCH 10/22] version 0.91 --- 0.83/GameInterfaces/ET/src/cgame/cgame.rc | 10 ++++----- 0.83/GameInterfaces/ET/src/game/game.rc | 10 ++++----- 0.83/GameInterfaces/ET/src/ui/ui.rc | 10 ++++----- 0.83/GameInterfaces/RTCW/src/cgame/cgame.rc | 8 +++---- 0.83/GameInterfaces/RTCW/src/game/game.rc | 8 +++---- 0.83/GameInterfaces/RTCW/src/game/q_shared.h | 2 +- 0.83/GameInterfaces/RTCW/src/ui/ui.rc | 8 +++---- 0.83/Installer/Files/rtcw/changelog.txt | 22 +++++++++++++++++-- 0.83/Installer/Files/rtcw/readme.txt | 2 +- 0.83/Omnibot/Common/IGame.cpp | 2 +- 0.83/Omnibot/projects/msvc12/Common/Common.rc | 10 ++++----- 11 files changed, 55 insertions(+), 37 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/cgame/cgame.rc b/0.83/GameInterfaces/ET/src/cgame/cgame.rc index 30ec0dbce..5f15c5105 100644 --- a/0.83/GameInterfaces/ET/src/cgame/cgame.rc +++ b/0.83/GameInterfaces/ET/src/cgame/cgame.rc @@ -45,8 +45,8 @@ END // 1 VERSIONINFO -FILEVERSION 0, 9, 0, 0 -PRODUCTVERSION 0, 9, 0, 0 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot mod for Enemy Territory" - VALUE "FileVersion", "0.9.0.0" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "omnibot cgame" - VALUE "LegalCopyright", "Copyright (C) 2023" + VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "cgame_mp_x86.dll" VALUE "ProductName", "omnibot mod - client" - VALUE "ProductVersion", "0.9.0.0" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" diff --git a/0.83/GameInterfaces/ET/src/game/game.rc b/0.83/GameInterfaces/ET/src/game/game.rc index cbfb6bb0d..d5c7d116e 100644 --- a/0.83/GameInterfaces/ET/src/game/game.rc +++ b/0.83/GameInterfaces/ET/src/game/game.rc @@ -45,8 +45,8 @@ END // 1 VERSIONINFO -FILEVERSION 0, 8, 4, 1048 -PRODUCTVERSION 0, 8, 4, 1048 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot mod for Enemy Territory" - VALUE "FileVersion", "0.8.4.1048" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "omnibot qagame" - VALUE "LegalCopyright", "Copyright (C) 2014" + VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "qagame_mp_x86.dll" VALUE "ProductName", "omnibot mod - server" - VALUE "ProductVersion", "0.8.4.1048" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" diff --git a/0.83/GameInterfaces/ET/src/ui/ui.rc b/0.83/GameInterfaces/ET/src/ui/ui.rc index b4c63093c..5f4428895 100644 --- a/0.83/GameInterfaces/ET/src/ui/ui.rc +++ b/0.83/GameInterfaces/ET/src/ui/ui.rc @@ -45,8 +45,8 @@ END // 1 VERSIONINFO -FILEVERSION 0, 8, 5, 0 -PRODUCTVERSION 0, 8, 5, 0 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot mod for Enemy Territory" - VALUE "FileVersion", "0.8.5.0" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "omnibot ui" - VALUE "LegalCopyright", "Copyright (C) 2015" + VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "ui_mp_x86.dll" VALUE "ProductName", "omnibot mod - ui" - VALUE "ProductVersion", "0.8.5.0" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" diff --git a/0.83/GameInterfaces/RTCW/src/cgame/cgame.rc b/0.83/GameInterfaces/RTCW/src/cgame/cgame.rc index 96c662337..69f56d85c 100644 --- a/0.83/GameInterfaces/RTCW/src/cgame/cgame.rc +++ b/0.83/GameInterfaces/RTCW/src/cgame/cgame.rc @@ -45,8 +45,8 @@ END // 1 VERSIONINFO -FILEVERSION 0, 9, 0, 0 -PRODUCTVERSION 0, 9, 0, 0 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot mod for Return to Castle Wolfenstein" - VALUE "FileVersion", "0.9.0.0" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "omnibot cgame" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "cgame_mp_x86.dll" VALUE "ProductName", "omnibot mod - client" - VALUE "ProductVersion", "0.9.0.0" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" diff --git a/0.83/GameInterfaces/RTCW/src/game/game.rc b/0.83/GameInterfaces/RTCW/src/game/game.rc index cfeabdb63..e958bfb22 100644 --- a/0.83/GameInterfaces/RTCW/src/game/game.rc +++ b/0.83/GameInterfaces/RTCW/src/game/game.rc @@ -45,8 +45,8 @@ END // 1 VERSIONINFO -FILEVERSION 0, 9, 0, 0 -PRODUCTVERSION 0, 9, 0, 0 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot mod for Return to Castle Wolfenstein" - VALUE "FileVersion", "0.9.0.0" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "omnibot qagame" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "qagame_mp_x86.dll" VALUE "ProductName", "omnibot mod - server" - VALUE "ProductVersion", "0.9.0.0" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" diff --git a/0.83/GameInterfaces/RTCW/src/game/q_shared.h b/0.83/GameInterfaces/RTCW/src/game/q_shared.h index c5b16dfa7..c4065de9b 100644 --- a/0.83/GameInterfaces/RTCW/src/game/q_shared.h +++ b/0.83/GameInterfaces/RTCW/src/game/q_shared.h @@ -5,7 +5,7 @@ // A user mod should never modify this file #define Q3_VERSION "Wolf 1.41-MP" -#define OB_VERSION "0.9" +#define OB_VERSION "0.91" #define OMNIBOT_URL "www.omni-bot.com" // 1.4-MP : (== 1.34) // 1.3-MP : final for release diff --git a/0.83/GameInterfaces/RTCW/src/ui/ui.rc b/0.83/GameInterfaces/RTCW/src/ui/ui.rc index d6a1d96a2..1a5b7c27d 100644 --- a/0.83/GameInterfaces/RTCW/src/ui/ui.rc +++ b/0.83/GameInterfaces/RTCW/src/ui/ui.rc @@ -45,8 +45,8 @@ END // 1 VERSIONINFO -FILEVERSION 0, 9, 0, 0 -PRODUCTVERSION 0, 9, 0, 0 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot mod for Return to Castle Wolfenstein" - VALUE "FileVersion", "0.9.0.0" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "omnibot ui" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "ui_mp_x86.dll" VALUE "ProductName", "omnibot mod - ui" - VALUE "ProductVersion", "0.9.0.0" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" diff --git a/0.83/Installer/Files/rtcw/changelog.txt b/0.83/Installer/Files/rtcw/changelog.txt index 0732dc03a..13ee328b9 100644 --- a/0.83/Installer/Files/rtcw/changelog.txt +++ b/0.83/Installer/Files/rtcw/changelog.txt @@ -1,6 +1,16 @@ +==0.91 RTCW Change Log== -=== COMMANDS === -Added saveplayerpos, saveusepoint, stuckstart, stucknext, warptogoaloffset, cleargoalflags +macOS is supported + +=== BOT === +Improved waypoints drawing (incompatible with older omnibot mods !) +Added config option Script/EndGameStats, which prints gm scripts memory usage at the end of game +Added GetGoals parameter can be a hash number instead of a regular expression +Added QueryGoals filter CheckRange +Added TraceLine parameter CONTENT.PLAYERCLIP +Fixed Wp.Connect blockable connections +Fixed invalid characters in goal names +Optimized RegexMatch, SetAvailableMapGoals, SetGoalPriority === MOD === Added more video modes (screen resolutions) @@ -8,6 +18,14 @@ Added DMS tool commands setGoalName, setWaypointName, setGoalStance, ... Changed MAX_MENUS increased from 64 to 128 Fixed GetLocalPosition of a spectator +=== SCRIPTS === +Changed paththrough navigation can use this instead of _this parameter +Improved Util.SetGoalRange, Util.RemoveGoal parameter can be a regular expression + +=== COMMANDS === +Added saveplayerpos, saveusepoint, stuckstart, stucknext, warptogoaloffset, cleargoalflags +Added parameter toggle to waypoint_view + --------------------------------------------------------------- ==0.9 RTCW Change Log== diff --git a/0.83/Installer/Files/rtcw/readme.txt b/0.83/Installer/Files/rtcw/readme.txt index c091c762e..849cad9c2 100644 --- a/0.83/Installer/Files/rtcw/readme.txt +++ b/0.83/Installer/Files/rtcw/readme.txt @@ -1,5 +1,5 @@ ==Overview== -RTCW:Omnibot is a modification for http://en.wikipedia.org/wiki/Return_to_Castle_Wolfenstein. Some general modifications have been made to the 1.4 SDK. +RTCW:Omnibot is a modification for https://en.wikipedia.org/wiki/Return_to_Castle_Wolfenstein. Some general modifications have been made to the 1.4 SDK. ===Bot Features=== * 99 fully supported maps (complete waypoints / scripts) diff --git a/0.83/Omnibot/Common/IGame.cpp b/0.83/Omnibot/Common/IGame.cpp index 09ee8afd2..86adee552 100644 --- a/0.83/Omnibot/Common/IGame.cpp +++ b/0.83/Omnibot/Common/IGame.cpp @@ -55,7 +55,7 @@ IGame::~IGame() const char *IGame::GetVersion() const { - return "0.9"; + return "0.91"; } const char *IGame::GetVersionDateTime() const diff --git a/0.83/Omnibot/projects/msvc12/Common/Common.rc b/0.83/Omnibot/projects/msvc12/Common/Common.rc index 973a885ed..6e22e7e6d 100644 --- a/0.83/Omnibot/projects/msvc12/Common/Common.rc +++ b/0.83/Omnibot/projects/msvc12/Common/Common.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 9, 0, 0 -PRODUCTVERSION 0, 9, 0, 0 +FILEVERSION 0, 9, 1, 0 +PRODUCTVERSION 0, 9, 1, 0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot" - VALUE "FileVersion", "0.9.0.0" + VALUE "FileVersion", "0.9.1.0" VALUE "InternalName", "Omni-bot" - VALUE "LegalCopyright", "Copyright (C) 2023" + VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "omnibot.dll" VALUE "ProductName", "Omni-bot" - VALUE "ProductVersion", "0.9.0.0" + VALUE "ProductVersion", "0.9.1.0" END END BLOCK "VarFileInfo" From ada126841ae078330dcbba75cfbd16e8fb9b0f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Fri, 14 Jun 2024 15:02:20 +0200 Subject: [PATCH 11/22] fixed RegexMatch --- 0.83/Omnibot/Common/Utilities.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/0.83/Omnibot/Common/Utilities.cpp b/0.83/Omnibot/Common/Utilities.cpp index fb206ebaf..73aa9d8ad 100644 --- a/0.83/Omnibot/Common/Utilities.cpp +++ b/0.83/Omnibot/Common/Utilities.cpp @@ -57,15 +57,19 @@ namespace Utils if(e == s) continue; if(e >= 'A' && e <= 'Z') { - if(e + ('a' - 'A') == s) continue; - return false; + if(e + ('a' - 'A') == s) continue; //case insensitive } - if(e >= 'a' && e <= 'z') + else if(e >= 'a' && e <= 'z') { if(e - ('a' - 'A') == s) continue; - return false; } - if(e == '_' || (e >= '0' && e <= '9')) return false; + else if(e != '_' && !(e >= '0' && e <= '9')) + { + if(e == '*' || e == '\\' && exp[1] == '{') exp--, str--; //repeat last char + break; + } + e = exp[1]; + if(e != '*' && e != '\\') return false; break; } From 095871bfdc5e521824367d9133e5aed4465e4219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Thu, 20 Jun 2024 20:13:21 +0200 Subject: [PATCH 12/22] rtcw: version 0.91 --- .../RTCW/src/game/Jamfile.withlua | 4 +- 0.83/Installer/Files/rtcw/changelog.txt | 4 + .../rtcw/game/sound/hitsounds/headshot.wav | Bin 4670 -> 0 bytes .../Files/rtcw/game/sound/hitsounds/hit.wav | Bin 3349 -> 0 bytes .../rtcw/game/sound/hitsounds/hitteammate.wav | Bin 3646 -> 0 bytes .../Files/rtcw/incomplete_navs/fun_beach_2.gm | 340 ------------------ .../rtcw/incomplete_navs/mp_norway_cp.gm | 96 ----- .../Files/rtcw/incomplete_navs/mp_xdam.gm | 5 - .../rtcw/incomplete_navs/teamtemple_rtcw.gm | 7 - 0.83/Installer/Files/rtcw/nav/mp_base_cp.gm | 14 - 0.83/Installer/Files/rtcw/nav/mp_dam_cp.gm | 19 - 0.83/Installer/Files/rtcw/nav/mp_depot_cp.gm | 4 - .../Installer/Files/rtcw/nav/mp_generator2.gm | 3 - 0.83/Installer/Files/rtcw/nav/mp_ice_cp.gm | 16 - 0.83/Installer/Files/rtcw/nav/mp_sub_cp.gm | 10 - 0.83/Installer/Files/rtcw/nav/mp_theguns.gm | 18 - 0.83/Installer/Files/rtcw/nav/mp_vietnam.gm | 6 - .../Installer/Files/rtcw/nav/mp_village_cp.gm | 20 -- 0.83/Installer/Files/rtcw/nav/mp_zion.gm | 3 - .../Files/rtcw/scripts/goals/goal_camp.gm | 7 + .../goals/goal_paththrough_artillery.gm | 2 +- .../rtcw/scripts/goals/goal_rolemanager.gm | 14 +- 22 files changed, 22 insertions(+), 570 deletions(-) delete mode 100644 0.83/Installer/Files/rtcw/game/sound/hitsounds/headshot.wav delete mode 100644 0.83/Installer/Files/rtcw/game/sound/hitsounds/hit.wav delete mode 100644 0.83/Installer/Files/rtcw/game/sound/hitsounds/hitteammate.wav delete mode 100644 0.83/Installer/Files/rtcw/incomplete_navs/mp_norway_cp.gm diff --git a/0.83/GameInterfaces/RTCW/src/game/Jamfile.withlua b/0.83/GameInterfaces/RTCW/src/game/Jamfile.withlua index b1315a029..4851f22ce 100644 --- a/0.83/GameInterfaces/RTCW/src/game/Jamfile.withlua +++ b/0.83/GameInterfaces/RTCW/src/game/Jamfile.withlua @@ -16,7 +16,7 @@ alias lua : lua_lib : static ; SOURCES = [ glob bg_*.c ] [ glob g_*.c ] - [ glob et-*.c ] + [ glob et-*.c ] [ glob g_*.cpp ] [ glob ../sqlite/*.c ] [ glob ../sha-1/sha1.c ] @@ -25,5 +25,5 @@ SOURCES = [ glob bg_*.c ] q_shared.c ; -lib qagame.mp.i386.so : $(SOURCES) ..//dl_lib lua : gcc:-Os -w -fno-strict-aliasing ; +lib qagame.mp.i386.so : $(SOURCES) lua : gcc:-Os ; diff --git a/0.83/Installer/Files/rtcw/changelog.txt b/0.83/Installer/Files/rtcw/changelog.txt index 13ee328b9..46be269d1 100644 --- a/0.83/Installer/Files/rtcw/changelog.txt +++ b/0.83/Installer/Files/rtcw/changelog.txt @@ -18,6 +18,10 @@ Added DMS tool commands setGoalName, setWaypointName, setGoalStance, ... Changed MAX_MENUS increased from 64 to 128 Fixed GetLocalPosition of a spectator +=== GOALS === +Improved role's crucialClass can be a table of classes +Improved camp goal can be moved during game + === SCRIPTS === Changed paththrough navigation can use this instead of _this parameter Improved Util.SetGoalRange, Util.RemoveGoal parameter can be a regular expression diff --git a/0.83/Installer/Files/rtcw/game/sound/hitsounds/headshot.wav b/0.83/Installer/Files/rtcw/game/sound/hitsounds/headshot.wav deleted file mode 100644 index 6eb2264788871ba9251208ab9909e342c63ca6e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4670 zcmW-kNsJuVea7iqatPq)k|2Np!-ym^N(4tS>_{|CiV{Z@*Wr+}?^{n#?@R4fuijQm z*VfhR^i22kY&{Eij>zF6E;2=Jk!-~_A{mI2zzCciatM%9PC4YYy3s&Y*Q@uw@Av=y zwe-E$)AQpO4jmeNYv5!g$$js;hYlV34*Pz8;Lx|f?;QH0Lvz#I^b2f^u9zi_cPW-M z0cQXPM6gi7Dp1?@>;kU27LUr3kt9S*SfMfx%P<)a8jS^1akv};?p$8Ws|l+q63}kV z&g?vlS;a?puh=&#xm2E>y8O=M#erkP^Su`)`#7{!v35$&>aF(kptyaHX7;W$&&|`~ z#f2OvymcuqszOv>Q^Y5G)!5d@2C@I)>Bca(UXNs*CH+F#h`yHGz_0fhTP3yd;M%Cx z*yS=aEu^V0 z5075o8+n)e_`^-`<>&3`#6A~|t=?QF`yFhCXZPMN+i3R!@|6YtZua5X&;0>a*Y`v0?^=&`dD;e9gFX?POs?W%cT(xn( zql&ORlWachaN+yf$Z*jeo1f!m-DW!*H;wz%x~s+}@{z@2<+c(R$Wj~uZ;|q8D?YGL za(gE|CI9zJ>KIosH3+ma@=`it}%u?l`b;MVd-qSvz;Z`#JjI z_y-?nkLI_$Xl)PWdX>4s^!D%Y$Z@T0&Y^oZ($VC);a}}69WPRJajN{>KQj01qu5#e z8~JG8)6JPd)9)V$e%p9E`nxMH|Ly%Rx#Qdi?zz5C4vg$(2R91Ow)64EgC*Wxd6F4b zS9Ydtb2)hm-NbK~pJb2sF5ewJD{YKNQW6-uA$T!(2MEw8yHY!ScIi$Kv8}D_Md`tgFMjY?n@NAt9zl1!xdwK(U7cwnRK{bcgFk~IG1#_6Gr2g!4_b>(z@&lYe;nmrk|CyuK%u}5jwbF*O< zarL#pwx9u&+Ap8`S+oJN=>4U1R#`Lr;Ks9a@6_*Q-U2sEXM65^D4(H~%+F?@I0LV2 zKlU)iL&xze9`jJ9)WmNw33Hj^FuMaNwb-psr&OO_mOK;sc+wVV2{>8xW zuOEKt+3#bAg-_HoiFtv|aGMtP|)HD&BbFY@bTHe!cUJ((b~D7)Z9HotC5*7a(?yt9o_=MGwscdNy0 zsOBceZ{MUBOAqV|*}EUj^|an!I4175-tIp*IDfeMapKSC{;7Ft^7?lF8Te=^vfL_< zM~VlVW4Zc%>^ypOB{I?3TpV0}ilT{s?!3|W#WxoYOV27tqW7woM_2TzUX2Z_~x8FA++}2GVG}jt}9M)I819T#`(>^`s>_i8IE7ow_ z;%7$ND+}Y|ew20G?(AUQnY%USIyY_;;iG)gK+X@-+KizBVzOZf^IS=gVV#c%J@ZdS?!Od^4JZ{m}c{`Ut3#Ars9U%2w-!i zsO61X;BoGR@@Tn#@Y;>cDfL0=*x9nPkgF|?PrGZGH}L0`*N+69*huLrI-6+Gn6~LC zm!|jjwV~<cM>y4riE23>o&!IKf<%^vRzkbh|gqvhMx!2($cm+wMSQsA;o9Ts>UFAZe?8QYS z4~>D`0uK>)IaObiaK(@3&00tU8qK3>v9o+OR&NY0ZanqIl6S8ubaQ1Pvf5c3Fg{Ga zICyYvYYj6x|*2WJP5LdWqH=$qeJ7>=Ij98w9gJhHv{}Ym`4RpTra~o4=to2 zsHC-oYLy&OcP*mV$pR|c$#ADUnF>ppbXb?h(jgU%YGo)^TuLmKm*t6^8Ndwn?NruW z-AHi06VI>RaI)SVZvx-lotkW}#ZG}|;ON}#cHcl{d$E^Xb<=pGHl1s(kvOT7fnlR= zr5M4PnC+Q@?V?1cxu-9}>#I`2T2d22fha~9XQkaOeW7_B4bQJ_!K`m_2^DFHqL&&< zmb_%#_d(WiO*hnK!7CD3Gct+?d2h{{h?kbQba7ot8!JwR7LD0xqZpgj>xZ5%AuXft2%pbgSwd(>{1nL5J<>CDYdLk=IX1$RK9>j!=gM# zq*GjE z&p}u+>oAicE=f^Wjl>;KNLV#AqO@9C$|?nII5)+?*PQs_DSI2n&i`go!xy zv>Yjzk+f`^20~(9BSh6Xh(x~Bv}f~SD08(Xn6m>`kY#^%zP83qn>*e_yu1ul%a;?d z=>fs=Qpv(bz=@WgNs)#xDXPICr{<<|#8)I*Hr2cnAiZFNI4rrETE15W6Mu&9(w zK97|I@7cOSRX$$`h>AT`lmeFk9ZE6sfu&8${5Q~C0;wkR(b zB(dnp89*h?bn@AZWLN;Qo3JL)0IC|o5C&F3_gp~;%W75&3mPffs-zPPLn0;F8-WNd zCC_W3$go0ARVlG;%QT?o_$a4QLvpfU(k{&)iXG(@F`HBs^Qyw&Ts+N3Z^6# zs+NihnBAc&Sb{d;kyqDaAT$$dy`g1k+0pGH;ncuTnaOxWU$QvWQWF_sVc?To+6V|G zhN#F`Ve9g&w1yX z7>;EWd_yND1)yNC`+#ro#I-oVD^VF+Sb$+!2gHNM1&c2_yq+Dz&gGD7K?A z5Q2zYsv$!YVbKGK#VAW_hM@X}AX-#XbRf#qk$4fRGPJRxvys>_Gyzgs0Ui@CDyU$v z7Z}4vgqkLjA#T z^Pm7&Q&=L8EJd?IQ#Kr1fxfLs&@ceDbxA^iQbm-Is^}KQfD)Zrj3#2FR2PYY!KhHI z$p9m28bH#pLJ*QA1wt8FR8e&kL29!!K|l(SMFTVV5JFvoriD~ma7=0h7E-8FFbxb5 zM63=Bo`Nu|2m{74Zx@&&UDpU^*L{P*Duf^jd{2Y61Ayfl*tCJbOe)MRFX$F#tLd^% zDKK>=fk2%iASf8?tnf0M+RzA6nFPv|5CQ=*4PC*6vP%J0RLki4)&&h?sB2JRolOm@ zE3(NRPboE#Wmt}lfX>d+0plxE%hVCV*fdQ_nPlkNc6T2ULNU@+fGJ_FA%;`~44Qyg zC#a-52W3=rS;Hogb!;dsG*DC7C4iVv(-BaaX;}wA)fjvoGV&~;nxZojl&MFE=qfU) zrWzKb#cqt$VvUChRIp`e0AiMC){2ZAuq*_4d-o$PsYc}>c%J{1cEdmD9#C{qyOvu(|C7_h)L#!!GmJbu^>~GfS z>|7Qn77F(8O(VF%dK8XL++FoJ9tJHqDD z8Dmy5z(66E3Zf~*?D}Q@u)0HLhw*2pv+;msqFZ8yjM-%^Lm-Q+u2Zu+7hyG^Y$Y}p zTV2&G$A-;-cjskx*bu1e-7>IKu!*~bFk(QuJ;01WzyPujO9+!haW@RiH(|>$N30VW zS0)&+MF2}h*OvxZ*%@G{vFlN{?ilFZniHmq$@@0xj5gb0$eBynO(m-_Wu&?r-O6_> a!b~v%3>@2F^RWzck+Qum_iu->jsFJ?HxM=e diff --git a/0.83/Installer/Files/rtcw/game/sound/hitsounds/hit.wav b/0.83/Installer/Files/rtcw/game/sound/hitsounds/hit.wav deleted file mode 100644 index deb0ce24099aeeaf0cf467233ba2d3584ced3110..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3349 zcmY*b0gT&b6~2v4Vxp5K7*a*0ic&an5CSI!4x+G(h%784BXUWX$ujeBG4s5dS~Ui1 zo;(X{9-cL?7M_dMY#COxu&g1}!%`L$Es&jd+QC7YR8euNKooVA3Plwf2qE}>=h}^T zy1V?p-v9pZeeZkk4|V4qciepQ($YO&I9TNmD<8aNX=&*?{Cw!(Quce@(z}-q-LKsL z=B}kB)AmpFPQLiU30pdN*PRD={Rbz1`J3OpcG4A_m2$l;YL;WE>=*Oh z;%kGaG_Jb;y}NF@X?Kx(^5=i~+gtxS7vKM}TX((x)Awq};!!&O*^htt_`^rP^^m|H zdf=$x9*B%R*dHaX=eB?G-{r<6I?i0tJ8~^r?=gHwt{ub1Y4kBv~_T&vy-( z=Or`fC&N&#?0L^EdD@+vyK;GZ5-L=2Ww}7<@pN-N?O3X6g@YvN`5IFzu9cg-YUnac zHEG%HPiEtus|viR`@M9&u`x?~zA1BUs@bTP^80r0UM@2Lv9Y;68APtBX}TT25zBsH z>8h$}3g0a3zVZ5-m#c!)pUh|Deqc(xpa;YG*4BI!S&AqKlA_yw=vyjJQ_XsM%)+#O0^ie^XZMA4lHoVSYJe$v_ zX_BOAGU&Lv(5}~NjV9HouH`{4qu4>zjeEU*e?V-M5UP8CE|Jt^)!LyR6jX=;mVZ@n*)ojmn#iM)C@yYB!TBxnrh$zMt0(KHlHT3gK{ylpKNWP zJ3S6nrb#i9VcWVuRZHZgs;LssFuY;~@h};W)6sAU6zQlJ+N#JgG)=eLRJ~kSSmvs>eiA+%dGFKe32HY>$al_JVC zRS7lH>@XgVr_sAP#Iz;#uHrw;Gkg^4`5GWmIb zN;$}Oe}1i8qgcfbd&AKHXcgH&!(901zb~Ij9Ijd@K!TcOqaE7KMje%-i2Ci$XgXh? zjyjgi3#!+jZN0IPMmpbWwmC^9aI58NgBBD`S7lKURTEN3#*=Xh8&A?<$JGR;-KJR% zC2LmKR`xHWIaS;5pvxxnjm^#VY0~dTQPk;lLeG?$I>eC67mB5FwMk2ck7^M`S#~g( zZ(qE8;q=JiYHNiOYUH?q; zXJi8<6=-x?twFVbNWla^+mP-y zWJ$53(R6*5b{&+U&G4cmvQSP9VP#F%30&25gKi(9giR)sbP(C_MJ!Gb1-9M59Lp7I zj0`u>JD#m?Zf(xTgHGW40r(9am94MkmRD9wwI<371g75|jE4Qlcl~a zmsVHHEkQR;P2%WQ6Jj9Fvg!Ad$!s=8Q4LJHARY_{UEfp$j>9Zb72t((s5UDqx@lRq z?fOKP==uR^wNXEERDq!xK~`0nZ`X?XT&`FrVu(7V*+{QVl78elZV<&}G)V2*T0Xa0 ztRgDS@-pUJw?F8|9q`{zrt9moBz7^r2s}xaC6GW72sAIDv>|+nGnvvLpxf;PF2-fQK*F=>z0RE)<^6v zux1wcga}y@1&(RA;0M4+6Je1(nbR3@7M*@LwI$jWlVAi#5%L3pK$M9@ol*=$h!Sg9DEK3f$fq#f%1dIPTXrgYJ z8=3tJ##DpEBElwyka&w-048{m7X~`Rfi4B_p>CK&jF>WS6F@@BxD}8I0&+imbpyiP zkwS*pG7Xcc!-l^G$E&8`l|@+S+%oZ(APKS@K^V^H+CpbpXhGmXgl6Ik0(?l_h>>p< zI8B@}={dqLFDe>hl7Lr9AUSy+;m$-E5J&)EJZ1;7TGZbw{bHJq!M0jAcX;3R$mkX5+_~@2nbHRh-Dvu z7caFSELbHcVT;_5oR={`YDMN+#w3Z0yEEJANGH1#!w)BsWwsR5%^k|#a)>f*}J-2 lq_uN*wz)X*4v%Y@@0_{n@PA=;oUVnvcIaB5tH%~D{{szLdk_Es diff --git a/0.83/Installer/Files/rtcw/game/sound/hitsounds/hitteammate.wav b/0.83/Installer/Files/rtcw/game/sound/hitsounds/hitteammate.wav deleted file mode 100644 index 5360ebc986b3c81dd9a723e7f4b3be7b18f2d626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3646 zcmX9>ZEV_Dy6*n#j_%CtjI^^=XSAKUv!k|Z8?{lJs;!bL376*PLnJpeH$i~-SU`MS zV;KwE!WK5NEo=nHvA_rr1OWmBLRn_j#Z9JTC7>2!&({3>v4SFM3 zV75A8Uyz&6G}jLvJ$d&0*`r5$_cqp-s=0*7kT?Qf@cBuarYVvl{1_3SsDRh)w9JhU zUcLD3??3=@Z9XE%MFlP#Q%dcn#b%?B&E)c>YQ5fE zY_*q~)yhJ?P_DLCH@0@~Z?AV&?yPTg7Au8}l8}TDLt-f6^&(!o#iZ9;Twcgw(&_YO zyDxxw5uXnwNDOv+U;>9dcAZvdvUwo4O+Tf%ZMIqU6DqZOXhbtPKHi;iL0-rg2(qzc zI$JE4YxP>S)?QiL+1=jSTDx;+wcTD>s+UWpVm^~f%*RBI!~la3>UB9iPAB9r>TZt> z4)tF;bNcj|3zvHP)whPnz}7m4%>jAcURqu#mW#PmG9jn4$yhwjQ6V8j0;+vJf{jLF zN}*D3uWhWaEVrB0YGbhqm;hOn5^-8R5Q`xM zfjA8_n!#&VuJ`x$_NzuFbzWMSPZz3{dS`3*-uBkU>T0LcZgv?h6w8%j8eoy6c$6bi z$O$x{o6~AWMn+VFLxVR5ZjR1cJOK{q3}mCV)LQPeYK>}E7HQaK(NB%52M4ZSxjHyH zt+T-x84OUY7>mdmIhik)^3Ao*&Z8$U-oANuxV2Kw$_yQ%5EQm(hE;tR`-ar28PlB2 zhd==VhjB=yId8dmv7!5uGh+O`{?=a zzB@bVa#(E!tIy?fI_w5q={$b*{>7b)#F;fi1J^E3p+Z(Q&W;@4g6x%|g27bm~#xu&`~JYhl5@WOIu>+ml}|NG0+gT3v$%avr9!o84PtG;yZ zT+f+5oc!w4g@Gxn4-G`+WNUeGv9Z2?_~0R6du6p=kkd)j<#u{BSBKAh^Y!u1fBWet z-(R>gFrs%b@t_dpWhuF~QhEO2_21vUeY3Uqpp_4?f~e%0B7{1fW`kky%y|t$h7)mC z-q^X*OlRWhR=btYm$R8Px{;cF}>Sm_Ty+Yv3R&~@9A1+eS4>wlEO4WvM?YFaarsz zPVrKzP+J0Gsug5pYJ3itqC5)I91 zZW~Q=>dQTsrcoaZ&lxc?9>zIV-a5E@Z>?I-M&r!waU0I?ypm;;)f8tPGr%qgCFoGR z)m9>clrJo_JB{V-{r!$2K-w|Y)!s`zBW5SbhGbccPza2mIELcEP!M(5Z4QqY!3c_v z=h9M=^&%lLB82#4q1q_Me0JMZf8Qw}^WRT0nUW;d9{u`{eT5=Ruivhx17u-iEoHv= zCl$=#rfGAizPqsy#+Y0sBa&3SxwDxMLQa=`Zs5z~pZ1M`5}cmIOBo)rLS(w$Dkn+@ zKObzC16G^YF#%8-_@u-IVN6I!42-0=_79)zFV&apQI}S&nwT+LO;$L-@+4w2K?I*j zWs0r!wMLq@O{uP5`u@Zp&-G8c2!@X&3a$Guom~yRQpwT`t-SPKKtyHHnI8a{+;#vFW$XBT&=Zse|*r9 zsSs|N?farz@n4?o85ncO`~Usw@!sa655K%VXsx~e>+1(q7V%id&-@l_^!3^PYd0oc zLStin>&4%|$BvHv^6vH1rhnv2cZcry;qPljla9j7|2PJ9qhdf8WKc<2D3!+dL@Ageb`2 z3reMCJy%&?T`Mt;nK7+Nr|KUuU{XGlPURc5g%s}t#}!S&9)FOR5;6}fck9Mg*Uy|dak@{XwZcJV_29|gaue*_%0w}Wk0}9%eoj9(YtT`-sUObtYpg#!R|&QDRRIH_+7@^pq6cB!|jPFz158inWfF$!yor{AM9^b zB^+#PLQNSG=X6lIF5yQGGD1LHcP1p{V@XWvL{ym=Ezn zF4Jwj2O~k>bh>aME+sSha=qE8mGj9MPoW5k!Vu)L+C7lV?SUY_pyUh1Y6G0)$q4QD zdOS9x#p!l=AP?k4DJCS!>0-0JSk9(X5fXOjwKKE8Xc^3A{q*SYK>y7#gNID4{P^MM z=zrcl-fgFYE`w%dLOVOFvjR(l;TT5HQP9{HS5`YKOJ$jI>Bfhy^_>1wk7^baCmqc+ zcOO06SzBGM6>>5QU^^YAIql@+^vu-6w9yj~lwxD)&b@;No6F65DW3t_N=Q+G!Q2)- za5FamNh4aL(~Gf^q9l|oFb;)WA};c@AF_3=qsw8p!*o2Ah=gcfQj*aS%|_&;90!I| zin2K3!w3RJy2cPEaK9g?7?u|!k!Um`3T!X{8lTtga@wsHtHbGXL*A|(jL8WZP+Ke& z3%N`>olZtsiU2;&4%{jPcWoU`pl%?f_cqrE zjA1yA=V-svs57}hpA7=W^W|!_pv0rmuKNm*WRPV8up5HC9=8`IKrJaLMakrIDJ3}{ zjY%;OYyd-jki%@$>rHl-2gVtW=fk29B2Y3c@M2t~s7N}eNIc=Ecs_{1PM|;Vh7BUw zAWpJj5l|Bghohk3Gc-dHIB>0Qo7L%dTFo|x!|p`<2;vWh7@7s`p656gSav|6oXX}w z5ohuX={T6+!U9L(ehdRz1m+yH3MRyb!)(y+@!-HA27`VdlgMQfF)qXbd_f$BK)dp~ z+$b5u!I{Lck@>j5a*=q1XL&vZyn2wP0)YU5p?;7H1VR0%pCCyp$nsnW3>r9jAblWM z#D`)8Nq4^}MkFPj&SZ1BY&sE-guyj~zyK@^JaB>ltOgmDu?P>Y8Gt&- z;{oLbrhNc4362;b1ONy4atV+G_yzmp-Q0peXqo|o<->v~gn2MH1~es-1k%GkV)+OL zpy|dp(qN#0xl(>5rJi0s4$Ftj34x)m?S3wTxA|C0BAvD0IBE>#0Ty?6vKrh zaY>fv<57VHQ2Yqwc6$I;5EF9J7posd(U0r~0u 0) { + crucialClass = null; + } + // see which one needs a bot the most if ( numFree > evalNum ) { evalNum = numFree; newRole = id; - - if ( currentBots == 0 ) { - newClass = role.crucialClass; - } else { - newClass = null; - } + newClass = crucialClass; spawnPoint = role.spawnpt; voiceMacro = role.voice; } From bda15f185184ba4ae34e9e83709d88a2394c46d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Mon, 24 Jun 2024 18:19:03 +0200 Subject: [PATCH 13/22] fixed GetMapGoals null expr parameter --- 0.83/Omnibot/Common/gmBotLibrary.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0.83/Omnibot/Common/gmBotLibrary.cpp b/0.83/Omnibot/Common/gmBotLibrary.cpp index c48463c89..ec1ff6ff5 100644 --- a/0.83/Omnibot/Common/gmBotLibrary.cpp +++ b/0.83/Omnibot/Common/gmBotLibrary.cpp @@ -581,6 +581,8 @@ int GM_CDECL GetMapGoals(gmThread *a_thread, Client *client) } } break; + case GM_NULL: + break; default: GM_EXCEPTION_MSG("expecting param %d as string or int or table, got %s", p, GM_THREAD_ARG->ParamTypeName(p)); return GM_EXCEPTION; From 57c2ea9ff3b393a408880f6c079f102b483d272c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Sun, 7 Jul 2024 11:59:44 +0200 Subject: [PATCH 14/22] et: optimized command entitylist --- 0.83/GameInterfaces/ET/src/game/g_svcmds.c | 47 +++++++++++++++++----- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/game/g_svcmds.c b/0.83/GameInterfaces/ET/src/game/g_svcmds.c index 8a997043b..1885ebb17 100644 --- a/0.83/GameInterfaces/ET/src/game/g_svcmds.c +++ b/0.83/GameInterfaces/ET/src/game/g_svcmds.c @@ -544,16 +544,43 @@ void ClearMaxLivesBans () Svcmd_EntityList_f =================== */ -void Svcmd_EntityList_f (void) { + +void Appendf( char **dest, int *size, const char *fmt, ... ) +{ + va_list argptr; + int ret; + + va_start (argptr, fmt); + if(*size>0) + { + ret = Q_vsnprintf(*dest, *size, fmt, argptr); + if(ret<0) { + *dest += *size - 1; + *size = 0; + } + else { + *size -= ret; + *dest += ret; + } + } + va_end (argptr); +} + +void Svcmd_EntityList_f() { int e; gentity_t *check; + char *dest; + int size; + char buf[256]; check = g_entities+1; for (e = 1; e < level.num_entities ; e++, check++) { if ( !check->inuse ) { continue; } - G_Printf("%3i:", e); + dest = buf; + size = sizeof(buf)-1; + Appendf(&dest, &size, "%3i:", e); static char *typeName[] = {"ET_GENERAL", "ET_PLAYER", "ET_ITEM", "ET_MISSILE", "ET_MOVER", "ET_BEAM", "ET_PORTAL", "ET_SPEAKER", "ET_PUSH_TRIGGER", "ET_TELEPORT_TRIGGER", "ET_INVISIBLE", "ET_CONCUSSIVE_TRIGGER", "ET_OID_TRIGGER", "ET_EXPLOSIVE_INDICATOR", "ET_EXPLOSIVE", "ET_EF_SPOTLIGHT", "ET_ALARMBOX", "ET_CORONA", "ET_TRAP", "ET_GAMEMODEL", @@ -562,23 +589,25 @@ void Svcmd_EntityList_f (void) { "ET_BOTGOAL_INDICATOR", "ET_CORPSE", "ET_SMOKER", "ET_TEMPHEAD", "ET_MG42_BARREL", "ET_TEMPLEGS", "ET_TRIGGER_MULTIPLE", "ET_TRIGGER_FLAGONLY", "ET_TRIGGER_FLAGONLY_MULTIPLE", "ET_GAMEMANAGER", "ET_AAGUN", "ET_CABINET_H", "ET_CABINET_A", "ET_HEALER", "ET_SUPPLIER", "ET_LANDMINE_HINT", "ET_ATTRACTOR_HINT", "ET_SNIPER_HINT", "ET_LANDMINESPOT_HINT", "ET_COMMANDMAP_MARKER", "ET_WOLF_OBJECTIVE", "ET_EVENTS"}; - if(check->s.eType >= ET_GENERAL && check->s.eType <= ET_EVENTS) - G_Printf("%-19s ", typeName[check->s.eType]); + if (check->s.eType >= ET_GENERAL && check->s.eType <= ET_EVENTS) + Appendf(&dest, &size, "%-19s ", typeName[check->s.eType]); else - G_Printf("%3i ", check->s.eType); + Appendf(&dest, &size, "%-20i", check->s.eType); if ( check->classname ) { - G_Printf("%s ", check->classname); + Appendf(&dest, &size, "%s ", check->classname); } if ( check->scriptName ) { - G_Printf("^3(script: %s)^7 ", check->scriptName); + Appendf(&dest, &size, "^3(script: %s)^7 ", check->scriptName); } if ( check->targetname ) { - G_Printf("^3(target: %s)^7", check->targetname); + Appendf(&dest, &size, "^3(target: %s)^7", check->targetname); } - G_Printf("\n"); + *dest++ = '\n'; + *dest = 0; + trap_Printf(buf); } } From 961709d46e88e5ee01a332f65cbad18313c20770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Mon, 8 Jul 2024 08:39:20 +0200 Subject: [PATCH 15/22] SetAvailableMapGoals parameter can be a table of tables --- 0.83/Omnibot/Common/gmBotLibrary.cpp | 38 ++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/0.83/Omnibot/Common/gmBotLibrary.cpp b/0.83/Omnibot/Common/gmBotLibrary.cpp index ec1ff6ff5..f5480e1f9 100644 --- a/0.83/Omnibot/Common/gmBotLibrary.cpp +++ b/0.83/Omnibot/Common/gmBotLibrary.cpp @@ -676,6 +676,31 @@ static int SetAvailableMapGoals(gmThread *a_thread, int team, bool available, co return n; } +static int SetAvailableTable(gmThread *a_thread, int team, bool available, gmTableObject* tbl, int ignoreErrors) +{ + int n = 0; + int i; + gmTableIterator tIt; + for(gmTableNode *pNode = tbl->GetFirst(tIt); pNode; pNode = tbl->GetNext(tIt)) + { + switch(pNode->m_value.m_type) + { + case GM_STRING: + n += SetAvailableMapGoals(a_thread, team, available, pNode->m_value.GetCStringSafe(0), ignoreErrors); + break; + case GM_TABLE: + i = SetAvailableTable(a_thread, team, available, pNode->m_value.GetTableObjectSafe(), ignoreErrors); + if(i < 0) return i; + n += i; + break; + default: + GM_EXCEPTION_MSG("expecting table of strings, got %s", a_thread->GetMachine()->GetTypeName(pNode->m_value.m_type)); + return -1; + } + } + return n; +} + // function: SetAvailableMapGoals // This function enables/disables map goals // @@ -704,17 +729,8 @@ static int GM_CDECL gmfSetAvailableMapGoals(gmThread *a_thread) } else if(a_thread->ParamType(2)==GM_TABLE) { - gmTableObject* tbl = a_thread->ParamTable(2); - gmTableIterator tIt; - for(gmTableNode *pNode = tbl->GetFirst(tIt); pNode; pNode = tbl->GetNext(tIt)) - { - if(!pNode->m_value.IsString()) - { - GM_EXCEPTION_MSG("expecting param 2 as table of string, got %s", a_thread->GetMachine()->GetTypeName(pNode->m_value.m_type)); - return GM_EXCEPTION; - } - size += SetAvailableMapGoals(a_thread, team, enable != 0, pNode->m_value.GetCStringSafe(0), ignoreErrors); - } + size = SetAvailableTable(a_thread, team, enable != 0, a_thread->ParamTable(2), ignoreErrors); + if(size < 0) return GM_EXCEPTION; } else { From d4c2730c170e596ed37ae333e9a5b3092aae0b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Thu, 11 Jul 2024 09:15:34 +0200 Subject: [PATCH 16/22] SetGoalPriority, SetGoalGroup, SetGoalRole, ClearGoalRole, SetMapGoalProperties parameter can be a table of goal expressions --- 0.83/Omnibot/Common/GoalManager.cpp | 34 ++++ 0.83/Omnibot/Common/GoalManager.h | 1 + 0.83/Omnibot/Common/gmBotLibrary.cpp | 147 ++++++------------ 0.83/Omnibot/projects/msvc12/Common/Common.rc | 8 +- 4 files changed, 84 insertions(+), 106 deletions(-) diff --git a/0.83/Omnibot/Common/GoalManager.cpp b/0.83/Omnibot/Common/GoalManager.cpp index 858c28d24..4372cc8cb 100644 --- a/0.83/Omnibot/Common/GoalManager.cpp +++ b/0.83/Omnibot/Common/GoalManager.cpp @@ -8,6 +8,7 @@ #include "MapGoalDatabase.h" #include "physfs.h" #include "gmUtilityLib.h" +#include "gmBotLibrary.h" ////////////////////////////////////////////////////////////////////////// @@ -1835,3 +1836,36 @@ int GoalManager::Iterate(const char* expression, std::function a } return n; } + +int GoalManager::Iterate(gmThread *a_thread, gmVariable &expression, const char *function, bool ignoreErrors, std::function action) +{ + gmTableIterator tIt; + gmTableObject *tbl; + const char *expr; + int n; + + switch(expression.m_type) + { + case GM_STRING: + expr = ((gmStringObject *)expression.m_value.m_ref)->GetString(); + n = Iterate(expr, action); + if(n==0 && !ignoreErrors) + MapDebugPrint(a_thread, va("%s: goal query for %s has no results", function, expr)); + break; + case GM_TABLE: + tbl = (gmTableObject *)expression.m_value.m_ref; + n = 0; + for(gmTableNode *pNode = tbl->GetFirst(tIt); pNode; pNode = tbl->GetNext(tIt)) + { + int i = Iterate(a_thread, pNode->m_value, function, ignoreErrors, action); + if(i < 0) return i; + n += i; + } + break; + default: + GM_EXCEPTION_MSG("expecting goal expression or table of goal expressions, got %s", + a_thread->GetMachine()->GetTypeName(expression.m_type)); + return -1; + } + return n; +} diff --git a/0.83/Omnibot/Common/GoalManager.h b/0.83/Omnibot/Common/GoalManager.h index b8c548c98..647ea287d 100644 --- a/0.83/Omnibot/Common/GoalManager.h +++ b/0.83/Omnibot/Common/GoalManager.h @@ -131,6 +131,7 @@ class GoalManager : public CommandReciever void GetGoals(Query &_qry); int Iterate(const char *expression, std::function action); + int Iterate(gmThread *a_thread, gmVariable &expression, const char *function, bool ignoreErrors, std::function action); MapGoalPtr GetGoal(const String &_goalname); MapGoalPtr GetGoal(int _serialNum); diff --git a/0.83/Omnibot/Common/gmBotLibrary.cpp b/0.83/Omnibot/Common/gmBotLibrary.cpp index f5480e1f9..6113ab19d 100644 --- a/0.83/Omnibot/Common/gmBotLibrary.cpp +++ b/0.83/Omnibot/Common/gmBotLibrary.cpp @@ -637,14 +637,16 @@ int GM_CDECL GetMapGoals(gmThread *a_thread, Client *client) // none static int GM_CDECL gmfSetMapGoalProperties(gmThread *a_thread) { - GM_CHECK_STRING_PARAM(expr,0); + GM_CHECK_NUM_PARAMS(2); GM_CHECK_TABLE_PARAM(props,1); - if(!GoalManager::GetInstance()->Iterate(expr, [=](MapGoal *g) { g->FromScriptTable(a_thread->GetMachine(),props,false); })) - MapDebugPrint(a_thread, va("SetMapGoalProperties: goal query for %s has no results", expr)); - return GM_OK; + int n = GoalManager::GetInstance()->Iterate(a_thread, a_thread->Param(0), "SetMapGoalProperties", false, [=](MapGoal *g) + { g->FromScriptTable(a_thread->GetMachine(), props, false); }); + return n < 0 ? GM_EXCEPTION : GM_OK; } +// function: MapDebugPrint +// Prints debug message to the console. static void MapDebugPrint(gmMachine *a_machine, int threadId, const char *message) { gmCall call; @@ -668,76 +670,35 @@ void MapDebugPrint(const char *message) MapDebugPrint(ScriptManager::GetInstance()->GetMachine(), 0, message); } -static int SetAvailableMapGoals(gmThread *a_thread, int team, bool available, const char* expr, int ignoreErrors) -{ - int n = GoalManager::GetInstance()->Iterate(expr, [=](MapGoal *g) { g->SetAvailable(team, available); }); - if(n==0 && !ignoreErrors) - MapDebugPrint(a_thread, va("SetAvailableMapGoals: goal query for %s has no results", expr)); - return n; -} - -static int SetAvailableTable(gmThread *a_thread, int team, bool available, gmTableObject* tbl, int ignoreErrors) -{ - int n = 0; - int i; - gmTableIterator tIt; - for(gmTableNode *pNode = tbl->GetFirst(tIt); pNode; pNode = tbl->GetNext(tIt)) - { - switch(pNode->m_value.m_type) - { - case GM_STRING: - n += SetAvailableMapGoals(a_thread, team, available, pNode->m_value.GetCStringSafe(0), ignoreErrors); - break; - case GM_TABLE: - i = SetAvailableTable(a_thread, team, available, pNode->m_value.GetTableObjectSafe(), ignoreErrors); - if(i < 0) return i; - n += i; - break; - default: - GM_EXCEPTION_MSG("expecting table of strings, got %s", a_thread->GetMachine()->GetTypeName(pNode->m_value.m_type)); - return -1; - } - } - return n; -} - // function: SetAvailableMapGoals // This function enables/disables map goals // // Parameters: // // int - The team the goal should be for. 0 means any team. See global team table. -// int - True to enable, false to disable. +// int - true to enable, false to disable. // string or table - OPTIONAL - The expression to use to match the goal names. +// int - OPTIONAL - true to ignore errors, false to print debug message if the goal does not exist // // Returns: // int - count of goals static int GM_CDECL gmfSetAvailableMapGoals(gmThread *a_thread) { + GM_CHECK_NUM_PARAMS(2); GM_CHECK_INT_PARAM(team, 0); GM_CHECK_INT_PARAM(enable, 1); + bool available = enable != 0; GM_INT_PARAM(ignoreErrors, 3, 0); - int size = 0; + auto action = [=](MapGoal *g) { g->SetAvailable(team, available); }; + int n; if(a_thread->GetNumParams() < 3) - { - size = SetAvailableMapGoals(a_thread, team, enable != 0, 0, 0); - } - else if(a_thread->ParamType(2)==GM_STRING) - { - size = SetAvailableMapGoals(a_thread, team, enable != 0, a_thread->ParamString(2), ignoreErrors); - } - else if(a_thread->ParamType(2)==GM_TABLE) - { - size = SetAvailableTable(a_thread, team, enable != 0, a_thread->ParamTable(2), ignoreErrors); - if(size < 0) return GM_EXCEPTION; - } + n = GoalManager::GetInstance()->Iterate("", action); else - { - MapDebugPrint(a_thread, "SetAvailableMapGoals: Parameter 3 must be a string or table"); - } + n = GoalManager::GetInstance()->Iterate(a_thread, a_thread->Param(2), "SetAvailableMapGoals", ignoreErrors!=0, action); - a_thread->PushInt(size); + if(n < 0) return GM_EXCEPTION; + a_thread->PushInt(n); return GM_OK; } @@ -755,31 +716,34 @@ static int GM_CDECL gmfSetAvailableMapGoals(gmThread *a_thread) // // Returns: // none -static int GM_CDECL gmfSetGoalPriorityForTeamClass(gmThread *a_thread) +static int GM_CDECL gmfSetGoalPriority(gmThread *a_thread) { GM_CHECK_NUM_PARAMS(2); - GM_CHECK_STRING_PARAM(exp,0); GM_CHECK_FLOAT_OR_INT_PARAM(priority,1); GM_INT_PARAM(teamId,2,0); GM_INT_PARAM(classId,3,0); GM_INT_PARAM(persis,4,0); - if(!GoalManager::GetInstance()->Iterate(exp, [=](MapGoal *g) { g->SetPriorityForClass(teamId, classId, priority); }) && !persis) - MapDebugPrint(a_thread, va("SetGoalPriority: goal query for %s has no results", exp)); + if(GoalManager::GetInstance()->Iterate(a_thread, a_thread->Param(0), "SetGoalPriority", persis!=0, + [=](MapGoal *g) { g->SetPriorityForClass(teamId, classId, priority); }) < 0) + return GM_EXCEPTION; - if(persis) MapGoal::SetPersistentPriorityForClass(exp,teamId,classId,priority); + if(persis) + { + GM_CHECK_STRING_PARAM(exp,0); + MapGoal::SetPersistentPriorityForClass(exp, teamId, classId, priority); + } return GM_OK; } static int GM_CDECL SetOrClearGoalRole(gmThread *a_thread, bool enable) { GM_CHECK_NUM_PARAMS(2); - GM_CHECK_STRING_PARAM(exp, 0); - int persis = 0; + bool persist = false; if(enable){ - GM_INT_PARAM(persis0, 2, 0); - persis=persis0; + GM_INT_PARAM(persist0, 2, 0); + persist = persist0!=0; } obint32 roleInt = 0; @@ -809,13 +773,19 @@ static int GM_CDECL SetOrClearGoalRole(gmThread *a_thread, bool enable) } BitFlag32 role(roleInt); - if(!GoalManager::GetInstance()->Iterate(exp, [=](MapGoal *g){ + if(GoalManager::GetInstance()->Iterate(a_thread, a_thread->Param(0), enable ? "SetGoalRole" : "ClearGoalRole", persist, + [=](MapGoal *g) + { BitFlag32 oldRole = g->GetRoleMask(); g->SetRoleMask(enable ? (oldRole | role) : (oldRole & ~role)); - }) && !persis) - MapDebugPrint(a_thread, va("%s: goal query for %s has no results", enable ? "SetGoalRole" : "ClearGoalRole", exp)); + }) < 0) + return GM_EXCEPTION; - if(persis) MapGoal::SetPersistentRole(exp, role); + if(persist) + { + GM_CHECK_STRING_PARAM(exp, 0); + MapGoal::SetPersistentRole(exp, role); + } return GM_OK; } @@ -856,7 +826,7 @@ static int GM_CDECL gmfClearGoalRole(gmThread *a_thread) // // Parameters: // -// string - The group expression to use to match the goal names. -OR- indexed string table of goal expressions +// string - The group expression to use to match the goal names. -OR- string table of goal expressions // string - The group name to use. // // Returns: @@ -866,36 +836,9 @@ static int GM_CDECL gmfSetGoalGroup(gmThread *a_thread) GM_CHECK_NUM_PARAMS(2); GM_CHECK_STRING_PARAM(group,1); - if(a_thread->ParamType(0)==GM_TABLE) - { - GM_TABLE_PARAM(tbl,0,0); - if(tbl) - { - gmTableIterator tIt; - gmTableNode *pNode = tbl->GetFirst(tIt); - while(pNode) - { - const char *pGoalName = pNode->m_value.GetCStringSafe(0); - MapGoalPtr mg = pGoalName ? GoalManager::GetInstance()->GetGoal(pGoalName) : MapGoalPtr(); - if(mg) - { - mg->SetGroupName(group); - } - pNode = tbl->GetNext(tIt); - } - } - } - else if(a_thread->ParamType(0)==GM_STRING) - { - GM_STRING_PARAM(exp,0,0); - GoalManager::GetInstance()->Iterate(exp, [=](MapGoal *g){ g->SetGroupName(group); }); - } - else - { - GM_EXCEPTION_MSG("expected param 0 as table or string"); - return GM_EXCEPTION; - } - return GM_OK; + int n = GoalManager::GetInstance()->Iterate(a_thread, a_thread->Param(0), "SetGoalGroup", false, + [=](MapGoal *g){ g->SetGroupName(group); }); + return n < 0 ? GM_EXCEPTION : GM_OK; } ////////////////////////////////////////////////////////////////////////// @@ -2939,10 +2882,10 @@ static gmFunctionEntry s_botLib[] = {"SetMapGoalProperties", gmfSetMapGoalProperties}, {"SetAvailableMapGoals", gmfSetAvailableMapGoals}, - {"SetGoalPriority", gmfSetGoalPriorityForTeamClass}, + {"SetGoalPriority", gmfSetGoalPriority}, {"SetGoalGroup", gmfSetGoalGroup}, - {"SetGoalRole", gmfSetGoalRole}, - {"ClearGoalRole", gmfClearGoalRole}, + {"SetGoalRole", gmfSetGoalRole}, + {"ClearGoalRole", gmfClearGoalRole}, {"CreateMapGoal", gmfCreateMapGoal}, diff --git a/0.83/Omnibot/projects/msvc12/Common/Common.rc b/0.83/Omnibot/projects/msvc12/Common/Common.rc index 6e22e7e6d..96528c9da 100644 --- a/0.83/Omnibot/projects/msvc12/Common/Common.rc +++ b/0.83/Omnibot/projects/msvc12/Common/Common.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 9, 1, 0 -PRODUCTVERSION 0, 9, 1, 0 +FILEVERSION 0, 9, 1, 2 +PRODUCTVERSION 0, 9, 1, 2 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Omni-bot" - VALUE "FileVersion", "0.9.1.0" + VALUE "FileVersion", "0.9.1.2" VALUE "InternalName", "Omni-bot" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "omnibot.dll" VALUE "ProductName", "Omni-bot" - VALUE "ProductVersion", "0.9.1.0" + VALUE "ProductVersion", "0.9.1.2" END END BLOCK "VarFileInfo" From d97c351b06fca153b34452335ef1930bc3298063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Thu, 11 Jul 2024 10:24:06 +0200 Subject: [PATCH 17/22] MapGoal.SetRoles parameter can be a table of roles --- 0.83/Omnibot/Common/MapGoal.cpp | 47 +++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/0.83/Omnibot/Common/MapGoal.cpp b/0.83/Omnibot/Common/MapGoal.cpp index e6c3b3079..934d05777 100644 --- a/0.83/Omnibot/Common/MapGoal.cpp +++ b/0.83/Omnibot/Common/MapGoal.cpp @@ -2147,7 +2147,7 @@ static int gmfGetPriorityForClient(gmThread *a_thread) return GM_OK; } -static int gmfSetRoles(gmThread *a_thread) +static int gmfSetOrClearRoles(gmThread *a_thread, bool enable) { MapGoal *NativePtr = 0; if(!gmBind2::Class::FromThis(a_thread,NativePtr) || !NativePtr) @@ -2161,32 +2161,39 @@ static int gmfSetRoles(gmThread *a_thread) BitFlag32 rolemask = NativePtr->GetRoleMask(); // cs: preserve current mask for(int p = 0; p < a_thread->GetNumParams(); ++p) { - GM_CHECK_INT_PARAM(r,p); - rolemask.SetFlag(r,true); + gmTableObject *tbl = a_thread->ParamTable(p); + if(tbl) + { + gmTableIterator tIt; + for(gmTableNode *pNode = tbl->GetFirst(tIt); pNode; pNode = tbl->GetNext(tIt)) + { + int r; + if(!pNode->m_value.GetInt(r, 0)) + { + GM_EXCEPTION_MSG("expecting param %d as int or table of int, got %s", p, a_thread->GetMachine()->GetTypeName(pNode->m_value.m_type)); + return GM_EXCEPTION; + } + rolemask.SetFlag(r,enable); + } + } + else + { + GM_CHECK_INT_PARAM(r,p); + rolemask.SetFlag(r,enable); + } } NativePtr->SetRoleMask(rolemask); return GM_OK; } -static int gmfClearRoles(gmThread *a_thread) +static int gmfSetRoles(gmThread *a_thread) { - MapGoal *NativePtr = 0; - if(!gmBind2::Class::FromThis(a_thread,NativePtr) || !NativePtr) - { - GM_EXCEPTION_MSG("Script Function on NULL MapGoal"); - return GM_EXCEPTION; - } - - GM_CHECK_NUM_PARAMS(1); + return gmfSetOrClearRoles(a_thread, true); +} - BitFlag32 rolemask = NativePtr->GetRoleMask(); // cs: preserve current mask - for(int p = 0; p < a_thread->GetNumParams(); ++p) - { - GM_CHECK_INT_PARAM(r,p); - rolemask.SetFlag(r,false); - } - NativePtr->SetRoleMask(rolemask); - return GM_OK; +static int gmfClearRoles(gmThread *a_thread) +{ + return gmfSetOrClearRoles(a_thread, false); } static int gmfHasRole(gmThread *a_thread) From 98bed2d7db3533c54356086a015eddbf411adc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Thu, 11 Jul 2024 15:35:47 +0200 Subject: [PATCH 18/22] Bot.HasRole() returns true if the bot has any role --- 0.83/Omnibot/Common/gmBot.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/0.83/Omnibot/Common/gmBot.cpp b/0.83/Omnibot/Common/gmBot.cpp index 310c39d4d..22de07e54 100644 --- a/0.83/Omnibot/Common/gmBot.cpp +++ b/0.83/Omnibot/Common/gmBot.cpp @@ -2104,18 +2104,25 @@ int gmBot::gmfClearRoles(gmThread *a_thread) int gmBot::gmfHasRole(gmThread *a_thread) { CHECK_THIS_BOT(); - GM_CHECK_NUM_PARAMS(1); - for(int i = 0; i < a_thread->GetNumParams(); ++i) + int result = 0; + if(a_thread->GetNumParams() == 0) { - GM_CHECK_INT_PARAM(n, i); - if(native->GetRoleMask().CheckFlag(n)) + result = native->GetRoleMask().AnyFlagSet(); + } + else + { + for(int i = 0; i < a_thread->GetNumParams(); ++i) { - a_thread->PushInt(1); - return GM_OK; + GM_CHECK_INT_PARAM(n, i); + if(native->GetRoleMask().CheckFlag(n)) + { + result = 1; + break; + } } } - a_thread->PushInt(0); + a_thread->PushInt(result); return GM_OK; } From 8c8b4b4668079ea153965b6ffdab8765fa451a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Sat, 13 Jul 2024 12:56:15 +0200 Subject: [PATCH 19/22] Bot.IgnoreTarget parameter can be a goal name or a table of goal names and the second parameter is optional, removed Bot.IgnoreTargetForTime --- 0.83/Omnibot/Common/MemoryRecord.cpp | 1 - 0.83/Omnibot/Common/MemoryRecord.h | 9 +--- 0.83/Omnibot/Common/gmBot.cpp | 80 ++++++++++++++-------------- 0.83/Omnibot/Common/gmBot.h | 1 - 4 files changed, 41 insertions(+), 50 deletions(-) diff --git a/0.83/Omnibot/Common/MemoryRecord.cpp b/0.83/Omnibot/Common/MemoryRecord.cpp index 380025a3b..39d042a4a 100644 --- a/0.83/Omnibot/Common/MemoryRecord.cpp +++ b/0.83/Omnibot/Common/MemoryRecord.cpp @@ -27,6 +27,5 @@ void MemoryRecord::Reset(GameEntity _ent) m_InFOV = false; m_IsAllied = false; m_IsShootable = false; - m_IgnoreAsTarget = false; m_Serial++; } diff --git a/0.83/Omnibot/Common/MemoryRecord.h b/0.83/Omnibot/Common/MemoryRecord.h index 56cc8d136..f06b2fd6e 100644 --- a/0.83/Omnibot/Common/MemoryRecord.h +++ b/0.83/Omnibot/Common/MemoryRecord.h @@ -22,11 +22,10 @@ class MemoryRecord inline int GetTimeTargetHasBeenVisible() const { return IsInFOV() ? IGame::GetTime() - GetTimeBecameVisible() : 0; } inline int GetTimeHasBeenOutOfView() const { return IGame::GetTime() - GetTimeLastVisible(); } + inline int GetIgnoreTargetTime() const { return m_IgnoreForTargeting; } - - inline void IgnoreAsTarget(bool _ignore) { m_IgnoreAsTarget = _ignore; } inline void IgnoreAsTargetForTime(int _milliseconds) { m_IgnoreForTargeting = IGame::GetTime() + _milliseconds; } - inline bool ShouldIgnore() const { return m_IgnoreAsTarget || m_IgnoreForTargeting > IGame::GetTime(); } + inline bool ShouldIgnore() const { return m_IgnoreForTargeting > IGame::GetTime(); } inline const Vector3f &GetLastSensedPosition() const { return m_TargetInfo.m_LastPosition; } inline const Vector3f &GetLastSensedVelocity() const { return m_TargetInfo.m_LastVelocity; } @@ -86,10 +85,6 @@ class MemoryRecord // bool: m_IsAllied // Marks whether this entity is an ally of this bot. bool m_IsAllied : 1; - - // bool: m_IgnoreAsTarget - // Ignore this entity as a valid target. - bool m_IgnoreAsTarget : 1; }; class RecordHandle diff --git a/0.83/Omnibot/Common/gmBot.cpp b/0.83/Omnibot/Common/gmBot.cpp index 22de07e54..5baa80765 100644 --- a/0.83/Omnibot/Common/gmBot.cpp +++ b/0.83/Omnibot/Common/gmBot.cpp @@ -54,8 +54,7 @@ GMBIND_FUNCTION_MAP_BEGIN(gmBot) GMBIND_FUNCTION( "ForceTarget", gmfForceTarget ) GMBIND_FUNCTION( "GetLastTarget", gmfGetLastTarget ) GMBIND_FUNCTION( "GetTargetInfo", gmfGetTargetInfo ) - GMBIND_FUNCTION( "IgnoreTargetForTime", gmfIgnoreTargetForTime ) - GMBIND_FUNCTION( "IgnoreTarget", gmfIgnoreTargetForTime /*gmfIgnoreTarget*/ ) + GMBIND_FUNCTION( "IgnoreTarget", gmfIgnoreTarget ) GMBIND_FUNCTION( "GetWeapon", gmfGetWeapon ) GMBIND_FUNCTION( "GetHighLevelGoalName", gmfGetHighLevelGoalName ) GMBIND_FUNCTION( "GetMapGoalName", gmfGetMapGoalName ) @@ -841,42 +840,17 @@ int gmBot::gmfGetTargetInfo(gmThread *a_thread) return GM_OK; } -// function: IgnoreTargetForTime -// This function causes the bot to ignore a specific entity for targeting for some duration of time. -// -// Parameters: -// -// - The entity to use -// - OR - -// - The gameId for the entity to use -// float/int - The number of seconds to ignore target -// -// Returns: -// none -int gmBot::gmfIgnoreTargetForTime(gmThread *a_thread) -{ - CHECK_THIS_BOT(); - GM_CHECK_NUM_PARAMS(2); - GameEntity gameEnt; - GM_CHECK_GAMEENTITY_FROM_PARAM(gameEnt, 0); - OBASSERT(gameEnt.IsValid(), "Bad Entity"); - GM_CHECK_FLOAT_OR_INT_PARAM(ignoreTime, 1); - - MemoryRecord *pRecord = native->GetSensoryMemory()->GetMemoryRecord(gameEnt, true); - if(pRecord) - pRecord->IgnoreAsTargetForTime(Utils::SecondsToMilliseconds(ignoreTime)); - return GM_OK; -} - // function: IgnoreTarget // This function causes the bot to ignore a specific entity for targeting for some duration of time. // // Parameters: // -// - The entity to use +// - The entity // - OR - -// - The gameId for the entity to use -// - - OPTIONAL - true to ignore, false to disable ignore. default true. +// - The gameId for the entity +// - OR - +// or - goals names (MOVER_) +// float/int - OPTIONAL - The number of seconds to ignore target // // Returns: // none @@ -884,15 +858,39 @@ int gmBot::gmfIgnoreTarget(gmThread *a_thread) { CHECK_THIS_BOT(); GM_CHECK_NUM_PARAMS(1); - GameEntity gameEnt; - GM_CHECK_GAMEENTITY_FROM_PARAM(gameEnt, 0); - OBASSERT(gameEnt.IsValid(), "Bad Entity"); - GM_INT_PARAM(ignoreTarget, 1, 1); + GM_FLOAT_OR_INT_PARAM(ignoreTime, 1, 99999); + int ignoreMilliseconds = Utils::SecondsToMilliseconds(ignoreTime); - MemoryRecord *pRecord = native->GetSensoryMemory()->GetMemoryRecord(gameEnt, true); - if(pRecord) - pRecord->IgnoreAsTarget(ignoreTarget != 0); - return GM_OK; + SensoryMemory *sensoryMemory = native->GetSensoryMemory(); + + switch(a_thread->ParamType(0)) + { + case GM_ENTITY: + case GM_INT: + { + GameEntity ent; + GM_GAMEENTITY_FROM_PARAM(ent, 0, GameEntity()); + MemoryRecord *pRecord = sensoryMemory->GetMemoryRecord(ent, true); + if(pRecord) pRecord->IgnoreAsTargetForTime(ignoreMilliseconds); + return GM_OK; + } + case GM_STRING: + case GM_TABLE: + { + int n = GoalManager::GetInstance()->Iterate(a_thread, a_thread->Param(0), "IgnoreTarget", false, [=](MapGoal *g) { + GameEntity ent = g->GetEntity(); + if(ent.IsValid()) + { + MemoryRecord *pRecord = sensoryMemory->GetMemoryRecord(ent, true); + if(pRecord) pRecord->IgnoreAsTargetForTime(ignoreMilliseconds); + } + }); + return n < 0 ? GM_EXCEPTION : GM_OK; + } + default: + GM_EXCEPTION_MSG("expecting param 0 gameentity or int or string or table of strings. got %s", a_thread->GetMachine()->GetTypeName(a_thread->ParamType(0))); + return GM_EXCEPTION; + } } // function: GetWeapon @@ -1948,7 +1946,7 @@ int gmBot::gmfIsWeaponCharged(gmThread *a_thread) // string - filename to dump to // // Returns: -// int - bot version number +// None int gmBot::gmfDumpBotTable(gmThread *a_thread) { CHECK_THIS_BOT(); diff --git a/0.83/Omnibot/Common/gmBot.h b/0.83/Omnibot/Common/gmBot.h index d462a060d..5b416108f 100644 --- a/0.83/Omnibot/Common/gmBot.h +++ b/0.83/Omnibot/Common/gmBot.h @@ -32,7 +32,6 @@ class gmBot : public gmBind static int gmfGetLastTarget(gmThread *a_thread); static int gmfForceTarget(gmThread *a_thread); static int gmfGetTargetInfo(gmThread *a_thread); - static int gmfIgnoreTargetForTime(gmThread *a_thread); static int gmfIgnoreTarget(gmThread *a_thread); static int gmfGetWeapon(gmThread *a_thread); static int gmfGetIsAllied(gmThread *a_thread); From 145fb5d2b5fcb7949ee9de9e5db0167bc7c9ff33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Wed, 9 Oct 2024 23:13:43 +0200 Subject: [PATCH 20/22] fixed crash of bot command with more than 64 arguments --- 0.83/GameInterfaces/ET/src/game/g_etbot_interface.cpp | 3 ++- 0.83/GameInterfaces/RTCW/src/game/g_rtcwbot_interface.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/0.83/GameInterfaces/ET/src/game/g_etbot_interface.cpp b/0.83/GameInterfaces/ET/src/game/g_etbot_interface.cpp index d43dd0a0e..affc0c04f 100644 --- a/0.83/GameInterfaces/ET/src/game/g_etbot_interface.cpp +++ b/0.83/GameInterfaces/ET/src/game/g_etbot_interface.cpp @@ -5765,7 +5765,8 @@ void Bot_Interface_ConsoleCommand() } Arguments args; - for(int i = 0; i < trap_Argc(); ++i) + int n = min(trap_Argc(), Arguments::MaxArgs); + for(int i = 0; i < n; ++i) { trap_Argv(i, args.m_Args[args.m_NumArgs++], Arguments::MaxArgLength); } diff --git a/0.83/GameInterfaces/RTCW/src/game/g_rtcwbot_interface.cpp b/0.83/GameInterfaces/RTCW/src/game/g_rtcwbot_interface.cpp index 2ad663ba9..2b610120d 100644 --- a/0.83/GameInterfaces/RTCW/src/game/g_rtcwbot_interface.cpp +++ b/0.83/GameInterfaces/RTCW/src/game/g_rtcwbot_interface.cpp @@ -3641,7 +3641,8 @@ qboolean Bot_Util_CheckForSuicide( gentity_t *ent ) { int Bot_Interface_ConsoleCommand() { if ( IsOmnibotLoaded() ) { Arguments args; - for ( int i = 0; i < trap_Argc(); ++i ) + int n = min(trap_Argc(), Arguments::MaxArgs); + for ( int i = 0; i < n; ++i ) { trap_Argv( i, args.m_Args[args.m_NumArgs++], Arguments::MaxArgLength ); } From d73787629dd52b1bc9ed1b636b69a66d70045cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Sun, 20 Oct 2024 15:58:15 +0200 Subject: [PATCH 21/22] rtcw: fixed G_Script_ScriptParse error --- 0.83/GameInterfaces/RTCW/src/game/g_script.c | 1 + 1 file changed, 1 insertion(+) diff --git a/0.83/GameInterfaces/RTCW/src/game/g_script.c b/0.83/GameInterfaces/RTCW/src/game/g_script.c index 27b55a067..ae1186e6c 100644 --- a/0.83/GameInterfaces/RTCW/src/game/g_script.c +++ b/0.83/GameInterfaces/RTCW/src/game/g_script.c @@ -239,6 +239,7 @@ void G_Script_ScriptLoad( void ) { level.scriptEntity = G_Alloc( len ); trap_FS_Read( level.scriptEntity, len, f ); + level.scriptEntity[len] = 0; trap_FS_FCloseFile( f ); } From 7bf5296c33004f8ae550036b141c7fcfbb7f0aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20La=C5=A1tovi=C4=8Dka?= Date: Sat, 9 Nov 2024 22:18:45 +0100 Subject: [PATCH 22/22] rtcw: mp_railway_te --- .../Installer/Files/rtcw/nav/mp_railway_te.gm | 102 +++++ .../Files/rtcw/nav/mp_railway_te.way | Bin 0 -> 5325 bytes .../Files/rtcw/nav/mp_railway_te_goals.gm | 411 ++++++++++++++++++ 3 files changed, 513 insertions(+) create mode 100644 0.83/Installer/Files/rtcw/nav/mp_railway_te.gm create mode 100644 0.83/Installer/Files/rtcw/nav/mp_railway_te.way create mode 100644 0.83/Installer/Files/rtcw/nav/mp_railway_te_goals.gm diff --git a/0.83/Installer/Files/rtcw/nav/mp_railway_te.gm b/0.83/Installer/Files/rtcw/nav/mp_railway_te.gm new file mode 100644 index 000000000..a24c9b7c4 --- /dev/null +++ b/0.83/Installer/Files/rtcw/nav/mp_railway_te.gm @@ -0,0 +1,102 @@ +//========================================================================================== +// +// mp_railway_te.gm +// +// Who When What +//------------------------------------------------------------------------------------------ +// palota 9 November 2024 Initial Script +// +//========================================================================================== +// + +global Map = +{ + Debug = 0, + + access_door_target_Destroyed = function( trigger ) + { + Util.EnableGoal("ROUTE_door"); + SetAvailableMapGoals( TEAM.ALLIES, false, "ATTACK_door.*"); + SetAvailableMapGoals( TEAM.AXIS, false, "DEFEND_door[24678]"); + SetAvailableMapGoals( TEAM.AXIS, true, "DEFEND_room.*"); + Util.MapDebugPrint( "access_door_target_Destroyed" ); + }, +}; + +global OnMapLoad = function() +{ + OnTrigger( "The access door has been destroyed!", Map.access_door_target_Destroyed ); + + Util.DisableGoal("", true); + Util.DisableGoal("ROUTE_door"); + + SetAvailableMapGoals(TEAM.AXIS, true, "DEFEND_door.*"); + SetAvailableMapGoals(TEAM.ALLIES, true, { "ATTACK_.*", "PLANT_.*" }); + + SetGoalPriority("ATTACK_door1", 0.51); + + Util.SetMaxUsersInProgress(1, "DEFEND_.*"); + + Util.MapDebugPrint( "Omni-bot map script for " + GetMapName() + " executed." ); + + sleep(20); + SetAvailableMapGoals(TEAM.AXIS, true, "DEFEND_room[1258]"); +}; + +global OnBotJoin = function( bot ) +{ + bot.TargetBreakableDist = 200; +}; + +global InitializeRoutes = function() +{ + MapRoutes = + { + PLANT_access_door_target = + { + ROUTE_spawn_allies = { + ROUTE_allies1 = { Weight = 2 }, + ROUTE_allies2 = {}, + } + }, + PLANT_control_room_target = + { + ROUTE_spawn_allies = { + ROUTE_allies1 = { + ROUTE_door = { + Weight = 4, + ROUTE_room1 = {}, + ROUTE_room2 = { Weight = 2 }, + }, + ROUTE_back = { + ROUTE_room1 = {}, + ROUTE_room2 = {}, + }, + }, + ROUTE_allies2 = { + ROUTE_door = { Weight = 2 }, + ROUTE_back = {}, + }, + } + }, + }; + MapRoutes["DEFEND_door.*"] = + { + ROUTE_spawn_axis = + { + ROUTE_tram1 = {}, + ROUTE_tram2 = {}, + } + }; + MapRoutes["DEFEND_room.*"] = + { + ROUTE_spawn_axis = + { + ROUTE_room1 = {}, + ROUTE_room2 = { Weight = 2 }, + } + }; + MapRoutes["ATTACK_door.*"] = MapRoutes.PLANT_access_door_target; + MapRoutes["ATTACK_room.*"] = MapRoutes.PLANT_control_room_target; + Util.Routes(MapRoutes); +}; diff --git a/0.83/Installer/Files/rtcw/nav/mp_railway_te.way b/0.83/Installer/Files/rtcw/nav/mp_railway_te.way new file mode 100644 index 0000000000000000000000000000000000000000..9519e40fb78259bc68e5985215376e0a8bfa5fdb GIT binary patch literal 5325 zcmd^C_gfU#yC1BJVnk6CETG1U2x0@-WoA9IvVfu}Dp5lTpa>`sdR@+$-35dYP(-6d zMQo@sAQsBb4D1diO3)CZi4Zk0hv~U>4{-6Cc;`=rdeX3^sS0VoPsoa%I7x&U@Lo6Bz z$y_?WHUX)#5 z-V%B<_aOzA;0cwGI@<6XD9-&5XN(e*e-C>A{9d(*@^c!q*^w8MdEe*jIXMH(p%V<- zZ8C$Rr^bX}f-&^@`)RyOUXJX=^N%<=LeBz=4YS{Z2OYs8yEdS*&iR)he*K82`1WQn zY+udmYTCS1A`s>kK)JDyO_QdQaaD`CCFl`SF8r;U)*cvXFoI^YwbJ^oWHOWT=j^dz z_mrXBZu;v}W+F=Ert;kMX5GrYQp}3Y9_1BEPdRTYf;*)t{G^pg-E^24GuxdrInj#e(Vfj)a_NH*A-t&Bi-lOaO>0z zf?8$#*-z+>6K_6%y)@XV%uZ^RI+8v*cQgIJ*|VU!ON#=bKU5ZPc?||zInqWOzUC76 zw-zO`v|7Z;wT#vhLQNVBJ2I@qm-bk*R}@pT=BjJaFL8WPsi)tx$E|Ld4F08_VCzJgN)MEx`o`)oUP?W4%sjPv~a_=bClVAeHn@UWQpA^>@M= z!DU3T=+S8>9Ax>=Qph0*3Ql7zWyTv)l>NX|CTrBw7kQZdS95Mhid9mmAgQf#?XWD-P0?R`1xeC3~r9# zvd~TjPJ}d^h?LiIzYwyPxQjxnK2GBkj=py7z30f;YZ25~!)1{1@bA?L2WkLLook?{ zTg4B)b59CVb+rUhfGcDS46J!IR1nJc{)BV*3D|nDOqW%i#_KJoatylf2dOo77lmM_ z1`++{WjvV?s$olTfKWSBhF&==H0;QrCoGKyi^nDKL;8?xv~vzF%p5ctQl)xUNMY5Y zbsw$xoNqDhm3?3F6)t&1WjgAG)5}g`%od~-pRLVu^Cw?Ud?#XODZMcL$#wd=3E}2Y zpU5t(jV2F8o))o5ZS_KI_+SMwfN(o8^NjTSQ3<5i)jW*hm<@iKCYWB9C=S&PbW_hs zB8i!smR<@<#WBO+@0aWaa=1j%$M@-*-zJfX78j&{+>OMX+8~4DHx&l!k8DJ6#6NXQ z{iP~0-s&JLj>7_^MsoF-bB1xrP9jC?M|X7&(^O>I|4=Z{8?J`(irRKV$)gd9<1u~u z#jGzs#N~ZUzNX$V{kEsLn_3g zNLX&aT0u}1%S<;y-7ci!{qM!G2p1GZu01APo!JjgJFJ&3tVtpZ9AdB&&IEoxf=(AQ zM`E?MejwyQ2KjFBaB11~I+pRpeG1p=z1Jav=MP#DzqTCPy=Wh6`RW3T{ET|now5?h zKCR-cyC2x{M>_fE@s)MS;|FqT?ztb_0R!7_d0*9E?Kmj1XFp9N*QEs1wbo4H&=ExK ze|}#7(6ms*ij-4zV?8r?GX1|;guP0cM6&wHmHl=F(no3~ei{6i1@~Dz_i(K}3>+*_ zu5pSSZ1sUN>3ny}CTW1gloO{ObuFu!cG*`eHfSsV)v^$I8h`7Y-i*abXK^iuLJdt5y88H^1mIfBg(Q98oj$1aKO@NX*gKi7LLi}c)&-(a zXpjhD+WzQ=ui2^FJZ~%SR^N#;uaq*gJth3q?2qr^3|1Z6KrWP=aW#8p%A?bWs(gJ^ z@cJ%R@uS=iFn5y4wi9PrN%IQK=LCZug_-bxiXDsH_XO;po+5L-8^_PQS71e7;E zrM!_FLh7%#ZTcI94a{ba?JP; zPW=MTfe)y^o=p@q`8kTQANzrwT!dTe*!6tkm3N$)y?EXl%J(*00Tu(BuRM&in*e(Jto~yBb9Fc$-m_gMAJvLcHL9jMqE&P- z+mA;68P0ox5z>tzS2!)M#m0;E)P9YMmNpBbZD!jdd2`PInGmJNxCS<#=aj#v{XwgA z9inB0o1f^MPNwna9Hw%4xFEOTm&51!$0F9XcLA$%OXpwW%^E>>yq|@gp&wltC_XEu zj#cpv8#AT9xt?MfSd>N$a%KvmFK_%y~w7~Wz;lR&o0Pxow51b_0~clg=`=mMmQei|#xnW0v& zn0eu(9IoK)CUX4f+Z_7mcPi4h-Jn`y9P)j7w)z=+Y)}%<;8%@CtwonxsB_*Ug;736 z__6-f$ap^g+vieWup8Go91N*Fxg&*pRg8$XSR!daKpMG}u;bL7kZGr8&8RT^T(ezl z;OCjk(kE>hy;Wi-Q~K5!yTD<4kFZGRMV(PPjK-Y1|~=37(EX{u@-^yE<dn1h9k07vTYA#)<+A064T~3ehxhhiqIxC)Eu9+_lShd@z0#h+C zm#4gP3h4(6lp;xbcocs!zr<~G>tas*DMThPTS*_=MW4`z&{5+nfMsebU-<4FYpf}I zbpV6|p_VES<>_}D%0vNMI#c=O*TZDXiFq6|7^(+C<%aFW^dPq1geYk$U$rDjYBPw& z{Cp0JBNV1NN1w|5Tx4I-vyrcP)62OmFuuC7Od%6E8%FzX6Fex~=W!!XFAkJ#{4$P| zRTtseenJj`v9dpALxe}Mcg1Ih1di2tO-vv+b>`tk&kI+K_3jYC+SNuxtzSvW5qT4N z%bSH9;{#VhILiU{rj~;GF;heZ_9zq<5CiNcfYr;p3|nxv!eA&FeQ+F@k!XdBE(wgp z6iDLoavTuMHtG9M;HOY>>}yM~c-|qb#z+%@X%x#Wfp<_Fm{<$(3ET!HehJpV87#+| zj5J#@js33{An5B)=_^x>ClL@5vInJL^XdNg4)bMqDwLGRmV*`74`E%=z#b*S!HDRq zY!EKp*kF+1T16WmB5d1{0E#>e4#orgJ$oY(oHp+V)5PySNm6#1aElwNh)o#mW`%sP z=C0CwVa1!FiUG?8;1lQr3F^jT!>W+}RR>MN&LIw(RT^xaX|eQhhg$`SU(aP5D%p62 zHGUj04XBy8TPrghybKk^c*({c{5v8cF49oDBwOK!DU6n+Mfn+C%-N+Vd;jfSmSnIU zU84Bn{dbY`TZ7f*ufz&9(w7=~4BZ`h3WxXjXA$=etrcp;T=Dw{;)e}OgtsRBOD^ur zYauapZi%5h;r)pRjydsnc8z{wlUnRWXeG8=GC6#;aO2nhmE6kcG0E+J90keK_a_>- z0b0S|iY27`ZlQ{a6*;ZYd>mNfpvxH{_;r*b9N*9wdty#>x$q!AK+%m4aKKD5b_;_t z@KQz$kmHzcgM{aGfBmIp8|YFTFlHp0gb)#5Wu+&rO6aJm(Evh;VU)LgcH1IgW)}^t z7&~Z#J3n#yYMfA(kf|v2_5)}ejDV7d7Dt5JE-vyZIEw3_D>P~TwiO(UxP*)44xn)B noC)n9vGswIu)I*MK)89LJ=>wgds>7rzUDL?fR(L-6VQJE^;X^y literal 0 HcmV?d00001 diff --git a/0.83/Installer/Files/rtcw/nav/mp_railway_te_goals.gm b/0.83/Installer/Files/rtcw/nav/mp_railway_te_goals.gm new file mode 100644 index 000000000..e63f86327 --- /dev/null +++ b/0.83/Installer/Files/rtcw/nav/mp_railway_te_goals.gm @@ -0,0 +1,411 @@ +global _MG = +{ + ATTACK_door1 = + { + AimVectors = + { + [0] = Vec3(0.971, 0.239, -0.015), + }, + GoalType = "Attack", + MaxCampTime = 40, + MinCampTime = 20, + Position = Vec3(1117.345, 1599.219, 328.125), + Radius = 32, + }, + ATTACK_door2 = + { + AimVectors = + { + [0] = Vec3(-0.888, -0.460, -0.019), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(1203.000, 965.000, 329.000), + Radius = 32, + }, + ATTACK_door3 = + { + AimVectors = + { + [0] = Vec3(-0.669, -0.734, -0.115), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(742.000, 1097.000, 329.000), + Radius = 32, + }, + ATTACK_door4 = + { + AimVectors = + { + [0] = Vec3(-0.317, -0.948, 0.019), + [1] = Vec3(-0.806, -0.591, 0.028), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(1514.000, 1662.000, 329.000), + Radius = 32, + }, + ATTACK_room1 = + { + AimVectors = + { + [0] = Vec3(-0.558, -0.829, -0.030), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(-613.000, 4463.000, 193.000), + Radius = 32, + }, + ATTACK_room2 = + { + AimVectors = + { + [0] = Vec3(-0.668, 0.743, -0.046), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(-656.000, 4246.000, 193.000), + Radius = 32, + }, + ATTACK_room3 = + { + AimVectors = + { + [0] = Vec3(-0.990, -0.127, -0.061), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(-145.039, 4454.172, 192.125), + Radius = 32, + }, + ATTACK_room4 = + { + AimVectors = + { + [0] = Vec3(-0.980, 0.196, -0.038), + }, + GoalType = "Attack", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(-169.000, 4191.000, 193.000), + Radius = 32, + }, + ATTACK_room5 = + { + AimVectors = + { + [0] = Vec3(0.544, -0.833, -0.101), + }, + GoalType = "Attack", + MaxCampTime = 20, + MinCampTime = 10, + Position = Vec3(-958.008, 4377.479, 193.592), + Radius = 32, + }, + DEFEND_door1 = + { + AimVectors = + { + [0] = Vec3(0.983, 0.182, 0.018), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(1011.000, 1572.000, 329.000), + Radius = 32, + }, + DEFEND_door2 = + { + AimVectors = + { + [0] = Vec3(0.926, -0.377, 0.009), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(1096.000, 1731.000, 329.000), + Radius = 32, + }, + DEFEND_door3 = + { + AimVectors = + { + [0] = Vec3(0.878, 0.477, -0.029), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(1194.000, 1565.000, 329.000), + Radius = 32, + }, + DEFEND_door4 = + { + AimVectors = + { + [0] = Vec3(0.953, -0.302, -0.033), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(1366.000, 239.000, 329.000), + Radius = 32, + }, + DEFEND_door5 = + { + AimVectors = + { + [0] = Vec3(-0.196, 0.977, 0.083), + [1] = Vec3(-0.820, 0.558, 0.128), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(903.000, -565.000, 329.000), + Radius = 32, + }, + DEFEND_door6 = + { + AimVectors = + { + [0] = Vec3(0.918, 0.389, -0.074), + [1] = Vec3(-0.828, 0.560, -0.035), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(1278.000, -220.000, 329.000), + Radius = 32, + }, + DEFEND_door7 = + { + AimVectors = + { + [0] = Vec3(1.000, -0.027, 0.002), + }, + GoalType = "Defend", + MaxCampTime = 30, + MinCampTime = 10, + Position = Vec3(942.102, 1669.997, 329.195), + Radius = 32, + }, + DEFEND_door8 = + { + AimVectors = + { + [0] = Vec3(0.807, 0.517, 0.285), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(286.518, -561.477, 226.074), + Radius = 32, + }, + DEFEND_room1 = + { + AimVectors = + { + [0] = Vec3(0.011, -0.945, -0.328), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 5, + Position = Vec3(-715.003, 4507.942, 192.125), + Radius = 35, + TeamAvailability = 2, + }, + DEFEND_room2 = + { + AimVectors = + { + [0] = Vec3(0.958, 0.246, -0.150), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 5, + Position = Vec3(-749.875, 4242.961, 192.125), + Radius = 35, + TeamAvailability = 2, + }, + DEFEND_room3 = + { + AimVectors = + { + [0] = Vec3(-0.013, -0.919, -0.395), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 5, + Position = Vec3(-637.780, 4505.005, 224.125), + Radius = 35, + Stance = "crouch", + TeamAvailability = 2, + }, + DEFEND_room4 = + { + AimVectors = + { + [0] = Vec3(-0.268, 0.859, -0.436), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 5, + Position = Vec3(-592.412, 4194.125, 192.236), + Radius = 35, + TeamAvailability = 2, + }, + DEFEND_room5 = + { + AimVectors = + { + [0] = Vec3(-0.972, -0.231, -0.046), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(-156.000, 3982.000, -142.000), + Radius = 32, + }, + DEFEND_room6 = + { + AimVectors = + { + [0] = Vec3(-0.689, 0.725, -0.008), + [1] = Vec3(-0.887, 0.448, -0.111), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(-174.000, 3889.000, 193.000), + Radius = 32, + }, + DEFEND_room7 = + { + AimVectors = + { + [0] = Vec3(0.032, -0.869, -0.494), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(-1220.245, 3858.344, 192.125), + Radius = 32, + }, + DEFEND_room8 = + { + AimVectors = + { + [0] = Vec3(0.369, 0.929, -0.008), + }, + GoalType = "Defend", + MaxCampTime = 40, + MinCampTime = 10, + Position = Vec3(-481.149, 2499.277, -150.790), + Radius = 32, + Stance = "crouch", + }, + PLANT_access_door_target = + { + CreateOnLoad = 0, + GoalType = "PLANT", + Position = Vec3(832.000, 1664.000, 368.000), + TagName = "access door target", + TeamAvailability = 4, + }, + PLANT_control_room_target = + { + CoverSpots = + { + [0] = + { + AimVectors = + { + [0] = Vec3(0.354, -0.931, -0.086), + }, + position = Vec3(-712.518, 4475.469, 216.125), + stance = "stand", + }, + [1] = + { + AimVectors = + { + [0] = Vec3(0.256, 0.962, -0.096), + }, + position = Vec3(-719.601, 4242.125, 216.125), + stance = "stand", + }, + }, + CreateOnLoad = 0, + GoalType = "PLANT", + Position = Vec3(-644.000, 4352.000, 228.000), + TagName = "control room target", + TeamAvailability = 4, + }, + ROUTE_allies1 = + { + GoalType = "ROUTE", + Position = Vec3(1245.000, -916.000, 329.000), + Radius = 125, + }, + ROUTE_allies2 = + { + GoalType = "ROUTE", + Position = Vec3(386.000, -802.000, 425.000), + Radius = 125, + }, + ROUTE_back = + { + GoalType = "ROUTE", + Position = Vec3(-1544.000, 2116.000, -23.000), + Radius = 125, + }, + ROUTE_door = + { + GoalType = "ROUTE", + Position = Vec3(873.000, 1662.000, 329.000), + Radius = 125, + }, + ROUTE_room1 = + { + GoalType = "ROUTE", + Position = Vec3(-1307.000, 3332.000, 65.000), + Radius = 125, + }, + ROUTE_room2 = + { + GoalType = "ROUTE", + Position = Vec3(-110.771, 5100.894, 192.125), + Radius = 125, + }, + ROUTE_spawn_allies = + { + GoalType = "ROUTE", + Position = Vec3(1626.000, -2024.000, 665.000), + Radius = 600, + }, + ROUTE_spawn_axis = + { + GoalType = "ROUTE", + Position = Vec3(-1320.000, 166.000, 457.000), + Radius = 350, + }, + ROUTE_tram1 = + { + GoalType = "ROUTE", + Position = Vec3(148.712, 1143.822, 224.125), + Radius = 125, + }, + ROUTE_tram2 = + { + GoalType = "ROUTE", + Position = Vec3(152.000, -263.000, 225.000), + Radius = 125, + }, + Version = 1, +}; \ No newline at end of file