Merge branch 'develop', preparing for 3.7.3 release.

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.7b
+;v3.7.3
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -301,7 +301,7 @@ SaveInCombatFix=1
 ;Point at an ini file containing elevator data
 ;ElevatorsFile=Elevators.ini
 
-;Uncomment and set to a comma delimited list of numbers to use a custom xp table.
+;Uncomment and set a comma delimited list of numbers to use a custom xp table.
 ;Players level is capped once the highest specified level is reached
 ;XPTable=50,100,200
 
@@ -395,7 +395,7 @@ UseScrollingQuestsList=1
 ExtraSaveSlots=0
 
 ;Set to 1 to speed up the hp/ac counter animations
-;Set to 2 to update the hp/ac counter instantly when the number is not negative
+;Set to 2 to update the hp/ac counters instantly
 SpeedInterfaceCounterAnims=0
 
 ;These lines allow you to control the karma frm's displayed on the character screen
@@ -531,7 +531,7 @@ PipboyTimeAnimDelay=50
 ;Set to 0 to disable
 ;Set to 1 to control all critters in combat
 ;Set to 2 to control all party members
-;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set it to a comma delimited list of PIDs
+;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
 ControlCombat=0
 ;ControlCombatPIDList=62,89,97,107,160,161
 
@@ -563,6 +563,16 @@ InstantWeaponEquip=0
 ;To change the carry weight limit, uncomment the next line (Default is 999)
 ;CarryWeightLimit=999
 
+;To add additional game msg files, uncomment the next line and set a comma delimited list of filenames without .msg extension
+;You need to use the message_str_game script function to get messages from the files
+;ExtraGameMsgFileList=
+
+;Set to 1 to display numbered dialogue options
+NumbersInDialogue=0
+
+;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
+CreditsAtBottom=0
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Debugging]
 ;Extra sfall configuration settings that can be used by modders

artifacts/scripting/headers/define_extra.h

@@ -2,16 +2,6 @@
 #ifndef DEFINE_EXTRA_H
 #define DEFINE_EXTRA_H
 
-#define ATTACK_MODE_NONE      0
-#define ATTACK_MODE_PUNCH     1
-#define ATTACK_MODE_KICK      2
-#define ATTACK_MODE_SWING     3
-#define ATTACK_MODE_THRUST    4
-#define ATTACK_MODE_THROW     5
-#define ATTACK_MODE_SINGLE    6
-#define ATTACK_MODE_BURST     7
-#define ATTACK_MODE_FLAME     8
-
 #define OBJ_TYPE_ITEM       (0)
 #define OBJ_TYPE_CRITTER    (1)
 #define OBJ_TYPE_SCENERY    (2)
@@ -20,18 +10,47 @@
 #define OBJ_TYPE_MISC       (5)
 #define OBJ_TYPE_SPATIAL    (6)
 
+/* Item Common Flags */
+#define HIDDEN_ITEM     134217728  // 0x08000000 - Hidden Item
+
+#define ITEM_ACTION_USE      2048  // 0x00000800 - Use (can be used)
+#define ITEM_ACTION_USEON    4096  // 0x00001000 - Use On Smth (can be used on anything)
+#define ITEM_ACTION_PICKUP  32768  // 0x00008000 - PickUp
+
+#define WEAPON_BIGGUN         256  // 0x00000100 - Big Gun
+#define WEAPON_2HAND          512  // 0x00000200 - 2Hnd (weapon is two-handed)
+
+#define ATKMODE_PRI_NONE        0
+#define ATKMODE_PRI_PUNCH       1
+#define ATKMODE_PRI_KICK        2
+#define ATKMODE_PRI_SWING       3
+#define ATKMODE_PRI_THRUST      4
+#define ATKMODE_PRI_THROW       5
+#define ATKMODE_PRI_SINGLE      6
+#define ATKMODE_PRI_BURST       7
+#define ATKMODE_PRI_FLAME       8
+#define ATKMODE_SEC_NONE        0
+#define ATKMODE_SEC_PUNCH      16  // 0x00000010
+#define ATKMODE_SEC_KICK       32  // 0x00000020
+#define ATKMODE_SEC_SWING      48  // 0x00000030
+#define ATKMODE_SEC_THRUST     64  // 0x00000040
+#define ATKMODE_SEC_THROW      80  // 0x00000050
+#define ATKMODE_SEC_SINGLE     96  // 0x00000060
+#define ATKMODE_SEC_BURST     112  // 0x00000070
+#define ATKMODE_SEC_FLAME     128  // 0x00000080
+
 /* Critter Flags */
-#define CFLG_BARTER             2  //0x00000002 - Barter (can trade with)
-#define CFLG_NOSTEAL           32  //0x00000020 - Steal (cannot steal from)
-#define CFLG_NODROP            64  //0x00000040 - Drop (doesn't drop items)
-#define CFLG_NOLIMBS          128  //0x00000080 - Limbs (cannot lose limbs)
-#define CFLG_NOAGES           256  //0x00000100 - Ages (dead body does not disappear)
-#define CFLG_NOHEAL           512  //0x00000200 - Heal (damage is not cured with time)
-#define CFLG_INVULN          1024  //0x00000400 - Invulnerable (cannot be hurt)
-#define CFLG_FLATTN          2048  //0x00000800 - Flatten (leaves no dead body)
-#define CFLG_SPECIAL         4096  //0x00001000 - Special (there is a special type of death)
-#define CFLG_RANGED          8192  //0x00002000 - Range (melee attack is possible at a distance)
-#define CFLG_NOKNOCKDOWN    16384  //0x00004000 - Knock (cannot be knocked down)
+#define CFLG_BARTER             2  // 0x00000002 - Barter (can trade with)
+#define CFLG_NOSTEAL           32  // 0x00000020 - Steal (cannot steal from)
+#define CFLG_NODROP            64  // 0x00000040 - Drop (doesn't drop items)
+#define CFLG_NOLIMBS          128  // 0x00000080 - Limbs (cannot lose limbs)
+#define CFLG_NOAGES           256  // 0x00000100 - Ages (dead body does not disappear)
+#define CFLG_NOHEAL           512  // 0x00000200 - Heal (damage is not cured with time)
+#define CFLG_INVULN          1024  // 0x00000400 - Invulnerable (cannot be hurt)
+#define CFLG_FLATTN          2048  // 0x00000800 - Flatten (leaves no dead body)
+#define CFLG_SPECIAL         4096  // 0x00001000 - Special (there is a special type of death)
+#define CFLG_RANGED          8192  // 0x00002000 - Range (melee attack is possible at a distance)
+#define CFLG_NOKNOCKDOWN    16384  // 0x00004000 - Knock (cannot be knocked down)
 
 //remove inven obj defines
 #define RMOBJ_CONSUME_DRUG        4666772

artifacts/scripting/sfall function notes.txt

@@ -277,6 +277,7 @@ Some utility/math functions are available:
 > string message_str_game(int fileId, int messageId)
 - works exactly the same as message_str, except you get messages from files in "text/english/game" folder
 - use GAME_MSG_* defines or mstr_* macros from sfall.h to use specific msg file
+- Additional game msg files added by ExtraGameMsgFileList setting will have consecutive fileIds assigned beginning from 0x2000. (e.g. if you set ExtraGameMsgFileList=foo,bar in ddraw.ini, foo.msg will be associated with 0x2000 and bar.msg with 0x2001.)
 
 > int sneak_success
 - returns 1 if last sneak attempt (roll against skill) was successful, 0 otherwise

sfall/AmmoMod.cpp

@@ -658,8 +658,8 @@ static void __declspec(naked) DisplayBonusHtHDmg2() {
 		push eax
 		call sprintf_
 		add  esp, 4*5
-		mov  eax, 0x472569
-		jmp  eax
+		push 0x472569
+		retn
 	}
 }