Skip to content

Commit af9c77c

Browse files
committed
Fix battle_calling flag mistake
1 parent 74c660f commit af9c77c

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/game_interpreter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void Game_Interpreter::Update() {
197197
break;
198198
}
199199

200-
if (Game_Temp::battle_calling ||
200+
if ((Game_Temp::battle_calling && !Game_Temp::battle_running) ||
201201
Game_Temp::shop_calling ||
202202
// Game_Temp::inn_calling ||
203203
Game_Temp::name_calling ||

src/scene_map.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ void Scene_Map::Update() {
165165

166166
if (Game_Temp::battle_calling) {
167167
CallBattle();
168-
Game_Temp::battle_calling = false;
169168
return;
170169
}
171170

0 commit comments

Comments
 (0)