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

Whiteboard: planned recruit gold taking into account except in top bar display.

Browse source
This commit is contained in:
Gabriel Morin 2010-08-01 22:30:30 +00:00
parent 96a60efda3
commit 2d4f3b0a0f
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/menu_events.cpp
View file

@ -682,8 +682,13 @@ void menu_handler::recruit(int side_num, const map_location &last_hex)
item_keys.push_back(*it);
//display units that we can't afford to recruit in red
const char prefix = (type->cost() > current_team.gold() ? font::BAD_TEXT : font::NULL_MARKUP);
char prefix;
{ wb::scoped_planned_pathfind_map future; //< start planned pathfind map scope
int wb_gold = resources::whiteboard->get_spent_gold_for(side_num);
//display units that we can't afford to recruit in red
prefix = (type->cost() > current_team.gold() - wb_gold
? font::BAD_TEXT : font::NULL_MARKUP);
} // end planned pathfind map scope
std::stringstream description;
description << font::IMAGE << type->image();
@ -757,7 +762,7 @@ void menu_handler::do_recruit(const std::string &name, int side_num,
assert(u_type);
{ wb::scoped_planned_pathfind_map future; //< start planned pathfind map scope
if (u_type->cost() > current_team.gold()) {
if (u_type->cost() > current_team.gold() - resources::whiteboard->get_spent_gold_for(side_num)) {
gui2::show_transient_message(gui_->video(), "",
_("You don't have enough gold to recruit that unit"));
return;

5
src/whiteboard/manager.cpp
View file

@ -606,6 +606,11 @@ bool manager::unit_has_actions(const unit& unit) const
return viewer_actions()->unit_has_actions(unit);
}
int manager::get_spent_gold_for(int side)
{
return resources::teams->at(side - 1).get_side_actions()->get_gold_spent();
}
void manager::fake_unit_deleter::operator() (unit*& fake_unit)
{
if (fake_unit)

2
src/whiteboard/manager.hpp
View file

@ -124,6 +124,8 @@ public:
/** Checks whether the specified unit has at least one planned action */
bool unit_has_actions(const unit& unit) const;
int get_spent_gold_for(int side);
struct fake_unit_deleter {
void operator() (unit*& ptr);
};