Author: ilor
Date: Sat Jun 7 15:34:05 2008
New Revision: 27027
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27027&view=rev
Log:
change editor2 define to USE_EDITOR2 for consistency
Modified:
trunk/src/game.cpp
trunk/src/titlescreen.cpp
trunk/src/titlescreen.hpp
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=27027&r1=27026&r2=27027&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Sat Jun 7 15:34:05 2008
@@ -66,7 +66,7 @@
#include "ai_python.hpp"
#endif
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
#include "editor2/editor_main.hpp"
#endif
@@ -141,7 +141,7 @@
enum RELOAD_GAME_DATA { RELOAD_DATA, NO_RELOAD_DATA };
void play_game(RELOAD_GAME_DATA reload=RELOAD_DATA);
void play_replay();
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
editor2::EXIT_STATUS start_editor();
#endif
const config& game_config(){return game_config_;};
@@ -2021,11 +2021,6 @@
defines_map_["NORMAL"] = preproc_define();
defines_map_["MEDIUM"] = preproc_define();
}
-#ifdef MAP_EDITOR
- defines_map_["EDITOR"] = preproc_define();
- defines_map_["NORMAL"] = preproc_define();
- defines_map_["MEDIUM"] = preproc_define();
-#endif
//refresh_game_cfg();
}
@@ -2126,9 +2121,11 @@
}
}
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
editor2::EXIT_STATUS game_controller::start_editor()
{
+ defines_map_["EDITOR"] = preproc_define();
+ refresh_game_cfg();
editor2::start(game_config_, video_);
}
#endif
@@ -2542,7 +2539,7 @@
} else if(res == gui::BEG_FOR_UPLOAD) {
game.show_upload_begging();
continue;
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
} else if(res == gui::START_MAP_EDITOR) {
//@todo editor can ask the game to quit completely
game.start_editor();
Modified: trunk/src/titlescreen.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/titlescreen.cpp?rev=27027&r1=27026&r2=27027&view=diff
==============================================================================
--- trunk/src/titlescreen.cpp (original)
+++ trunk/src/titlescreen.cpp Sat Jun 7 15:34:05 2008
@@ -368,7 +368,7 @@
N_("TitleScreen
button^Multiplayer"),
N_("TitleScreen button^Load"),
N_("TitleScreen button^Add-ons"),
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
N_("TitleScreen button^Editor"),
#endif
N_("TitleScreen
button^Language"),
@@ -388,7 +388,7 @@
N_("Play multiplayer
(hotseat, LAN, or Internet), or a single scenario against the AI"),
N_("Load a saved game"),
N_("Download usermade
campaigns, eras, or map packs"),
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
N_("Start the map editor"),
#endif
N_("Change the language"),
Modified: trunk/src/titlescreen.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/titlescreen.hpp?rev=27027&r1=27026&r2=27027&view=diff
==============================================================================
--- trunk/src/titlescreen.hpp (original)
+++ trunk/src/titlescreen.hpp Sat Jun 7 15:34:05 2008
@@ -25,7 +25,7 @@
NEW_CAMPAIGN, /**< Let user
select a campaign to play */
MULTIPLAYER, /**< Play
single scenario against humans or AI */
LOAD_GAME, GET_ADDONS,
-#ifdef MAP_EDITOR
+#ifdef USE_EDITOR2
START_MAP_EDITOR,
#endif
CHANGE_LANGUAGE, EDIT_PREFERENCES,
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
