Naming convention update

sdslabs · Sep 21, 2022 · 1b14649 · 1b14649
1 parent d02bf69
commit 1b14649
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rootex/framework/scene.cpp b/rootex/framework/scene.cpp
@@ -10,7 +10,6 @@
 Vector<Scene*> Scene::s_Scenes;
 SceneID Scene::BaseID;
 static SceneID NextSceneID = ROOT_SCENE_ID + 1;
-static SceneID SceneIDOffset = 4;
 
 void to_json(JSON::json& j, const SceneSettings& s)
 {
@@ -70,6 +69,7 @@ Ptr<Scene> Scene::Create(const JSON::json& sceneData, const bool assignNewIDs)
 	}
 	else
 	{
+		SceneID SceneIDOffset = 4;
 		NextSceneID = std::max(std::max(BaseID, NextSceneID), SceneIDOffset);
 		thisSceneID = NextSceneID;
 	}
@@ -349,7 +349,7 @@ Scene::Scene(SceneID id, const String& name, const SceneSettings& settings, Impo
     , m_Entity(this)
 {
 	setName(m_Name);
-	setm_BaseID();
+	setBaseID();
 	s_Scenes.push_back(this);
 }
 

diff --git a/rootex/framework/scene.h b/rootex/framework/scene.h
@@ -82,7 +82,7 @@ class Scene
 	bool removeChild(Scene* toRemove);
 
 	void setName(const String& name);
-	void Scene::setm_BaseID() { m_BaseID = BaseID; }
+	void setBaseID() { m_BaseID = BaseID; }
 
 	JSON::json getJSON() const;
 	bool& getIsScenePaused() { return m_IsScenePaused; }