[Wesnoth-cvs-commits] wesnoth/src Makefile.am animated.hpp builder.cp... (February 21, 2005 - 10:29)

 

CVSROOT:	/cvsroot/wesnoth
Module name:	wesnoth
Branch: 	
Changes by:	Guillaume Melquiond <silene@xxxxxxxxxxxxxxxx>	05/02/21 09:05:51

Modified files:
	src            : Makefile.am animated.hpp builder.cpp 
	                 cavegen.cpp dialogs.cpp font.cpp game.cpp 
	                 game_events.cpp gamestatus.cpp halo.cpp 
	                 help.cpp leader_list.cpp map.cpp mapgen.cpp 
	                 multiplayer_connect.cpp multiplayer_wait.cpp 
	                 playturn.cpp preferences.cpp race.cpp team.cpp 
	                 theme.cpp unit.cpp unit_types.cpp 
	src/editor     : editor.cpp editor_main.cpp 
	src/widgets    : button.cpp menu.cpp 
Added files:
	src            : animated.cpp 

Log message:
	Remove the template code from animated.hpp and put it into animated.cpp. This code was indirectly included in at least 25 files: the 25 files for which a dependency on string_utils.hpp has been added by a consequence of its removal from animated.hpp. It should induce a small compile time improvement.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/animated.cpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/animated.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cavegen.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.195&tr2=1.196&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.120&tr2=1.121&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/halo.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/leader_list.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.cpp.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.cpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.329&tr2=1.330&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/team.cpp.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/theme.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.122&tr2=1.123&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_main.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/button.cpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.77&tr2=1.78&r1=text&r2=text

Patches:
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.71 wesnoth/src/Makefile.am:1.72
--- wesnoth/src/Makefile.am:1.71	Sun Feb 20 22:30:27 2005
+++ wesnoth/src/Makefile.am	Mon Feb 21 09:05:51 2005
@@ -33,6 +33,7 @@
 		  ai.cpp \
 		  ai_attack.cpp \
 		  ai_move.cpp \
+		  animated.cpp \
 		  astarnode.cpp \
 		  builder.cpp \
 		  cavegen.cpp \
@@ -214,6 +215,7 @@
 			 editor/editor_undo.cpp \
 			 about.cpp \
 			 actions.cpp \
+			 animated.cpp \
 			 astarnode.cpp \
 			 builder.cpp \
 			 cavegen.cpp \
@@ -289,6 +291,7 @@
 			 ai.hpp \
 			 ai_attack.hpp \
 			 ai_move.hpp \
+			 animated.hpp \
 			 array.hpp \
 			 astarnode.hpp \
 		         builder.hpp \
Index: wesnoth/src/animated.hpp
diff -u wesnoth/src/animated.hpp:1.5 wesnoth/src/animated.hpp:1.6
--- wesnoth/src/animated.hpp:1.5	Sun Feb 20 20:46:47 2005
+++ wesnoth/src/animated.hpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: animated.hpp,v 1.5 2005/02/20 20:46:47 silene Exp $ */
+/* $Id: animated.hpp,v 1.6 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <ayin@xxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -16,9 +16,6 @@
 
 #include <string>
 #include <vector>
-#include "SDL.h"
-#include "util.hpp"
-#include "serialization/string_utils.hpp"
 
 template<typename T>
 class void_value
@@ -69,8 +66,7 @@
 	bool animation_finished() const;
 	int get_animation_time() const;
 	int get_frame_time() const;
-	inline const T& get_current_frame() const;
-	const T& get_base_frame() const;
+	const T& get_current_frame() const;
 	
 private:
 	struct frame
@@ -113,249 +109,5 @@
 	std::vector<frame> frames_;
 };
 
-
-template<typename T, typename T_void_value>
-const T animated<T,T_void_value>::void_value_ = T_void_value()();
-
-template<typename T, typename T_void_value>
-animated<T,T_void_value>::animated() : 
-	starting_frame_time_(INT_MAX),
-	ending_frame_time_(INT_MIN),
-	started_(false),
-	no_current_frame_(true),
-	does_not_change_(false),
-	real_start_ticks_(0),
-	start_ticks_(0),
-	acceleration_(1)
-{}
-
-template<typename T,  typename T_void_value>
-animated<T,T_void_value>::animated(const std::string &cfg, const string_initializer& init): 
-	starting_frame_time_(INT_MAX),
-	started_(false),
-	no_current_frame_(true),
-	does_not_change_(false),
-	real_start_ticks_(0),
-	start_ticks_(0),
-	acceleration_(1)
-{
-	std::vector<std::string> items = utils::split(cfg);
-
-	int current_time = 0;
-
-	std::vector<std::string>::const_iterator itor = items.begin();
-	for(; itor != items.end(); ++itor) {
-		const std::vector<std::string>& items = utils::split(*itor, ':');
-		std::string str;
-		int time;
-
-		if(items.size() > 1) {
-			str = items.front();
-			time = atoi(items.back().c_str());
-		} else {
-			str = *itor;
-			time = 100;
-		}
-
-		frames_.push_back(frame(current_time, init(str)));
-		current_time += time;
-	}
-	
-	starting_frame_time_ = 0;
-	ending_frame_time_ = current_time;
-}
-
-
-template<typename T,  typename T_void_value>
-void animated<T,T_void_value>::add_frame(int start)
-{
-	frames_.push_back(frame(start));
-	starting_frame_time_ = minimum<int>(starting_frame_time_, start);
-	ending_frame_time_ = maximum<int>(ending_frame_time_, start);
-}
-
-template<typename T,  typename T_void_value>
-void animated<T,T_void_value>::add_frame(int start, const T& value)
-{
-	frames_.push_back(frame(start, value));
-	starting_frame_time_ = minimum<int>(starting_frame_time_, start);
-	ending_frame_time_ = maximum<int>(ending_frame_time_, start);
-}
-
-template<typename T,  typename T_void_value>
-void animated<T,T_void_value>::start_animation(int start_frame, int cycles, int acceleration)
-{
-	started_ = true;
-	start_frame_ = start_frame;
-	start_ticks_ = real_start_ticks_ = current_time_ = SDL_GetTicks() * acceleration;
-	cycles_ = cycles;
-	current_cycle_ = 0;
-	acceleration_ = acceleration;
-	// current_frame_ = frames_.begin();
-	current_frame_ = 0;
-
-	if (ending_frame_time_ >= start_frame_) {
-		duration_ = ending_frame_time_ - start_frame_;
-	} else {
-		duration_ = 0;
-	}
-}
-
-
-template<typename T,  typename T_void_value>
-void animated<T,T_void_value>::update_current_frame_internal()
-{
-	// std::cerr << "--- updating frame ---\n";
-	if(does_not_change_)
-		return;
-	
-	frame_changed_ = false;
-	// Always update current_time_, for the animation_time functions to work.
-	current_time_ = SDL_GetTicks() * acceleration_;
-	if(!started_) 
-		return;
-
-	if(frames_.empty()) {
-		no_current_frame_ = true;
-		does_not_change_ = true;
-		return;
-	}
-
-	if(frames_.size() == 1 && cycles_ == INFINITE_CYCLES) {
-		does_not_change_ = true;
-		frame_changed_ = false;
-	}
-
-	if (duration_ > 0) {
-		// Ticks is the actual time since animation started.
-		int ticks = current_time_ - start_ticks_;
-
-		// Handles cycle overflow
-		if(ticks > duration_) {
-			int ncycles = ticks/duration_;
-			current_cycle_ = minimum<int>(cycles_, current_cycle_ + ncycles);
-			start_ticks_ += ncycles * duration_;
-			ticks -= ncycles * duration_;
-			// current_frame_ = frames_.begin();
-			current_frame_ = 0;
-			frame_changed_ = true;
-		}
-		// Checks if the animation is finished
-		if(cycles_ != INFINITE_CYCLES && current_cycle_ >= cycles_) {
-			// If the animation is finished, the current frame is the last
-			// one
-			current_frame_ = frames_.size() - 1;
-			frame_changed_ = true;
-			// std::cerr << "Animation finished\n";
-			no_current_frame_ = false;
-			started_ = false;
-			return;
-		}
-
-		if(ticks < (frames_[current_frame_].milliseconds - start_frame_)) {
-			// std::cerr << "Animation not yet started\n";
-			frame_changed_ = true;
-			no_current_frame_ = true;
-			return;
-		}
-
-		// Looks for the current frame
-		typename std::vector<frame>::size_type i = current_frame_ + 1;
-		for(; i != frames_.size(); ++i) {
-			if(ticks < (frames_[i].milliseconds - start_frame_))
-				break;
-			current_frame_ = i;
-			frame_changed_ = true;
-			// std::cerr << "Skipping to next frame\n";
-		}
-		no_current_frame_ = false;
-
-	} else {
-		// If the duration is void, the animation is automatically finished.
-		// current_cycle_ = cycles_;
-		if(cycles_ != -1)
-			started_ = false;
-
-		does_not_change_ = true;
-		frame_changed_ = false;
-		// current_frame_ = frames_.size() - 1;
-		// frame_changed_ = false;
-		// std::cerr << "Returning last frame\n";
-		no_current_frame_ = false;
-	}
-
-}
-
-template<typename T,  typename T_void_value>
-bool animated<T,T_void_value>::frame_changed() const
-{
-	return frame_changed_;
-}
-
-template<typename T,  typename T_void_value>
-bool animated<T,T_void_value>::animation_finished() const
-{
-	if(!started_)
-		return true;
-	//if(current_cycle_ == cycles_)
-	//	return true;
-
-	return false;
-}
-
-template<typename T,  typename T_void_value>
-int animated<T,T_void_value>::get_animation_time() const
-{
-	if(does_not_change_)
-		return SDL_GetTicks() * acceleration_ - real_start_ticks_ + start_frame_;
-
-	return current_time_ - real_start_ticks_ + start_frame_;
-}
-
-template<typename T,  typename T_void_value>
-int animated<T,T_void_value>::get_frame_time() const
-{
-	return current_time_ - start_ticks_ + start_frame_;
-}
-
-template<typename T,  typename T_void_value>
-const T& animated<T,T_void_value>::get_current_frame() const
-{
-	if(no_current_frame_ == true)
-		return void_value_;
-	const frame& cur = frames_[current_frame_];
-	if(!cur.has_value)
-		return void_value_;
-	return cur.value;
-}
-
-template<typename T,  typename T_void_value>
-const T& animated<T,T_void_value>::get_base_frame() const
-{
-	if(frames_.empty())
-		return void_value_;
-
-	return frames_[0];
-}
-
-template<typename T,  typename T_void_value>
-int animated<T,T_void_value>::get_first_frame_time() const
-{
-	if (starting_frame_time_ != INT_MAX && starting_frame_time_ != INT_MIN)
-		return starting_frame_time_;
-
-	return 0;
-}
-
-template<typename T,  typename T_void_value>
-int animated<T,T_void_value>::get_last_frame_time() const
-{
-	if (ending_frame_time_ != INT_MAX && ending_frame_time_ != INT_MIN)
-		return ending_frame_time_;
-
-	return 0;
-}
-
 #endif
 
-
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.41 wesnoth/src/builder.cpp:1.42
--- wesnoth/src/builder.cpp:1.41	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/builder.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.41 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: builder.cpp,v 1.42 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <ayin@xxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -19,6 +19,7 @@
 #include "terrain.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #define ERR_NG lg::err(lg::engine)
 
Index: wesnoth/src/cavegen.cpp
diff -u wesnoth/src/cavegen.cpp:1.15 wesnoth/src/cavegen.cpp:1.16
--- wesnoth/src/cavegen.cpp:1.15	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/cavegen.cpp	Mon Feb 21 09:05:51 2005
@@ -5,6 +5,7 @@
 #include "pathfind.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #define LOG_NG lg::info(lg::engine)
 
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.81 wesnoth/src/dialogs.cpp:1.82
--- wesnoth/src/dialogs.cpp:1.81	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/dialogs.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.81 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: dialogs.cpp,v 1.82 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,6 +27,7 @@
 #include "show_dialog.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/progressbar.hpp"
 
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.91 wesnoth/src/editor/editor.cpp:1.92
--- wesnoth/src/editor/editor.cpp:1.91	Sun Feb 20 21:45:22 2005
+++ wesnoth/src/editor/editor.cpp	Mon Feb 21 09:05:51 2005
@@ -31,6 +31,7 @@
 #include "../team.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "serialization/string_utils.hpp"
 
 #include "editor.hpp"
 #include "map_manip.hpp"
Index: wesnoth/src/editor/editor_main.cpp
diff -u wesnoth/src/editor/editor_main.cpp:1.25 wesnoth/src/editor/editor_main.cpp:1.26
--- wesnoth/src/editor/editor_main.cpp:1.25	Sun Feb 20 21:45:22 2005
+++ wesnoth/src/editor/editor_main.cpp	Mon Feb 21 09:05:51 2005
@@ -25,6 +25,7 @@
 #include "../team.hpp"
 #include "../util.hpp"
 #include "../wesconfig.h"
+#include "serialization/string_utils.hpp"
 
 #include <cctype>
 #include <cstdlib>
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.99 wesnoth/src/font.cpp:1.100
--- wesnoth/src/font.cpp:1.99	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/font.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.99 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: font.cpp,v 1.100 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -23,6 +23,7 @@
 #include "team.hpp"
 #include "tooltips.hpp"
 #include "util.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <cstdio>
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.195 wesnoth/src/game.cpp:1.196
--- wesnoth/src/game.cpp:1.195	Sun Feb 20 22:30:27 2005
+++ wesnoth/src/game.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.195 2005/02/20 22:30:27 gruikya Exp $ */
+/* $Id: game.cpp,v 1.196 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -51,6 +51,7 @@
 #include "unit.hpp"
 #include "video.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"
 
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.120 wesnoth/src/game_events.cpp:1.121
--- wesnoth/src/game_events.cpp:1.120	Sun Feb 20 23:55:06 2005
+++ wesnoth/src/game_events.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.120 2005/02/20 23:55:06 Sirp Exp $ */
+/* $Id: game_events.cpp,v 1.121 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -25,6 +25,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <cstdlib>
 #include <deque>
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.55 wesnoth/src/gamestatus.cpp:1.56
--- wesnoth/src/gamestatus.cpp:1.55	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/gamestatus.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.55 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: gamestatus.cpp,v 1.56 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -21,6 +21,7 @@
 #include "preferences.hpp"
 #include "statistics.hpp"
 #include "util.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <cstdio>
Index: wesnoth/src/halo.cpp
diff -u wesnoth/src/halo.cpp:1.13 wesnoth/src/halo.cpp:1.14
--- wesnoth/src/halo.cpp:1.13	Fri Dec 31 21:01:37 2004
+++ wesnoth/src/halo.cpp	Mon Feb 21 09:05:51 2005
@@ -6,6 +6,7 @@
 #include "sdl_utils.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <map>
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.67 wesnoth/src/help.cpp:1.68
--- wesnoth/src/help.cpp:1.67	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/help.cpp	Mon Feb 21 09:05:51 2005
@@ -25,6 +25,7 @@
 #include "unit.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/scrollbar.hpp"
Index: wesnoth/src/leader_list.cpp
diff -u wesnoth/src/leader_list.cpp:1.1 wesnoth/src/leader_list.cpp:1.2
--- wesnoth/src/leader_list.cpp:1.1	Sun Feb 20 22:30:27 2005
+++ wesnoth/src/leader_list.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: leader_list.cpp,v 1.1 2005/02/20 22:30:27 gruikya Exp $ */
+/* $Id: leader_list.cpp,v 1.2 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -12,6 +12,7 @@
 */
 
 #include "leader_list.hpp"
+#include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 
 leader_list_manager::leader_list_manager(const config::child_list& side_list,
Index: wesnoth/src/map.cpp
diff -u wesnoth/src/map.cpp:1.50 wesnoth/src/map.cpp:1.51
--- wesnoth/src/map.cpp:1.50	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/map.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: map.cpp,v 1.50 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: map.cpp,v 1.51 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -19,6 +19,7 @@
 #include "pathfind.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <cctype>
Index: wesnoth/src/mapgen.cpp
diff -u wesnoth/src/mapgen.cpp:1.56 wesnoth/src/mapgen.cpp:1.57
--- wesnoth/src/mapgen.cpp:1.56	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/mapgen.cpp	Mon Feb 21 09:05:51 2005
@@ -20,6 +20,7 @@
 #include "race.hpp"
 #include "scoped_resource.hpp"
 #include "util.hpp"
+#include "serialization/string_utils.hpp"
 
 #define ERR_CF lg::err(lg::config)
 #define LOG_NG lg::info(lg::engine)
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.107 wesnoth/src/multiplayer_connect.cpp:1.108
--- wesnoth/src/multiplayer_connect.cpp:1.107	Mon Feb 21 03:02:55 2005
+++ wesnoth/src/multiplayer_connect.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.107 2005/02/21 03:02:55 Sirp Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.108 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -12,13 +12,14 @@
 */
 
 #include "global.hpp"
-#include "multiplayer_connect.hpp"
+#include "dialogs.hpp"
 #include "font.hpp"
+#include "game_config.hpp"
+#include "multiplayer_connect.hpp"
 #include "preferences.hpp"
 #include "show_dialog.hpp"
-#include "dialogs.hpp"
-#include "game_config.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #define LOG_NW lg::info(lg::network)
 #define ERR_NW lg::err(lg::network)
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.1 wesnoth/src/multiplayer_wait.cpp:1.2
--- wesnoth/src/multiplayer_wait.cpp:1.1	Sun Feb 20 22:30:27 2005
+++ wesnoth/src/multiplayer_wait.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.1 2005/02/20 22:30:27 gruikya Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.2 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -17,6 +17,7 @@
 #include "wassert.hpp"
 #include "util.hpp"
 #include "replay.hpp"
+#include "serialization/string_utils.hpp"
 
 #define LOG_NW lg::info(lg::network)
 #define ERR_NW lg::err(lg::network)
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.329 wesnoth/src/playturn.cpp:1.330
--- wesnoth/src/playturn.cpp:1.329	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/playturn.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.329 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: playturn.cpp,v 1.330 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -34,6 +34,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 
 #include <cmath>
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.133 wesnoth/src/preferences.cpp:1.134
--- wesnoth/src/preferences.cpp:1.133	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/preferences.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.133 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: preferences.cpp,v 1.134 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -26,6 +26,7 @@
 #include "show_dialog.hpp"
 #include "sound.hpp"
 #include "util.hpp"
+#include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/label.hpp"
 #include "widgets/menu.hpp"
Index: wesnoth/src/race.cpp
diff -u wesnoth/src/race.cpp:1.12 wesnoth/src/race.cpp:1.13
--- wesnoth/src/race.cpp:1.12	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/race.cpp	Mon Feb 21 09:05:51 2005
@@ -2,6 +2,7 @@
 
 #include "race.hpp"
 #include "replay.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <cstdlib>
 
Index: wesnoth/src/team.cpp
diff -u wesnoth/src/team.cpp:1.79 wesnoth/src/team.cpp:1.80
--- wesnoth/src/team.cpp:1.79	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/team.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: team.cpp,v 1.79 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: team.cpp,v 1.80 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -22,6 +22,7 @@
 #include "team.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <cstdlib>
Index: wesnoth/src/theme.cpp
diff -u wesnoth/src/theme.cpp:1.31 wesnoth/src/theme.cpp:1.32
--- wesnoth/src/theme.cpp:1.31	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/theme.cpp	Mon Feb 21 09:05:51 2005
@@ -7,6 +7,7 @@
 #include "theme.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <cstdlib>
 #include <sstream>
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.122 wesnoth/src/unit.cpp:1.123
--- wesnoth/src/unit.cpp:1.122	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/unit.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.122 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: unit.cpp,v 1.123 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -24,6 +24,7 @@
 #include "unit.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <cstdlib>
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.80 wesnoth/src/unit_types.cpp:1.81
--- wesnoth/src/unit_types.cpp:1.80	Sun Feb 20 21:45:21 2005
+++ wesnoth/src/unit_types.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.80 2005/02/20 21:45:21 silene Exp $ */
+/* $Id: unit_types.cpp,v 1.81 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -20,18 +20,12 @@
 #include "unit_types.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iostream>
 
-//these headers are used to check for file existence
-#ifdef linux
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
-
 unit_animation::frame::frame(const config& cfg)
 {
 	xoffset = atoi(cfg["xoffset"].c_str()); 
Index: wesnoth/src/widgets/button.cpp
diff -u wesnoth/src/widgets/button.cpp:1.54 wesnoth/src/widgets/button.cpp:1.55
--- wesnoth/src/widgets/button.cpp:1.54	Sun Feb 20 21:45:22 2005
+++ wesnoth/src/widgets/button.cpp	Mon Feb 21 09:05:51 2005
@@ -1,4 +1,4 @@
-/* $Id: button.cpp,v 1.54 2005/02/20 21:45:22 silene Exp $ */
+/* $Id: button.cpp,v 1.55 2005/02/21 09:05:51 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <davidnwhite@xxxxxxxxxxxxxxx>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -22,6 +22,7 @@
 #include "../log.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "serialization/string_utils.hpp"
 
 namespace gui {
 
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.77 wesnoth/src/widgets/menu.cpp:1.78
--- wesnoth/src/widgets/menu.cpp:1.77	Sun Feb 20 21:45:22 2005
+++ wesnoth/src/widgets/menu.cpp	Mon Feb 21 09:05:51 2005
@@ -7,6 +7,7 @@
 #include "../show_dialog.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <numeric>
 



You are on the gna.org mail server.

Generated by mhonarc, Tue Sep 20 16:46:54 2005