Commit 47ad4fa9 authored by VanillaSalt's avatar VanillaSalt

update Duel.GetTurnCount()

parent 96bbbedb
......@@ -29,6 +29,8 @@ field::field(duel* pduel) {
infos.copy_id = 1;
infos.can_shuffle = TRUE;
infos.turn_id = 0;
infos.turn_id_by_player[0] = 0;
infos.turn_id_by_player[1] = 0;
infos.card_id = 1;
infos.phase = 0;
infos.turn_player = 0;
......
......@@ -112,6 +112,7 @@ struct field_info {
int32 field_id;
int16 copy_id;
int16 turn_id;
int16 turn_id_by_player[2];
int16 card_id;
uint16 phase;
uint8 turn_player;
......
......@@ -51,7 +51,13 @@ int32 scriptlib::duel_get_turn_player(lua_State *L) {
}
int32 scriptlib::duel_get_turn_count(lua_State *L) {
duel* pduel = interpreter::get_duel_info(L);
lua_pushinteger(L, pduel->game_field->infos.turn_id);
if(lua_gettop(L) > 0) {
int32 playerid = lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1)
return 0;
lua_pushinteger(L, pduel->game_field->infos.turn_id_by_player[playerid]);
} else
lua_pushinteger(L, pduel->game_field->infos.turn_id);
return 1;
}
int32 scriptlib::duel_get_draw_count(lua_State *L) {
......
......@@ -3962,6 +3962,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
}
}
infos.turn_id++;
infos.turn_id_by_player[turn_player]++;
infos.turn_player = turn_player;
pduel->write_buffer8(MSG_NEW_TURN);
pduel->write_buffer8(turn_player);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment