[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] remove_sdl1_2 6003b54 16/29: FIXED deadlo
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] remove_sdl1_2 6003b54 16/29: FIXED deadlock during extro |
Date: |
Mon, 25 Jul 2016 18:16:08 +0000 (UTC) |
tag: remove_sdl1_2
commit 6003b54205921eb155f72b2ee6a06a43321ca116
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED deadlock during extro
After carefully analysing the code, it seems that pathfinding can fail to
ever reach the goal under the following condition:
a new goal is set while the character is walking and thus offx_ or offy_
are not 0.
In that case mapcharacter::follow_path always returns false. And then Bjarn
never makes it to his chest and the extro will hang indefinitely.
While the proper fix might be in mapcharacter::set_goal, for now just
reset the offsets to 0 once the final dialogue starts. Less likely to
break other things that way.
---
scripts/schedules/mapcharacters/to_cellar.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/schedules/mapcharacters/to_cellar.py
b/scripts/schedules/mapcharacters/to_cellar.py
index df2dbbe..17043e2 100644
--- a/scripts/schedules/mapcharacters/to_cellar.py
+++ b/scripts/schedules/mapcharacters/to_cellar.py
@@ -85,6 +85,8 @@ class to_cellar(object):
bjarn = adonthell.gamedata_get_character ("Bjarn Fingolson")
bjarn.set_dialogue ("dialogues.extro")
bjarn.pause ()
+ bjarn.stop_moving ()
+ bjarn.set_offset (0, 0)
bjarn.launch_action (self.myself)
else:
- [adonthell-wastesedge-commits] tag remove_sdl1_2 created (now cb91a44), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 eca730f 02/29: ADDED custom site.py for Adonthell's embedded Python interpreter, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 6003b54 16/29: FIXED deadlock during extro,
Kai Sterker <=
- [adonthell-wastesedge-commits] remove_sdl1_2 eca4ca6 15/29: FIXED URLs in end credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 7197e65 05/29: ADDED missing file (thanks Clément Plantier), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 cb91a44 29/29: FIXED activating final dialogue twice, when rapidly pressing space, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 b044632 19/29: ADDED larger icons and updated .desktop file accordingly, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 1b1c82b 06/29: FIXED spelling error/missing translation (Thanks Clément), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 1c4c04f 22/29: FIXED installation of message catalogues. We expect them inside the game directory, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 e011a99 24/29: ADDED window to display locked/unlocked achievements, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 3c0a585 08/29: FIXED deprecated Copyright keyword (Thanks Mathieu!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 3c8ad19 25/29: UPDATED README and assorted files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 8aa7e16 01/29: UPDATED installer script for Waste's Edge v0.3.4 and NSIS 2.x, Kai Sterker, 2016/07/25