mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-12 03:14:04 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114 from mniip/deco

Browse Source 
'b' key opens deco editor
This commit is contained in:
jacob1
2013-01-12 14:04:31 -08:00
parent b3037857f0 df628c7fe3
commit e29b4c14d6
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/GameController.cpp
View File

@@ -1388,3 +1388,8 @@ void GameController::RunUpdater()
new UpdateActivity(); new UpdateActivity();
} }
std::vector<Menu*> GameController::GetMenuList()
{
return gameModel->GetMenuList();
}

1
src/game/GameController.h
View File

@@ -148,6 +148,7 @@ public:
virtual void NotifyAuthUserChanged(Client * sender); virtual void NotifyAuthUserChanged(Client * sender);
virtual void NotifyNewNotification(Client * sender, std::pair<std::string, std::string> notification); virtual void NotifyNewNotification(Client * sender, std::pair<std::string, std::string> notification);
void RunUpdater(); void RunUpdater();
std::vector<Menu*> GetMenuList();
}; };
#endif // GAMECONTROLLER_H #endif // GAMECONTROLLER_H

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->GetMenuList()[SC_DECO]);
break; break;
case 'y': case 'y':
c->SwitchAir(); c->SwitchAir();