small refactoring

Author: codenamecpp

gamedata/entities/weapons.json

@@ -27,7 +27,6 @@
         "base_hit_range": 4.5,
         "base_fire_rate": 2.3,
         "base_ammo_limit": 99,
-        "base_damage": 5,
         "shot_sfx": 33, // sound index
         "hud_sprite": 30
     },
@@ -53,7 +52,6 @@
         "base_fire_rate": 16.0,
         "base_ammo_limit": 999,
         "shots_per_clip": 5,
-        "base_damage": 5,
         "shot_sfx": 34, // sound index
         "hud_sprite": 31
     },
@@ -77,7 +75,6 @@
         "base_fire_rate": 16.0,
         "base_ammo_limit": 999,
         "shots_per_clip": 5,
-        "base_damage": 15,
         "shot_sfx": 35, // sound index
         "hud_sprite": 33
     },
@@ -100,7 +97,6 @@
         "base_hit_range": 20.0,
         "base_fire_rate": 1.17,
         "base_ammo_limit": 99,
-        "base_damage": 100,
         "shot_sfx": 36, // sound index
         "hud_sprite": 32
     }

src/BroadcastEventsManager.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "BroadcastEventsManager.h"
 #include "TimeManager.h"
+#include "CarnageGame.h"
 
 BroadcastEventsManager gBroadcastEvents;
 
@@ -75,6 +76,12 @@ void BroadcastEventsManager::RegisterEvent(eBroadcastEvent eventType, GameObject
     evData.mPosition = subject->mTransform.GetPosition2();
     evData.mSubject = subject;
     evData.mCharacter = character;
+
+    // notify current gamestate controller
+    if (gCarnageGame.mCurrentGamestate)
+    {
+        gCarnageGame.mCurrentGamestate->OnGamestateBroadcastEvent(evData);
+    }
 }
 
 void BroadcastEventsManager::RegisterEvent(eBroadcastEvent eventType, const glm::vec2& position, float durationTime)
@@ -102,6 +109,12 @@ void BroadcastEventsManager::RegisterEvent(eBroadcastEvent eventType, const glm:
     evData.mEventTimestamp = currentGameTime;
     evData.mEventDurationTime = durationTime;
     evData.mPosition = position;
+
+    // notify current gamestate controller
+    if (gCarnageGame.mCurrentGamestate)
+    {
+        gCarnageGame.mCurrentGamestate->OnGamestateBroadcastEvent(evData);
+    }
 }
 
 bool BroadcastEventsManager::PeekEvent(eBroadcastEvent eventType, BroadcastEvent& outputEventData) const

src/BroadcastEventsManager.h

@@ -4,6 +4,8 @@
 #include "GameObject.h"
 #include "Pedestrian.h"
 
+//////////////////////////////////////////////////////////////////////////
+
 // When something is happening on game map broadcast event gets fired up
 enum eBroadcastEvent
 {
@@ -13,10 +15,15 @@ enum eBroadcastEvent
     eBroadcastEvent_StealCar,
     eBroadcastEvent_Explosion,
     eBroadcastEvent_CarBurns,
+
+    eBroadcastEvent_StartDriveCar,
+    eBroadcastEvent_StopDriveCar,
 };
 
 decl_enum_strings(eBroadcastEvent);
 
+//////////////////////////////////////////////////////////////////////////
+
 enum eBroadcastEventSubject
 {
     eBroadcastEventSubject_None,
@@ -27,6 +34,8 @@ enum eBroadcastEventSubject
 
 decl_enum_strings(eBroadcastEventSubject);
 
+//////////////////////////////////////////////////////////////////////////
+
 // Broadcast event data
 struct BroadcastEvent
 {
@@ -38,14 +47,16 @@ struct BroadcastEvent
     eBroadcastEventSubject mEventSubject;
 
     float mEventTimestamp; // time when event was created
-    float mEventDurationTime; // how long event lives
+    float mEventDurationTime; // how long event lives, seconds
 
     glm::vec2 mPosition; // position in the world where event did happen, meters
 
     GameObjectHandle mSubject; // object that was affected
     PedestrianHandle mCharacter; // character which causes event 
 };
 
+//////////////////////////////////////////////////////////////////////////
+
 // Broadcast events manager
 class BroadcastEventsManager final: public cxx::noncopyable
 {

src/Carnage3D.vcxproj

@@ -161,6 +161,9 @@
     <ClInclude Include="Collider.h" />
     <ClInclude Include="Collision.h" />
     <ClInclude Include="GameObjectHelpers.h" />
+    <ClInclude Include="GameplayGamestate.h" />
+    <ClInclude Include="GenericGamestate.h" />
+    <ClInclude Include="MainMenuGamestate.h" />
     <ClInclude Include="SfxEmitter.h" />
     <ClInclude Include="AudioListener.h" />
     <ClInclude Include="AudioSource.h" />
@@ -289,6 +292,9 @@
     <ClCompile Include="AudioDataStream.cpp" />
     <ClCompile Include="Collider.cpp" />
     <ClCompile Include="Collision.cpp" />
+    <ClCompile Include="GameplayGamestate.cpp" />
+    <ClCompile Include="GenericGamestate.cpp" />
+    <ClCompile Include="MainMenuGamestate.cpp" />
     <ClCompile Include="SfxEmitter.cpp" />
     <ClCompile Include="AudioSource.cpp" />
     <ClCompile Include="ConsoleVar.cpp" />

src/Carnage3D.vcxproj.filters

@@ -74,6 +74,9 @@
     <Filter Include="Game\Particles">
       <UniqueIdentifier>{9702cb17-25cc-44a7-92ba-65a8c47323d6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Game\GameStates">
+      <UniqueIdentifier>{1ba8bbc1-0de7-4c68-83e9-ab609908dc23}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -453,6 +456,15 @@
     <ClInclude Include="GameObjectHelpers.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>
+    <ClInclude Include="GenericGamestate.h">
+      <Filter>Game\GameStates</Filter>
+    </ClInclude>
+    <ClInclude Include="GameplayGamestate.h">
+      <Filter>Game\GameStates</Filter>
+    </ClInclude>
+    <ClInclude Include="MainMenuGamestate.h">
+      <Filter>Game\GameStates</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -721,6 +733,15 @@
     <ClCompile Include="Collision.cpp">
       <Filter>Game\Physics</Filter>
     </ClCompile>
+    <ClCompile Include="GenericGamestate.cpp">
+      <Filter>Game\GameStates</Filter>
+    </ClCompile>
+    <ClCompile Include="GameplayGamestate.cpp">
+      <Filter>Game\GameStates</Filter>
+    </ClCompile>
+    <ClCompile Include="MainMenuGamestate.cpp">
+      <Filter>Game\GameStates</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">