Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2014-12-13 12:03:00 +0000
committerStijn Buys <ingar@osirion.org>2014-12-13 12:03:00 +0000
commitf58c9992f6a6006213123c2fc2cda0d0f055494b (patch)
tree19fe82ac01620c93bf436d7f01d8ac39534f30fd /src/client/mainmenu.cc
parent493e4317e19725e2de2d51753e5c1906bf9c64ba (diff)
Suppressed client::Dialog as it has been superceded by client::Messagebox.
Diffstat (limited to 'src/client/mainmenu.cc')
-rw-r--r--src/client/mainmenu.cc40
1 files changed, 1 insertions, 39 deletions
diff --git a/src/client/mainmenu.cc b/src/client/mainmenu.cc
index a70cad0..89c29be 100644
--- a/src/client/mainmenu.cc
+++ b/src/client/mainmenu.cc
@@ -5,7 +5,6 @@
*/
#include "client/buttonmenu.h"
-#include "client/dialog.h"
#include "client/mainmenu.h"
#include "client/savegamemenu.h"
#include "core/core.h"
@@ -63,7 +62,6 @@ void MainMenu::load_definitions()
con_debug << " Loading menu definitions..." << std::endl;
- Dialog *dialog = 0;
ui::Label *label = 0;
ui::Button *button = 0;
ButtonMenu *menu = 0;
@@ -74,16 +72,9 @@ void MainMenu::load_definitions()
if (ini.got_section()) {
if (ini.got_section("menu")) {
- dialog = 0;
menu = 0;
continue;
- // dialog
- } else if (ini.got_section("dialog")) {
- dialog = 0;
- menu = 0;
- continue;
-
// menu button
} else if (ini.got_section("button")) {
@@ -111,36 +102,7 @@ void MainMenu::load_definitions()
} else if (ini.got_key()) {
- if (ini.in_section("dialog")) {
- if (!dialog) {
- if (ini.got_key_label("label", strval)) {
- dialog = new Dialog(this);
- dialog->set_label(strval);
- } else {
- ini.unknown_error("dialog definition requires label first");
- }
- } else {
- if (ini.got_key_label("label", strval)) {
- dialog->set_label(strval);
-
- } else if (ini.got_key_string("text", strval)) {
- dialog->set_text(strval);
-
- } else if (ini.got_key_string("button", strval)) {
- dialog->set_button(strval);
-
- } else if (ini.got_key_string("command", strval)) {
- for (size_t i = 0; i <= strval.size(); i++) {
- if (strval[i] == ',') strval[i] = ';';
- }
- aux::strip_quotes(strval);
- dialog->set_command(strval);
- } else {
- ini.unknown_key();
- }
- }
-
- } else if (ini.in_section("menu")) {
+ if (ini.in_section("menu")) {
if (ini.got_key_label("label", strval)) {