Merge pull request #842 from WALLOFJUSTICE/dev-23-q3-2

* mergy
TurningWheel · Oct 20, 2024 · 9fde0d9 · 9fde0d9
2 parents 15c5208 + bf98737
commit 9fde0d9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/VS.2015/Barony/Barony.vcxproj b/VS.2015/Barony/Barony.vcxproj
@@ -904,6 +904,8 @@ copy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)EOS 4\barony_test.exe" </Com
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
       <AdditionalOptions>/DBUILD_PR="$(BARONY_BUILD_PR)" /DBUILD_CC="$(BARONY_BUILD_CC)" /DBUILD_CS="$(BARONY_BUILD_CS)" /DBUILD_DE="$(BARONY_BUILD_DE)" /DBUILD_SA="$(BARONY_BUILD_SA)" /DBUILD_GSE="$(BARONY_BUILD_GSTATE)" /DBUILD_PFTID="$(BARONY_BUILD_PFTID)" /DBUILD_PFHID="$(BARONY_BUILD_PFHID)" %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/game.hpp b/src/game.hpp
@@ -25,9 +25,9 @@
 
 // REMEMBER TO CHANGE THIS WITH EVERY NEW OFFICIAL VERSION!!!
 #ifdef NINTENDO
-static const char VERSION[] = "v4.2.2";
+static const char VERSION[] = "v4.3.0";
 #else
-static const char VERSION[] = "v4.2.2";
+static const char VERSION[] = "v4.3.0";
 #endif
 #define GAME_CODE
 

diff --git a/src/mod_tools.cpp b/src/mod_tools.cpp
@@ -15609,9 +15609,9 @@ void Compendium_t::readModelLimbsFromFile(std::string section)
 						&& d["map_tiles"]["mid"].IsArray()
 						&& d["map_tiles"]["top"].IsArray() )
 					{
-						auto& floor = d["map_tiles"]["floor"].GetArray();
-						auto& mid = d["map_tiles"]["mid"].GetArray();
-						auto& top = d["map_tiles"]["top"].GetArray();
+						auto floor = d["map_tiles"]["floor"].GetArray();
+						auto mid = d["map_tiles"]["mid"].GetArray();
+						auto top = d["map_tiles"]["top"].GetArray();
 						w = d["map_tiles"]["width"].GetInt();
 						h = d["map_tiles"]["height"].GetInt();
 						if ( floor.Size() == mid.Size() &&

diff --git a/src/mod_tools.hpp b/src/mod_tools.hpp
@@ -4130,7 +4130,7 @@ struct Compendium_t
 	static void writeUnlocksSaveData();
 	static void readUnlocksSaveData();
 
-	static const char* Compendium_t::getSkillStringForCompendium(const int skill)
+	static const char* getSkillStringForCompendium(const int skill)
 	{
 		switch ( skill )
 		{

diff --git a/src/ui/MainMenu.cpp b/src/ui/MainMenu.cpp
@@ -34727,7 +34727,7 @@ namespace MainMenu {
 										if ( auto txt = frame->findField("txt_1") )
 										{
 											bool toggle = ticks % TICKS_PER_SECOND < TICKS_PER_SECOND / 2;
-											char* binding = "MenuPageRight";
+											const char* binding = "MenuPageRight";
 											if ( input.input("MenuUp").isBindingUsingKeyboard() )
 											{
 												binding = "MenuUp";
@@ -34757,7 +34757,7 @@ namespace MainMenu {
 										}
 										if ( auto txt = frame->findField("txt_2") )
 										{
-											char* binding = "MenuPageRightAlt";
+											const char* binding = "MenuPageRightAlt";
 											if ( input.input("MenuRight").isBindingUsingKeyboard() )
 											{
 												binding = "MenuRight";