add a version function to gamestate to avoid hardcoding the value in …

…the theme (because it's not theme specific) also increment to 0.54.1
etternagame · Jan 27, 2017 · 0ad919a · 0ad919a
1 parent 51b22c2
commit 0ad919a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Themes/Til Death/BGAnimations/_PlayerInfo.lua b/Themes/Til Death/BGAnimations/_PlayerInfo.lua
@@ -132,7 +132,7 @@ t[#t+1] = Def.ActorFrame{
 		InitCommand=cmd(xy,SCREEN_WIDTH-5,AvatarY+10;halign,1;zoom,0.35;diffuse,getMainColor('positive')),
 		BeginCommand=cmd(queuecommand,"Set"),
 		SetCommand=function(self)
-			self:settextf("Etterna 0.54")
+			self:settext(GAMESTATE:GetEtternaVersion())
 		end,
 		PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
 		PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),

diff --git a/src/GameState.cpp b/src/GameState.cpp
@@ -3329,7 +3329,7 @@ class LunaGameState: public Luna<GameState>
 		lua_pushboolean(L, p->HighestSkillsetsOnly);
 		return 1;
 	}
-
+	DEFINE_METHOD(GetEtternaVersion, GetEtternaVersion())
 	LunaGameState()
 	{
 		ADD_METHOD( IsPlayerEnabled );
@@ -3459,7 +3459,7 @@ class LunaGameState: public Luna<GameState>
 		ADD_METHOD( SetAutoGenFarg );
 		ADD_METHOD( SetSSFilter );
 		ADD_METHOD( GetSSFilter );
-		ADD_METHOD(ResetSSFilters);
+		ADD_METHOD( ResetSSFilters );
 		ADD_METHOD( AnyActiveFilter );
 		ADD_METHOD( SetMaxFilterRate );
 		ADD_METHOD( GetMaxFilterRate );
@@ -3469,6 +3469,7 @@ class LunaGameState: public Luna<GameState>
 		ADD_METHOD( GetFilterMode );
 		ADD_METHOD( ToggleHighestSkillsetsOnly );
 		ADD_METHOD( GetHighestSkillsetsOnly );
+		ADD_METHOD( GetEtternaVersion );
 	}
 };
 

diff --git a/src/GameState.h b/src/GameState.h
@@ -254,7 +254,7 @@ class GameState
 	bool HighestSkillsetsOnly = false;
 	bool SkillsetFiltersActive = false;
 	bool AnyActiveFilter();
-
+	RString GetEtternaVersion() { return "0.54.1"; }
 
 
 

diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc
@@ -8,7 +8,7 @@
 ; when they install StepMania 5. (not recommended)
 !define PRODUCT_ID "Stepmania - Etterna"
 ; TODO: This needs to be updated with the git rev hash
-!define PRODUCT_VER "- Etterna v0.54 Installer"
+!define PRODUCT_VER "- Etterna v0.54.1 Installer"
 !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "sm5"