[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src display.cpp editor/editor_main.cpp
From: |
Philippe Plantier |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src display.cpp editor/editor_main.cpp |
Date: |
Mon, 13 Sep 2004 14:53:25 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 04/09/13 18:48:07
Modified files:
src : display.cpp
src/editor : editor_main.cpp
Log message:
FIxed editor not building
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.260&tr2=1.261&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_main.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.260 wesnoth/src/display.cpp:1.261
--- wesnoth/src/display.cpp:1.260 Sun Sep 12 12:41:46 2004
+++ wesnoth/src/display.cpp Mon Sep 13 18:48:07 2004
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.260 2004/09/12 12:41:46 silene Exp $ */
+/* $Id: display.cpp,v 1.261 2004/09/13 18:48:07 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -53,8 +53,8 @@
}
display::display(unit_map& units, CVideo& video, const gamemap& map,
- const gamestatus& status, const std::vector<team>& t, const
config& theme_cfg,
- const config& config, const config& level) :
+ const gamestatus& status, const std::vector<team>& t,
+ const config& theme_cfg, const config& config, const config&
level) :
screen_(video), xpos_(0), ypos_(0),
zoom_(DefaultZoom), map_(map), units_(units),
minimap_(NULL), redrawMinimap_(false),
Index: wesnoth/src/editor/editor_main.cpp
diff -u wesnoth/src/editor/editor_main.cpp:1.19
wesnoth/src/editor/editor_main.cpp:1.20
--- wesnoth/src/editor/editor_main.cpp:1.19 Fri Sep 3 10:35:28 2004
+++ wesnoth/src/editor/editor_main.cpp Mon Sep 13 18:48:07 2004
@@ -239,8 +239,9 @@
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);
+ *theme_cfg, cfg, dummy_cfg);
map_editor::map_editor editor(gui, map, *theme_cfg,
cfg);
editor.set_file_to_save_as(filename);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src display.cpp editor/editor_main.cpp,
Philippe Plantier <=