Correct air include path for OptionsModel, correct Window debugmode logic, justifications for sign

1 files changed, 11 insertions, 2 deletions

diff --git a/src/game/SignTool.cpp b/src/game/SignTool.cpp
index fa004a8..7f28b5e 100644
--- a/src/game/SignTool.cpp
+++ b/src/game/SignTool.cpp
@@ -5,10 +5,12 @@
 #include "interface/Button.h"
 #include "interface/Label.h"
 #include "interface/Textbox.h"
+#include "interface/DropDown.h"
 
 class SignWindow: public ui::Window
 {
 public:
+	ui::DropDown * justification;
 	ui::Textbox * textField;
 	SignTool * tool;
 	Simulation * sim;
@@ -29,11 +31,11 @@ public:
 		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::Left));
+			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::Left));
+			prompt->sim->signs[prompt->signID] = sign(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second));
 		}
 		prompt->SelfDestruct();
 	}
@@ -56,6 +58,13 @@ SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Poi
 	okayButton->SetActionCallback(new OkayAction(this));
 	AddComponent(okayButton);
 	
+	justification = new ui::DropDown(ui::Point(4, 18), ui::Point(50, 16));
+	AddComponent(justification);
+	justification->AddOption(std::pair<std::string, int>("Left", (int)sign::Left));
+	justification->AddOption(std::pair<std::string, int>("Centre", (int)sign::Centre));
+	justification->AddOption(std::pair<std::string, int>("Right", (int)sign::Right));
+	justification->SetOption(0);
+	
 	textField = new ui::Textbox(ui::Point(4, 32), ui::Point(Size.X-8, 16), "");
 	textField->SetAlignment(AlignLeft, AlignBottom);
 	AddComponent(textField);