summaryrefslogtreecommitdiff
path: root/src/gui/game/GameModel.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-14 18:40:18 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-14 18:40:18 (GMT)
commit431f5a0083dca3da5c881e507908690ebb5a052a (patch)
tree0b9aeb0e485e3892960a403f445f4a273b03d1f7 /src/gui/game/GameModel.cpp
parent18ddb7a1558d474f6f216307c89bfde5e24f924d (diff)
downloadpowder-431f5a0083dca3da5c881e507908690ebb5a052a.zip
powder-431f5a0083dca3da5c881e507908690ebb5a052a.tar.gz
lua simulation api functions for creating particles, walls, boxes, and walls
Diffstat (limited to 'src/gui/game/GameModel.cpp')
-rw-r--r--src/gui/game/GameModel.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index 1494d6d..18276d0 100644
--- a/src/gui/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -292,7 +292,7 @@ void GameModel::BuildMenus()
//Build menu for GOL types
for(int i = 0; i < NGOL; i++)
{
- Tool * tempTool = new GolTool(i, sim->gmenu[i].name, std::string(sim->gmenu[i].description), PIXR(sim->gmenu[i].colour), PIXG(sim->gmenu[i].colour), PIXB(sim->gmenu[i].colour), "DEFAULT_PT_LIFE_"+std::string(sim->gmenu[i].name));
+ Tool * tempTool = new GolTool(PT_LIFE|(i<<8), sim->gmenu[i].name, std::string(sim->gmenu[i].description), PIXR(sim->gmenu[i].colour), PIXG(sim->gmenu[i].colour), PIXB(sim->gmenu[i].colour), "DEFAULT_PT_LIFE_"+std::string(sim->gmenu[i].name));
menuList[SC_LIFE]->AddTool(tempTool);
}
@@ -424,12 +424,17 @@ Brush * GameModel::GetBrush()
return brushList[currentBrush];
}
+vector<Brush*> GameModel::GetBrushList()
+{
+ return brushList;
+}
+
int GameModel::GetBrushID()
{
return currentBrush;
}
-void GameModel::SetBrush(int i)
+void GameModel::SetBrushID(int i)
{
currentBrush = i%brushList.size();
notifyBrushChanged();
@@ -511,6 +516,7 @@ Menu * GameModel::GetActiveMenu()
return activeMenu;
}
+//Get an element tool from an element ID
Tool * GameModel::GetElementTool(int elementID)
{
#ifdef DEBUG