[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src about.cpp about.hpp actions.cpp act...
|
From: |
ott |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src about.cpp about.hpp actions.cpp act... |
|
Date: |
Sat, 02 Jul 2005 17:37:21 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <address@hidden> 05/07/02 21:37:20
Modified files:
src : about.cpp about.hpp actions.cpp actions.hpp
ai.cpp ai.hpp ai_attack.cpp ai_interface.hpp
ai_move.cpp astarnode.cpp astarnode.hpp
config.cpp config.hpp dialogs.cpp dialogs.hpp
display.cpp display.hpp filesystem.cpp
filesystem.hpp font.cpp font.hpp game.cpp
game_config.cpp game_config.hpp game_errors.hpp
game_events.cpp game_events.hpp gamestatus.cpp
gamestatus.hpp help.cpp help.hpp hotkeys.cpp
hotkeys.hpp intro.cpp intro.hpp key.cpp key.hpp
language.cpp language.hpp log.cpp log.hpp
map.cpp map.hpp mouse.cpp mouse.hpp
multiplayer_lobby.cpp network_worker.cpp
pathfind.cpp pathfind.hpp pathutils.hpp
playcampaign.cpp playcampaign.hpp playlevel.cpp
playlevel.hpp playturn.cpp playturn.hpp
preferences.cpp preferences.hpp random.cpp
random.hpp replay.cpp replay.hpp
scoped_resource.hpp sdl_utils.cpp sdl_utils.hpp
show_dialog.cpp show_dialog.hpp sound.cpp
sound.hpp team.cpp team.hpp terrain.cpp
terrain.hpp unit.cpp unit.hpp unit_types.cpp
unit_types.hpp util.hpp variable.cpp
variable.hpp video.cpp video.hpp
src/editor : editor.cpp editor.hpp editor_dialogs.cpp
editor_dialogs.hpp editor_layout.cpp
editor_layout.hpp editor_main.cpp
editor_palettes.cpp editor_palettes.hpp
editor_undo.cpp editor_undo.hpp map_manip.cpp
map_manip.hpp
src/serialization: binary_or_text.cpp binary_or_text.hpp
binary_wml.cpp binary_wml.hpp parser.cpp
parser.hpp preprocessor.cpp preprocessor.hpp
string_utils.cpp string_utils.hpp
src/server : game.cpp
src/widgets : button.cpp button.hpp combo.cpp combo.hpp
file_chooser.cpp file_chooser.hpp scrollbar.cpp
scrollbar.hpp slider.cpp slider.hpp textbox.cpp
textbox.hpp
Log message:
codeclean in src, mostly Dave's new email address (checked with cvs
diff -b)
BY THE WAY, many of the source files have no copyright headers!
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.cpp.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.hpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.230&tr2=1.231&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.hpp.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.hpp.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_attack.cpp.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_interface.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_move.cpp.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/astarnode.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/astarnode.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/config.cpp.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/config.hpp.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.hpp.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.322&tr2=1.323&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.hpp.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.hpp.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.259&tr2=1.260&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_config.cpp.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_config.hpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_errors.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.150&tr2=1.151&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.hpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.hpp.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.hpp.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.hpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.hpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/key.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/key.hpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.hpp.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/log.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/log.hpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.cpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map.hpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mouse.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mouse.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/pathfind.cpp.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/pathfind.hpp.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/pathutils.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playcampaign.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playcampaign.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.210&tr2=1.211&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.hpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.383&tr2=1.384&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.hpp.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.160&tr2=1.161&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.hpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/random.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/random.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.cpp.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.hpp.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/scoped_resource.hpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sdl_utils.cpp.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sdl_utils.hpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.134&tr2=1.135&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.hpp.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.hpp.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.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/team.hpp.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.hpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.hpp.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/util.hpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.cpp.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.hpp.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.hpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_dialogs.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_dialogs.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_layout.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_layout.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_main.cpp.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_undo.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_undo.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/map_manip.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/map_manip.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/binary_or_text.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/binary_or_text.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/binary_wml.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/binary_wml.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/parser.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/parser.hpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/preprocessor.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/preprocessor.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/string_utils.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/string_utils.hpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/game.cpp.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/button.cpp.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/button.hpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/combo.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/combo.hpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/file_chooser.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/file_chooser.hpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollbar.cpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollbar.hpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/slider.cpp.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/slider.hpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.cpp.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.hpp.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
Patches:
Index: wesnoth/src/about.cpp
diff -u wesnoth/src/about.cpp:1.133 wesnoth/src/about.cpp:1.134
--- wesnoth/src/about.cpp:1.133 Mon Jun 27 02:54:46 2005
+++ wesnoth/src/about.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: about.cpp,v 1.133 2005/06/27 02:54:46 Sirp Exp $ */
+/* $Id: about.cpp,v 1.134 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -102,7 +102,7 @@
"_" N_("+Multiplayer Maps"),
"- Peter Groen (pg)",
- "- Tom Chance (telex4)",
+ "- Tom Chance (telex4)",
"- Mike Quinones (Doc Paterson)",
"_" N_("+Packagers"),
Index: wesnoth/src/about.hpp
diff -u wesnoth/src/about.hpp:1.16 wesnoth/src/about.hpp:1.17
--- wesnoth/src/about.hpp:1.16 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/about.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: about.hpp,v 1.16 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: about.hpp,v 1.17 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.230 wesnoth/src/actions.cpp:1.231
--- wesnoth/src/actions.cpp:1.230 Sun Jun 12 21:39:49 2005
+++ wesnoth/src/actions.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: actions.cpp,v 1.230 2005/06/12 21:39:49 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.231 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -534,15 +534,15 @@
const int base_damage = attack.damage();
int resistance_modifier = d->second.damage_against(attack);
-
- //steadfast doubles resistance, but is capped at increasing resistance
to 50%
- if (steadfast && resistance_modifier < 100 && resistance_modifier > 50)
{
- const int diff = 100 - resistance_modifier;
- resistance_modifier -= diff;
- if(resistance_modifier < 50) {
- resistance_modifier = 50;
- }
- }
+
+ //steadfast doubles resistance, but is capped at increasing resistance
to 50%
+ if (steadfast && resistance_modifier < 100 && resistance_modifier > 50)
{
+ const int diff = 100 - resistance_modifier;
+ resistance_modifier -= diff;
+ if(resistance_modifier < 50) {
+ resistance_modifier = 50;
+ }
+ }
if (strings) {
std::stringstream str_base;
@@ -594,15 +594,15 @@
const int resist = resistance_modifier - 100;
std::stringstream str_resist;
str_resist << gettext(resist < 0 ? N_("defender resistance vs")
: N_("defender vulnerability vs"))
- << ' ' << gettext(attack.type().c_str());
- if(steadfast && resistance_modifier < 100) {
- str_resist << ' ' << _(" (+steadfast)");
- }
-
+ << ' ' << gettext(attack.type().c_str());
+ if(steadfast && resistance_modifier < 100) {
+ str_resist << ' ' << _(" (+steadfast)");
+ }
+
str_resist << EMPTY_COLUMN
<< (resist > 0 ? "+" : "") << resist << '%';
- strings->attack_calculations.push_back(str_resist.str());
-
+ strings->attack_calculations.push_back(str_resist.str());
+
}
bonus *= resistance_modifier;
Index: wesnoth/src/actions.hpp
diff -u wesnoth/src/actions.hpp:1.51 wesnoth/src/actions.hpp:1.52
--- wesnoth/src/actions.hpp:1.51 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/actions.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: actions.hpp,v 1.51 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: actions.hpp,v 1.52 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.154 wesnoth/src/ai.cpp:1.155
--- wesnoth/src/ai.cpp:1.154 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/ai.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: ai.cpp,v 1.154 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: ai.cpp,v 1.155 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/ai.hpp
diff -u wesnoth/src/ai.hpp:1.58 wesnoth/src/ai.hpp:1.59
--- wesnoth/src/ai.hpp:1.58 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/ai.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: ai.hpp,v 1.58 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: ai.hpp,v 1.59 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/ai_attack.cpp
diff -u wesnoth/src/ai_attack.cpp:1.63 wesnoth/src/ai_attack.cpp:1.64
--- wesnoth/src/ai_attack.cpp:1.63 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/ai_attack.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: ai_attack.cpp,v 1.63 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: ai_attack.cpp,v 1.64 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/ai_interface.hpp
diff -u wesnoth/src/ai_interface.hpp:1.5 wesnoth/src/ai_interface.hpp:1.6
--- wesnoth/src/ai_interface.hpp:1.5 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/ai_interface.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: ai_interface.hpp,v 1.5 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: ai_interface.hpp,v 1.6 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/ai_move.cpp
diff -u wesnoth/src/ai_move.cpp:1.62 wesnoth/src/ai_move.cpp:1.63
--- wesnoth/src/ai_move.cpp:1.62 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/ai_move.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: ai_move.cpp,v 1.62 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: ai_move.cpp,v 1.63 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/astarnode.cpp
diff -u wesnoth/src/astarnode.cpp:1.4 wesnoth/src/astarnode.cpp:1.5
--- wesnoth/src/astarnode.cpp:1.4 Sun Jun 5 10:56:41 2005
+++ wesnoth/src/astarnode.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: astarnode.cpp,v 1.4 2005/06/05 10:56:41 silene Exp $ */
+/* $Id: astarnode.cpp,v 1.5 2005/07/02 21:37:18 ott Exp $ */
/*
-Copyright (C) 2003 by David White <address@hidden>
+Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/astarnode.hpp
diff -u wesnoth/src/astarnode.hpp:1.5 wesnoth/src/astarnode.hpp:1.6
--- wesnoth/src/astarnode.hpp:1.5 Sun Jun 5 10:56:41 2005
+++ wesnoth/src/astarnode.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: astarnode.hpp,v 1.5 2005/06/05 10:56:41 silene Exp $ */
+/* $Id: astarnode.hpp,v 1.6 2005/07/02 21:37:18 ott Exp $ */
/*
-Copyright (C) 2003 by David White <address@hidden>
+Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/config.cpp
diff -u wesnoth/src/config.cpp:1.140 wesnoth/src/config.cpp:1.141
--- wesnoth/src/config.cpp:1.140 Sat Jun 11 02:41:37 2005
+++ wesnoth/src/config.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: config.cpp,v 1.140 2005/06/11 02:41:37 Sirp Exp $ */
+/* $Id: config.cpp,v 1.141 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -59,22 +59,22 @@
for(string_map::const_iterator j = cfg.values.begin(); j !=
cfg.values.end(); ++j) {
values[j->first] = j->second;
}
-}
-
-void config::merge_children(const std::string& key)
-{
- config merged_children;
- const child_list& children = get_children(key);
- if(children.size() < 2) {
- return;
- }
-
- for(child_list::const_iterator i = children.begin(); i !=
children.end(); ++i) {
- merged_children.append(**i);
- }
-
- clear_children(key);
- add_child(key,merged_children);
+}
+
+void config::merge_children(const std::string& key)
+{
+ config merged_children;
+ const child_list& children = get_children(key);
+ if(children.size() < 2) {
+ return;
+ }
+
+ for(child_list::const_iterator i = children.begin(); i !=
children.end(); ++i) {
+ merged_children.append(**i);
+ }
+
+ clear_children(key);
+ add_child(key,merged_children);
}
config::child_itors config::child_range(const std::string& key)
Index: wesnoth/src/config.hpp
diff -u wesnoth/src/config.hpp:1.63 wesnoth/src/config.hpp:1.64
--- wesnoth/src/config.hpp:1.63 Sat Jun 11 02:41:37 2005
+++ wesnoth/src/config.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: config.hpp,v 1.63 2005/06/11 02:41:37 Sirp Exp $ */
+/* $Id: config.hpp,v 1.64 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -122,10 +122,10 @@
//append data from another config object to this one. attributes in the
//latter config object will clobber attributes in this one.
- void append(const config& cfg);
-
- //all children with the given key will be merged into the first element
- //with that key
+ void append(const config& cfg);
+
+ //all children with the given key will be merged into the first element
+ //with that key
void merge_children(const std::string& key);
//resets the translated values of all strings contained in this object
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.105 wesnoth/src/dialogs.cpp:1.106
--- wesnoth/src/dialogs.cpp:1.105 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/dialogs.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: dialogs.cpp,v 1.105 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: dialogs.cpp,v 1.106 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/dialogs.hpp
diff -u wesnoth/src/dialogs.hpp:1.34 wesnoth/src/dialogs.hpp:1.35
--- wesnoth/src/dialogs.hpp:1.34 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/dialogs.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: dialogs.hpp,v 1.34 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: dialogs.hpp,v 1.35 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.322 wesnoth/src/display.cpp:1.323
--- wesnoth/src/display.cpp:1.322 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/display.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: display.cpp,v 1.322 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: display.cpp,v 1.323 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.104 wesnoth/src/display.hpp:1.105
--- wesnoth/src/display.hpp:1.104 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/display.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: display.hpp,v 1.104 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: display.hpp,v 1.105 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.105 wesnoth/src/editor/editor.cpp:1.106
--- wesnoth/src/editor/editor.cpp:1.105 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor.hpp
diff -u wesnoth/src/editor/editor.hpp:1.43 wesnoth/src/editor/editor.hpp:1.44
--- wesnoth/src/editor/editor.hpp:1.43 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_dialogs.cpp
diff -u wesnoth/src/editor/editor_dialogs.cpp:1.31
wesnoth/src/editor/editor_dialogs.cpp:1.32
--- wesnoth/src/editor/editor_dialogs.cpp:1.31 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_dialogs.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_dialogs.hpp
diff -u wesnoth/src/editor/editor_dialogs.hpp:1.10
wesnoth/src/editor/editor_dialogs.hpp:1.11
--- wesnoth/src/editor/editor_dialogs.hpp:1.10 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_dialogs.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_layout.cpp
diff -u wesnoth/src/editor/editor_layout.cpp:1.5
wesnoth/src/editor/editor_layout.cpp:1.6
--- wesnoth/src/editor/editor_layout.cpp:1.5 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_layout.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_layout.hpp
diff -u wesnoth/src/editor/editor_layout.hpp:1.4
wesnoth/src/editor/editor_layout.hpp:1.5
--- wesnoth/src/editor/editor_layout.hpp:1.4 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_layout.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_main.cpp
diff -u wesnoth/src/editor/editor_main.cpp:1.34
wesnoth/src/editor/editor_main.cpp:1.35
--- wesnoth/src/editor/editor_main.cpp:1.34 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_main.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_palettes.cpp
diff -u wesnoth/src/editor/editor_palettes.cpp:1.28
wesnoth/src/editor/editor_palettes.cpp:1.29
--- wesnoth/src/editor/editor_palettes.cpp:1.28 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_palettes.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_palettes.hpp
diff -u wesnoth/src/editor/editor_palettes.hpp:1.8
wesnoth/src/editor/editor_palettes.hpp:1.9
--- wesnoth/src/editor/editor_palettes.hpp:1.8 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_palettes.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_undo.cpp
diff -u wesnoth/src/editor/editor_undo.cpp:1.4
wesnoth/src/editor/editor_undo.cpp:1.5
--- wesnoth/src/editor/editor_undo.cpp:1.4 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_undo.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/editor_undo.hpp
diff -u wesnoth/src/editor/editor_undo.hpp:1.4
wesnoth/src/editor/editor_undo.hpp:1.5
--- wesnoth/src/editor/editor_undo.hpp:1.4 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/editor_undo.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/map_manip.cpp
diff -u wesnoth/src/editor/map_manip.cpp:1.9
wesnoth/src/editor/map_manip.cpp:1.10
--- wesnoth/src/editor/map_manip.cpp:1.9 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/map_manip.cpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/editor/map_manip.hpp
diff -u wesnoth/src/editor/map_manip.hpp:1.6
wesnoth/src/editor/map_manip.hpp:1.7
--- wesnoth/src/editor/map_manip.hpp:1.6 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/editor/map_manip.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.74 wesnoth/src/filesystem.cpp:1.75
--- wesnoth/src/filesystem.cpp:1.74 Fri Jun 24 22:41:49 2005
+++ wesnoth/src/filesystem.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: filesystem.cpp,v 1.74 2005/06/24 22:41:49 Sirp Exp $ */
+/* $Id: filesystem.cpp,v 1.75 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/filesystem.hpp
diff -u wesnoth/src/filesystem.hpp:1.37 wesnoth/src/filesystem.hpp:1.38
--- wesnoth/src/filesystem.hpp:1.37 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/filesystem.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: filesystem.hpp,v 1.37 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: filesystem.hpp,v 1.38 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.145 wesnoth/src/font.cpp:1.146
--- wesnoth/src/font.cpp:1.145 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/font.cpp Sat Jul 2 21:37:18 2005
@@ -1,7 +1,7 @@
-/* $Id: font.cpp,v 1.145 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: font.cpp,v 1.146 2005/07/02 21:37:18 ott Exp $ */
/* vim:set encoding=utf-8: */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/font.hpp
diff -u wesnoth/src/font.hpp:1.59 wesnoth/src/font.hpp:1.60
--- wesnoth/src/font.hpp:1.59 Wed Jun 22 23:30:18 2005
+++ wesnoth/src/font.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: font.hpp,v 1.59 2005/06/22 23:30:18 ydirson Exp $ */
+/* $Id: font.hpp,v 1.60 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.259 wesnoth/src/game.cpp:1.260
--- wesnoth/src/game.cpp:1.259 Tue Jun 28 16:23:46 2005
+++ wesnoth/src/game.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: game.cpp,v 1.259 2005/06/28 16:23:46 Sirp Exp $ */
+/* $Id: game.cpp,v 1.260 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -94,8 +94,8 @@
bool init_language();
bool play_test();
bool play_multiplayer_mode();
-
- void reset_game_cfg();
+
+ void reset_game_cfg();
bool is_loading() const;
bool load_game();
@@ -115,7 +115,7 @@
void operator=(const game_controller&);
void read_game_cfg(const preproc_map& defines, config& cfg, bool
use_cache);
- void refresh_game_cfg(bool reset_translations=false);
+ void refresh_game_cfg(bool reset_translations=false);
void download_campaigns();
void upload_campaign(const std::string& campaign, network::connection
sock);
@@ -355,8 +355,8 @@
units_data_.clear();
//Resets old_defines_map_, to force refresh_game_cfg to reload
//everything.
- old_defines_map_.clear();
-
+ old_defines_map_.clear();
+
reset_game_cfg();
game_config::load_config(game_config_.child("game_config"));
@@ -1261,64 +1261,64 @@
}
}
- std::cerr << "no valid cache found. Writing
cache to '" << fname << "'\n";
-
+ std::cerr << "no valid cache found. Writing
cache to '" << fname << "'\n";
+
preproc_map defines_map(defines);
//read the file and then write to the cache
scoped_istream stream =
preprocess_file("data/game.cfg", &defines_map);
std::string error_log, user_error_log;
- read(cfg, *stream, &error_log);
-
- //load user campaigns
- const std::string user_campaign_dir =
get_user_data_dir() + "/data/campaigns/";
- std::vector<std::string> user_campaigns,
error_campaigns;
-
get_files_in_dir(user_campaign_dir,&user_campaigns,NULL,ENTIRE_FILE_PATH);
- for(std::vector<std::string>::const_iterator uc
= user_campaigns.begin(); uc != user_campaigns.end(); ++uc) {
- static const std::string extension =
".cfg";
- if(uc->size() < extension.size() ||
std::equal(uc->end() - extension.size(),uc->end(),extension.begin()) == false) {
- continue;
- }
-
- try {
- scoped_istream stream =
preprocess_file(*uc,&defines_map);
-
- std::string campaign_error_log;
-
- config user_campaign_cfg;
-
read(user_campaign_cfg,*stream,&campaign_error_log);
-
- if(campaign_error_log.empty()) {
-
cfg.append(user_campaign_cfg);
- } else {
- user_error_log +=
campaign_error_log;
-
error_campaigns.push_back(*uc);
- }
- } catch(config::error& err) {
- std::cerr << "error reading
user campaign '" << *uc << "'\n";
- error_campaigns.push_back(*uc);
-
- user_error_log += err.message +
"\n";
- } catch(io_exception&) {
- std::cerr << "error reading
user campaign '" << *uc << "'\n";
- error_campaigns.push_back(*uc);
- }
- }
-
- if(error_campaigns.empty() == false) {
- std::stringstream msg;
- msg << _("The following add-on
campaign(s) had errors and could not be loaded:");
-
for(std::vector<std::string>::const_iterator i = error_campaigns.begin(); i !=
error_campaigns.end(); ++i) {
- msg << "\n" << *i;
- }
-
- msg << "\n" << _("ERROR DETAILS:") <<
"\n" << user_error_log;
-
-
gui::show_error_message(disp(),msg.str());
- }
-
- cfg.merge_children("units");
+ read(cfg, *stream, &error_log);
+
+ //load user campaigns
+ const std::string user_campaign_dir =
get_user_data_dir() + "/data/campaigns/";
+ std::vector<std::string> user_campaigns,
error_campaigns;
+
get_files_in_dir(user_campaign_dir,&user_campaigns,NULL,ENTIRE_FILE_PATH);
+ for(std::vector<std::string>::const_iterator uc
= user_campaigns.begin(); uc != user_campaigns.end(); ++uc) {
+ static const std::string extension =
".cfg";
+ if(uc->size() < extension.size() ||
std::equal(uc->end() - extension.size(),uc->end(),extension.begin()) == false) {
+ continue;
+ }
+
+ try {
+ scoped_istream stream =
preprocess_file(*uc,&defines_map);
+
+ std::string campaign_error_log;
+
+ config user_campaign_cfg;
+
read(user_campaign_cfg,*stream,&campaign_error_log);
+
+ if(campaign_error_log.empty()) {
+
cfg.append(user_campaign_cfg);
+ } else {
+ user_error_log +=
campaign_error_log;
+
error_campaigns.push_back(*uc);
+ }
+ } catch(config::error& err) {
+ std::cerr << "error reading
user campaign '" << *uc << "'\n";
+ error_campaigns.push_back(*uc);
+
+ user_error_log += err.message +
"\n";
+ } catch(io_exception&) {
+ std::cerr << "error reading
user campaign '" << *uc << "'\n";
+ error_campaigns.push_back(*uc);
+ }
+ }
+
+ if(error_campaigns.empty() == false) {
+ std::stringstream msg;
+ msg << _("The following add-on
campaign(s) had errors and could not be loaded:");
+
for(std::vector<std::string>::const_iterator i = error_campaigns.begin(); i !=
error_campaigns.end(); ++i) {
+ msg << "\n" << *i;
+ }
+
+ msg << "\n" << _("ERROR DETAILS:") <<
"\n" << user_error_log;
+
+
gui::show_error_message(disp(),msg.str());
+ }
+
+ cfg.merge_children("units");
if(!error_log.empty()) {
gui::show_error_message(disp(),
@@ -1343,7 +1343,7 @@
}
}
- std::cerr << "caching cannot be done. Reading file\n";
+ std::cerr << "caching cannot be done. Reading file\n";
preproc_map defines_map(defines);
scoped_istream stream = preprocess_file("data/game.cfg", &defines_map);
read(cfg, *stream);
@@ -1376,25 +1376,25 @@
e.message + _("' (The game will now
exit)"));
throw e;
}
-}
-
-void game_controller::reset_game_cfg()
-{
- defines_map_.clear();
-
- //load in the game's configuration files
-#if defined(__APPLE__)
- defines_map_["APPLE"] = preproc_define();
-#endif
-
- defines_map_["NORMAL"] = preproc_define();
- defines_map_["MEDIUM"] = preproc_define();
-
- if(multiplayer_mode_) {
- defines_map_["MULTIPLAYER"] = preproc_define();
- }
-
- refresh_game_cfg();
+}
+
+void game_controller::reset_game_cfg()
+{
+ defines_map_.clear();
+
+ //load in the game's configuration files
+#if defined(__APPLE__)
+ defines_map_["APPLE"] = preproc_define();
+#endif
+
+ defines_map_["NORMAL"] = preproc_define();
+ defines_map_["MEDIUM"] = preproc_define();
+
+ if(multiplayer_mode_) {
+ defines_map_["MULTIPLAYER"] = preproc_define();
+ }
+
+ refresh_game_cfg();
}
void game_controller::play_game(RELOAD_GAME_DATA reload)
@@ -1577,14 +1577,14 @@
std::cerr << "could not initialize display\n";
return 0;
}
-
-#ifdef WIN32
- res = game.init_config();
- if(res == false) {
- std::cerr << "could not initialize game config\n";
- return 0;
- }
-#endif
+
+#ifdef WIN32
+ res = game.init_config();
+ if(res == false) {
+ std::cerr << "could not initialize game config\n";
+ return 0;
+ }
+#endif
res = game.init_language();
if(res == false) {
@@ -1613,9 +1613,9 @@
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
#endif
- for(;;) {
- //make sure the game config is always set to how it should be
at the title screen
- game.reset_game_cfg();
+ for(;;) {
+ //make sure the game config is always set to how it should be
at the title screen
+ game.reset_game_cfg();
statistics::fresh_stats();
@@ -1682,7 +1682,7 @@
}
return 0;
-}
+}
int main(int argc, char** argv)
{
Index: wesnoth/src/game_config.cpp
diff -u wesnoth/src/game_config.cpp:1.99 wesnoth/src/game_config.cpp:1.100
--- wesnoth/src/game_config.cpp:1.99 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/game_config.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: game_config.cpp,v 1.99 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: game_config.cpp,v 1.100 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/game_config.hpp
diff -u wesnoth/src/game_config.hpp:1.30 wesnoth/src/game_config.hpp:1.31
--- wesnoth/src/game_config.hpp:1.30 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/game_config.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: game_config.hpp,v 1.30 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: game_config.hpp,v 1.31 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/game_errors.hpp
diff -u wesnoth/src/game_errors.hpp:1.3 wesnoth/src/game_errors.hpp:1.4
--- wesnoth/src/game_errors.hpp:1.3 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/game_errors.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: game_errors.hpp,v 1.3 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: game_errors.hpp,v 1.4 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Yann Dirson <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.150 wesnoth/src/game_events.cpp:1.151
--- wesnoth/src/game_events.cpp:1.150 Thu Jun 9 21:20:13 2005
+++ wesnoth/src/game_events.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: game_events.cpp,v 1.150 2005/06/09 21:20:13 silene Exp $ */
+/* $Id: game_events.cpp,v 1.151 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/game_events.hpp
diff -u wesnoth/src/game_events.hpp:1.28 wesnoth/src/game_events.hpp:1.29
--- wesnoth/src/game_events.hpp:1.28 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/game_events.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: game_events.hpp,v 1.28 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: game_events.hpp,v 1.29 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.73 wesnoth/src/gamestatus.cpp:1.74
--- wesnoth/src/gamestatus.cpp:1.73 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/gamestatus.cpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: gamestatus.cpp,v 1.73 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: gamestatus.cpp,v 1.74 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/gamestatus.hpp
diff -u wesnoth/src/gamestatus.hpp:1.46 wesnoth/src/gamestatus.hpp:1.47
--- wesnoth/src/gamestatus.hpp:1.46 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/gamestatus.hpp Sat Jul 2 21:37:18 2005
@@ -1,6 +1,6 @@
-/* $Id: gamestatus.hpp,v 1.46 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: gamestatus.hpp,v 1.47 2005/07/02 21:37:18 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.107 wesnoth/src/help.cpp:1.108
--- wesnoth/src/help.cpp:1.107 Fri Jun 10 22:34:17 2005
+++ wesnoth/src/help.cpp Sat Jul 2 21:37:18 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/help.hpp
diff -u wesnoth/src/help.hpp:1.20 wesnoth/src/help.hpp:1.21
--- wesnoth/src/help.hpp:1.20 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/help.hpp Sat Jul 2 21:37:19 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.78 wesnoth/src/hotkeys.cpp:1.79
--- wesnoth/src/hotkeys.cpp:1.78 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/hotkeys.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: hotkeys.cpp,v 1.78 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: hotkeys.cpp,v 1.79 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/hotkeys.hpp
diff -u wesnoth/src/hotkeys.hpp:1.61 wesnoth/src/hotkeys.hpp:1.62
--- wesnoth/src/hotkeys.hpp:1.61 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/hotkeys.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: hotkeys.hpp,v 1.61 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: hotkeys.hpp,v 1.62 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.79 wesnoth/src/intro.cpp:1.80
--- wesnoth/src/intro.cpp:1.79 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/intro.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: intro.cpp,v 1.79 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: intro.cpp,v 1.80 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/intro.hpp
diff -u wesnoth/src/intro.hpp:1.22 wesnoth/src/intro.hpp:1.23
--- wesnoth/src/intro.hpp:1.22 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/intro.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: intro.hpp,v 1.22 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: intro.hpp,v 1.23 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/key.cpp
diff -u wesnoth/src/key.cpp:1.16 wesnoth/src/key.cpp:1.17
--- wesnoth/src/key.cpp:1.16 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/key.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: key.cpp,v 1.16 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: key.cpp,v 1.17 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/key.hpp
diff -u wesnoth/src/key.hpp:1.13 wesnoth/src/key.hpp:1.14
--- wesnoth/src/key.hpp:1.13 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/key.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: key.hpp,v 1.13 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: key.hpp,v 1.14 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.96 wesnoth/src/language.cpp:1.97
--- wesnoth/src/language.cpp:1.96 Fri Jun 24 22:41:49 2005
+++ wesnoth/src/language.cpp Sat Jul 2 21:37:19 2005
@@ -1,7 +1,7 @@
-/* $Id: language.cpp,v 1.96 2005/06/24 22:41:49 Sirp Exp $ */
+/* $Id: language.cpp,v 1.97 2005/07/02 21:37:19 ott Exp $ */
/* vim:set encoding=utf-8: */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/language.hpp
diff -u wesnoth/src/language.hpp:1.36 wesnoth/src/language.hpp:1.37
--- wesnoth/src/language.hpp:1.36 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/language.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: language.hpp,v 1.36 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: language.hpp,v 1.37 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/log.cpp
diff -u wesnoth/src/log.cpp:1.24 wesnoth/src/log.cpp:1.25
--- wesnoth/src/log.cpp:1.24 Sun May 1 09:54:30 2005
+++ wesnoth/src/log.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: log.cpp,v 1.24 2005/05/01 09:54:30 silene Exp $ */
+/* $Id: log.cpp,v 1.25 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
2004 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/log.hpp
diff -u wesnoth/src/log.hpp:1.23 wesnoth/src/log.hpp:1.24
--- wesnoth/src/log.hpp:1.23 Sun May 1 08:57:54 2005
+++ wesnoth/src/log.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: log.hpp,v 1.23 2005/05/01 08:57:54 silene Exp $ */
+/* $Id: log.hpp,v 1.24 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
2004 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/map.cpp
diff -u wesnoth/src/map.cpp:1.60 wesnoth/src/map.cpp:1.61
--- wesnoth/src/map.cpp:1.60 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/map.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: map.cpp,v 1.60 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: map.cpp,v 1.61 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/map.hpp
diff -u wesnoth/src/map.hpp:1.39 wesnoth/src/map.hpp:1.40
--- wesnoth/src/map.hpp:1.39 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/map.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: map.hpp,v 1.39 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: map.hpp,v 1.40 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/mouse.cpp
diff -u wesnoth/src/mouse.cpp:1.13 wesnoth/src/mouse.cpp:1.14
--- wesnoth/src/mouse.cpp:1.13 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/mouse.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: mouse.cpp,v 1.13 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: mouse.cpp,v 1.14 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/mouse.hpp
diff -u wesnoth/src/mouse.hpp:1.11 wesnoth/src/mouse.hpp:1.12
--- wesnoth/src/mouse.hpp:1.11 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/mouse.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: mouse.hpp,v 1.11 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: mouse.hpp,v 1.12 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.75
wesnoth/src/multiplayer_lobby.cpp:1.76
--- wesnoth/src/multiplayer_lobby.cpp:1.75 Mon Jun 6 20:12:47 2005
+++ wesnoth/src/multiplayer_lobby.cpp Sat Jul 2 21:37:19 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.75 2005/06/06 20:12:47 gruikya Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.76 2005/07/02 21:37:19 ott Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -137,7 +137,7 @@
quit_game_.set_location(create_game_.location().x +
create_game_.location().w + 5,yscale(7));
games_menu_.set_location(client_area().x, client_area().y +
title().height());
- games_menu_.set_measurements(client_area().w, client_area().h
+ games_menu_.set_measurements(client_area().w, client_area().h
- title().height() - gui::ButtonVPadding);
}
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.30 wesnoth/src/network_worker.cpp:1.31
--- wesnoth/src/network_worker.cpp:1.30 Tue Jun 14 22:56:35 2005
+++ wesnoth/src/network_worker.cpp Sat Jul 2 21:37:19 2005
@@ -347,7 +347,7 @@
--socket_errors;
const TCPsocket sock = i->first;
sockets_locked.erase(i);
- remove_buffers(sock);
+ remove_buffers(sock);
pending_receives.erase(std::remove(pending_receives.begin(),pending_receives.end(),sock),pending_receives.end());
return sock;
}
Index: wesnoth/src/pathfind.cpp
diff -u wesnoth/src/pathfind.cpp:1.71 wesnoth/src/pathfind.cpp:1.72
--- wesnoth/src/pathfind.cpp:1.71 Sun Jun 5 10:56:41 2005
+++ wesnoth/src/pathfind.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: pathfind.cpp,v 1.71 2005/06/05 10:56:41 silene Exp $ */
+/* $Id: pathfind.cpp,v 1.72 2005/07/02 21:37:19 ott Exp $ */
/*
-Copyright (C) 2003 by David White <address@hidden>
+Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/pathfind.hpp
diff -u wesnoth/src/pathfind.hpp:1.38 wesnoth/src/pathfind.hpp:1.39
--- wesnoth/src/pathfind.hpp:1.38 Sun Jun 5 07:03:43 2005
+++ wesnoth/src/pathfind.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: pathfind.hpp,v 1.38 2005/06/05 07:03:43 silene Exp $ */
+/* $Id: pathfind.hpp,v 1.39 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/pathutils.hpp
diff -u wesnoth/src/pathutils.hpp:1.6 wesnoth/src/pathutils.hpp:1.7
--- wesnoth/src/pathutils.hpp:1.6 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/pathutils.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: pathutils.hpp,v 1.6 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: pathutils.hpp,v 1.7 2005/07/02 21:37:19 ott Exp $ */
/*
-Copyright (C) 2003 by David White <address@hidden>
+Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/playcampaign.cpp
diff -u wesnoth/src/playcampaign.cpp:1.7 wesnoth/src/playcampaign.cpp:1.8
--- wesnoth/src/playcampaign.cpp:1.7 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/playcampaign.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: playcampaign.cpp,v 1.7 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: playcampaign.cpp,v 1.8 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003-2005 by David White <address@hidden>
+ Copyright (C) 2003-2005 by David White <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
Index: wesnoth/src/playcampaign.hpp
diff -u wesnoth/src/playcampaign.hpp:1.2 wesnoth/src/playcampaign.hpp:1.3
--- wesnoth/src/playcampaign.hpp:1.2 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/playcampaign.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: playcampaign.hpp,v 1.2 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: playcampaign.hpp,v 1.3 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003-2005 by David White <address@hidden>
+ Copyright (C) 2003-2005 by David White <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.210 wesnoth/src/playlevel.cpp:1.211
--- wesnoth/src/playlevel.cpp:1.210 Fri Jul 1 22:01:36 2005
+++ wesnoth/src/playlevel.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: playlevel.cpp,v 1.210 2005/07/01 22:01:36 darthfool Exp $ */
+/* $Id: playlevel.cpp,v 1.211 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -753,8 +753,8 @@
network::send_data(cfg);
} else {
gui::show_dialog(gui, NULL, _("Game Over"),
- _("The game is over."),
gui::OK_ONLY);
- return QUIT;
+ _("The game is over."),
gui::OK_ONLY);
+ return QUIT;
}
}
Index: wesnoth/src/playlevel.hpp
diff -u wesnoth/src/playlevel.hpp:1.24 wesnoth/src/playlevel.hpp:1.25
--- wesnoth/src/playlevel.hpp:1.24 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/playlevel.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: playlevel.hpp,v 1.24 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: playlevel.hpp,v 1.25 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.383 wesnoth/src/playturn.cpp:1.384
--- wesnoth/src/playturn.cpp:1.383 Tue Jun 21 22:19:19 2005
+++ wesnoth/src/playturn.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: playturn.cpp,v 1.383 2005/06/21 22:19:19 ydirson Exp $ */
+/* $Id: playturn.cpp,v 1.384 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -2934,15 +2934,15 @@
}
close_textbox();
-}
-
-namespace {
-
-bool tab_complete(const std::string& partword, const std::string& name)
-{
- return name.size() >= partword.size() &&
std::equal(partword.begin(),partword.end(),name.begin(),chars_equal_insensitive);
-}
-
+}
+
+namespace {
+
+bool tab_complete(const std::string& partword, const std::string& name)
+{
+ return name.size() >= partword.size() &&
std::equal(partword.begin(),partword.end(),name.begin(),chars_equal_insensitive);
+}
+
}
void turn_info::tab_textbox()
@@ -2981,21 +2981,21 @@
}
const unit_map::const_iterator leader =
team_leader(n+1,units_);
if(leader != units_.end()) {
- const std::string& name =
leader->second.description();
- if(tab_complete(semiword,name)) {
- guess = name;
+ const std::string& name =
leader->second.description();
+ if(tab_complete(semiword,name)) {
+ guess = name;
+ }
+ }
+ }
+
+ if(guess.empty()) {
+ const std::set<std::string>& observers =
gui_.observers();
+ for(std::set<std::string>::const_iterator i =
observers.begin(); i != observers.end(); ++i) {
+ if(tab_complete(semiword,*i)) {
+ guess = *i;
+ break;
}
}
- }
-
- if(guess.empty()) {
- const std::set<std::string>& observers =
gui_.observers();
- for(std::set<std::string>::const_iterator i =
observers.begin(); i != observers.end(); ++i) {
- if(tab_complete(semiword,*i)) {
- guess = *i;
- break;
- }
- }
}
if(guess.empty() == false) {
Index: wesnoth/src/playturn.hpp
diff -u wesnoth/src/playturn.hpp:1.69 wesnoth/src/playturn.hpp:1.70
--- wesnoth/src/playturn.hpp:1.69 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/playturn.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: playturn.hpp,v 1.69 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: playturn.hpp,v 1.70 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.160 wesnoth/src/preferences.cpp:1.161
--- wesnoth/src/preferences.cpp:1.160 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/preferences.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: preferences.cpp,v 1.160 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: preferences.cpp,v 1.161 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/preferences.hpp
diff -u wesnoth/src/preferences.hpp:1.56 wesnoth/src/preferences.hpp:1.57
--- wesnoth/src/preferences.hpp:1.56 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/preferences.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: preferences.hpp,v 1.56 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: preferences.hpp,v 1.57 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/random.cpp
diff -u wesnoth/src/random.cpp:1.7 wesnoth/src/random.cpp:1.8
--- wesnoth/src/random.cpp:1.7 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/random.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: random.cpp,v 1.7 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: random.cpp,v 1.8 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Yann Dirson <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/random.hpp
diff -u wesnoth/src/random.hpp:1.4 wesnoth/src/random.hpp:1.5
--- wesnoth/src/random.hpp:1.4 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/random.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: random.hpp,v 1.4 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: random.hpp,v 1.5 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Yann Dirson <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/replay.cpp
diff -u wesnoth/src/replay.cpp:1.113 wesnoth/src/replay.cpp:1.114
--- wesnoth/src/replay.cpp:1.113 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/replay.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: replay.cpp,v 1.113 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: replay.cpp,v 1.114 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/replay.hpp
diff -u wesnoth/src/replay.hpp:1.36 wesnoth/src/replay.hpp:1.37
--- wesnoth/src/replay.hpp:1.36 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/replay.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: replay.hpp,v 1.36 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: replay.hpp,v 1.37 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/scoped_resource.hpp
diff -u wesnoth/src/scoped_resource.hpp:1.19
wesnoth/src/scoped_resource.hpp:1.20
--- wesnoth/src/scoped_resource.hpp:1.19 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/scoped_resource.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: scoped_resource.hpp,v 1.19 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: scoped_resource.hpp,v 1.20 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/sdl_utils.cpp
diff -u wesnoth/src/sdl_utils.cpp:1.79 wesnoth/src/sdl_utils.cpp:1.80
--- wesnoth/src/sdl_utils.cpp:1.79 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/sdl_utils.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: sdl_utils.cpp,v 1.79 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: sdl_utils.cpp,v 1.80 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/sdl_utils.hpp
diff -u wesnoth/src/sdl_utils.hpp:1.56 wesnoth/src/sdl_utils.hpp:1.57
--- wesnoth/src/sdl_utils.hpp:1.56 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/sdl_utils.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: sdl_utils.hpp,v 1.56 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: sdl_utils.hpp,v 1.57 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/serialization/binary_or_text.cpp
diff -u wesnoth/src/serialization/binary_or_text.cpp:1.13
wesnoth/src/serialization/binary_or_text.cpp:1.14
--- wesnoth/src/serialization/binary_or_text.cpp:1.13 Mon May 16 22:44:20 2005
+++ wesnoth/src/serialization/binary_or_text.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: binary_or_text.cpp,v 1.13 2005/05/16 22:44:20 ydirson Exp $ */
+/* $Id: binary_or_text.cpp,v 1.14 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/binary_or_text.hpp
diff -u wesnoth/src/serialization/binary_or_text.hpp:1.3
wesnoth/src/serialization/binary_or_text.hpp:1.4
--- wesnoth/src/serialization/binary_or_text.hpp:1.3 Tue Apr 5 19:42:07 2005
+++ wesnoth/src/serialization/binary_or_text.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: binary_or_text.hpp,v 1.3 2005/04/05 19:42:07 gruikya Exp $ */
+/* $Id: binary_or_text.hpp,v 1.4 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/binary_wml.cpp
diff -u wesnoth/src/serialization/binary_wml.cpp:1.12
wesnoth/src/serialization/binary_wml.cpp:1.13
--- wesnoth/src/serialization/binary_wml.cpp:1.12 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/serialization/binary_wml.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: binary_wml.cpp,v 1.12 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: binary_wml.cpp,v 1.13 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/binary_wml.hpp
diff -u wesnoth/src/serialization/binary_wml.hpp:1.4
wesnoth/src/serialization/binary_wml.hpp:1.5
--- wesnoth/src/serialization/binary_wml.hpp:1.4 Fri Mar 25 19:35:27 2005
+++ wesnoth/src/serialization/binary_wml.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: binary_wml.hpp,v 1.4 2005/03/25 19:35:27 silene Exp $ */
+/* $Id: binary_wml.hpp,v 1.5 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/parser.cpp
diff -u wesnoth/src/serialization/parser.cpp:1.19
wesnoth/src/serialization/parser.cpp:1.20
--- wesnoth/src/serialization/parser.cpp:1.19 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/serialization/parser.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: parser.cpp,v 1.19 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: parser.cpp,v 1.20 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/parser.hpp
diff -u wesnoth/src/serialization/parser.hpp:1.9
wesnoth/src/serialization/parser.hpp:1.10
--- wesnoth/src/serialization/parser.hpp:1.9 Wed Apr 27 22:17:37 2005
+++ wesnoth/src/serialization/parser.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: parser.hpp,v 1.9 2005/04/27 22:17:37 silene Exp $ */
+/* $Id: parser.hpp,v 1.10 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/preprocessor.cpp
diff -u wesnoth/src/serialization/preprocessor.cpp:1.21
wesnoth/src/serialization/preprocessor.cpp:1.22
--- wesnoth/src/serialization/preprocessor.cpp:1.21 Thu Jun 23 23:10:54 2005
+++ wesnoth/src/serialization/preprocessor.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: preprocessor.cpp,v 1.21 2005/06/23 23:10:54 Sirp Exp $ */
+/* $Id: preprocessor.cpp,v 1.22 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -67,7 +67,7 @@
virtual int underflow();
std::ostringstream buffer_;
preprocessor *current_;
- preproc_map *defines_;
+ preproc_map *defines_;
preproc_map default_defines_;
std::string textdomain_;
std::string location_;
@@ -86,9 +86,9 @@
preprocessor_streambuf::preprocessor_streambuf(preproc_map *def)
: current_(NULL), defines_(def), textdomain_(PACKAGE),
depth_(0), quoted_(false)
-{
- if(defines_ == NULL) {
- defines_ = &default_defines_;
+{
+ if(defines_ == NULL) {
+ defines_ = &default_defines_;
}
}
Index: wesnoth/src/serialization/preprocessor.hpp
diff -u wesnoth/src/serialization/preprocessor.hpp:1.8
wesnoth/src/serialization/preprocessor.hpp:1.9
--- wesnoth/src/serialization/preprocessor.hpp:1.8 Thu Jun 23 23:10:54 2005
+++ wesnoth/src/serialization/preprocessor.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: preprocessor.hpp,v 1.8 2005/06/23 23:10:54 Sirp Exp $ */
+/* $Id: preprocessor.hpp,v 1.9 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/string_utils.cpp
diff -u wesnoth/src/serialization/string_utils.cpp:1.22
wesnoth/src/serialization/string_utils.cpp:1.23
--- wesnoth/src/serialization/string_utils.cpp:1.22 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/serialization/string_utils.cpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: string_utils.cpp,v 1.22 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: string_utils.cpp,v 1.23 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/serialization/string_utils.hpp
diff -u wesnoth/src/serialization/string_utils.hpp:1.14
wesnoth/src/serialization/string_utils.hpp:1.15
--- wesnoth/src/serialization/string_utils.hpp:1.14 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/serialization/string_utils.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: string_utils.hpp,v 1.14 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: string_utils.hpp,v 1.15 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/server/game.cpp
diff -u wesnoth/src/server/game.cpp:1.37 wesnoth/src/server/game.cpp:1.38
--- wesnoth/src/server/game.cpp:1.37 Wed Jun 8 21:10:39 2005
+++ wesnoth/src/server/game.cpp Sat Jul 2 21:37:20 2005
@@ -117,7 +117,7 @@
bool game::take_side(network::connection player, const config& cfg)
{
wassert(is_member(player));
-
+
// verify that side is a side id
const std::string& side = cfg["side"];
ssize_t side_num;
@@ -129,9 +129,9 @@
catch(bad_lexical_cast& bad_lexical) {
return false;
}
-
+
size_t side_index = static_cast<size_t>(side_num - 1);
-
+
//if the side is already taken, see if we can give the player
//another side instead
if(side_controllers_[side_index] == "human" ||
(sides_taken_[side_index] && side_controllers_[side_index] == "network")) {
@@ -204,7 +204,7 @@
continue;
}
side_index = static_cast<size_t>(side_num - 1);
-
+
if((**sd)["controller"] == "network") {
side_controllers_[side_index] = "network";
if((**sd)["user_description"] ==
info->second.name()) {
@@ -257,9 +257,9 @@
const size_t nsides = level_.get_children("side").size();
if(side_num > nsides)
return invalid;
-
+
const size_t side_index = static_cast<size_t>(side_num - 1);
-
+
if(side_controllers_[side_index] == "network" &&
sides_taken_[side_index]) {
static const std::string already = "This side is already
controlled by a player";
return already;
@@ -276,7 +276,7 @@
side_controllers_[side_index] = "network";
sides_taken_[side_index] = true;
sides_.insert(std::pair<const network::connection,size_t>(*i,
side_index));
-
+
// send a response to the host and to the new controller
config response;
config& change = response.add_child("change_controller");
@@ -452,7 +452,7 @@
{
const std::vector<network::connection>::iterator itor =
std::find(players_.begin(),players_.end(),player);
-
+
if(itor != players_.end())
players_.erase(itor);
@@ -472,7 +472,7 @@
}
if(!observer)
sides_.erase(player);
-
+
send_user_list();
const player_map::const_iterator pl = player_info_->find(player);
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.134 wesnoth/src/show_dialog.cpp:1.135
--- wesnoth/src/show_dialog.cpp:1.134 Sun Jun 19 13:32:13 2005
+++ wesnoth/src/show_dialog.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: show_dialog.cpp,v 1.134 2005/06/19 13:32:13 Sirp Exp $ */
+/* $Id: show_dialog.cpp,v 1.135 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
@@ -817,14 +817,14 @@
}
} else if(res ==
dialog_button_action::CLOSE_DIALOG) {
return -1;
- }
-
- //reset button-tracking flags so that if the
action displays a dialog, a button-press
- //at the end of the dialog won't be mistaken
for a button-press in this dialog.
- //(We should eventually use a proper
event-handling system instead of tracking
- //flags to avoid problems like this altogether).
- left_button = true;
- right_button = true;
+ }
+
+ //reset button-tracking flags so that if the
action displays a dialog, a button-press
+ //at the end of the dialog won't be mistaken
for a button-press in this dialog.
+ //(We should eventually use a proper
event-handling system instead of tracking
+ //flags to avoid problems like this altogether).
+ left_button = true;
+ right_button = true;
key_down = true;
}
}
Index: wesnoth/src/show_dialog.hpp
diff -u wesnoth/src/show_dialog.hpp:1.51 wesnoth/src/show_dialog.hpp:1.52
--- wesnoth/src/show_dialog.hpp:1.51 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/show_dialog.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: show_dialog.hpp,v 1.51 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: show_dialog.hpp,v 1.52 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/sound.cpp
diff -u wesnoth/src/sound.cpp:1.30 wesnoth/src/sound.cpp:1.31
--- wesnoth/src/sound.cpp:1.30 Mon Jun 6 20:12:47 2005
+++ wesnoth/src/sound.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: sound.cpp,v 1.30 2005/06/06 20:12:47 gruikya Exp $ */
+/* $Id: sound.cpp,v 1.31 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/sound.hpp
diff -u wesnoth/src/sound.hpp:1.12 wesnoth/src/sound.hpp:1.13
--- wesnoth/src/sound.hpp:1.12 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/sound.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: sound.hpp,v 1.12 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: sound.hpp,v 1.13 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/team.cpp
diff -u wesnoth/src/team.cpp:1.90 wesnoth/src/team.cpp:1.91
--- wesnoth/src/team.cpp:1.90 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/team.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: team.cpp,v 1.90 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: team.cpp,v 1.91 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/team.hpp
diff -u wesnoth/src/team.hpp:1.59 wesnoth/src/team.hpp:1.60
--- wesnoth/src/team.hpp:1.59 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/team.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: team.hpp,v 1.59 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: team.hpp,v 1.60 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/terrain.cpp
diff -u wesnoth/src/terrain.cpp:1.29 wesnoth/src/terrain.cpp:1.30
--- wesnoth/src/terrain.cpp:1.29 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/terrain.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: terrain.cpp,v 1.29 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: terrain.cpp,v 1.30 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/terrain.hpp
diff -u wesnoth/src/terrain.hpp:1.24 wesnoth/src/terrain.hpp:1.25
--- wesnoth/src/terrain.hpp:1.24 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/terrain.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: terrain.hpp,v 1.24 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: terrain.hpp,v 1.25 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.154 wesnoth/src/unit.cpp:1.155
--- wesnoth/src/unit.cpp:1.154 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/unit.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: unit.cpp,v 1.154 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: unit.cpp,v 1.155 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/unit.hpp
diff -u wesnoth/src/unit.hpp:1.70 wesnoth/src/unit.hpp:1.71
--- wesnoth/src/unit.hpp:1.70 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/unit.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: unit.hpp,v 1.70 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: unit.hpp,v 1.71 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.104 wesnoth/src/unit_types.cpp:1.105
--- wesnoth/src/unit_types.cpp:1.104 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/unit_types.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: unit_types.cpp,v 1.104 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: unit_types.cpp,v 1.105 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.70 wesnoth/src/unit_types.hpp:1.71
--- wesnoth/src/unit_types.hpp:1.70 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/unit_types.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: unit_types.hpp,v 1.70 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: unit_types.hpp,v 1.71 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/util.hpp
diff -u wesnoth/src/util.hpp:1.25 wesnoth/src/util.hpp:1.26
--- wesnoth/src/util.hpp:1.25 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/util.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: util.hpp,v 1.25 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: util.hpp,v 1.26 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/variable.cpp
diff -u wesnoth/src/variable.cpp:1.4 wesnoth/src/variable.cpp:1.5
--- wesnoth/src/variable.cpp:1.4 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/variable.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: variable.cpp,v 1.4 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: variable.cpp,v 1.5 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/variable.hpp
diff -u wesnoth/src/variable.hpp:1.6 wesnoth/src/variable.hpp:1.7
--- wesnoth/src/variable.hpp:1.6 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/variable.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: variable.hpp,v 1.6 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: variable.hpp,v 1.7 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/video.cpp
diff -u wesnoth/src/video.cpp:1.69 wesnoth/src/video.cpp:1.70
--- wesnoth/src/video.cpp:1.69 Mon Jun 6 20:12:47 2005
+++ wesnoth/src/video.cpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: video.cpp,v 1.69 2005/06/06 20:12:47 gruikya Exp $ */
+/* $Id: video.cpp,v 1.70 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/video.hpp
diff -u wesnoth/src/video.hpp:1.36 wesnoth/src/video.hpp:1.37
--- wesnoth/src/video.hpp:1.36 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/video.hpp Sat Jul 2 21:37:19 2005
@@ -1,6 +1,6 @@
-/* $Id: video.hpp,v 1.36 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: video.hpp,v 1.37 2005/07/02 21:37:19 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/button.cpp
diff -u wesnoth/src/widgets/button.cpp:1.67 wesnoth/src/widgets/button.cpp:1.68
--- wesnoth/src/widgets/button.cpp:1.67 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/button.cpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: button.cpp,v 1.67 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: button.cpp,v 1.68 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/button.hpp
diff -u wesnoth/src/widgets/button.hpp:1.33 wesnoth/src/widgets/button.hpp:1.34
--- wesnoth/src/widgets/button.hpp:1.33 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/button.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: button.hpp,v 1.33 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: button.hpp,v 1.34 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/combo.cpp
diff -u wesnoth/src/widgets/combo.cpp:1.30 wesnoth/src/widgets/combo.cpp:1.31
--- wesnoth/src/widgets/combo.cpp:1.30 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/combo.cpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: combo.cpp,v 1.30 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: combo.cpp,v 1.31 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/combo.hpp
diff -u wesnoth/src/widgets/combo.hpp:1.23 wesnoth/src/widgets/combo.hpp:1.24
--- wesnoth/src/widgets/combo.hpp:1.23 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/combo.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: combo.hpp,v 1.23 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: combo.hpp,v 1.24 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/file_chooser.cpp
diff -u wesnoth/src/widgets/file_chooser.cpp:1.29
wesnoth/src/widgets/file_chooser.cpp:1.30
--- wesnoth/src/widgets/file_chooser.cpp:1.29 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/file_chooser.cpp Sat Jul 2 21:37:20 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/file_chooser.hpp
diff -u wesnoth/src/widgets/file_chooser.hpp:1.13
wesnoth/src/widgets/file_chooser.hpp:1.14
--- wesnoth/src/widgets/file_chooser.hpp:1.13 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/file_chooser.hpp Sat Jul 2 21:37:20 2005
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/scrollbar.cpp
diff -u wesnoth/src/widgets/scrollbar.cpp:1.33
wesnoth/src/widgets/scrollbar.cpp:1.34
--- wesnoth/src/widgets/scrollbar.cpp:1.33 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/scrollbar.cpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: scrollbar.cpp,v 1.33 2005/06/04 19:16:06 ott Exp $*/
+/* $Id: scrollbar.cpp,v 1.34 2005/07/02 21:37:20 ott Exp $*/
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
2004 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/widgets/scrollbar.hpp
diff -u wesnoth/src/widgets/scrollbar.hpp:1.17
wesnoth/src/widgets/scrollbar.hpp:1.18
--- wesnoth/src/widgets/scrollbar.hpp:1.17 Fri Mar 18 21:21:48 2005
+++ wesnoth/src/widgets/scrollbar.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: scrollbar.hpp,v 1.17 2005/03/18 21:21:48 ydirson Exp $ */
+/* $Id: scrollbar.hpp,v 1.18 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
2004 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Index: wesnoth/src/widgets/slider.cpp
diff -u wesnoth/src/widgets/slider.cpp:1.41 wesnoth/src/widgets/slider.cpp:1.42
--- wesnoth/src/widgets/slider.cpp:1.41 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/slider.cpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: slider.cpp,v 1.41 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: slider.cpp,v 1.42 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/slider.hpp
diff -u wesnoth/src/widgets/slider.hpp:1.26 wesnoth/src/widgets/slider.hpp:1.27
--- wesnoth/src/widgets/slider.hpp:1.26 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/slider.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: slider.hpp,v 1.26 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: slider.hpp,v 1.27 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/textbox.cpp
diff -u wesnoth/src/widgets/textbox.cpp:1.82
wesnoth/src/widgets/textbox.cpp:1.83
--- wesnoth/src/widgets/textbox.cpp:1.82 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/textbox.cpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: textbox.cpp,v 1.82 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: textbox.cpp,v 1.83 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Index: wesnoth/src/widgets/textbox.hpp
diff -u wesnoth/src/widgets/textbox.hpp:1.45
wesnoth/src/widgets/textbox.hpp:1.46
--- wesnoth/src/widgets/textbox.hpp:1.45 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/widgets/textbox.hpp Sat Jul 2 21:37:20 2005
@@ -1,6 +1,6 @@
-/* $Id: textbox.hpp,v 1.45 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: textbox.hpp,v 1.46 2005/07/02 21:37:20 ott Exp $ */
/*
- Copyright (C) 2003 by David White <address@hidden>
+ Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src about.cpp about.hpp actions.cpp act...,
ott <=