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

Fix MSVC compiler warnings about hiding declarations

Browse source
This commit is contained in:
Jyrki Vesterinen 2017-05-17 07:23:07 +03:00
parent 597099abb6
commit 9eae9eac3c
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ai/formula/candidates.cpp
View file

@ -222,7 +222,6 @@ void attack_candidate_action::evaluate(ai::formula_ai* ai, unit_map& units)
for( size_t my_unit = 0 ; my_unit < my_units_flt.size() ; ++my_unit){
auto my_unit_callable = my_units_flt[my_unit].convert_to<unit_callable>();
auto enemy_unit_callable = my_units_flt[my_unit].convert_to<unit_callable>();
for( size_t enemy_unit = 0 ; enemy_unit < enemy_units_flt.size() ; ++enemy_unit){
auto enemy_unit_callable = enemy_units_flt[enemy_unit].convert_to<unit_callable>();
if(ai->can_reach_unit(my_unit_callable->get_location(), enemy_unit_callable->get_location())) {

6
src/scripting/lua_audio.cpp
View file

@ -156,9 +156,9 @@ static int intf_music_next(lua_State*) {
}
static int intf_music_add(lua_State* L) {
int i = -1;
int index = -1;
if(lua_isinteger(L, 1)) {
i = lua_tointeger(L, 1);
index = lua_tointeger(L, 1);
lua_remove(L, 1);
}
config cfg = config_of
@ -186,7 +186,7 @@ static int intf_music_add(lua_State* L) {
return luaL_argerror(L, i, "unrecognized argument");
}
}
sound::play_music_config(cfg, i);
sound::play_music_config(cfg, index);
return 0;
}