Merge pull request #113 from fallahn/golf-1.16

Golf 1.16.4
fallahn · May 2, 2024 · 7830a20 · 7830a20
2 parents 9ce5a4a + b0034c0
commit 7830a20
Show file tree

Hide file tree

Showing 31 changed files with 514 additions and 322 deletions.
diff --git a/crogine.sln b/crogine.sln
@@ -268,7 +268,6 @@ Global
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|ARM.ActiveCfg = Debug|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|x64.ActiveCfg = Debug|x64
-		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|x64.Build.0 = Debug|x64
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|x86.ActiveCfg = Debug|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.DebugASan|Any CPU.ActiveCfg = DebugASan|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.DebugASan|ARM.ActiveCfg = DebugASan|Win32
@@ -291,6 +290,7 @@ Global
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|ARM.ActiveCfg = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x64.ActiveCfg = Debug|x64
+		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x64.Build.0 = Debug|x64
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x86.ActiveCfg = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x86.Build.0 = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.DebugASan|Any CPU.ActiveCfg = DebugASan|Win32

diff --git a/crogine/src/audio/OpenALImpl.cpp b/crogine/src/audio/OpenALImpl.cpp
@@ -122,7 +122,7 @@ bool OpenALImpl::init()
 
     bool current = false;
     /*alcCheck*/(current = alcMakeContextCurrent(m_context));
-
+    
     return current;
 }
 
@@ -861,7 +861,7 @@ void OpenALStream::updateStream()
 
             //update the buffers if necessary
             if (processed > 0
-                && state == AL_PLAYING)
+                && (state == AL_PLAYING))
             {
                 for (auto i = 0; i < processed; ++i)
                 {

diff --git a/libsocial/include/Social.hpp b/libsocial/include/Social.hpp
@@ -49,11 +49,11 @@ source distribution.
 //(ball started sending wind effect 1120 -> 1124)
 //(added night mode/weather 1141 -> 1150)
 //(player avatar data format changed 1153->1160)
-static constexpr std::uint16_t CURRENT_VER = 1163;
+static constexpr std::uint16_t CURRENT_VER = 1164;
 #ifdef __APPLE__
-static const std::string StringVer("1.16.3 (macOS beta)");
+static const std::string StringVer("1.16.4 (macOS beta)");
 #else
-static const std::string StringVer("1.16.3");
+static const std::string StringVer("1.16.4");
 #endif
 
 struct HallEntry final

diff --git a/samples/golf/buildnumber.h b/samples/golf/buildnumber.h
@@ -3,7 +3,7 @@
 #ifndef BUILD_NUMBER_H_ 
 #define BUILD_NUMBER_H_ 
 
-#define BUILDNUMBER 5455
-#define BUILDNUMBER_STR "5455" 
+#define BUILDNUMBER 5536
+#define BUILDNUMBER_STR "5536" 
 
 #endif /* BUILD_NUMBER_H_ */
diff --git a/samples/golf/golf.aps b/samples/golf/golf.aps
diff --git a/samples/golf/golf.rc b/samples/golf/golf.rc
@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "icon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,16,3,0
- PRODUCTVERSION 1,16,3,0
+ FILEVERSION 1,16,4,0
+ PRODUCTVERSION 1,16,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Trederia"
             VALUE "FileDescription", "Super Video Golf"
-            VALUE "FileVersion", "1.16.3.0"
+            VALUE "FileVersion", "1.16.4.0"
             VALUE "InternalName", "golf.exe"
             VALUE "LegalCopyright", "Copyright (C) 2024 Trederia Games"
             VALUE "OriginalFilename", "golf.exe"
             VALUE "ProductName", "Super Video Golf"
-            VALUE "ProductVersion", "1.16.3.0"
+            VALUE "ProductVersion", "1.16.4.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/samples/golf/golf.vcxproj b/samples/golf/golf.vcxproj
@@ -629,6 +629,7 @@
     <ClCompile Include="src\golf\FloatingTextSystem.cpp" />
     <ClCompile Include="src\golf\FpsCameraSystem.cpp" />
     <ClCompile Include="src\golf\FreePlayState.cpp" />
+    <ClCompile Include="src\golf\GameConsts.cpp" />
     <ClCompile Include="src\golf\GcState.cpp" />
     <ClCompile Include="src\golf\GolfCartSystem.cpp" />
     <ClCompile Include="src\golf\GolfParticleDirector.cpp" />

diff --git a/samples/golf/golf.vcxproj.filters b/samples/golf/golf.vcxproj.filters
@@ -450,6 +450,9 @@
     <ClCompile Include="src\golf\CareerState.cpp">
       <Filter>Source Files\golf\client\states</Filter>
     </ClCompile>
+    <ClCompile Include="src\golf\GameConsts.cpp">
+      <Filter>Source Files\golf\client</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\ErrorCheck.hpp">