Minor fix in Worldmap.cpp

Added pickup item message for sfall_mods.ssl script.
Update release version to 4.1.9.1

Author: FakelsHub

artifacts/config_files/sfall-mods.ini

@@ -47,6 +47,9 @@ DropItemsOnDeath=0
 ; 34 - G key
 PickupItemKey=0
 
+;Messages
+PickupItemMsg=You pickup: %s.
+
 [CombatControl]
 ;Allows you to directly control other critters in combat
 ;Set to 0 to disable

artifacts/mods/gl_sfall-mods.ssl

@@ -23,13 +23,14 @@ procedure InventoryMoveHandler;
 procedure KeyPressHandler;
 
 procedure pickup_ground_items;
-procedure pickup_info();
+procedure pickup_clear();
 procedure distance_sort(variable array);
 procedure weapon_drop;
 procedure DeathAmimHandler;
 
 variable quickAmmoReload, pickupKey, keyMod, pickupItem, temp;
 variable deathNpcArray, countDeath;
+variable pickupMessage;
 
 procedure start begin
    variable sfall_version;
@@ -43,6 +44,7 @@ procedure start begin
 
       if (sfall_version >= 414) then begin
          pickupKey := GetConfig("Inventory", "PickupItemKey", 0);
+         if (pickupKey > 0) then pickupMessage := GetConfigStr("Inventory", "PickupItemMsg", "Error");
 
          if ((GetConfig("Inventory", "QuickAmmoReload", 0) > 0)
          and GetIniConfig("Misc", "ReloadReserve", -1, "ddraw.ini") > -1) then begin
@@ -101,6 +103,12 @@ procedure InventoryMoveHandler begin
       set_weapon_ammo_count(ammoObj, cAmmo);
       add_obj_to_inven(inven, ammoObj);
    end
+   else if (event == 7) then begin
+       if (pickupItem and pickupItem == itemDrop) then begin
+          display_msg(sprintf(pickupMessage, obj_name(itemDrop)));
+       end
+       pickupItem := 0;
+   end
    else if (event == 8) then begin
       if (obj_item_subtype(itemDrop) == item_type_drug) then begin
          set_self(dude_obj);
@@ -137,7 +145,7 @@ procedure KeyPressHandler begin
       else if (keyDX == DIK_Z and (mode bwand PIPBOY)) then begin
          tap_key(DIK_ESCAPE);
       end
-      else if (not(pickupItem) and keyDX == pickupKey and (mode == 0)) then begin
+      else if (keyDX == pickupKey and (mode == 0)) then begin
          call pickup_ground_items;
       end
       else if (keyMod and keyDX == DIK_A and (mode bwand (COMBAT bwor PCOMBAT))) then begin
@@ -173,18 +181,17 @@ procedure pickup_ground_items begin
 
          // pickup object
          set_self(dude_obj);
-         pickup_obj(item);
          pickupItem := item;
-         walkDist /= 2;
-         call pickup_info in walkDist;
+         pickup_obj(item);
+         //walkDist /= 2;
+         call pickup_clear in 3;
          break; // exit loop
       end
    end
    if weight == -1 then display_msg(mstr_misc(8000)); // You carry too much
 end
 
-procedure pickup_info() begin
-   display_msg(sprintf(mstr_misc(8002), obj_name(pickupItem)));
+procedure pickup_clear() begin
    pickupItem := 0;
 end
 

artifacts/scripting/sfall function notes.txt

@@ -612,11 +612,12 @@ optional arguments:
 
 > int sfall_func1("add_extra_msg_file", string fileName)
 > int sfall_func2("add_extra_msg_file", string fileName, int fileNumber)
-- Loads the custom message file, and returns the identification number assigned to it in range from 0x3000 to 0x3FFF for accessing messages via the message_str_game script function
-- fileName: the name of the message file (including the .msg extension) located in the game directory "text\<current_lang>\game\"
+- loads the custom message file, and returns the file ID number assigned to it in range from 0x3000 to 0x3FFF for the message_str_game function to get messages from the file
+- fileName: the name of the custom message file (including the .msg extension) in "text\<language>\game\" directory
 optional argument:
-- fileNumber: file number ID for accessing, available number range from 0x2000 to 0x2FFF (see ExtraGameMsgFileList option)
-  use fileNumber only if you want to adding a message file without editing ddraw.ini or existing scripts to support the old way
+- fileNumber: the file ID number for the message_str_game function. The available range is from 0x2000 to 0x2FFF (see ExtraGameMsgFileList setting in ddraw.ini)
+  use fileNumber only if you want to add a message file without editing ddraw.ini or existing scripts to support the old way  
+
 ------------------------
 ------ MORE INFO -------
 ------------------------

sfall/Modules/Scripting/Handlers/Worldmap.cpp

@@ -266,7 +266,7 @@ void sf_set_rest_on_map(OpcodeContext& ctx) {
 		return;
 	}
 	long elev = ctx.arg(1).asInt();
-	if (elev < -1 && elev > 2) {
+	if (elev < -1 || elev > 2) {
 		ctx.printOpcodeError("%s() - invalid map elevation argument.", ctx.getMetaruleName());
 	} else {
 		Worldmap::SetRestMapLevel(mapId, elev, ctx.arg(2).asBool());
@@ -275,7 +275,7 @@ void sf_set_rest_on_map(OpcodeContext& ctx) {
 
 void sf_get_rest_on_map(OpcodeContext& ctx) {
 	long elev = ctx.arg(1).asInt();
-	if (elev < 0 && elev > 2) {
+	if (elev < 0 || elev > 2) {
 		ctx.printOpcodeError("%s() - invalid map elevation argument.", ctx.getMetaruleName());
 	} else {
 		ctx.setReturn(Worldmap::GetRestMapLevel(elev, ctx.arg(0).asInt()));

sfall/version.h

@@ -23,11 +23,10 @@
 #define LEGAL_COPYRIGHT "Copyright © 2006-2019, sfall team"
 
 #define VERSION_MAJOR 4
-#define VERSION_MINOR 2
-#define VERSION_BUILD 0
-#define VERSION_REV 0
+#define VERSION_MINOR 1
+#define VERSION_BUILD 9
+#define VERSION_REV 1
 
-#define VERSION_STRING "4.2.0"
-
-//#define CHECK_VAL  (4)
+#define VERSION_STRING "4.1.9.1"
 
+//#define CHECK_VAL  (4)