-

Author: codenamecpp

src/Carnage3D.vcxproj

@@ -189,7 +189,7 @@
     <ClInclude Include="Console.h" />
     <ClInclude Include="FileSystem.h" />
     <ClInclude Include="GameDefs.h" />
-    <ClInclude Include="GameRules.h" />
+    <ClInclude Include="GameParams.h" />
     <ClInclude Include="geometries.h" />
     <ClInclude Include="cJSON.h" />
     <ClInclude Include="frustum.h" />
@@ -265,7 +265,7 @@
     <ClCompile Include="CarnageGame.cpp" />
     <ClCompile Include="config_document.cpp" />
     <ClCompile Include="FileSystem.cpp" />
-    <ClCompile Include="GameRules.cpp" />
+    <ClCompile Include="GameParams.cpp" />
     <ClCompile Include="GpuTextureArray2D.cpp" />
     <ClCompile Include="GuiRenderContext.cpp" />
     <ClCompile Include="GuiSystem.cpp" />

src/Carnage3D.vcxproj.filters

@@ -202,9 +202,6 @@
     <ClInclude Include="SpriteAnimation.h">
       <Filter>Game</Filter>
     </ClInclude>
-    <ClInclude Include="GameRules.h">
-      <Filter>Game</Filter>
-    </ClInclude>
     <ClInclude Include="GameCheatsWindow.h">
       <Filter>Game\GUI\DebugWindows</Filter>
     </ClInclude>
@@ -310,6 +307,9 @@
     <ClInclude Include="HumanCharacterView.h">
       <Filter>Game</Filter>
     </ClInclude>
+    <ClInclude Include="GameParams.h">
+      <Filter>Game</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -391,9 +391,6 @@
     <ClCompile Include="SpriteAnimation.cpp">
       <Filter>Game</Filter>
     </ClCompile>
-    <ClCompile Include="GameRules.cpp">
-      <Filter>Game</Filter>
-    </ClCompile>
     <ClCompile Include="GameCheatsWindow.cpp">
       <Filter>Game\GUI\DebugWindows</Filter>
     </ClCompile>
@@ -485,6 +482,9 @@
     <ClCompile Include="RenderView.cpp">
       <Filter>Game\Rendering</Filter>
     </ClCompile>
+    <ClCompile Include="GameParams.cpp">
+      <Filter>Game</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">

src/CarnageGame.cpp

@@ -23,7 +23,7 @@ bool CarnageGame::Initialize()
 
     SetInputActionsFromConfig();
 
-    gGameRules.LoadDefaults();
+    gGameParams.LoadDefaults();
 
     // scan all gta1 maps
     std::vector<std::string> gtaMapNames;
@@ -306,6 +306,11 @@ void CarnageGame::SetupHumanCharacter(int humanIndex, Pedestrian* pedestrian)
     if (mHumanCharacters[humanIndex].mCharPedestrian)
         return;
 
+    if (humanIndex > 0)
+    {
+        pedestrian->mRemapIndex = humanIndex - 1;
+    }
+
     mHumanCharacters[humanIndex].mCharPedestrian = pedestrian;
     mHumanCharacters[humanIndex].mCharController.SetCharacter(pedestrian);
     mHumanCharacters[humanIndex].mCharView.mFollowCameraController.SetFollowTarget(pedestrian);

src/CarnageGame.h

@@ -27,6 +27,8 @@ class CarnageGame final: public cxx::noncopyable
 
     Timespan mGameTime;
 
+    cxx::randomizer mGameRand;
+
 public:
     // Setup resources and switch to initial game state
     bool Initialize();

src/GameCheatsWindow.cpp

@@ -117,9 +117,9 @@ void GameCheatsWindow::DoUI(Timespan deltaTime)
 
     if (ImGui::CollapsingHeader("Ped"))
     {
-        ImGui::SliderFloat("Turn speed", &gGameRules.mPedestrianTurnSpeed, 10.0f, 640.0f, "%.2f");
-        ImGui::SliderFloat("Run speed", &gGameRules.mPedestrianRunSpeed, 0.1f, 16.0f, "%.2f");
-        ImGui::SliderFloat("Walk speed", &gGameRules.mPedestrianWalkSpeed, 0.1f, 16.0f, "%.2f");
+        ImGui::SliderFloat("Turn speed", &gGameParams.mPedestrianTurnSpeed, 10.0f, 640.0f, "%.2f");
+        ImGui::SliderFloat("Run speed", &gGameParams.mPedestrianRunSpeed, 0.1f, 16.0f, "%.2f");
+        ImGui::SliderFloat("Walk speed", &gGameParams.mPedestrianWalkSpeed, 0.1f, 16.0f, "%.2f");
     }
 
     if (ImGui::CollapsingHeader("Graphics"))

src/GameObjectsManager.cpp

@@ -5,6 +5,12 @@
 #include "PhysicsComponents.h"
 #include "GameMapManager.h"
 
+GameObjectsManager::~GameObjectsManager()
+{
+    mPedestriansPool.cleanup();
+    mCarsPool.cleanup();
+}
+
 bool GameObjectsManager::Initialize()
 {
     mIDsCounter = 0;

src/GameObjectsManager.h

@@ -15,6 +15,8 @@ class GameObjectsManager final: public cxx::noncopyable
     cxx::intrusive_list<Vehicle> mDeleteCarsList;
 
 public:
+    ~GameObjectsManager();
+
     bool Initialize();
     void Deinit();
     void UpdateFrame(Timespan deltaTime);

src/GameParams.cpp

@@ -0,0 +1,34 @@
+#include "stdafx.h"
+#include "GameParams.h"
+
+GameParams gGameParams;
+
+GameParams::GameParams()
+{
+    LoadDefaults();
+}
+
+void GameParams::LoadDefaults()
+{
+    mPedestrianTurnSpeed = 260.0f;
+    mPedestrianTurnSpeedSlideOnCar = 120.0f;
+    mPedestrianSlideOnCarSpeed = MAP_BLOCK_LENGTH * 1.2f;
+    mPedestrianWalkSpeed = MAP_BLOCK_LENGTH * 0.7f;
+    mPedestrianRunSpeed = MAP_BLOCK_LENGTH * 1.5f;
+    mPedestrianSpotTheCarDistance = MAP_BLOCK_LENGTH * 3.0f;
+    mPedestrianKnockedDownTime = 3.0f;
+
+    // weapons time todo
+    mWeaponsRechargeTime[eWeaponType_Fists] = 1.0f / 2.0f;
+    mWeaponsRechargeTime[eWeaponType_Pistol] = 1.0f / 4.0f;
+    mWeaponsRechargeTime[eWeaponType_Machinegun] = 1.0f / 4.0f;
+    mWeaponsRechargeTime[eWeaponType_Flamethrower] = 1.0f / 4.0f;
+    mWeaponsRechargeTime[eWeaponType_RocketLauncher] = 1.0f * 3.0f;
+
+    // weapons distance todo
+    mWeaponsDistance[eWeaponType_Fists] = PHYSICS_PED_BOUNDING_SPHERE_RADIUS;
+    mWeaponsDistance[eWeaponType_Pistol] = 1.0f;
+    mWeaponsDistance[eWeaponType_Machinegun] = 1.0f;
+    mWeaponsDistance[eWeaponType_Flamethrower] = 1.0f;
+    mWeaponsDistance[eWeaponType_RocketLauncher] = 1.0f;
+}

src/GameRules.h src/GameParams.hsrc/GameRules.h renamed to src/GameParams.h

@@ -1,10 +1,12 @@
 #pragma once
 
+#include "GameDefs.h"
+
 // defines manager that hold all game logic parameters
-class GameRules
+class GameParams
 {
 public:
-    GameRules();
+    GameParams();
 
     // reset all rules to default values
     void LoadDefaults();
@@ -16,7 +18,10 @@ class GameRules
     float mPedestrianSlideOnCarSpeed; // in blocks per second
     float mPedestrianWalkSpeed; // in blocks per second
     float mPedestrianRunSpeed; // in blocks per second
-    float mPedestrianSpotTheCarDistance; // max distance to detect the car 
+    float mPedestrianKnockedDownTime; // knocked down duration after the punch in face, seconds
+    float mPedestrianSpotTheCarDistance; // max distance to detect the car
+    float mWeaponsRechargeTime[eWeaponType_COUNT]; // weapons reload time specified in seconds
+    float mWeaponsDistance[eWeaponType_COUNT]; // specified in blocks
 };
 
-extern GameRules gGameRules;
+extern GameParams gGameParams;