games/RedMew
games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-01-18 03:21:47 +02:00
Code Issues Releases Activity

Fix for crashsite cutscene edge cases

Browse Source
This commit is contained in:
Zahir Khan 2019-12-19 21:00:50 -05:00
parent be2cc08f31
commit 35990dd22c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
features/cutscene/cutscene_controller.lua
View File

@ -172,7 +172,10 @@ function Public.register_running_cutscene(player_index, identifier, final_transi
if not valid(player) then
return
end
if player.controller_type ~= 1 then
player.print('Cannot start cutscene without a character')
return
end
local cutscene_function = cutscene_functions[identifier]
if not cutscene_function then
return
@ -344,9 +347,15 @@ local reconnect_character =
local running_cutscene = params.running_cutscene
local character = running_cutscene.character
local func = running_cutscene.terminate_func
if valid(player) and valid(character) then
if valid(player) then
player.exit_cutscene()
player.set_controller {type = defines.controllers.character, character = character}
if valid(character) then
player.set_controller {type = defines.controllers.character, character = character}
else
params.skip_btn_flag = true
player.ticks_to_respawn = 3600
player.print('[color=red][font=compi]Oops - You Died! Please go to a safe location and restart the cutscene[/font][/color]')
end
if func then
Token.get(func)(player_index, params.skip_btn_flag)
end