0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

white space cleanup

Browse source
This commit is contained in:
Gunter Labes 2007-10-05 13:36:57 +00:00
parent 6b95c1f720
commit 5609af46c6
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gamestatus.hpp
View file

@ -75,8 +75,8 @@ struct player_info
{
player_info():gold(-1) {}
std::string name; /** < Stores the current_player name */
int gold; /** < Amount of gold the player has saved */
std::string name; /** < Stores the current_player name */
int gold; /** < Amount of gold the player has saved */
std::vector<unit> available_units; /** < Units the player may recall */
std::set<std::string> can_recruit; /** < Units the player has the ability to recruit */
};
@ -91,15 +91,15 @@ public:
~game_state();
game_state& operator=(const game_state& state);
std::string label; //!< Name of the game (e.g. name of save file).
std::string version; //!< Version game was created with.
std::string campaign_type; //!< Type of the game - campaign, multiplayer etc.
std::string label; //!< Name of the game (e.g. name of save file).
std::string version; //!< Version game was created with.
std::string campaign_type; //!< Type of the game - campaign, multiplayer etc.
std::string campaign_define; //! If there is a define the campaign uses to customize data
std::vector<std::string> campaign_xtra_defines; // more customization of data
std::string campaign_define; //! If there is a define the campaign uses to customize data
std::vector<std::string> campaign_xtra_defines; // more customization of data
std::string campaign; //!< the campaign being played
std::string scenario; //!< the scenario being played
std::string campaign; //!< the campaign being played
std::string scenario; //!< the scenario being played
std::string completion; //!< running. victory, or defeat
//! Information about campaign players who carry resources

16
src/reports.hpp
View file

@ -26,9 +26,9 @@
//various game and unit statistics
namespace reports {
enum TYPE { UNIT_DESCRIPTION, UNIT_TYPE, UNIT_LEVEL, UNIT_AMLA,
enum TYPE { UNIT_DESCRIPTION, UNIT_TYPE, UNIT_LEVEL, UNIT_AMLA,
UNIT_TRAITS, UNIT_STATUS,
UNIT_ALIGNMENT, UNIT_ABILITIES, UNIT_HP, UNIT_XP,
UNIT_ALIGNMENT, UNIT_ABILITIES, UNIT_HP, UNIT_XP,
UNIT_ADVANCEMENT_OPTIONS, UNIT_MOVES, UNIT_WEAPONS,
UNIT_IMAGE, UNIT_PROFILE, TIME_OF_DAY,
TURN, GOLD, VILLAGES, NUM_UNITS, UPKEEP, EXPENSES,
@ -45,7 +45,7 @@ namespace reports {
// Invariant: either text or image should be empty
// It would be okay to create a class for this, but it's a pretty simple
// invariant so I left it like the original report class.
image::locator image;
image::locator image;
std::string text;
std::string tooltip;
@ -88,11 +88,11 @@ namespace reports {
report generate_report(TYPE type,
std::map<reports::TYPE, std::string> report_contents,
const gamemap& map, unit_map& units,
const std::vector<team>& teams, const team& current_team,
unsigned int current_side, int unsigned active_side,
const gamemap::location& loc, const gamemap::location& mouseover,
const gamestatus& status, const std::set<std::string>& observers,
const config& level);
const std::vector<team>& teams, const team& current_team,
unsigned int current_side, int unsigned active_side,
const gamemap::location& loc, const gamemap::location& mouseover,
const gamestatus& status, const std::set<std::string>& observers,
const config& level);
}
#endif

1
src/team.hpp
View file

@ -78,6 +78,7 @@ public:
std::string team_name;
std::string user_team_name;
std::string save_id;
// 'id' of the current player (not necessarily unique)
std::string current_player;
std::string countdown_time;
int action_bonus_count;