upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 01:02:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

insert missing local variable name for auto-stored recall units

Browse Source 
(thanks for noticing that to silene)
This commit is contained in:
Patrick Parker 2007-04-13 04:23:11 +00:00
parent 29d0738033
commit 1225da150c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game_events.cpp
View File

@ -1164,7 +1164,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
ui != player->available_units.end(); ++ui) {
wassert(game_data_ptr != NULL);
ui->set_game_context(game_data_ptr,units,game_map,status_ptr,teams);
scoped_recall_unit("this_unit", player_id,
scoped_recall_unit auto_store("this_unit", player_id,
(ui - player->available_units.begin()));
if(game_events::unit_matches_filter(*ui, filter,gamemap::location())) {
ui->assign_role(cfg["role"]);
@ -1183,7 +1183,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
ui != pi->second.available_units.end(); ++ui) {
wassert(game_data_ptr != NULL);
ui->set_game_context(game_data_ptr,units,game_map,status_ptr,teams);
scoped_recall_unit("this_unit", pi->first,
scoped_recall_unit auto_store("this_unit", pi->first,
(ui - pi->second.available_units.begin()));
if(game_events::unit_matches_filter(*ui, filter,gamemap::location())) {
ui->assign_role(cfg["role"]);
@ -1431,7 +1431,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
LOG_NG << "checking unit against filter...\n";
wassert(game_data_ptr != NULL);
u->set_game_context(game_data_ptr,units,game_map,status_ptr,teams);
scoped_recall_unit("this_unit", player_id, u - avail.begin());
scoped_recall_unit auto_store("this_unit", player_id, u - avail.begin());
if(game_events::unit_matches_filter(*u, &unit_filter, gamemap::location())) {
gamemap::location loc = cfg_to_loc(cfg);
unit to_recruit(*u);
@ -1738,7 +1738,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
for(std::vector<unit>::iterator j = avail_units.begin(); j != avail_units.end();) {
wassert(game_data_ptr != NULL);
j->set_game_context(game_data_ptr,units,game_map,status_ptr,teams);
scoped_recall_unit("this_unit", pi->first, j - avail_units.begin());
scoped_recall_unit auto_store("this_unit", pi->first, j - avail_units.begin());
if(game_events::unit_matches_filter(*j, cfg,gamemap::location())) {
j = avail_units.erase(j);
} else {
@ -1850,7 +1850,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
for(std::vector<unit>::iterator j = avail_units.begin(); j != avail_units.end();) {
wassert(game_data_ptr != NULL);
j->set_game_context(game_data_ptr,units,game_map,status_ptr,teams);
scoped_recall_unit("this_unit", pi->first, j - avail_units.begin());
scoped_recall_unit auto_store("this_unit", pi->first, j - avail_units.begin());
if(game_events::unit_matches_filter(*j, filter,gamemap::location()) == false) {
++j;
continue;