Author: mordante
Date: Sun Jul 20 13:36:27 2008
New Revision: 28102
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28102&view=rev
Log:
A cleaner fix for r28095, now the new editor can be used without being force to
use the new widgets. (Was in a hurry with r28095 ;-))
Modified:
trunk/src/game.cpp
trunk/src/gui/widgets/settings.cpp
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=28102&r1=28101&r2=28102&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Sun Jul 20 13:36:27 2008
@@ -2691,10 +2691,7 @@
const cursor::manager cursor_manager;
cursor::set(cursor::WAIT);
- if(gui2::new_widgets) {
- gui2::init();
- }
-
+ gui2::init();
loadscreen::global_loadscreen_manager
loadscreen_manager(game.disp().video());
Modified: trunk/src/gui/widgets/settings.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/settings.cpp?rev=28102&r1=28101&r2=28102&view=diff
==============================================================================
--- trunk/src/gui/widgets/settings.cpp (original)
+++ trunk/src/gui/widgets/settings.cpp Sun Jul 20 13:36:27 2008
@@ -51,13 +51,7 @@
namespace gui2 {
-// editor2 uses the new widgets so they always need to be available there.
-// Since there's no off switch, changing the default will do.
-#ifdef USE_EDITOR2
-bool new_widgets = true;
-#else
bool new_widgets = false;
-#endif
namespace settings {
unsigned screen_width = 0;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
