[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src playturn.cpp unit.cpp
From: |
Guillaume Melquiond |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src playturn.cpp unit.cpp |
Date: |
Sat, 22 Jan 2005 04:05:31 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 05/01/22 09:05:31
Modified files:
src : playturn.cpp unit.cpp
Log message:
Remove dead code.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.319&tr2=1.320&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
Patches:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.319 wesnoth/src/playturn.cpp:1.320
--- wesnoth/src/playturn.cpp:1.319 Sat Jan 22 03:51:18 2005
+++ wesnoth/src/playturn.cpp Sat Jan 22 09:05:30 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.319 2005/01/22 03:51:18 j_daniel Exp $ */
+/* $Id: playturn.cpp,v 1.320 2005/01/22 09:05:30 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -584,8 +584,6 @@
const std::vector<attack_type>& attacks = attacker->second.attacks();
std::vector<std::string> items;
- const int range = distance_between(attacker->first,defender->first);
-
int best_weapon_index = -1;
simple_attack_rating best_weapon_rating;
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.118 wesnoth/src/unit.cpp:1.119
--- wesnoth/src/unit.cpp:1.118 Sat Jan 22 00:25:54 2005
+++ wesnoth/src/unit.cpp Sat Jan 22 09:05:30 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.118 2005/01/22 00:25:54 Sirp Exp $ */
+/* $Id: unit.cpp,v 1.119 2005/01/22 09:05:30 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -608,7 +608,6 @@
void unit::read(const game_data& data, const config& cfg)
{
- const std::string& type = cfg["type"];
std::map<std::string,unit_type>::const_iterator i =
data.unit_types.find(cfg["type"]);
if(i != data.unit_types.end())
type_ = &i->second;
@@ -647,7 +646,7 @@
description_ = cfg["user_description"];
underlying_description_ = cfg["description"];
- if(description_ == "") {
+ if(description_.empty()) {
description_ = underlying_description_;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src playturn.cpp unit.cpp,
Guillaume Melquiond <=