diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-06 15:14:08 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-06 15:14:08 (GMT) |
| commit | 662640c96c86ba83132f0683c35bfba24b43783c (patch) | |
| tree | 5f0b5270d9410a683d45909e789c478c01d6d6e0 /src/game | |
| parent | 0e43f2e83118897bc916db69a012f4686429d930 (diff) | |
| download | powder-662640c96c86ba83132f0683c35bfba24b43783c.zip powder-662640c96c86ba83132f0683c35bfba24b43783c.tar.gz | |
Fix previous merge with SOAP.cpp that created a bug in SOAP. add debug lines for PRTI, PRTO, WIFI and lines for SOAP.
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/GameController.cpp | 2 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index ea21fd1..2ca447d 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -560,6 +560,8 @@ void GameController::Update() ui::Point pos = gameView->GetMousePosition(); if(pos.X >= 0 && pos.Y >= 0 && pos.X < XRES && pos.Y < YRES) { + gameModel->GetRenderer()->mousePosX = pos.X; + gameModel->GetRenderer()->mousePosY = pos.Y; gameView->SetSample(gameModel->GetSimulation()->Get(pos.X, pos.Y)); } diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index c9c293d..d0fde06 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -1289,7 +1289,7 @@ void GameView::NotifyNotificationsChanged(GameModel * sender) std::vector<Notification*> notifications = sender->GetNotifications(); - int currentY = YRES-17; + int currentY = YRES-23; for(std::vector<Notification*>::iterator iter = notifications.begin(), end = notifications.end(); iter != end; ++iter) { int width = (Graphics::textwidth((*iter)->Message.c_str()))+8; |