matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GOL loads gol colours for use

Browse Source
This commit is contained in:
Simon Robertshaw 2012-07-19 17:05:01 +01:00
parent 2b4ec99894
commit c2873180e2
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/GameView.cpp
View File

@ -365,7 +365,7 @@ void GameView::NotifyMenuListChanged(GameModel * sender)
std::string tempString = "";
Menu * item = *iter;
tempString += item->GetIcon();
ui::Button * tempButton = new ui::Button(ui::Point(XRES+BARSIZE-16, currentY), ui::Point(15, 15), tempString);
ui::Button * tempButton = new ui::Button(ui::Point(XRES+BARSIZE-16, currentY), ui::Point(15, 15), tempString, item->GetDescription());
tempButton->Appearance.Margin = ui::Border(0, 2, 3, 2);
tempButton->SetTogglable(true);
tempButton->SetActionCallback(new MenuAction(this, item));

21
src/simulation/elements/LIFE.cpp
View File

@ -1,4 +1,8 @@
#include "simulation/Elements.h"
bool Element_GOL_colourInit = false;
pixel Element_GOL_colour[NGOL];
//#TPT-Directive ElementClass Element_LIFE PT_LIFE 78
Element_LIFE::Element_LIFE()
{
@ -44,8 +48,23 @@ Element_LIFE::Element_LIFE()
Update = NULL;
Graphics = &Element_LIFE::graphics;
if(!Element_GOL_colourInit)
{
Element_GOL_colourInit = true;
int golMenuCount;
gol_menu * golMenuT = LoadGOLMenu(golMenuCount);
for(int i = 0; i < golMenuCount && i < NGOL; i++)
{
Element_GOL_colour[i] = golMenuT[i].colour;
}
free(golMenuT);
}
}
//#TPT-Directive ElementHeader Element_LIFE static int graphics(GRAPHICS_FUNC_ARGS)
int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS)
@ -94,7 +113,7 @@ int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS)
else
pc = PIXRGB(255, 255, 0);
} else {
pc = PIXRGB(255, 255, 0);//sim->gmenu[cpart->ctype].colour;
pc = Element_GOL_colour[cpart->ctype];
}
*colr = PIXR(pc);
*colg = PIXG(pc);