Version 92.0

also update README, and make ctrl+a moderator only shortcut
The-Powder-Toy · Jul 23, 2017 · aad8eba · aad8eba
1 parent ddce20d
commit aad8eba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-The Powder Toy - July 2016
+The Powder Toy - July 2017
 ==========================
 
 Get the latest version here: http://powdertoy.co.uk/Download.html
@@ -85,6 +85,7 @@ Controls
 | Alt + ]                 | Increase brush size by 1                                        |
 | Ctrl + C/V/X            | Copy/Paste/Cut                                                  |
 | Ctrl + Z                | Undo                                                            |
+| Ctrl + Y                | Redo                                                            |
 | Ctrl + Cursor drag      | Rectangle                                                       |
 | Shift + Cursor drag     | Line                                                            |
 | Middle click            | Sample element                                                  |

diff --git a/src/Config.h b/src/Config.h
@@ -12,15 +12,15 @@
 
 //VersionInfoStart
 #ifndef SAVE_VERSION
-#define SAVE_VERSION 91
+#define SAVE_VERSION 92
 #endif
 
 #ifndef MINOR_VERSION
-#define MINOR_VERSION 5
+#define MINOR_VERSION 0
 #endif
 
 #ifndef BUILD_NUM
-#define BUILD_NUM 330
+#define BUILD_NUM 331
 #endif
 
 #ifndef SNAPSHOT_ID

diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
@@ -2138,7 +2138,6 @@ char * GameSave::serialiseOPS(unsigned int & dataLength)
 				{
 					RESTRICTVERSION(91, 5);
 				}
-#ifdef SNAPSHOT
 				if (particles[i].type == PT_HEAC || particles[i].type == PT_SAWD || particles[i].type == PT_POLO
 						|| particles[i].type == PT_RFRG || particles[i].type == PT_RFGL || particles[i].type == PT_LSNS)
 				{
@@ -2150,7 +2149,6 @@ char * GameSave::serialiseOPS(unsigned int & dataLength)
 					RESTRICTVERSION(92, 0);
 					fromNewerVersion = true;
 				}
-#endif
 
 				//Get the pmap entry for the next particle in the same position
 				i = partsPosLink[i];

diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
@@ -1488,15 +1488,15 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 	case SDLK_F5:
 		c->ReloadSim();
 		break;
-#if defined(DEBUG) || defined(SNAPSHOT)
 	case 'a':
-		if (ctrl)
+		if ((Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator
+		     || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin
+			 || Client::Ref().GetAuthUser().Username == "Mrprocom") && ctrl)
 		{
 			std::string authorString = Client::Ref().GetAuthorInfo().toStyledString();
 			new InformationMessage("Save authorship info", authorString, true);
 		}
 		break;
-#endif
 	case 'r':
 		if (ctrl)
 			c->ReloadSim();