mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-01 20:12:50 +02:00
Code Issues Projects Releases Wiki Activity

'B' opens deco editor

Browse Source
This commit is contained in:
mniip
2013-01-11 21:27:20 +04:00
parent 9d67dd61e8
commit 269420c6c7
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/GameController.h
View File

@@ -36,7 +36,6 @@ private:
int screenshotIndex; int screenshotIndex;
PreviewController * activePreview; PreviewController * activePreview;
GameView * gameView; GameView * gameView;
GameModel * gameModel;
SearchController * search; SearchController * search;
RenderController * renderOptions; RenderController * renderOptions;
LoginController * loginWindow; LoginController * loginWindow;
@@ -57,6 +56,7 @@ public:
class SaveOpenCallback; class SaveOpenCallback;
friend class SaveOpenCallback; friend class SaveOpenCallback;
GameController(); GameController();
GameModel * gameModel;
~GameController(); ~GameController();
GameView * GetView(); GameView * GetView();

3
src/game/GameView.cpp
View File

@@ -12,6 +12,7 @@
#include "interface/Slider.h" #include "interface/Slider.h"
#include "search/Thumbnail.h" #include "search/Thumbnail.h"
#include "simulation/SaveRenderer.h" #include "simulation/SaveRenderer.h"
#include "simulation/SimulationData.h"
#include "dialogues/ConfirmPrompt.h" #include "dialogues/ConfirmPrompt.h"
#include "Format.h" #include "Format.h"
#include "QuickOption.h" #include "QuickOption.h"
@@ -1321,6 +1322,8 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
case 'b': case 'b':
if(ctrl) if(ctrl)
c->SetDecoration(); c->SetDecoration();
else
c->SetActiveMenu(c->gameModel->GetMenuList()[SC_DECO]);
break; break;
case 'y': case 'y':
c->SwitchAir(); c->SwitchAir();