Merge branch 'gamepad' of git://github.com/WALLOFJUSTICE/Barony into …

…2.0.6-branch
TurningWheel · Oct 8, 2017 · eba1873 · eba1873
2 parents 470a0e2 + 1673e97
commit eba1873
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/VS-includes/Config.hpp b/VS-includes/Config.hpp
@@ -1,6 +1,6 @@
 
 #define WINDOWS
 
-//#define STEAMWORKS
+#define STEAMWORKS
 
 #define HAVE_FMOD
diff --git a/src/game.hpp b/src/game.hpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 // REMEMBER TO CHANGE THIS WITH EVERY NEW OFFICIAL VERSION!!!
-#define VERSION "v2.0.5"
+#define VERSION "v2.0.6"
 #define GAME_CODE
 
 #define MAX_FPS_LIMIT 60 //TODO: Make this configurable.

diff --git a/src/menu.cpp b/src/menu.cpp
@@ -3912,6 +3912,7 @@ void handleMainMenu(bool mode)
 				{
 					stats[clientnum]->clearStats();
 					initClass(clientnum);
+					mapseed = 0;
 				}
 				else
 				{
@@ -3931,7 +3932,6 @@ void handleMainMenu(bool mode)
 				}
 #endif
 				// load next level
-				mapseed = 0;
 				entity_uids = 1;
 				lastEntityUIDs = entity_uids;
 				numplayers = 0;