Merge branch 'development' into cf/468-add-proper-semantic-version-comparison-to-check-mod-compatibility

Author: traunts

Activities/ActorEditor.cpp

@@ -14,6 +14,7 @@
 #include "ActorEditor.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
+#include "CameraMan.h"
 #include "UInputMan.h"
 //#include "AHuman.h"
 //#include "MOPixel.h"
@@ -218,7 +219,7 @@ void ActorEditor::Update()
         // Show the picker dialog to select an object to load
         m_pPicker->SetEnabled(true);
         // Scroll to center of scene
-        g_SceneMan.SetScrollTarget(g_SceneMan.GetSceneDim() * 0.5);
+        g_CameraMan.SetScrollTarget(g_SceneMan.GetSceneDim() * 0.5);
         m_EditorMode = m_PreviousMode = EditorActivity::LOADDIALOG;
         m_ModeChange = true;
     }
@@ -238,7 +239,7 @@ void ActorEditor::Update()
     {
         m_pEditedActor->SetPos(g_SceneMan.GetSceneDim() * 0.5);
         m_pEditedActor->Update();
-        g_SceneMan.SetScrollTarget(m_pEditedActor->GetPos());
+        g_CameraMan.SetScrollTarget(m_pEditedActor->GetPos());
     }
 
     /////////////////////////////////////////////////////
@@ -252,7 +253,7 @@ void ActorEditor::Update()
 
     // Set the screen occlusion situation
     if (!m_pPicker->IsVisible())
-        g_SceneMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(Players::PlayerOne));
+        g_CameraMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(Players::PlayerOne));
 
     // Picking something to load into the editor
     if (m_EditorMode == EditorActivity::LOADDIALOG)

Activities/BaseEditor.cpp

@@ -12,6 +12,8 @@
 // Inclusions of header files
 
 #include "BaseEditor.h"
+
+#include "CameraMan.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
 #include "UInputMan.h"
@@ -195,8 +197,8 @@ int BaseEditor::Start()
         m_ViewState[editingPlayer] = ViewState::Normal;
         g_FrameMan.ClearScreenText(ScreenOfPlayer(editingPlayer));
         // Set the team associations with the first screen so that the correct unseen are shows up
-        g_SceneMan.SetScreenTeam(ScreenOfPlayer(editingPlayer), m_Team[editingPlayer]);
-        g_SceneMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(editingPlayer));
+        g_CameraMan.SetScreenTeam(ScreenOfPlayer(editingPlayer), m_Team[editingPlayer]);
+        g_CameraMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(editingPlayer));
 
         m_PlayerController[editingPlayer].Reset();
         m_PlayerController[editingPlayer].Create(Controller::CIM_PLAYER, editingPlayer);

Activities/GAScripted.cpp

@@ -135,7 +135,7 @@ int GAScripted::ReadProperty(const std::string_view &propName, Reader &reader) {
 
 int GAScripted::Save(Writer &writer) const {
     // Call the script OnSave() function, if it exists
-    g_LuaMan.RunScriptString("if " + m_LuaClassName + ".OnSave then " + m_LuaClassName + ":OnSave(); end");
+    g_LuaMan.RunScriptString("if " + m_LuaClassName + " and " + m_LuaClassName + ".OnSave then " + m_LuaClassName + ":OnSave(); end");
 
     GameActivity::Save(writer);
 

Activities/GameActivity.cpp

@@ -12,6 +12,8 @@
 // Inclusions of header files
 
 #include "GameActivity.h"
+
+#include "CameraMan.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
 #include "FrameMan.h"
@@ -892,9 +894,9 @@ int GameActivity::Start()
             continue;
 
         // Set the team associations with each screen displayed
-        g_SceneMan.SetScreenTeam(ScreenOfPlayer(player), m_Team[player]);
+        g_CameraMan.SetScreenTeam(ScreenOfPlayer(player), m_Team[player]);
         // And occlusion
-        g_SceneMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
+        g_CameraMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
 
         // Allocate and (re)create the Inventory Menu GUIs
         if (m_InventoryMenuGUI[player]) {
@@ -1086,7 +1088,7 @@ void GameActivity::End()
         if (!(m_IsActive[player] && m_IsHuman[player]))
             continue;
 
-        g_SceneMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
+        g_CameraMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
 
         if (m_Team[player] == m_WinnerTeam)
         {
@@ -1159,7 +1161,7 @@ void GameActivity::UpdateEditing()
         m_pEditorGUI[player]->Update();
 
         // Set the team associations with each screen displayed
-        g_SceneMan.SetScreenTeam(ScreenOfPlayer(player), m_Team[player]);
+        g_CameraMan.SetScreenTeam(ScreenOfPlayer(player), m_Team[player]);
 
         // Check if the player says he's done editing, and if so, make sure he really is good to go
         if (m_pEditorGUI[player]->GetEditorGUIMode() == SceneEditorGUI::DONEEDITING)
@@ -1259,7 +1261,7 @@ void GameActivity::UpdateEditing()
                 // CLear the messages before starting the game
                 g_FrameMan.ClearScreenText(ScreenOfPlayer(player));
                 // Reset the screen occlusion if any players are still in menus
-                g_SceneMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
+                g_CameraMan.SetScreenOcclusion(Vector(), ScreenOfPlayer(player));
             }
         }
 
@@ -1320,7 +1322,7 @@ void GameActivity::Update()
         bool skipBuyUpdate = false;
 
         // Set the team associations with each screen displayed
-        g_SceneMan.SetScreenTeam(ScreenOfPlayer(player), team);
+        g_CameraMan.SetScreenTeam(ScreenOfPlayer(player), team);
 
         //////////////////////////////////////////////////////
         // Assure that Controlled Actor is a safe pointer
@@ -1458,7 +1460,7 @@ void GameActivity::Update()
                 m_PlayerController[player].RelativeCursorMovement(m_ObservationTarget[player], 1.2f);
             }
             // Set the view to the observation position
-            g_SceneMan.SetScrollTarget(m_ObservationTarget[player], 0.1, g_SceneMan.ForceBounds(m_ObservationTarget[player]), ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(m_ObservationTarget[player], 0.1, g_SceneMan.ForceBounds(m_ObservationTarget[player]), ScreenOfPlayer(player));
         }
 
         ///////////////////////////////////////////////////
@@ -1520,7 +1522,7 @@ void GameActivity::Update()
 
             // Set the view to the cursor pos
             bool wrapped = g_SceneMan.ForceBounds(m_ActorCursor[player]);
-            g_SceneMan.SetScrollTarget(m_ActorCursor[player], 0.1, wrapped, ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(m_ActorCursor[player], 0.1, wrapped, ScreenOfPlayer(player));
 
 			if (m_pLastMarkedActor[player]) {
 				if (!g_MovableMan.ValidMO(m_pLastMarkedActor[player])) {
@@ -1557,7 +1559,7 @@ void GameActivity::Update()
 
             // Set the view to the cursor pos
             bool wrapped = g_SceneMan.ForceBounds(m_ActorCursor[player]);
-            g_SceneMan.SetScrollTarget(m_ActorCursor[player], 0.1, wrapped, ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(m_ActorCursor[player], 0.1, wrapped, ScreenOfPlayer(player));
 
             // Draw the actor's waypoints
             m_ControlledActor[player]->DrawWaypoints(true);
@@ -1630,12 +1632,12 @@ void GameActivity::Update()
 
             // Set the view to the cursor pos
             wrapped = g_SceneMan.ForceBounds(m_ActorCursor[player]);
-            //g_SceneMan.SetScrollTarget(m_ActorCursor[player], 0.1, wrapped, ScreenOfPlayer(player));
+            //g_CameraMan.SetScrollTarget(m_ActorCursor[player], 0.1, wrapped, ScreenOfPlayer(player));
 
             // Set the view to the actor pos
 			Vector scrollPos = Vector(m_ControlledActor[player]->GetPos());
             wrapped = g_SceneMan.ForceBounds(scrollPos);
-            g_SceneMan.SetScrollTarget(scrollPos, 0.1, wrapped, ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(scrollPos, 0.1, wrapped, ScreenOfPlayer(player));
 
             // Disable the actor's controller
             m_ControlledActor[player]->GetController()->SetDisabled(true);
@@ -1819,7 +1821,7 @@ void GameActivity::Update()
 
             // Set the view to a little above the LZ position
             Vector viewTarget(m_LandingZone[player].m_X, m_LandingZone[player].m_Y - (g_FrameMan.GetPlayerScreenHeight() / 4));
-            g_SceneMan.SetScrollTarget(viewTarget, 0.1, wrapped, ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(viewTarget, 0.1, wrapped, ScreenOfPlayer(player));
         }
 
         ////////////////////////////
@@ -1830,7 +1832,7 @@ void GameActivity::Update()
             // Continuously deathwatch message
             g_FrameMan.SetScreenText("Lost control of remote body!", ScreenOfPlayer(player));
             // Don't move anything, just stay put watching the death funnies
-            g_SceneMan.SetScrollTarget(m_DeathViewTarget[player], 0.1, false, ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(m_DeathViewTarget[player], 0.1, false, ScreenOfPlayer(player));
         }
 
         ////////////////////////////////////////////////////
@@ -1839,7 +1841,7 @@ void GameActivity::Update()
 		// and double scrolling will cause CC gitch when we'll cross the seam
 		else if (m_ControlledActor[player] && m_ActivityState != ActivityState::Editing && m_ActivityState != ActivityState::PreGame)
         {
-            g_SceneMan.SetScrollTarget(m_ControlledActor[player]->GetViewPoint(), 0.1, m_ControlledActor[player]->DidWrap(), ScreenOfPlayer(player));
+            g_CameraMan.SetScrollTarget(m_ControlledActor[player]->GetViewPoint(), 0.1, m_ControlledActor[player]->DidWrap(), ScreenOfPlayer(player));
         }
 
 		if (m_ControlledActor[player] && m_ViewState[player] != ViewState::DeathWatch && m_ViewState[player] != ViewState::ActorSelect && m_ViewState[player] != ViewState::AIGoToPoint && m_ViewState[player] != ViewState::UnitSelectCircle) {
@@ -2101,7 +2103,7 @@ void GameActivity::Update()
         }
 
         // Set the view to the observation position
-        g_SceneMan.SetScrollTarget(m_ObservationTarget[Players::PlayerFour], 0.1, g_SceneMan.ForceBounds(m_ObservationTarget[Players::PlayerFour]), ScreenOfPlayer(Players::PlayerFour));
+        g_CameraMan.SetScrollTarget(m_ObservationTarget[Players::PlayerFour], 0.1, g_SceneMan.ForceBounds(m_ObservationTarget[Players::PlayerFour]), ScreenOfPlayer(Players::PlayerFour));
     }
 */
 }
@@ -2313,14 +2315,14 @@ void GameActivity::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int w
     // Team Icon up in the top left corner
     const Icon *pIcon = GetTeamIcon(m_Team[PoS]);
     if (pIcon)
-        draw_sprite(pTargetBitmap, pIcon->GetBitmaps8()[0], MAX(2, g_SceneMan.GetScreenOcclusion(which).m_X + 2), 2);
+        draw_sprite(pTargetBitmap, pIcon->GetBitmaps8()[0], MAX(2, g_CameraMan.GetScreenOcclusion(which).m_X + 2), 2);
     // Gold
     std::snprintf(str, sizeof(str), "%c Funds: %.10g oz", TeamFundsChanged(which) ? -57 : -58, std::floor(GetTeamFunds(m_Team[PoS])));
-    g_FrameMan.GetLargeFont()->DrawAligned(&pBitmapInt, MAX(16, g_SceneMan.GetScreenOcclusion(which).m_X + 16), yTextPos, str, GUIFont::Left);
+    g_FrameMan.GetLargeFont()->DrawAligned(&pBitmapInt, MAX(16, g_CameraMan.GetScreenOcclusion(which).m_X + 16), yTextPos, str, GUIFont::Left);
 /* Not applicable anymore to the 4-team games
     // Body losses
     std::snprintf(str, sizeof(str), "%c Losses: %c%i %c%i", -39, -62, GetTeamDeathCount(Teams::TeamOne), -59, GetTeamDeathCount(Teams::TeamTwo));
-    g_FrameMan.GetLargeFont()->DrawAligned(&pBitmapInt, MIN(pTargetBitmap->w - 4, pTargetBitmap->w - 4 + g_SceneMan.GetScreenOcclusion(which).m_X), yTextPos, str, GUIFont::Right);
+    g_FrameMan.GetLargeFont()->DrawAligned(&pBitmapInt, MIN(pTargetBitmap->w - 4, pTargetBitmap->w - 4 + g_CameraMan.GetScreenOcclusion(which).m_X), yTextPos, str, GUIFont::Right);
 */
     // Show the player's controller scheme icon in the upper right corner of his screen, but only for a minute
     if (m_GameTimer.GetElapsedRealTimeS() < 30)
@@ -2332,7 +2334,7 @@ void GameActivity::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int w
             pIcon = g_UInputMan.GetSchemeIcon(PoS);
             if (pIcon)
             {
-                draw_sprite(pTargetBitmap, pIcon->GetBitmaps8()[0], MIN(pTargetBitmap->w - pIcon->GetBitmaps8()[0]->w - 2, pTargetBitmap->w - pIcon->GetBitmaps8()[0]->w - 2 + g_SceneMan.GetScreenOcclusion(which).m_X), yTextPos);
+                draw_sprite(pTargetBitmap, pIcon->GetBitmaps8()[0], MIN(pTargetBitmap->w - pIcon->GetBitmaps8()[0]->w - 2, pTargetBitmap->w - pIcon->GetBitmaps8()[0]->w - 2 + g_CameraMan.GetScreenOcclusion(which).m_X), yTextPos);
 // TODO: make a black Activity intro screen, saying "Player X, press any key/button to show that you are ready!, and display their controller icon, then fade into the scene"
 //                stretch_sprite(pTargetBitmap, pIcon->GetBitmaps8()[0], 10, 10, pIcon->GetBitmaps8()[0]->w * 4, pIcon->GetBitmaps8()[0]->h * 4);
             }