CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <[EMAIL PROTECTED]> 05/01/20 20:50:31
Modified files:
src/editor : editor_main.cpp
Log message:
Remove annoying theme dump, and fix include order.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_main.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
Patches:
Index: wesnoth/src/editor/editor_main.cpp
diff -u wesnoth/src/editor/editor_main.cpp:1.22
wesnoth/src/editor/editor_main.cpp:1.23
--- wesnoth/src/editor/editor_main.cpp:1.22 Sat Dec 4 20:06:07 2004
+++ wesnoth/src/editor/editor_main.cpp Thu Jan 20 20:50:30 2005
@@ -13,17 +13,17 @@
#include "editor.hpp"
#include "../config.hpp"
-#include "../game_config.hpp"
-#include "../gettext.hpp"
+#include "../cursor.hpp"
#include "../filesystem.hpp"
#include "../font.hpp"
+#include "../game_config.hpp"
+#include "../gettext.hpp"
#include "../image.hpp"
+#include "../language.hpp"
#include "../map.hpp"
+#include "../preferences.hpp"
#include "../team.hpp"
#include "../util.hpp"
-#include "../preferences.hpp"
-#include "../language.hpp"
-#include "../cursor.hpp"
#include "../wesconfig.h"
#include <cctype>
@@ -236,7 +236,6 @@
std::cerr << "creating map...\n";
gamemap map(cfg, mapdata);
- std::cerr << "Using theme cfg: " << std::endl <<
theme_cfg->write() << std::endl;
const config dummy_cfg("");
display gui(units, video, map, status, teams,
*theme_cfg, cfg, dummy_cfg);