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

Fix: make the previous commit actually work

Browse source
This commit is contained in:
Dmitry Kovalenko 2012-04-03 17:45:25 +00:00
parent ee4d0b5800
commit 0bca7a9b5a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ai/lua/core.cpp
View file

@ -214,12 +214,12 @@ static int cfun_ai_execute_attack(lua_State *L)
int attacker_weapon = -1;//-1 means 'select what is best'
double aggression = context.get_aggression();//use the aggression from the context
if (!lua_isnoneornil(L, index) && attacker_weapon != -1) {
attacker_weapon = lua_tointeger(L, index) - 1; // Done for consistency of the Lua style
if (!lua_isnoneornil(L, index + 1) && attacker_weapon != -1) {
attacker_weapon = lua_tointeger(L, index + 1) - 1; // Done for consistency of the Lua style
}
if (!lua_isnoneornil(L, index+1) && lua_isnumber(L,index+1)) {
aggression = lua_tonumber(L, index+1);
if (!lua_isnoneornil(L, index) && lua_isnumber(L,index)) {
aggression = lua_tonumber(L, index);
}
ai::attack_result_ptr attack_result = ai::actions::execute_attack_action(side,true,attacker,defender,attacker_weapon,aggression);