Merge branch 'develop'

* allow to highlight alive critters

* allow to ignore NO_HIGHLIGHT flag

* don't highlight while in loot screen, so that it's not constantly toggled by shift-A ("Take All" hotkey)

artifacts/config_files/sfall-mods.ini

@@ -5,10 +5,10 @@
 Key=42
 
 ; Set to 1 to also highlight containers
-Containers=1
+Containers=0
 
-; Set to 1 to also highlight corpses
-Corpses=1
+; Set to 1 to also highlight lootable corpses
+Corpses=0
 
 ; Set to 1 to only highlight objects in the player's line-of-sight
 CheckLOS=0

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v4.0.2
+;v4.0.3
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.

artifacts/mods/gl_highlighting.ssl

@@ -4,7 +4,7 @@
 
    Previously was part of sfall itself, now a separate mod.
    Features:
-   - highlighting items, containers (optional) and dead bodies (optional) on the ground
+   - highlighting items, containers (optional) and lootable corpses (optional) on the ground
    - configurable hotkey is used to trigger highlight
    - only objects in direct line-of-sight of player are highlighted (optional)
    - motion scanner is required to enable highlight (optional)
@@ -23,6 +23,7 @@
 #define CRITTER_IS_DEAD    (1)
 #define PID_MOTION_SENSOR  (59)
 #define NO_HIGHLIGHT(obj)  (get_flags(obj) bwand FLAG_NOHIGHLIGHT)
+#define NO_STEAL(obj)      (get_proto_data(obj_pid(obj), PROTO_CR_FLAGS) bwand CFLG_NOSTEAL)
 
 variable configSection := "Highlighting";
 variable highlightKey;
@@ -52,7 +53,7 @@ procedure ToggleHighlight(variable enable) begin
    end
    if (alsoCorpse) then begin
       foreach obj in list_as_array(LIST_CRITTERS) begin
-         if critter_state(obj) == CRITTER_IS_DEAD then begin
+         if critter_state(obj) == CRITTER_IS_DEAD and not NO_STEAL(obj) then begin
             call ToggleHighlightObject(obj, enable);
          end
       end

artifacts/mods/gl_partycontrol.ssl

@@ -42,6 +42,7 @@ end
 
 procedure start begin
    if game_loaded and (sfall_ver_major >= 4) then begin
+      set_perk_ranks(PERK_gecko_skinning_perk, 1);
       controlMode := GetConfig("CombatControl", "Mode", 0);
       if (controlMode > 2) then controlMode := 0;
       if (controlMode > 0) then begin

sfall/Modules/BugFixes.cpp

@@ -1389,6 +1389,9 @@ void BugFixes::init()
 
 	// Fix crash when calling partyMemberGetCurLevel_ on a critter that has no data in party.txt
 	MakeJump(0x495FF6, partyMemberGetCurLevel_hack);
+
+	// Fix for add_mult_objs_to_inven only adding 500 of an object when the value of "count" argument is over 99999
+	SafeWrite32(0x45A2A0, 0x1869F); // 99999
 }
 
 }

sfall/Modules/Credits.cpp

@@ -34,7 +34,7 @@ static const char* ExtraLines[] = {
 	"#SFALL " VERSION_STRING,
 	"",
 	"sfall is free software, licensed under the GPL",
-	"Copyright 2008-2017  The sfall team",
+	"Copyright 2008-2018  The sfall team",
 	"",
 	"@Author",
 	"Timeslip",

sfall/Modules/LoadGameHook.cpp

@@ -154,7 +154,7 @@ end:
 
 static void __declspec(naked) SetPCBaseStatEMP() {
 	__asm {
-		mov  ds:[29*4 + 0x51C394], 100; // set_pc_base_stat(STAT_dmg_resist_emp, 100)
+		mov  dword ptr ds:[29*4 + 0x51C394], 100; // set_pc_base_stat(STAT_dmg_resist_emp, 100)
 		retn;
 	}
 }

sfall/Modules/Message.cpp

@@ -89,7 +89,7 @@ void ClearReadExtraGameMsgFiles() {
 }
 
 void Message::init() {
-	LoadGameHook::OnGameInit() += ReadExtraGameMsgFiles;
+	LoadGameHook::OnBeforeGameStart() += ReadExtraGameMsgFiles;
 }
 
 void Message::exit() {

sfall/Modules/MiscPatches.cpp

@@ -154,13 +154,13 @@ static void __declspec(naked) register_object_take_out_hack() {
 		push ecx
 		push eax
 		mov  ecx, edx                             // ID1
-		mov  edx, [eax + 0x1C]                      // cur_rot
+		mov  edx, [eax + 0x1C]                    // cur_rot
 		inc  edx
 		push edx                                  // ID3
 		xor  ebx, ebx                             // ID2
-		mov  edx, [eax + 0x20]                      // fid
-		and edx, 0xFFF                           // Index
-		xor eax, eax
+		mov  edx, [eax + 0x20]                    // fid
+		and  edx, 0xFFF                           // Index
+		xor  eax, eax
 		inc  eax                                  // Obj_Type
 		call fo::funcoffs::art_id_
 		xor  ebx, ebx

sfall/Modules/Perks.cpp

@@ -613,8 +613,7 @@ lower:
 }
 
 void _stdcall ApplyHeaveHoFix() {
-	SafeWrite8(0x478AC4, 0xE9);
-	HookCall(0x478AC4, HeaveHoHook);
+	MakeJump(0x478AC4, HeaveHoHook);
 	perks[PERK_heave_ho].strengthMin = 0;
 }
 

sfall/version.h

@@ -1,6 +1,6 @@
 /*
  *    sfall
- *    Copyright (C) 2008-2016  The sfall team
+ *    Copyright (C) 2008-2018  The sfall team
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 
 #define TARGETVERSION "Fallout 2 v1.02 US"
 
-#define LEGAL_COPYRIGHT "Copyright (C) 2006-2017, sfall team"
+#define LEGAL_COPYRIGHT "Copyright (C) 2006-2018, sfall team"
 
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 0
-#define VERSION_BUILD 2
+#define VERSION_BUILD 3
 #define VERSION_REV 0
 
 #ifdef WIN2K
-#define VERSION_STRING "4.0.2 win2k"
+#define VERSION_STRING "4.0.3 win2k"
 #else
-#define VERSION_STRING "4.0.2"
+#define VERSION_STRING "4.0.3"
 #endif
 
 #define CHECK_VAL  (4)