Skip to content

Commit

Permalink
fix side specific variables
Browse files Browse the repository at this point in the history
this fixes wesnoth.get_side_variable and wesnoth.set_side_variable
  • Loading branch information
gfgtdf committed Jul 9, 2016
1 parent 685b694 commit f4253c2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/carryover.cpp
Expand Up @@ -114,6 +114,7 @@ void carryover::to_config(config& cfg){
side["add"] = add_;
side["current_player"] = current_player_;
side["previous_recruits"] = get_recruits(false);
side.add_child("variables", variables_);
for(const config & u_cfg : recall_list_) {
side.add_child("unit", u_cfg);
}
Expand Down
6 changes: 3 additions & 3 deletions src/scripting/game_lua_kernel.cpp
Expand Up @@ -1117,7 +1117,7 @@ int game_lua_kernel::intf_get_side_variable(lua_State *L)
if(side_index >= teams().size()) {
return luaL_argerror(L, 1, "invalid side number");
}
char const *m = luaL_checkstring(L, 1);
char const *m = luaL_checkstring(L, 2);
variable_access_const v(m, teams()[side_index].variables());
return luaW_pushvariable(L, v) ? 1 : 0;
}
Expand All @@ -1134,10 +1134,10 @@ int game_lua_kernel::intf_set_side_variable(lua_State *L)
if(side_index >= teams().size()) {
return luaL_argerror(L, 1, "invalid side number");
}
char const *m = luaL_checkstring(L, 1);
char const *m = luaL_checkstring(L, 2);
//TODO: maybe support removing values with an empty arg3.
variable_access_create v(m, teams()[side_index].variables());
luaW_checkvariable(L, v, 2);
luaW_checkvariable(L, v, 3);
return 0;
}

Expand Down

0 comments on commit f4253c2

Please sign in to comment.