diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-14 23:10:10 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-14 23:10:10 (GMT) |
| commit | 45563e97e813cfd21724ad1111e5de3e04679e1a (patch) | |
| tree | 28d6e7d257c8790fa4ac892cb051bd9a86f3681d /src/game/SignTool.cpp | |
| parent | 0b4ad4f25cf168226677f648cf4cadfdb6caa59a (diff) | |
| download | powder-45563e97e813cfd21724ad1111e5de3e04679e1a.zip powder-45563e97e813cfd21724ad1111e5de3e04679e1a.tar.gz | |
Make flood_prop use PropertyType from StructProperty, Property tool works
Diffstat (limited to 'src/game/SignTool.cpp')
| -rw-r--r-- | src/game/SignTool.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/game/SignTool.cpp b/src/game/SignTool.cpp index a1db7fa..2d7a6e5 100644 --- a/src/game/SignTool.cpp +++ b/src/game/SignTool.cpp @@ -20,26 +20,25 @@ public: SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Point position_); virtual void OnDraw(); virtual ~SignWindow() {} -}; - -class OkayAction: public ui::ButtonAction -{ -public: - SignWindow * prompt; - OkayAction(SignWindow * prompt_) { prompt = prompt_; } - void ActionCallback(ui::Button * sender) + class OkayAction: public ui::ButtonAction { - ui::Engine::Ref().CloseWindow(); - if(prompt->signID==-1 && prompt->textField->GetText().length()) - { - prompt->sim->signs.push_back(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second)); - } - else if(prompt->textField->GetText().length()) + public: + SignWindow * prompt; + OkayAction(SignWindow * prompt_) { prompt = prompt_; } + void ActionCallback(ui::Button * sender) { - prompt->sim->signs[prompt->signID] = sign(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second)); + ui::Engine::Ref().CloseWindow(); + if(prompt->signID==-1 && prompt->textField->GetText().length()) + { + prompt->sim->signs.push_back(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second)); + } + else if(prompt->textField->GetText().length()) + { + prompt->sim->signs[prompt->signID] = sign(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second)); + } + prompt->SelfDestruct(); } - prompt->SelfDestruct(); - } + }; }; SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Point position_): |
