Author: uso
Date: Wed Aug 22 08:57:04 2007
New Revision: 19721
URL: http://svn.gna.org/viewcvs/wesnoth?rev=19721&view=rev
Log:
replace a define by a const, thanks for the hint Mordante
Modified:
trunk/src/team.cpp
trunk/src/team.hpp
Modified: trunk/src/team.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.cpp?rev=19721&r1=19720&r2=19721&view=diff
==============================================================================
--- trunk/src/team.cpp (original)
+++ trunk/src/team.cpp Wed Aug 22 08:57:04 2007
@@ -101,7 +101,7 @@
// this also handles the loading of older save files, though with wrong
// values for the start gold in the game settings screen
start_gold = lexical_cast_default<int>(cfg["start_gold"],
- lexical_cast_default<int>(gold,
DEFAULT_TEAM_GOLD));
+ lexical_cast_default<int>(gold,
default_team_gold));
income = cfg["income"];
name = cfg["name"];
team_name = cfg["team_name"];
Modified: trunk/src/team.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.hpp?rev=19721&r1=19720&r2=19721&view=diff
==============================================================================
--- trunk/src/team.hpp (original)
+++ trunk/src/team.hpp Wed Aug 22 08:57:04 2007
@@ -26,8 +26,6 @@
#include <vector>
#include "SDL.h"
-
-#define DEFAULT_TEAM_GOLD 100
//This class stores all the data for a single 'side' (in game nomenclature).
//e.g. there is only one leader unit per team.
@@ -117,7 +115,8 @@
};
static std::map<int, color_range> team_color_range_;
- team(const config& cfg, int gold=DEFAULT_TEAM_GOLD);
+ static const int default_team_gold=100;
+ team(const config& cfg, int gold=default_team_gold);
~team() {};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits