summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-24 21:19:29 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-24 21:19:29 (GMT)
commit04e4a2346d3d7ef6e0f0b38d8eafc928dc6e30bd (patch)
tree90dd247e31d85db8c66466f08308360d9c39fe9c /src/game
parent97b35bc47059315d4138c8e0827842d2c03de152 (diff)
downloadpowder-04e4a2346d3d7ef6e0f0b38d8eafc928dc6e30bd.zip
powder-04e4a2346d3d7ef6e0f0b38d8eafc928dc6e30bd.tar.gz
Wall menus
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameModel.cpp7
-rw-r--r--src/game/GameView.cpp1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 8f16f49..3271f3a 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -30,6 +30,13 @@ GameModel::GameModel():
menuList[sim->ptypes[i].menusection]->AddTool(tempTool);
}
}
+ //Build other menus from wall data
+ for(int i = 0; i < UI_WALLCOUNT; i++)
+ {
+ Tool * tempTool = new ElementTool(i+UI_WALLSTART, "", PIXR(sim->wtypes[i].colour), PIXG(sim->wtypes[i].colour), PIXB(sim->wtypes[i].colour));
+ menuList[SC_WALL]->AddTool(tempTool);
+ //sim->wtypes[i]
+ }
activeTool = new ElementTool(1, "TURD", 0, 0, 0);
}
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 8438e1b..d452756 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -412,6 +412,7 @@ void GameView::OnDraw()
ren->render_parts();
ren->render_fire();
ren->render_signs();
+ ren->draw_walls();
}
if(activeBrush && currentMouse.X > 0 && currentMouse.X < XRES && currentMouse.Y > 0 && currentMouse.Y < YRES)
{