summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-07 23:11:21 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-07 23:11:21 (GMT)
commitc88079d084f2f3b7ec891da22f8c497cd2652853 (patch)
treeba24b70fb653b24a23e51c18a1d8d876233f71a5 /src/game/GameController.cpp
parentbbfbb81086897d50b67bf1494ac150eb607add72 (diff)
downloadpowder-c88079d084f2f3b7ec891da22f8c497cd2652853.zip
powder-c88079d084f2f3b7ec891da22f8c497cd2652853.tar.gz
Element sampling HUD thingy (No very good with MVC)
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index dfdc12d..40d7501 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -348,6 +348,12 @@ void GameController::Tick()
void GameController::Update()
{
+ ui::Point pos = gameView->GetMousePosition();
+ if(pos.X >= 0 && pos.Y >= 0 && pos.X < XRES && pos.Y < YRES)
+ {
+ gameView->SetSample(gameModel->GetSimulation()->Get(pos.X, pos.Y));
+ }
+
gameModel->GetSimulation()->update_particles();
if(renderOptions && renderOptions->HasExited)
{
@@ -558,4 +564,8 @@ void GameController::ReloadSim()
gameModel->GetSimulation()->Load(gameModel->GetSave()->GetData(), gameModel->GetSave()->GetDataLength());
}
+std::string GameController::ElementResolve(int type)
+{
+ return std::string(gameModel->GetSimulation()->ptypes[type].name);
+}