[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src ai2.hpp array.hpp cavegen.cpp caveg...
|
From: |
ott |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src ai2.hpp array.hpp cavegen.cpp caveg... |
|
Date: |
Wed, 20 Jul 2005 04:22:37 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <address@hidden> 05/07/20 08:22:37
Modified files:
src : ai2.hpp array.hpp cavegen.cpp cavegen.hpp
clipboard.cpp clipboard.hpp cursor.cpp
cursor.hpp events.cpp events.hpp
filechooser.cpp game.cpp gettext.cpp
gettext.hpp global.hpp halo.cpp halo.hpp
image.cpp image.hpp map_create.cpp
map_create.hpp map_label.cpp map_label.hpp
mapgen.cpp mapgen.hpp mapgen_dialog.cpp
mapgen_dialog.hpp multiplayer_ui.cpp
network.cpp network.hpp network_worker.cpp
network_worker.hpp pathutils.cpp
publish_campaign.cpp publish_campaign.hpp
race.cpp race.hpp reports.cpp reports.hpp
statistics.cpp statistics.hpp theme.cpp
theme.hpp thread.cpp thread.hpp titlescreen.cpp
titlescreen.hpp tooltips.cpp tooltips.hpp
unit_display.cpp unit_display.hpp
wml_separators.hpp
src/editor : editor.hpp editor_palettes.cpp
src/widgets : menu.cpp
Log message:
add copyright notices (please change as appropriate), and deDOSify
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai2.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/array.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cavegen.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cavegen.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/clipboard.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/clipboard.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cursor.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cursor.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/events.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/events.hpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filechooser.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.265&tr2=1.266&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/global.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/halo.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/halo.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.cpp.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.hpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_create.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_create.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_label.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_label.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.cpp.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.hpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen_dialog.cpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen_dialog.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.hpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/pathutils.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/publish_campaign.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/publish_campaign.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.hpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.cpp.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.hpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/statistics.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/statistics.hpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/theme.cpp.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/theme.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/thread.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/thread.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/titlescreen.cpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/titlescreen.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tooltips.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tooltips.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/wml_separators.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.hpp.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
Patches:
Index: wesnoth/src/ai2.hpp
diff -u wesnoth/src/ai2.hpp:1.3 wesnoth/src/ai2.hpp:1.4
--- wesnoth/src/ai2.hpp:1.3 Sun Nov 21 21:27:07 2004
+++ wesnoth/src/ai2.hpp Wed Jul 20 08:22:36 2005
@@ -1,3 +1,16 @@
+/* $Id: ai2.hpp,v 1.4 2005/07/20 08:22:36 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef AI2_HPP_INCLUDED
#define AI2_HPP_INCLUDED
Index: wesnoth/src/array.hpp
diff -u wesnoth/src/array.hpp:1.3 wesnoth/src/array.hpp:1.4
--- wesnoth/src/array.hpp:1.3 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/array.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: array.hpp,v 1.4 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef ARRAY_HPP_INCLUDED
#define ARRAY_HPP_INCLUDED
Index: wesnoth/src/cavegen.cpp
diff -u wesnoth/src/cavegen.cpp:1.19 wesnoth/src/cavegen.cpp:1.20
--- wesnoth/src/cavegen.cpp:1.19 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/cavegen.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: cavegen.cpp,v 1.20 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "cavegen.hpp"
Index: wesnoth/src/cavegen.hpp
diff -u wesnoth/src/cavegen.hpp:1.8 wesnoth/src/cavegen.hpp:1.9
--- wesnoth/src/cavegen.hpp:1.8 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/cavegen.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: cavegen.hpp,v 1.9 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef CAVEGEN_HPP_INCLUDED
#define CAVEGEN_HPP_INCLUDED
Index: wesnoth/src/clipboard.cpp
diff -u wesnoth/src/clipboard.cpp:1.18 wesnoth/src/clipboard.cpp:1.19
--- wesnoth/src/clipboard.cpp:1.18 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/clipboard.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: clipboard.cpp,v 1.19 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "clipboard.hpp"
Index: wesnoth/src/clipboard.hpp
diff -u wesnoth/src/clipboard.hpp:1.6 wesnoth/src/clipboard.hpp:1.7
--- wesnoth/src/clipboard.hpp:1.6 Sat Mar 12 05:04:02 2005
+++ wesnoth/src/clipboard.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: clipboard.hpp,v 1.7 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef CLIPBOARD_HPP_INCLUDED
#define CLIPBOARD_HPP_INCLUDED
Index: wesnoth/src/cursor.cpp
diff -u wesnoth/src/cursor.cpp:1.16 wesnoth/src/cursor.cpp:1.17
--- wesnoth/src/cursor.cpp:1.16 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/cursor.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: cursor.cpp,v 1.17 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "cursor.hpp"
Index: wesnoth/src/cursor.hpp
diff -u wesnoth/src/cursor.hpp:1.6 wesnoth/src/cursor.hpp:1.7
--- wesnoth/src/cursor.hpp:1.6 Sun Jul 18 19:02:21 2004
+++ wesnoth/src/cursor.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: cursor.hpp,v 1.7 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef CURSOR_HPP_INCLUDED
#define CURSOR_HPP_INCLUDED
Index: wesnoth/src/editor/editor.hpp
diff -u wesnoth/src/editor/editor.hpp:1.47 wesnoth/src/editor/editor.hpp:1.48
--- wesnoth/src/editor/editor.hpp:1.47 Sun Jul 17 14:01:21 2005
+++ wesnoth/src/editor/editor.hpp Wed Jul 20 08:22:37 2005
@@ -172,7 +172,7 @@
/// Check whether the filename contains illegal characters.
bool verify_filename(const std::string& filename, bool show_error)
const;
-
+
/// Display a menu with given items and at the given location.
void show_menu(const std::vector<std::string>& items_arg, const int
xloc,
const int yloc, const bool
context_menu=false);
Index: wesnoth/src/editor/editor_palettes.cpp
diff -u wesnoth/src/editor/editor_palettes.cpp:1.31
wesnoth/src/editor/editor_palettes.cpp:1.32
--- wesnoth/src/editor/editor_palettes.cpp:1.31 Fri Jul 15 11:44:54 2005
+++ wesnoth/src/editor/editor_palettes.cpp Wed Jul 20 08:22:37 2005
@@ -49,11 +49,11 @@
}
void terrain_palette::adjust_size() {
-
+
scroll_top();
const size_t button_height = 24;
const size_t button_palette_padding = 8;
-
+
SDL_Rect rect = { size_specs_.palette_x, size_specs_.palette_y,
size_specs_.palette_w, size_specs_.palette_h };
set_location(rect);
top_button_y_ = size_specs_.palette_y;
@@ -232,7 +232,7 @@
}
void terrain_palette::draw(bool force) {
-
+
if (top_button_.pressed()) {
scroll_up();
}
@@ -262,7 +262,7 @@
if((unsigned)image->w != size_specs_.terrain_size ||
(unsigned)image->h != size_specs_.terrain_size) {
image.assign(scale_surface(image,
size_specs_.terrain_size, size_specs_.terrain_size));
}
-
+
const int counter_from_zero = counter - starting;
SDL_Rect dstrect;
dstrect.x = loc.x + (counter_from_zero %
size_specs_.terrain_width) * size_specs_.terrain_space;
Index: wesnoth/src/events.cpp
diff -u wesnoth/src/events.cpp:1.28 wesnoth/src/events.cpp:1.29
--- wesnoth/src/events.cpp:1.28 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/events.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: events.cpp,v 1.29 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "clipboard.hpp"
Index: wesnoth/src/events.hpp
diff -u wesnoth/src/events.hpp:1.14 wesnoth/src/events.hpp:1.15
--- wesnoth/src/events.hpp:1.14 Sun Oct 31 20:50:13 2004
+++ wesnoth/src/events.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: events.hpp,v 1.15 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef EVENTS_HPP_INCLUDED
#define EVENTS_HPP_INCLUDED
Index: wesnoth/src/filechooser.cpp
diff -u wesnoth/src/filechooser.cpp:1.10 wesnoth/src/filechooser.cpp:1.11
--- wesnoth/src/filechooser.cpp:1.10 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/filechooser.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: filechooser.cpp,v 1.11 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "display.hpp"
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.265 wesnoth/src/game.cpp:1.266
--- wesnoth/src/game.cpp:1.265 Sat Jul 16 14:03:24 2005
+++ wesnoth/src/game.cpp Wed Jul 20 08:22:37 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.265 2005/07/16 14:03:24 Sirp Exp $ */
+/* $Id: game.cpp,v 1.266 2005/07/20 08:22:37 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -263,12 +263,12 @@
int video_flags = preferences::fullscreen() ? FULL_SCREEN : 0;
- std::pair<int,int> resolution = preferences::resolution();
-
- int DefaultBPP = 24;
- const SDL_VideoInfo* const video_info = SDL_GetVideoInfo();
- if(video_info != NULL && video_info->vfmt != NULL) {
- DefaultBPP = video_info->vfmt->BitsPerPixel;
+ std::pair<int,int> resolution = preferences::resolution();
+
+ int DefaultBPP = 24;
+ const SDL_VideoInfo* const video_info = SDL_GetVideoInfo();
+ if(video_info != NULL && video_info->vfmt != NULL) {
+ DefaultBPP = video_info->vfmt->BitsPerPixel;
}
std::cerr << "Checking video mode: " << resolution.first
@@ -570,7 +570,7 @@
}
}
- try {
+ try {
state_.snapshot = level;
::play_game(disp(),state_,game_config_,units_data_,video_);
//play_level(units_data_,game_config_,&level,video_,state_,story);
@@ -1277,57 +1277,57 @@
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 {
- preproc_map
user_defines_map(defines_map);
- scoped_istream stream =
preprocess_file(*uc,&user_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 {
+ preproc_map
user_defines_map(defines_map);
+ scoped_istream stream =
preprocess_file(*uc,&user_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(),
Index: wesnoth/src/gettext.cpp
diff -u wesnoth/src/gettext.cpp:1.11 wesnoth/src/gettext.cpp:1.12
--- wesnoth/src/gettext.cpp:1.11 Tue Apr 12 22:03:41 2005
+++ wesnoth/src/gettext.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: gettext.cpp,v 1.12 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "gettext.hpp"
Index: wesnoth/src/gettext.hpp
diff -u wesnoth/src/gettext.hpp:1.11 wesnoth/src/gettext.hpp:1.12
--- wesnoth/src/gettext.hpp:1.11 Thu Apr 21 20:38:10 2005
+++ wesnoth/src/gettext.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: gettext.hpp,v 1.12 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef GETTEXT_HPP_INCLUDED
#define GETTEXT_HPP_INCLUDED
Index: wesnoth/src/global.hpp
diff -u wesnoth/src/global.hpp:1.5 wesnoth/src/global.hpp:1.6
--- wesnoth/src/global.hpp:1.5 Wed Jan 12 23:10:10 2005
+++ wesnoth/src/global.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: global.hpp,v 1.6 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef DISABLE_4786_HPP_INCLUDED
#define DISABLE_4786_HPP_INCLUDED
Index: wesnoth/src/halo.cpp
diff -u wesnoth/src/halo.cpp:1.17 wesnoth/src/halo.cpp:1.18
--- wesnoth/src/halo.cpp:1.17 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/halo.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: halo.cpp,v 1.18 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "display.hpp"
Index: wesnoth/src/halo.hpp
diff -u wesnoth/src/halo.hpp:1.8 wesnoth/src/halo.hpp:1.9
--- wesnoth/src/halo.hpp:1.8 Thu Mar 10 01:24:31 2005
+++ wesnoth/src/halo.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: halo.hpp,v 1.9 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef HALO_HPP_INCLUDED
#define HALO_HPP_INCLUDED
Index: wesnoth/src/image.cpp
diff -u wesnoth/src/image.cpp:1.80 wesnoth/src/image.cpp:1.81
--- wesnoth/src/image.cpp:1.80 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/image.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: image.cpp,v 1.81 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "config.hpp"
Index: wesnoth/src/image.hpp
diff -u wesnoth/src/image.hpp:1.35 wesnoth/src/image.hpp:1.36
--- wesnoth/src/image.hpp:1.35 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/image.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: image.hpp,v 1.36 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef IMAGE_HPP_INCLUDED
#define IMAGE_HPP_INCLUDED
Index: wesnoth/src/map_create.cpp
diff -u wesnoth/src/map_create.cpp:1.6 wesnoth/src/map_create.cpp:1.7
--- wesnoth/src/map_create.cpp:1.6 Sat Mar 26 17:10:32 2005
+++ wesnoth/src/map_create.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: map_create.cpp,v 1.7 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "cavegen.hpp"
Index: wesnoth/src/map_create.hpp
diff -u wesnoth/src/map_create.hpp:1.2 wesnoth/src/map_create.hpp:1.3
--- wesnoth/src/map_create.hpp:1.2 Thu Mar 10 20:06:20 2005
+++ wesnoth/src/map_create.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: map_create.hpp,v 1.3 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef MAP_CREATE_HPP_INCLUDED
#define MAP_CREATE_HPP_INCLUDED
Index: wesnoth/src/map_label.cpp
diff -u wesnoth/src/map_label.cpp:1.17 wesnoth/src/map_label.cpp:1.18
--- wesnoth/src/map_label.cpp:1.17 Thu Jun 2 20:50:26 2005
+++ wesnoth/src/map_label.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: map_label.cpp,v 1.18 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "display.hpp"
Index: wesnoth/src/map_label.hpp
diff -u wesnoth/src/map_label.hpp:1.8 wesnoth/src/map_label.hpp:1.9
--- wesnoth/src/map_label.hpp:1.8 Thu Mar 10 20:06:20 2005
+++ wesnoth/src/map_label.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: map_label.hpp,v 1.9 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef MAP_LABEL_HPP_INCLUDED
#define MAP_LABEL_HPP_INCLUDED
Index: wesnoth/src/mapgen.cpp
diff -u wesnoth/src/mapgen.cpp:1.65 wesnoth/src/mapgen.cpp:1.66
--- wesnoth/src/mapgen.cpp:1.65 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/mapgen.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: mapgen.cpp,v 1.66 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include <algorithm>
Index: wesnoth/src/mapgen.hpp
diff -u wesnoth/src/mapgen.hpp:1.13 wesnoth/src/mapgen.hpp:1.14
--- wesnoth/src/mapgen.hpp:1.13 Wed Mar 9 20:48:42 2005
+++ wesnoth/src/mapgen.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: mapgen.hpp,v 1.14 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef MAP_GEN_HPP_INCLUDED
#define MAP_GEN_HPP_INCLUDED
Index: wesnoth/src/mapgen_dialog.cpp
diff -u wesnoth/src/mapgen_dialog.cpp:1.39 wesnoth/src/mapgen_dialog.cpp:1.40
--- wesnoth/src/mapgen_dialog.cpp:1.39 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/mapgen_dialog.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: mapgen_dialog.cpp,v 1.40 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "mapgen_dialog.hpp"
Index: wesnoth/src/mapgen_dialog.hpp
diff -u wesnoth/src/mapgen_dialog.hpp:1.11 wesnoth/src/mapgen_dialog.hpp:1.12
--- wesnoth/src/mapgen_dialog.hpp:1.11 Thu Mar 10 22:03:32 2005
+++ wesnoth/src/mapgen_dialog.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: mapgen_dialog.hpp,v 1.12 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef MAPGEN_DIALOG_HPP_INCLUDED
#define MAPGEN_DIALOG_HPP_INCLUDED
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.29 wesnoth/src/multiplayer_ui.cpp:1.30
--- wesnoth/src/multiplayer_ui.cpp:1.29 Tue Jul 19 23:45:58 2005
+++ wesnoth/src/multiplayer_ui.cpp Wed Jul 20 08:22:37 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.29 2005/07/19 23:45:58 Sirp Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.30 2005/07/20 08:22:37 ott Exp $ */
/*
Copyright (C) 2005
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -351,7 +351,7 @@
void ui::layout_children(const SDL_Rect& rect)
{
title_.set_location(xscale(11)+4, xscale(42) + 4);
- users_menu_.set_width(xscale(159));
+ users_menu_.set_width(xscale(159));
users_menu_.set_max_width(xscale(159));
users_menu_.set_location(xscale(856), yscale(42));
users_menu_.set_height(yscale(715));
@@ -382,9 +382,9 @@
} else if(list.size() > user_list_.size()) {
sound::play_sound(game_config::sounds::user_arrive);
}
- }
-
- user_list_ = list;
+ }
+
+ user_list_ = list;
users_menu_.set_items(user_list_,true,true);
}
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.66 wesnoth/src/network.cpp:1.67
--- wesnoth/src/network.cpp:1.66 Sun Jul 3 16:19:49 2005
+++ wesnoth/src/network.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: network.cpp,v 1.67 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "serialization/binary_wml.hpp"
Index: wesnoth/src/network.hpp
diff -u wesnoth/src/network.hpp:1.26 wesnoth/src/network.hpp:1.27
--- wesnoth/src/network.hpp:1.26 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/network.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: network.hpp,v 1.27 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef NETWORK_HPP_INCLUDED
#define NETWORK_HPP_INCLUDED
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.31 wesnoth/src/network_worker.cpp:1.32
--- wesnoth/src/network_worker.cpp:1.31 Sat Jul 2 21:37:19 2005
+++ wesnoth/src/network_worker.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: network_worker.cpp,v 1.32 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "log.hpp"
Index: wesnoth/src/network_worker.hpp
diff -u wesnoth/src/network_worker.hpp:1.3 wesnoth/src/network_worker.hpp:1.4
--- wesnoth/src/network_worker.hpp:1.3 Sun Feb 27 18:15:21 2005
+++ wesnoth/src/network_worker.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: network_worker.hpp,v 1.4 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef NETWORK_WORKER_HPP_INCLUDED
#define NETWORK_WORKER_HPP_INCLUDED
Index: wesnoth/src/pathutils.cpp
diff -u wesnoth/src/pathutils.cpp:1.5 wesnoth/src/pathutils.cpp:1.6
--- wesnoth/src/pathutils.cpp:1.5 Wed May 4 21:20:05 2005
+++ wesnoth/src/pathutils.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: pathutils.cpp,v 1.6 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "pathutils.hpp"
Index: wesnoth/src/publish_campaign.cpp
diff -u wesnoth/src/publish_campaign.cpp:1.9
wesnoth/src/publish_campaign.cpp:1.10
--- wesnoth/src/publish_campaign.cpp:1.9 Sun Mar 27 23:06:17 2005
+++ wesnoth/src/publish_campaign.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: publish_campaign.cpp,v 1.10 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "config.hpp"
Index: wesnoth/src/publish_campaign.hpp
diff -u wesnoth/src/publish_campaign.hpp:1.3
wesnoth/src/publish_campaign.hpp:1.4
--- wesnoth/src/publish_campaign.hpp:1.3 Thu Mar 10 20:57:39 2005
+++ wesnoth/src/publish_campaign.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: publish_campaign.hpp,v 1.4 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef PUBLISH_CAMPAIGN_HPP_INCLUDED
#define PUBLISH_CAMPAIGN_HPP_INCLUDED
Index: wesnoth/src/race.cpp
diff -u wesnoth/src/race.cpp:1.21 wesnoth/src/race.cpp:1.22
--- wesnoth/src/race.cpp:1.21 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/race.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: race.cpp,v 1.22 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "race.hpp"
Index: wesnoth/src/race.hpp
diff -u wesnoth/src/race.hpp:1.9 wesnoth/src/race.hpp:1.10
--- wesnoth/src/race.hpp:1.9 Sun Mar 27 23:06:17 2005
+++ wesnoth/src/race.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: race.hpp,v 1.10 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef RACE_HPP_INCLUDED
#define RACE_HPP_INCLUDED
Index: wesnoth/src/reports.cpp
diff -u wesnoth/src/reports.cpp:1.67 wesnoth/src/reports.cpp:1.68
--- wesnoth/src/reports.cpp:1.67 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/reports.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: reports.cpp,v 1.68 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "actions.hpp"
Index: wesnoth/src/reports.hpp
diff -u wesnoth/src/reports.hpp:1.14 wesnoth/src/reports.hpp:1.15
--- wesnoth/src/reports.hpp:1.14 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/reports.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: reports.hpp,v 1.15 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef REPORTS_HPP_INCLUDED
#define REPORTS_HPP_INCLUDED
Index: wesnoth/src/statistics.cpp
diff -u wesnoth/src/statistics.cpp:1.17 wesnoth/src/statistics.cpp:1.18
--- wesnoth/src/statistics.cpp:1.17 Sun Apr 17 13:49:00 2005
+++ wesnoth/src/statistics.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: statistics.cpp,v 1.18 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "statistics.hpp"
Index: wesnoth/src/statistics.hpp
diff -u wesnoth/src/statistics.hpp:1.12 wesnoth/src/statistics.hpp:1.13
--- wesnoth/src/statistics.hpp:1.12 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/statistics.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: statistics.hpp,v 1.13 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef STATISTICS_HPP_INCLUDED
#define STATISTICS_HPP_INCLUDED
Index: wesnoth/src/theme.cpp
diff -u wesnoth/src/theme.cpp:1.40 wesnoth/src/theme.cpp:1.41
--- wesnoth/src/theme.cpp:1.40 Wed Jul 20 06:27:11 2005
+++ wesnoth/src/theme.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: theme.cpp,v 1.41 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "config.hpp"
Index: wesnoth/src/theme.hpp
diff -u wesnoth/src/theme.hpp:1.11 wesnoth/src/theme.hpp:1.12
--- wesnoth/src/theme.hpp:1.11 Wed Jul 20 06:27:11 2005
+++ wesnoth/src/theme.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: theme.hpp,v 1.12 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef THEME_HPP_INCLUDED
#define THEME_HPP_INCLUDED
Index: wesnoth/src/thread.cpp
diff -u wesnoth/src/thread.cpp:1.8 wesnoth/src/thread.cpp:1.9
--- wesnoth/src/thread.cpp:1.8 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/thread.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: thread.cpp,v 1.9 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "thread.hpp"
Index: wesnoth/src/thread.hpp
diff -u wesnoth/src/thread.hpp:1.5 wesnoth/src/thread.hpp:1.6
--- wesnoth/src/thread.hpp:1.5 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/thread.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: thread.hpp,v 1.6 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef THREAD_HPP_INCLUDED
#define THREAD_HPP_INCLUDED
Index: wesnoth/src/titlescreen.cpp
diff -u wesnoth/src/titlescreen.cpp:1.43 wesnoth/src/titlescreen.cpp:1.44
--- wesnoth/src/titlescreen.cpp:1.43 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/titlescreen.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: titlescreen.cpp,v 1.44 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "config.hpp"
Index: wesnoth/src/titlescreen.hpp
diff -u wesnoth/src/titlescreen.hpp:1.6 wesnoth/src/titlescreen.hpp:1.7
--- wesnoth/src/titlescreen.hpp:1.6 Thu Mar 10 22:03:32 2005
+++ wesnoth/src/titlescreen.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: titlescreen.hpp,v 1.7 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef TITLE_HPP_INCLUDED
#define TITLE_HPP_INCLUDED
Index: wesnoth/src/tooltips.cpp
diff -u wesnoth/src/tooltips.cpp:1.24 wesnoth/src/tooltips.cpp:1.25
--- wesnoth/src/tooltips.cpp:1.24 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/tooltips.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: tooltips.cpp,v 1.25 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "font.hpp"
Index: wesnoth/src/tooltips.hpp
diff -u wesnoth/src/tooltips.hpp:1.11 wesnoth/src/tooltips.hpp:1.12
--- wesnoth/src/tooltips.hpp:1.11 Wed Mar 23 08:52:10 2005
+++ wesnoth/src/tooltips.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: tooltips.hpp,v 1.12 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef TOOLTIPS_HPP_INCLUDED
#define TOOLTIPS_HPP_INCLUDED
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.60 wesnoth/src/unit_display.cpp:1.61
--- wesnoth/src/unit_display.cpp:1.60 Sat Jun 4 19:16:06 2005
+++ wesnoth/src/unit_display.cpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: unit_display.cpp,v 1.61 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#include "global.hpp"
#include "actions.hpp"
Index: wesnoth/src/unit_display.hpp
diff -u wesnoth/src/unit_display.hpp:1.6 wesnoth/src/unit_display.hpp:1.7
--- wesnoth/src/unit_display.hpp:1.6 Tue Mar 22 01:14:14 2005
+++ wesnoth/src/unit_display.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: unit_display.hpp,v 1.7 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef UNIT_DISPLAY_HPP_INCLUDED
#define UNIT_DISPLAY_HPP_INCLUDED
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.96 wesnoth/src/widgets/menu.cpp:1.97
--- wesnoth/src/widgets/menu.cpp:1.96 Tue Jul 19 23:45:59 2005
+++ wesnoth/src/widgets/menu.cpp Wed Jul 20 08:22:37 2005
@@ -396,7 +396,7 @@
void menu::set_max_height(const int new_max_height) {
max_height_ = new_max_height;
itemRects_.clear();
- max_items_ = -1;
+ max_items_ = -1;
update_size();
}
Index: wesnoth/src/wml_separators.hpp
diff -u wesnoth/src/wml_separators.hpp:1.5 wesnoth/src/wml_separators.hpp:1.6
--- wesnoth/src/wml_separators.hpp:1.5 Fri Jun 3 10:11:08 2005
+++ wesnoth/src/wml_separators.hpp Wed Jul 20 08:22:37 2005
@@ -1,3 +1,16 @@
+/* $Id: wml_separators.hpp,v 1.6 2005/07/20 08:22:37 ott Exp $ */
+/*
+ Copyright (C) 2003-5 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
+ it under the terms of the GNU General Public License.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef WIDGET_DEFINES_HPP_INCLUDED
#define WIDGET_DEFINES_HPP_INCLUDED
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src ai2.hpp array.hpp cavegen.cpp caveg...,
ott <=