summaryrefslogtreecommitdiff
path: root/game/battle.rpy
diff options
context:
space:
mode:
Diffstat (limited to 'game/battle.rpy')
-rw-r--r--game/battle.rpy6
1 files changed, 5 insertions, 1 deletions
diff --git a/game/battle.rpy b/game/battle.rpy
index 1d99471..1f207a3 100644
--- a/game/battle.rpy
+++ b/game/battle.rpy
@@ -107,11 +107,15 @@ label combat:
if (do_action == ACT_TURN):
$ response=loadbattle(Battle["party"])
elif (do_action == ACT_SUMMON):
- $ response=Battle
+ $ response=loadsummon()
else:
$ stdout("INVALID ACTION CODE: %d" % do_action)
jump combat
+ # Maybe nothing happened
+ if response == ERR_SUMMON:
+ $ response = Battle
+
# Maybe we error'ed out and should relog
if (response in [FAILUREMSG, OFFLINEMSG, ERR_JSONDECODER, ERR_LOGIN_DEFAULT]):
$ renpy.call_screen("msgbox", "Error:\n\n%s" % response)