#25, #24: Move the gameDialog class to the Controller namespace.

larspensjo · Jan 29, 2013 · 1ea890d · 1ea890d
1 parent d70c8e6
commit 1ea890d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/Source/gamedialog.cpp b/Source/gamedialog.cpp
@@ -68,6 +68,8 @@
 #include "worsttime.h"
 #include "ChunkProcess.h"
 
+using namespace Controller;
+
 using std::string;
 
 const float defaultRenderViewAngle = 60.0f;
@@ -80,7 +82,7 @@ static std::vector<unsigned>::iterator sTextureIterator;
 static bool sShowAlternateBitmap = false;
 
 static float mouseSens = -5.0f;
-gameDialog gGameDialog; // For now, there will only be one
+gameDialog Controller::gGameDialog; // For now, there will only be one
 
 // If there are any strings in these parameters, show them once in a popup dialog.
 string sgPopup, sgPopupTitle = "Ephenation";
@@ -309,7 +311,7 @@ int xStartTurn = 0, yStartTurn = 0;
 float angleHorStartTurn = 0.0f, angleVertStartTurn;
 
 static void handleMouseActiveMotion(int x, int y) {
-	gGameDialog.handleMouseActiveMotion(x, y);
+	Controller::gGameDialog.handleMouseActiveMotion(x, y);
 }
 
 void gameDialog::handleMouseActiveMotion(int x, int y) {

diff --git a/Source/gamedialog.h b/Source/gamedialog.h
@@ -42,6 +42,8 @@ namespace Rocket {
 	}
 };
 
+namespace Controller {
+
 /// This corresponds to the controller class in a Model/View/Controller.
 /// - keyboard input
 /// - mouse input
@@ -142,6 +144,9 @@ class gameDialog {
 };
 
 extern gameDialog gGameDialog;
+
+}
+
 extern float renderViewAngle;
 
 /// A string that automatically will be shown in a pop up window.

diff --git a/Source/main.cpp b/Source/main.cpp
@@ -398,7 +398,7 @@ int main(int argc, char** argv) {
 	gUniformBuffer.Init();
 	gDrawFont.Init("textures/georgia12"); // Must be done before gGameDialog.
 	GameTexture::Init();
-	gGameDialog.init();
+	Controller::gGameDialog.init();
 	ChunkShader *shader = ChunkShader::Make();
 	gChunkShaderPicking.Init();
 	Tree::InitStatic();
@@ -444,8 +444,8 @@ int main(int argc, char** argv) {
 				ListenForServerMessages();
 		}
 
-		gGameDialog.Update();
-		gGameDialog.render(sHideGUI);
+		Controller::gGameDialog.Update();
+		Controller::gGameDialog.render(sHideGUI);
 
 		glfwSwapBuffers();
 

diff --git a/Source/parse.cpp b/Source/parse.cpp
@@ -173,7 +173,7 @@ static void ServerMessage(const char *msg) {
 		// This is a special string to be used for sound effects.
 		gSoundControl.RequestTrigSound(msg+1);
 		if (strncmp(msg+1, "BOOM", 4) == 0)
-			gGameDialog.RequestEffect(gameDialog::EFFECT_ZOOM2);
+			Controller::gGameDialog.RequestEffect(Controller::gameDialog::EFFECT_ZOOM2);
 		if (strlen(msg) < 6)
 			return; // That was all for now
 		msg += 6; // Skip the sound string.
@@ -312,7 +312,7 @@ void Parse(const unsigned char *b, int n) {
 			else
 				gSoundControl.RequestSound(SoundControl::SBuildBlock);
 			if (type == BT_Text) {
-				gGameDialog.CreateActivatorMessage(dx, dy, dz, cc);
+				Controller::gGameDialog.CreateActivatorMessage(dx, dy, dz, cc);
 			}
 		}
 		cp->SetDirty(true);
@@ -398,7 +398,7 @@ void Parse(const unsigned char *b, int n) {
 	case CMD_RESP_AGGRO_FROM_MONSTER:
 		for (int i=1; i<n; i += 4) {
 			unsigned long id = ParseUint32(b+i);
-			gGameDialog.AggroFrom(gMonsters.Find(id));
+			Controller::gGameDialog.AggroFrom(gMonsters.Find(id));
 		}
 		break;
 	case CMD_UPD_INV:

diff --git a/Source/ui/activator.cpp b/Source/ui/activator.cpp
@@ -32,7 +32,7 @@
 
 void ActivatorDialog::UseDocument(Rocket::Core::ElementDocument *doc, std::function<void()> callback) {
 	this->Push(doc, callback); // Allways push the previous document first
-	gGameDialog.GetActivator(fDx, fDy, fDz, fCC);
+	Controller::gGameDialog.GetActivator(fDx, fDy, fDz, fCC);
 	fFormResultValues.clear(); // Restart with an empty list
 	this->Treewalk([this](Rocket::Core::Element *e){ this->UpdateInput(e);} ); // Fill default parameters in the document
 	this->Treewalk([this](Rocket::Core::Element *e) {this->DetectDefaultButton(e); }); // This can be done by the local callback
@@ -201,7 +201,7 @@ void ActivatorDialog::FormEvent(Rocket::Core::Event& event, const string &action
 	// std::cout << s << std::endl;
 
 	if (!this->Pop())
-		gGameDialog.ClearInputRedirect(); // Normal case
+		Controller::gGameDialog.ClearInputRedirect(); // Normal case
 }
 
 bool ActivatorDialog::ClickEvent(Rocket::Core::Event& event, const string &action) {

diff --git a/Source/ui/base.cpp b/Source/ui/base.cpp
@@ -85,7 +85,7 @@ bool BaseDialog::ClickEvent(Rocket::Core::Event& event, const string &action) {
 	Splitter split(action, " ");
 	if (action == "Close") {
 		if (!this->Pop())
-			gGameDialog.ClearInputRedirect();
+			Controller::gGameDialog.ClearInputRedirect();
 		return true;
 	} else if (split[0] == "Popup" && split.size() == 2) {
 		gDialogFactory.Make(fStack.back().fDocument->GetContext(), split[1]);
@@ -97,7 +97,7 @@ bool BaseDialog::ClickEvent(Rocket::Core::Event& event, const string &action) {
 		// Pop all saved documents, if any.
 		while(this->Pop())
 			continue;
-		gGameDialog.ClearInputRedirect();
+		Controller::gGameDialog.ClearInputRedirect();
 		gMode.Set(GameMode::ESC);
 		return true;
 	} else if (action == "") {

diff --git a/Source/ui/login.cpp b/Source/ui/login.cpp
@@ -76,6 +76,6 @@ void LoginDialog::FormEvent(Rocket::Core::Event& event, const string &action) {
 		// printf("Login %s, %s, %s\n", fFormResultValues["Login.licensekey"].c_str(), fFormResultValues["Login.email"].c_str(), fFormResultValues["Login.password"].c_str());
 
 		if (!this->Pop())
-			gGameDialog.ClearInputRedirect(); // Normal case
+			Controller::gGameDialog.ClearInputRedirect(); // Normal case
 	}
 }
diff --git a/Source/ui/options.cpp b/Source/ui/options.cpp
@@ -150,6 +150,6 @@ void OptionsDialog::FormEvent(Rocket::Core::Event& event, const string &action)
 		}
 
 		if (!this->Pop())
-			gGameDialog.ClearInputRedirect(); // Normal case
+			Controller::gGameDialog.ClearInputRedirect(); // Normal case
 	}
 }