[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src actions.hpp ai.cpp ai.hpp animated....
|
From: |
David White |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src actions.hpp ai.cpp ai.hpp animated.... |
|
Date: |
Tue, 24 Aug 2004 23:04:20 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <address@hidden> 04/08/25 02:59:51
Modified files:
src : actions.hpp ai.cpp ai.hpp animated.hpp
builder.cpp builder.hpp dialogs.cpp display.cpp
font.cpp game_events.cpp gamestatus.cpp
halo.cpp help.cpp image.cpp mapgen.cpp
mapgen.hpp mapgen_dialog.cpp multiplayer.cpp
multiplayer_client.cpp multiplayer_connect.cpp
pathfind.cpp playturn.cpp preferences.cpp
show_dialog.cpp titlescreen.cpp unit.cpp
unit_display.cpp unit_types.cpp unit_types.hpp
Log message:
removed some unnecessary diagnostics (CVS internal)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.hpp.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.hpp.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/animated.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.hpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.255&tr2=1.256&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/halo.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.cpp.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.cpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen_dialog.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_client.cpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/pathfind.cpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.255&tr2=1.256&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.109&tr2=1.110&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/titlescreen.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
Patches:
Index: wesnoth/src/actions.hpp
diff -u wesnoth/src/actions.hpp:1.44 wesnoth/src/actions.hpp:1.45
--- wesnoth/src/actions.hpp:1.44 Sat Jun 26 20:57:48 2004
+++ wesnoth/src/actions.hpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.hpp,v 1.44 2004/06/26 20:57:48 Sirp Exp $ */
+/* $Id: actions.hpp,v 1.45 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -163,9 +163,9 @@
//structure which records information to be able to undo a movement
struct undo_action {
undo_action(unit u,const std::vector<gamemap::location>& rt,int sm,int
orig=-1)
- : affected_unit(u), route(rt), starting_moves(sm),
original_village_owner(orig), recall_pos(-1) {}
+ : route(rt), starting_moves(sm), original_village_owner(orig),
recall_pos(-1), affected_unit(u) {}
undo_action(unit u,const gamemap::location& loc, int pos)
- : affected_unit(u), recall_loc(loc), recall_pos(pos) {}
+ : recall_loc(loc), recall_pos(pos), affected_unit(u) {}
std::vector<gamemap::location> route;
int starting_moves;
int original_village_owner;
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.111 wesnoth/src/ai.cpp:1.112
--- wesnoth/src/ai.cpp:1.111 Sat Aug 7 17:21:58 2004
+++ wesnoth/src/ai.cpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.111 2004/08/07 17:21:58 Sirp Exp $ */
+/* $Id: ai.cpp,v 1.112 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -49,9 +49,10 @@
}
ai::ai(ai_interface::info& info)
- : ai_interface(info), disp_(info.disp), map_(info.map),
gameinfo_(info.gameinfo), units_(info.units),
- teams_(info.teams), team_num_(info.team_num), state_(info.state),
- consider_combat_(true), threats_found_(false)
+ : ai_interface(info), threats_found_(false), disp_(info.disp),
+ map_(info.map), gameinfo_(info.gameinfo), units_(info.units),
+ teams_(info.teams), team_num_(info.team_num),
+ state_(info.state), consider_combat_(true)
{}
bool ai::recruit_usage(const std::string& usage)
Index: wesnoth/src/ai.hpp
diff -u wesnoth/src/ai.hpp:1.52 wesnoth/src/ai.hpp:1.53
--- wesnoth/src/ai.hpp:1.52 Tue Aug 24 02:31:07 2004
+++ wesnoth/src/ai.hpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: ai.hpp,v 1.52 2004/08/24 02:31:07 Sirp Exp $ */
+/* $Id: ai.hpp,v 1.53 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -222,7 +222,7 @@
int best_attack_rating = -1;
int best_attack = -1;
- for(int n = 0; n != attacks.size(); ++n) {
+ for(size_t n = 0; n != attacks.size(); ++n) {
const battle_stats stats =
evaluate_battle_stats(get_info().map,attacker,defender,n,get_info().units,get_info().state,get_info().gameinfo,0,false);
const int attack_rating =
stats.damage_defender_takes*stats.nattacks*stats.chance_to_hit_defender;
if(best_attack == -1 || attack_rating >
best_attack_rating) {
Index: wesnoth/src/animated.hpp
diff -u wesnoth/src/animated.hpp:1.3 wesnoth/src/animated.hpp:1.4
--- wesnoth/src/animated.hpp:1.3 Sun Aug 15 19:42:44 2004
+++ wesnoth/src/animated.hpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: animated.hpp,v 1.3 2004/08/15 19:42:44 gruikya Exp $ */
+/* $Id: animated.hpp,v 1.4 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2004 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -83,7 +83,7 @@
{};
frame(int milliseconds, const T& value) :
- milliseconds(milliseconds), value(value),
has_value(true)
+ milliseconds(milliseconds), has_value(true),
value(value)
{};
// Represents the timestamp of the frame start
@@ -122,22 +122,24 @@
template<typename T, typename T_void_value>
animated<T,T_void_value>::animated() :
- no_current_frame_(true), started_(false),
starting_frame_time_(INT_MAX),
ending_frame_time_(INT_MIN),
- start_ticks_(0),
- real_start_ticks_(0),
+ started_(false),
+ no_current_frame_(true),
does_not_change_(false),
+ real_start_ticks_(0),
+ start_ticks_(0),
acceleration_(1)
{}
template<typename T, typename T_void_value>
animated<T,T_void_value>::animated(const std::string &cfg, const
string_initializer& init):
- no_current_frame_(true), started_(false),
starting_frame_time_(INT_MAX),
- start_ticks_(0),
- real_start_ticks_(0),
+ started_(false),
+ no_current_frame_(true),
does_not_change_(false),
+ real_start_ticks_(0),
+ start_ticks_(0),
acceleration_(1)
{
std::vector<std::string> items = config::split(cfg);
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.31 wesnoth/src/builder.cpp:1.32
--- wesnoth/src/builder.cpp:1.31 Mon Aug 23 06:40:59 2004
+++ wesnoth/src/builder.cpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.31 2004/08/23 06:40:59 gakusho Exp $ */
+/* $Id: builder.cpp,v 1.32 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2004 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -27,8 +27,8 @@
class locator_string_initializer : public
animated<image::locator>::string_initializer
{
public:
- locator_string_initializer() : loc_(), no_loc_(true) {}
- locator_string_initializer(const gamemap::location& loc): loc_(loc),
no_loc_(false) {}
+ locator_string_initializer() : no_loc_(true) {}
+ locator_string_initializer(const gamemap::location& loc):
no_loc_(false), loc_(loc) {}
image::locator operator()(const std::string &s) const;
private:
@@ -299,7 +299,7 @@
void terrain_builder::replace_token(std::string &s, const std::string &token,
const std::string &replacement)
{
- int pos;
+ size_t pos;
if(token.empty()) {
std::cerr << "Error: empty token in replace_token\n";
@@ -548,7 +548,7 @@
} else {
const std::vector<std::string>& rot = config::split(rotations,
',');
- for(int angle = 0; angle < rot.size(); angle++) {
+ for(size_t angle = 0; angle < rot.size(); angle++) {
building_rule rule = rotate_rule(tpl, angle, rot);
add_rule(rules, rule);
}
@@ -673,8 +673,6 @@
bool terrain_builder::terrain_matches(gamemap::TERRAIN letter, const
std::string &terrains)
{
-
- bool res = false;
bool negative = false;
std::string::const_iterator itor;
@@ -712,8 +710,6 @@
if(!tile_map_.on_map(tloc))
return false;
- const tile& btile = tile_map_[tloc];
-
if(!terrain_matches(map_.get_terrain(tloc),
cons->second.terrain_types))
return false;
}
Index: wesnoth/src/builder.hpp
diff -u wesnoth/src/builder.hpp:1.22 wesnoth/src/builder.hpp:1.23
--- wesnoth/src/builder.hpp:1.22 Sat Jul 24 23:42:23 2004
+++ wesnoth/src/builder.hpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: builder.hpp,v 1.22 2004/07/24 23:42:23 gruikya Exp $ */
+/* $Id: builder.hpp,v 1.23 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2004 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -122,7 +122,7 @@
class tilemap
{
public:
- tilemap(int x, int y) : x_(x), y_(y), map_((x+2)*(y+2)) {}
+ tilemap(int x, int y) : map_((x+2)*(y+2)), x_(x), y_(y) {}
tile &operator[](const gamemap::location &loc);
const tile &operator[] (const gamemap::location &loc) const;
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.48 wesnoth/src/dialogs.cpp:1.49
--- wesnoth/src/dialogs.cpp:1.48 Tue Aug 24 19:49:35 2004
+++ wesnoth/src/dialogs.cpp Wed Aug 25 02:59:50 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.48 2004/08/24 19:49:35 ydirson Exp $ */
+/* $Id: dialogs.cpp,v 1.49 2004/08/25 02:59:50 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -155,7 +155,6 @@
void show_objectives(display& disp, config& level_info)
{
static const std::string no_objectives(_("No objectives available"));
- const std::string& id = level_info["id"];
const std::string& name = level_info["name"];
const std::string& lang_objectives = level_info["objectives"];
@@ -281,8 +280,6 @@
set_dirty(false);
- static int n = 0;
-
const config& summary = *(*summaries_)[index_];
surface const screen = disp().video().getSurface();
@@ -358,12 +355,12 @@
std::string name = (*info_)[index_].name;
str << font::BOLD_TEXT << config::escape(name) << "\n" << time_buf;
+ const std::string& campaign_type = summary["campaign_type"];
if(summary["corrupt"] == "yes") {
str << "\n" << _("#(Invalid)");
- } else if(summary["campaign_type"] != "") {
+ } else if (!campaign_type.empty()) {
str << "\n";
- const std::string& campaign_type = summary["campaign_type"];
if(campaign_type == "scenario") {
str << _("Campaign");
} else if(campaign_type == "multiplayer") {
@@ -378,7 +375,7 @@
if(summary["snapshot"] == "no" && summary["replay"] == "yes") {
str << _("replay");
- } else if(summary["turn"] != "") {
+ } else if (!summary["turn"].empty()) {
str << _("Turn") << " " << summary["turn"];
} else {
str << _("Scenario Start");
@@ -759,14 +756,10 @@
for(std::vector<attack_type>::const_iterator at_it =
attacks.begin();
at_it != attacks.end(); ++at_it) {
- const std::string& lang_weapon = at_it->name();
- const std::string& lang_type = at_it->type();
- const std::string& lang_special = at_it->special();
details << "\n"
- << (lang_weapon.empty() ?
at_it->name():lang_weapon) << " ("
- << (lang_type.empty() ?
at_it->type():lang_type) << ")\n"
- << (lang_special.empty() ?
at_it->special():lang_special)<<"\n"
- << at_it->damage() << "-" <<
at_it->num_attacks() << " -- "
+ << at_it->name() << " (" << at_it->type() <<
")\n"
+ << at_it->special() << "\n"
+ << at_it->damage() << "-" <<
at_it->num_attacks() << " -- "
<< (at_it->range() == attack_type::SHORT_RANGE ?
_("melee") :
_("ranged"));
@@ -778,7 +771,6 @@
}
const std::string text = details.str();
- const SDL_Rect& text_area = font::text_area(text,12);
const std::vector<std::string> lines = config::split(text,'\n');
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.255 wesnoth/src/display.cpp:1.256
--- wesnoth/src/display.cpp:1.255 Sun Aug 22 13:18:36 2004
+++ wesnoth/src/display.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.255 2004/08/22 13:18:36 gruikya Exp $ */
+/* $Id: display.cpp,v 1.256 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1533,9 +1533,6 @@
draw_unit(xloc,yloc,image,vflip,0.5);
if(show_time && route_.move_left > 0 && route_.move_left < 10) {
- //draw number in yellow if terrain is light, else draw in black
- gamemap::TERRAIN terrain = map_.get_terrain(loc);
-
const SDL_Rect& rect = map_area();
std::string str(1,'x');
str[0] = '1' + route_.move_left;
@@ -1582,7 +1579,6 @@
std::vector<std::string> res;
gamemap::location adjacent[6];
- bool transition_done[6];
get_adjacent_tiles(loc,adjacent);
int tiles[6];
static const int terrain_types[] = { gamemap::FOGGED,
gamemap::VOID_TERRAIN, 0 };
@@ -1951,7 +1947,7 @@
gamemap::location bottomright;
get_visible_hex_bounds(topleft, bottomright);
- for(int i = 0; i < flags_.size(); ++i) {
+ for(size_t i = 0; i < flags_.size(); ++i) {
flags_[i].update_current_frame();
if(flags_[i].frame_changed())
animate_flags = true;
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.80 wesnoth/src/font.cpp:1.81
--- wesnoth/src/font.cpp:1.80 Mon Aug 16 14:17:19 2004
+++ wesnoth/src/font.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.80 2004/08/16 14:17:19 erl Exp $ */
+/* $Id: font.cpp,v 1.81 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -519,7 +519,7 @@
std::string cur_word; // including start-whitespace
std::string cur_line; // the whole line so far
- for(int c = 0; c < unwrapped_text.length(); c++) {
+ for(size_t c = 0; c < unwrapped_text.length(); c++) {
// Find the next word
bool forced_line_break = false;
@@ -715,7 +715,6 @@
height += (*i)->h;
}
- const SDL_PixelFormat* const format =
surfaces.front()->format;
surf_.assign(create_compatible_surface(surfaces.front(),width,height));
size_t ypos = 0;
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.97 wesnoth/src/game_events.cpp:1.98
--- wesnoth/src/game_events.cpp:1.97 Sun Aug 15 20:25:11 2004
+++ wesnoth/src/game_events.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.97 2004/08/15 20:25:11 ydirson Exp $ */
+/* $Id: game_events.cpp,v 1.98 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -542,7 +542,7 @@
int choice = get_random() % num_choices;
tmp = 0;
- for (int i = 0; i < ranges.size(); i++) {
+ for(size_t i = 0; i < ranges.size(); i++) {
tmp += (ranges[i].second - ranges[i].first) + 1;
if (tmp > choice) {
if (ranges[i].first == 0 &&
ranges[i].second == 0) {
@@ -806,7 +806,6 @@
//displaying a message on-screen
else if(cmd == "print") {
const std::string& text = cfg["text"];
- const std::string& id = cfg["id"];
const int size = lexical_cast_default<int>(cfg["size"],12);
const int lifetime =
lexical_cast_default<int>(cfg["duration"],20);
const int red = lexical_cast_default<int>(cfg["red"],0);
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.39 wesnoth/src/gamestatus.cpp:1.40
--- wesnoth/src/gamestatus.cpp:1.39 Sat Aug 14 04:00:15 2004
+++ wesnoth/src/gamestatus.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.39 2004/08/14 04:00:15 Sirp Exp $ */
+/* $Id: gamestatus.cpp,v 1.40 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -194,8 +194,6 @@
game_state read_game(const game_data& data, const config* cfg)
{
- std::cerr << "reading scenario: '" << cfg->write() << "'\n";
-
log_scope("read_game");
game_state res;
res.label = (*cfg)["label"];
Index: wesnoth/src/halo.cpp
diff -u wesnoth/src/halo.cpp:1.10 wesnoth/src/halo.cpp:1.11
--- wesnoth/src/halo.cpp:1.10 Sun Jul 25 22:12:03 2004
+++ wesnoth/src/halo.cpp Wed Aug 25 02:59:51 2004
@@ -50,7 +50,8 @@
static const SDL_Rect empty_rect = {0,0,0,0};
effect::effect(int xpos, int ypos, const std::string& img, ORIENTATION
orientation, int lifetime)
-: reverse_(orientation == REVERSE), origx_(xpos), origy_(ypos), x_(xpos),
y_(ypos), origzoom_(disp->zoom()), zoom_(disp->zoom()), surf_(NULL),
buffer_(NULL), rect_(empty_rect), images_(img)
+: images_(img), reverse_(orientation == REVERSE), origx_(xpos), origy_(ypos),
x_(xpos), y_(ypos),
+ origzoom_(disp->zoom()), zoom_(disp->zoom()), surf_(NULL), buffer_(NULL),
rect_(empty_rect)
{
assert(disp != NULL);
// std::cerr << "Constructing halo sequence from image " << img << "\n";
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.26 wesnoth/src/help.cpp:1.27
--- wesnoth/src/help.cpp:1.26 Mon Aug 23 06:40:59 2004
+++ wesnoth/src/help.cpp Wed Aug 25 02:59:51 2004
@@ -846,9 +846,9 @@
}
}
show_info_about.erase(std::remove(show_info_about.begin(),
show_info_about.end(),
-
gamemap::VOID_TERRAIN), show_info_about.end());
+
(char)gamemap::VOID_TERRAIN), show_info_about.end());
show_info_about.erase(std::remove(show_info_about.begin(),
show_info_about.end(),
-
gamemap::FOGGED), show_info_about.end());
+
(char)gamemap::FOGGED), show_info_about.end());
for (std::vector<gamemap::TERRAIN>::const_iterator terrain_it =
show_info_about.begin();
terrain_it != show_info_about.end(); terrain_it++) {
const std::string& name =
string_table[map->terrain_name(*terrain_it)];
Index: wesnoth/src/image.cpp
diff -u wesnoth/src/image.cpp:1.62 wesnoth/src/image.cpp:1.63
--- wesnoth/src/image.cpp:1.62 Sat Aug 21 13:56:27 2004
+++ wesnoth/src/image.cpp Wed Aug 25 02:59:51 2004
@@ -100,12 +100,12 @@
}
locator::locator() :
- val_(), index_(-1)
+ index_(-1)
{
}
locator::locator(const locator &a):
- val_(a.val_), index_(a.index_)
+ index_(a.index_), val_(a.val_)
{
}
Index: wesnoth/src/mapgen.cpp
diff -u wesnoth/src/mapgen.cpp:1.43 wesnoth/src/mapgen.cpp:1.44
--- wesnoth/src/mapgen.cpp:1.43 Mon Aug 23 06:40:59 2004
+++ wesnoth/src/mapgen.cpp Wed Aug 25 02:59:51 2004
@@ -828,10 +828,6 @@
//based on our [convert] tags.
for(x = 0; x != width; ++x) {
for(y = 0; y != height; ++y) {
-
- const int temperature = temperature_map[x][y];
- const int height = heights[x][y];
-
for(std::vector<terrain_converter>::const_iterator i =
converters.begin(); i != converters.end(); ++i) {
if(i->convert_terrain(terrain[x][y],heights[x][y],temperature_map[x][y])) {
terrain[x][y] = i->convert_to();
Index: wesnoth/src/mapgen.hpp
diff -u wesnoth/src/mapgen.hpp:1.10 wesnoth/src/mapgen.hpp:1.11
--- wesnoth/src/mapgen.hpp:1.10 Tue Jul 20 11:56:58 2004
+++ wesnoth/src/mapgen.hpp Wed Aug 25 02:59:51 2004
@@ -12,6 +12,7 @@
class map_generator
{
public:
+ virtual ~map_generator() {}
//returns true iff the map generator has an interactive screen
//which allows the user to modify how the generator behaves
Index: wesnoth/src/mapgen_dialog.cpp
diff -u wesnoth/src/mapgen_dialog.cpp:1.23 wesnoth/src/mapgen_dialog.cpp:1.24
--- wesnoth/src/mapgen_dialog.cpp:1.23 Sun Aug 15 20:25:11 2004
+++ wesnoth/src/mapgen_dialog.cpp Wed Aug 25 02:59:51 2004
@@ -126,7 +126,6 @@
const int min_width = 20;
const int max_width = 200;
- const int min_height = 20;
const int max_height = 200;
const int extra_size_per_player = 2;
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.115 wesnoth/src/multiplayer.cpp:1.116
--- wesnoth/src/multiplayer.cpp:1.115 Sat Aug 21 22:33:43 2004
+++ wesnoth/src/multiplayer.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.115 2004/08/21 22:33:43 ydirson Exp $ */
+/* $Id: multiplayer.cpp,v 1.116 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -58,9 +58,9 @@
const config& cfg, game_state& state, bool
server)
: disp_(disp), units_data_(units_data), cfg_(cfg), state_(state),
server_(server), level_(NULL), map_selection_(-1),
maps_menu_(NULL), turns_slider_(NULL),
village_gold_slider_(NULL), xp_modifier_slider_(NULL),
- fog_game_(NULL), shroud_game_(NULL), observers_game_(NULL),
vision_combo_(NULL),
+ fog_game_(NULL), shroud_game_(NULL), observers_game_(NULL),
cancel_game_(NULL), launch_game_(NULL), regenerate_map_(NULL),
generator_settings_(NULL),
- era_combo_(NULL), name_entry_(NULL), generator_(NULL)
+ era_combo_(NULL), vision_combo_(NULL), name_entry_(NULL),
generator_(NULL)
{
std::cerr << "setup dialog ctor\n";
Index: wesnoth/src/multiplayer_client.cpp
diff -u wesnoth/src/multiplayer_client.cpp:1.60
wesnoth/src/multiplayer_client.cpp:1.61
--- wesnoth/src/multiplayer_client.cpp:1.60 Sun Aug 15 20:25:11 2004
+++ wesnoth/src/multiplayer_client.cpp Wed Aug 25 02:59:51 2004
@@ -64,7 +64,7 @@
class wait_for_start : public lobby::dialog
{
public:
- wait_for_start(display& disp, config& cfg, int team_num, const
std::string& team_name) : got_side(false), team(team_num), name(team_name),
status(START_GAME), disp_(disp), cancel_button_(NULL), menu_(NULL), sides_(cfg)
+ wait_for_start(display& disp, config& cfg, int team_num, const
std::string& team_name) : got_side(false), team(team_num), name(team_name),
status(START_GAME), disp_(disp), cancel_button_(NULL), sides_(cfg), menu_(NULL)
{
SDL_Rect empty_rect = {0,0,0,0};
area_ = empty_rect;
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.61
wesnoth/src/multiplayer_connect.cpp:1.62
--- wesnoth/src/multiplayer_connect.cpp:1.61 Tue Aug 24 19:49:35 2004
+++ wesnoth/src/multiplayer_connect.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.61 2004/08/24 19:49:35 ydirson Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.62 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -45,9 +45,9 @@
player_types_(), player_races_(), player_teams_(),
player_colors_(), combos_type_(), combos_race_(),
combos_team_(), combos_color_(), sliders_gold_(),
+ ai_(gui::button(disp, _(" Computer vs Computer "))),
launch_(gui::button(disp, _("I'm Ready"))),
cancel_(gui::button(disp, _("Cancel"))),
- ai_(gui::button(disp, _(" Computer vs Computer "))),
message_full_(true)
{
// Send Initial information
@@ -333,13 +333,8 @@
const int left = rect.x;
const int right = rect.x + rect.w;
- const int center_x = rect.x + rect.w/2;
const int top = rect.y;
const int bottom = rect.y + rect.h;
- const int center_y = rect.y + rect.h/2;
-
- const int width = rect.w;
- const int height = rect.h;
// Wait to players, Configure players
//gui::draw_dialog_background(left, right, width, height, *disp_,
"menu");
@@ -391,8 +386,6 @@
return;
}
- const config::child_list& possible_sides =
era_cfg->get_children("multiplayer_side");
-
combos_type_.clear();
combos_race_.clear();
combos_team_.clear();
@@ -460,8 +453,6 @@
return;
}
- const config::child_list& possible_sides =
era_cfg->get_children("multiplayer_side");
-
const config::child_itors sides = level_->child_range("side");
SDL_Rect rect;
@@ -915,10 +906,6 @@
std::cerr << "client has taken a valid
position\n";
- //does the client already own the side, and is
just updating
- //it, or is it taking a vacant slot?
- const bool update_only = pos->second == sock;
-
//broadcast to everyone the new game status
pos->first->values["controller"] = "network";
pos->first->values["taken"] = "yes";
Index: wesnoth/src/pathfind.cpp
diff -u wesnoth/src/pathfind.cpp:1.39 wesnoth/src/pathfind.cpp:1.40
--- wesnoth/src/pathfind.cpp:1.39 Tue Jul 20 11:56:58 2004
+++ wesnoth/src/pathfind.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: pathfind.cpp,v 1.39 2004/07/20 11:56:58 gakusho Exp $ */
+/* $Id: pathfind.cpp,v 1.40 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -318,7 +318,7 @@
const gamemap& map,
const gamestatus&
status)
: unit_(u), team_(t), units_(units), teams_(teams),
- status_(status), map_(map)
+ map_(map), status_(status)
{
}
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.255 wesnoth/src/playturn.cpp:1.256
--- wesnoth/src/playturn.cpp:1.255 Tue Aug 24 02:31:07 2004
+++ wesnoth/src/playturn.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.255 2004/08/24 02:31:07 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.256 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -67,8 +67,6 @@
gui.draw();
gui.update_display();
- team& current_team = teams[team_num-1];
-
const paths_wiper wiper(gui);
if(preferences::turn_bell()) {
@@ -139,8 +137,8 @@
key_(key), gui_(gui), map_(map), teams_(teams), team_num_(team_num),
units_(units), browse_(mode != PLAY_TURN), allow_network_commands_(mode ==
BROWSE_NETWORKED),
left_button_(false), right_button_(false), middle_button_(false),
- minimap_scrolling_(false), start_ncmd_(-1),
- enemy_paths_(false), path_turns_(0), end_turn_(false), textbox_(textbox),
replay_sender_(replay_sender)
+ minimap_scrolling_(false), enemy_paths_(false),
+ path_turns_(0), end_turn_(false), start_ncmd_(-1), textbox_(textbox),
replay_sender_(replay_sender)
{
enemies_visible_ = enemies_visible();
}
@@ -607,10 +605,8 @@
const battle_stats& st = stats.back();
const std::string& attack_name = st.attack_name;
- const std::string& attack_type = st.attack_type;
const std::string& attack_special = st.attack_special;
const std::string& defend_name = st.defend_name;
- const std::string& defend_type = st.defend_type;
const std::string& defend_special = st.defend_special;
const std::string& range = gettext(st.range == "Melee"
? N_("melee") : N_("ranged"));
@@ -759,7 +755,6 @@
gui_.select_hex(dst);
}
- const int range = u->second.longest_range();
current_route_.steps.clear();
show_attack_options(u);
@@ -2147,18 +2142,19 @@
} else if(cmd == "n" && game_config::debug) {
throw end_level_exception(VICTORY);
} else if(game_config::debug && cmd == "unit") {
- std::cerr << "processing unit: '" << data << "'\n";
const unit_map::iterator i = current_unit();
if(i != units_.end()) {
const std::string::const_iterator j =
std::find(data.begin(),data.end(),'=');
if(j != data.end()) {
const std::string name(data.begin(),j);
const std::string value(j+1,data.end());
- std::cerr << "setting '" << name << "' = '" <<
value << "\n";
config cfg;
i->second.write(cfg);
cfg[name] = value;
i->second = unit(gameinfo_,cfg);
+
+ gui_.invalidate(i->first);
+ gui_.invalidate_unit();
}
}
}
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.109 wesnoth/src/preferences.cpp:1.110
--- wesnoth/src/preferences.cpp:1.109 Sun Aug 22 20:10:12 2004
+++ wesnoth/src/preferences.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.109 2004/08/22 20:10:12 ydirson Exp $ */
+/* $Id: preferences.cpp,v 1.110 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -959,7 +959,6 @@
std::vector<std::pair<int,int> > resolutions;
- bool added_current = false;
for(int i = 0; modes[i] != NULL; ++i) {
if(modes[i]->w >= 800 && modes[i]->h >= 600) {
resolutions.push_back(std::pair<int,int>(modes[i]->w,modes[i]->h));
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.87 wesnoth/src/show_dialog.cpp:1.88
--- wesnoth/src/show_dialog.cpp:1.87 Sat Aug 21 22:21:05 2004
+++ wesnoth/src/show_dialog.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.87 2004/08/21 22:21:05 Sirp Exp $ */
+/* $Id: show_dialog.cpp,v 1.88 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -189,7 +189,7 @@
{
int border_size = 10;
SDL_Rect title_area = {0,0,0,0};
- if(title != "") {
+ if (!title.empty()) {
title_area = draw_dialog_title(0,0,NULL,title);
title_area.w += border_size;
title_area.h += border_size;
@@ -225,7 +225,7 @@
draw_dialog_frame(xpos,ypos,width,height,disp,style,restorer);
- if(title != "") {
+ if (!title.empty()) {
draw_dialog_title(x + border_size, y - title_area.h, &disp,
title);
}
@@ -416,12 +416,10 @@
menu menu_(disp,menu_items,type == MESSAGE);
- const int border_size = 6;
-
const int max_line_length = 54;
std::string message = msg;
- const size_t longest_line = text_to_lines(message,max_line_length);
+ text_to_lines(message,max_line_length);
SDL_Rect text_size = { 0, 0, 0, 0 };
if(!message.empty()) {
@@ -430,7 +428,7 @@
}
SDL_Rect caption_size = { 0, 0, 0, 0 };
- if(caption != "" && image != NULL) {
+ if (!caption.empty() && image != NULL) {
caption_size = font::draw_text(NULL, clipRect,
caption_font_size,
font::NORMAL_COLOUR,caption,0,0,NULL);
}
@@ -566,7 +564,6 @@
text_widget_height +
check_button_height;
- const int border_padding = 10;
int frame_width =
maximum<int>(total_width,above_left_preview_pane_width +
above_right_preview_pane_width);
int frame_height = maximum<int>(total_height,int(preview_pane_height));
int xframe = maximum<int>(0,xloc >= 0 ? xloc : scr->w/2 - (frame_width
+ left_preview_pane_width + right_preview_pane_width)/2);
@@ -681,9 +678,6 @@
yloc+top_padding+image->h, NULL);
}
- const int unitw = 200;
- const int unith = disp.y()/2;
-
font::draw_text(&disp, clipRect, message_font_size,
font::NORMAL_COLOUR, message,
xloc+total_image_width+left_padding+image_h_padding,
Index: wesnoth/src/titlescreen.cpp
diff -u wesnoth/src/titlescreen.cpp:1.14 wesnoth/src/titlescreen.cpp:1.15
--- wesnoth/src/titlescreen.cpp:1.14 Sat Aug 21 22:03:25 2004
+++ wesnoth/src/titlescreen.cpp Wed Aug 25 02:59:51 2004
@@ -229,7 +229,6 @@
for(;;) {
int mousex, mousey;
const int mouse_flags = SDL_GetMouseState(&mousex,&mousey);
- const bool left_button = mouse_flags&SDL_BUTTON_LMASK;
for(size_t b = 0; b != buttons.size(); ++b) {
if(buttons[b].pressed()) {
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.91 wesnoth/src/unit.cpp:1.92
--- wesnoth/src/unit.cpp:1.91 Tue Aug 24 19:49:35 2004
+++ wesnoth/src/unit.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.91 2004/08/24 19:49:35 ydirson Exp $ */
+/* $Id: unit.cpp,v 1.92 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -112,11 +112,11 @@
underlying_description_(u.underlying_description_),
description_(u.description_), recruit_(u.recruit_),
role_(u.role_), statusFlags_(u.statusFlags_),
+ overlays_(u.overlays_), variables_(u.variables_),
attacks_(type_->attacks()),
backupAttacks_(type_->attacks()),
modifications_(u.modifications_),
traitsDescription_(u.traitsDescription_),
- guardian_(false), upkeep_(u.upkeep_),
- overlays_(u.overlays_), variables_(u.variables_)
+ guardian_(false), upkeep_(u.upkeep_)
{
validate_side(side_);
@@ -1143,7 +1143,7 @@
log_scope("apply mods");
modificationDescriptions_.clear();
- for(int i = 0; i != NumModificationTypes; ++i) {
+ for(size_t i = 0; i != NumModificationTypes; ++i) {
const std::string& mod = ModificationTypes[i];
const config::child_list& mods =
modifications_.get_children(mod);
for(config::child_list::const_iterator j = mods.begin(); j !=
mods.end(); ++j) {
@@ -1158,7 +1158,7 @@
for(int i = 0; i != NumModificationTypes; ++i) {
const std::string& mod = ModificationTypes[i];
const config::child_list& mods =
modifications_.get_children(mod);
- for(int j = 0; j != mods.size(); ++j) {
+ for(size_t j = 0; j != mods.size(); ++j) {
if((*mods[j])["duration"] != "forever" &&
(*mods[j])["duration"] != "") {
modifications_.remove_child(mod,j);
--j;
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.26 wesnoth/src/unit_display.cpp:1.27
--- wesnoth/src/unit_display.cpp:1.26 Mon Aug 23 06:41:00 2004
+++ wesnoth/src/unit_display.cpp Wed Aug 25 02:59:51 2004
@@ -289,8 +289,6 @@
int flash_num = 0;
- int ticks = SDL_GetTicks();
-
bool shown_label = false;
util::scoped_resource<int,halo::remover> missile_halo_effect(0),
unit_halo_effect(0);
@@ -402,8 +400,6 @@
}
if(animation_time >= 0 && animation_time < real_last_missile &&
!hide) {
- const int missile_frame_time = animation_time +
first_missile;
-
const unit_animation::frame& missile_frame =
attack_anim.get_current_frame(unit_animation::MISSILE_FRAME);
std::cerr << "Missile: animation time :" <<
animation_time << ", image " << missile_frame.image << ", halo: " <<
missile_frame.halo << "\n";
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.60 wesnoth/src/unit_types.cpp:1.61
--- wesnoth/src/unit_types.cpp:1.60 Mon Aug 23 00:24:29 2004
+++ wesnoth/src/unit_types.cpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.60 2004/08/23 00:24:29 Sirp Exp $ */
+/* $Id: unit_types.cpp,v 1.61 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -527,7 +527,7 @@
unit_type::unit_type(const config& cfg, const movement_type_map& mv_types,
const race_map& races, const std::vector<config*>& traits)
- : cfg_(cfg), alpha_(1.0), possibleTraits_(traits),
movementType_(cfg)
+ : cfg_(cfg), alpha_(1.0), movementType_(cfg),
possibleTraits_(traits)
{
gender_types_[0] = NULL;
gender_types_[1] = NULL;
@@ -1010,7 +1010,5 @@
j.first != j.second; ++j.first) {
const unit_type
u_type(**j.first,movement_types,races,unit_traits);
unit_types.insert(std::pair<std::string,unit_type>(u_type.name(),u_type));
- std::cerr << "Inserting unit " << u_type.id() << " (" <<
u_type.name() << ")"
- << "\n";
}
}
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.46 wesnoth/src/unit_types.hpp:1.47
--- wesnoth/src/unit_types.hpp:1.46 Mon Aug 23 00:24:29 2004
+++ wesnoth/src/unit_types.hpp Wed Aug 25 02:59:51 2004
@@ -1,4 +1,4 @@
-/* $Id: unit_types.hpp,v 1.46 2004/08/23 00:24:29 Sirp Exp $ */
+/* $Id: unit_types.hpp,v 1.47 2004/08/25 02:59:51 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -28,7 +28,6 @@
public:
struct frame {
frame() {}
- explicit frame(const std::string& str) {}
explicit frame(const config& cfg);
// int start, end;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src actions.hpp ai.cpp ai.hpp animated....,
David White <=