fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added "combat ends normally" event to HOOK_COMBATTURN

Browse Source 
Fixed a crash in COMBATTURN hook when loading in combat mode while
controlling critters.

Fixed critter control algorithm in PartyControl.cpp and set_dude_obj
not accepting a null argument.
This commit is contained in:
NovaRain
2019-07-01 12:15:32 +08:00
parent 2ffdc43869
commit ff2ebdc82a
8 changed files with 114 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/hookscripts.txt
+2 -2
View File
@@ -462,9 +462,9 @@ HOOK_COMBATTURN (hs_combatturn.int)
Runs before and after each turn in combat (for both PC and NPC).
int arg1 - event type: 1 - start of turn, 0 - normal end of turn, -1 - combat ended abruptly (by script or by pressing Enter during PC turn)
int arg1 - event type: 1 - start of turn, 0 - normal end of turn, -1 - combat ends abruptly (by script or by pressing Enter during PC turn), -2 - combat ends normally (hook always runs at the end of combat)
int arg2 - critter doing the turn
bool arg3 - set to 1 at the start of the player's turn after the game has been loaded, 0 otherwise
bool arg3 - 1 at the start/end of the player's turn after loading a game saved in combat mode, 0 otherwise
int ret1 - pass 1 at the start of turn to skip the turn, pass -1 at the end of turn to force end of combat