[Wesnoth-commits] r28669 - in /trunk: data/_main.cfg src/editor/editor_main.cpp src/game.cpp

[kailoran]

Author: ilor
Date: Sun Aug 17 13:47:21 2008
New Revision: 28669

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28669&view=rev
Log:
more data/_main.cfg cleanup, set proper defines in cpp instead of juggling them 
with ifdef define

Modified:
    trunk/data/_main.cfg
    trunk/src/editor/editor_main.cpp
    trunk/src/game.cpp

Modified: trunk/data/_main.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/_main.cfg?rev=28669&r1=28668&r2=28669&view=diff
==============================================================================
--- trunk/data/_main.cfg (original)
+++ trunk/data/_main.cfg Sun Aug 17 13:47:21 2008
@@ -1,14 +1,4 @@
 #textdomain wesnoth
-
-#ifdef EDITOR
-#define OLD_EDITOR
-#enddef
-#else
-#ifdef EDITOR2
-#define EDITOR
-#enddef
-#endif
-#endif
 
 {themes/}
 

Modified: trunk/src/editor/editor_main.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor_main.cpp?rev=28669&r1=28668&r2=28669&view=diff
==============================================================================
--- trunk/src/editor/editor_main.cpp (original)
+++ trunk/src/editor/editor_main.cpp Sun Aug 17 13:47:21 2008
@@ -277,7 +277,7 @@
        preproc_map defines_map;
        // define editor to do conditionnal loading in the main cfg
        defines_map["EDITOR"] = preproc_define();
-
+       defines_map["OLD_EDITOR"] = preproc_define();
        defines_map["MEDIUM"] = preproc_define();
        defines_map["NORMAL"] = preproc_define();
 

Modified: trunk/src/game.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=28669&r1=28668&r2=28669&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Sun Aug 17 13:47:21 2008
@@ -1821,6 +1821,7 @@
 editor2::EXIT_STATUS game_controller::start_editor()
 {
     reset_game_cfg();
+    defines_map_["EDITOR"] = preproc_define();
     defines_map_["EDITOR2"] = preproc_define();
     refresh_game_cfg();
     const binary_paths_manager bin_paths_manager(game_config_);


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits