Backported "dialog_message" script function

Updated documents for the function.

.gitattributes

@@ -0,0 +1 @@
+*.ssl linguist-language=Pascal

.gitignore

@@ -46,6 +46,8 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
+*.VC.db
+*.VC.opendb
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

README.md

@@ -1,6 +1,8 @@
 # sfall
 
-A set of engine modifications for the classic game Fallout 2 in form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
+[![License](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
+A set of engine modifications for the classic game Fallout 2 in the form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
 
 **Engine modifications include:**
 - Better support for modern operating systems
@@ -10,7 +12,11 @@ A set of engine modifications for the classic game Fallout 2 in form of a DLL, w
 - Extended scripting capabilities for modders (many new opcodes to control sfall features as well as previously unavailable vanilla engine functions)
 
 
-Original author: timeslip
+Original author: **Timeslip**
 
 Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows fallout to run correctly on modern operating systems, and adds additional features for modders.
 
+---
+#### Fallout Engine IDA Database
+[Download for IDA Pro 6.8](https://www.dropbox.com/s/tm0nyx0lnk4yui0/Fallout_1_and_2_IDA68.rar?dl=1 "Download from Dropbox")
+ | [Download for IDA Pro 7.0](https://www.dropbox.com/s/61srq09pn8grfpu/Fallout_1_and_2_IDA70.rar?dl=1 "Download from Dropbox") (comments are in Russian)

artifacts/config_files/Perks.ini

@@ -1,7 +1,7 @@
 ;This file handles modifications to perks and traits
 
-;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make modifications
-; in this file, as some perks have hardcoded effects which may catch you out
+;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make
+; modifications in this file, as some perks have hardcoded effects which may catch you out
 
 ;Since traits need to be picked before any scripts run, they have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
@@ -64,20 +64,25 @@ Enable=0
 ;Image: The line number (0-indexed) of the corresponding FRM in skilldex.lst
 ;Ranks: The number of perk levels
 ;Level: The minimum required level
-;Type: If 0, the perk checks only Skill1 for skill requirements; if 1, it checks Skill1 or Skill2; if 2, it checks both Skill1 and Skill2
+;Type: If 0, the perk checks only Skill1 for skill requirements; if 1, it checks Skill1 or Skill2; if 2, it checks both
+; Skill1 and Skill2
 ;Stat: The modified stat or -1 if you don't want to change any stats
 ;StatMag: The increased/decreased value to the modified stat
 
-;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864), it checks GVAR.
-; For example, if Skill1=0x4000004, then the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
+;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864),
+; it checks the corresponding GVAR
+; For example, if Skill1=0x4000004, the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
 
-;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative value is interpreted as the maximum requirement.
-; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill >= 100 and meets all other requirements, the perk will be available in the
-; selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available if player has big guns skill >= 120
+;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative
+; value is interpreted as the maximum requirement
+; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill >= 100 and meets all other requirements,
+; the perk will be available in the selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available
+; if player has big guns skill >= 120
 
-;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as maximum requirements.
-; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not used as requirements
-; but to add to corresponding SPECIAL stats
+;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as
+; maximum requirements
+; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not
+; used as requirements but to add to corresponding SPECIAL stats
 
 ;If the value is set to -99999, the variable will be ignored (similar to comment out that line)
 

artifacts/config_files/Translations.ini

@@ -32,4 +32,4 @@ DoneBtn=Done
 ;PowerKick=Power Kick:
 ;HipKick=Hip Kick:
 ;HookKick=Hook Kick:
-;PiercingKick=Piercing kick:
+;PiercingKick=Piercing Kick:

artifacts/config_files/Tweaks.ini

@@ -10,4 +10,4 @@
 ;in the proto for other items, so AI will use them for healing in combat as well
 STIMPAK=40
 SUPER_STIMPAK=144
-HEALING_POWDER=237
+HEALING_POWDER=273

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.33
+;v3.8.37
 
 [Main]
 ;Set to 1 if you want to use command line arguments to tell sfall to use another ini file
@@ -38,6 +38,7 @@ SpeedMultiInitial=100
 ;Set to 6 for DX9 fullscreen windowed (the resolution in f2_res.ini should be set to the same aspect ratio as your desktop resolution)
 ;A DX9 mode is required for any graphics related script extender functions to work (i.e. fullscreen shaders)
 ;Modes 1, 2 and 3 are no longer supported
+;If using the hi-res patch by Mash, this option will always be read from the main ddraw.ini file
 Mode=0
 
 ;If using a DX9 mode, this changes the resolution
@@ -76,6 +77,7 @@ Use32BitHeadGraphics=0
 ;Set to 1 to automatically search for alternative AVI video files when Fallout tries to play the game movies
 ;Set to 2 to force AVI videos to fit the screen width
 ;Requires DX9 graphics mode
+;The recommended video codec is Xvid
 AllowDShowMovies=0
 
 ;Fade effect time percentage modifier
@@ -99,17 +101,14 @@ WorldMapTerrainInfo=0
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Sound]
 ;Sets the number of allowed simultaneous sound effects
-;Set to 0 to leave the default unchanged (i.e. 4). The maximum is 32
-NumSoundBuffers=0
-
-;Set to 1 to enable fade effects for background music when stopping and starting the playback
-FadeBackgroundMusic=1
+;Set to 0 to leave the default unchanged (i.e. 8). The maximum is 32
+NumSoundBuffers=8
 
 ;Set to 1 to allow attaching sound files to combat float messages
 AllowSoundForFloats=0
 
 ;Set to 1 to automatically search for alternative formats (mp3/wma/wav) when Fallout tries to play an ACM
-;Set to 2 to play alternative music files even if original ACM files are not present in the music folder
+;Alternative music files will play even if original ACM files are not present in the music folder
 ;This does not effect the play_sfall_sound and stop_sfall_sound script functions
 AllowDShowSound=0
 
@@ -184,10 +183,10 @@ WindowScrollKey=0
 ToggleItemHighlightsKey=42
 
 ;Set to 1 to also highlight containers
-HighlightContainers=1
+HighlightContainers=0
 
 ;Set to 1 to also highlight lootable corpses
-HighlightCorpses=1
+HighlightCorpses=0
 
 ;Set the color of outlines, available colors:
 ;1 - glowing red
@@ -321,7 +320,7 @@ Movie17=credits.mve
 
 ;To change the limit of the distance away from the player to which you're allowed to scroll the local maps, uncomment the next two lines
 ;Defaults are 480 in the x direction and 400 in the y direction.
-;Not compatible with the res patch!
+;Does not work with the hi-res patch by Mash!
 ;LocalMapXLimit=480
 ;LocalMapYLimit=400
 
@@ -444,7 +443,8 @@ NPCsTryToSpendExtraAP=0
 AllowLargeTiles=0
 
 ;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383
-MoreTiles=0
+;This option is always enabled in 4.3.7/3.8.37 or later. The information is left for reference only
+MoreTiles=1
 
 ;Change the Skilldex cursor FRM numbers
 ;Default is 293 for all skills
@@ -504,7 +504,7 @@ SpeedInterfaceCounterAnims=0
 ScienceOnCritters=0
 
 ;Modify this value to change the player's speed of rotation on the inventory and character screens
-;Default is 166
+;Default is 166 (lower - faster; valid range: 0..1000)
 SpeedInventoryPCRotation=166
 
 ;Modify the number of the extra interface boxes available to modders. (Default is 5, and the maximum is 95)
@@ -521,13 +521,16 @@ BonusHtHDamageFix=1
 DisplayBonusDamage=0
 
 ;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127)
-AnimationsAtOnceLimit=120
+AnimationsAtOnceLimit=64
 
 ;Set to 1 to remove the limits that stop the player rolling critical successes/misses in the first few days of game time
 RemoveCriticalTimelimits=0
 
-;Change the colour of the font used on the main menu for the Fallout/sfall version number and copyright text
+;Change the colour of the font used on the main menu for the Fallout/sfall version string and copyright text
 ;It's the last byte ('3C' by default) that picks the colour used. The first byte supplies additional flags for this option
+;1 - change the colour for the version string only
+;2 - underline text for the version string
+;4 - use monospace font for the version string
 ;MainMenuFontColour=0x00003C
 ;Change the colour of the font used on the main menu for the button text
 ;MainMenuBigFontColour=0x3C
@@ -581,15 +584,12 @@ SuperStimExploitFix=0
 InventoryApCost=4
 QuickPocketsApCostReduction=2
 
-;Set to 1 to enable the balanced bullet distribution formula for burst attacks
-ComputeSprayMod=0
-
-;These options modify the bullet distribution of burst attacks if ComputeSprayMod is 1
-;All the bullets are divided into three groups: central, left and right
-;These three groups will then travel along three parallel tracks, trying to hit targets on the way
-;CenterMult/Div set the ratio of how many bullets go to the central group, and remaining bullets are divided equally to left and right sides
-;TargetMult/Div set the ratio of how many bullets in the central group will attack the primary target directly
-;Multipliers are capped at divisor values
+;These options modify the bullet distribution of burst attacks
+;All the bullets are divided into three groups: center, left, and right
+;These groups will then travel along three parallel tracks, trying to hit targets on the way
+;CenterMult/Div set the ratio of how many bullets go to the center group, and the remaining are divided equally to the left and right sides
+;TargetMult/Div set the ratio of how many bullets in the center group will attack the primary target directly
+;Multiplier values are capped at divisor values
 ComputeSpray_CenterMult=1
 ComputeSpray_CenterDiv=3
 ComputeSpray_TargetMult=1
@@ -624,7 +624,7 @@ PipboyTimeAnimDelay=50
 
 ;Allows you to directly control other critters in combat
 ;Set to 0 to disable
-;Set to 1 to control all critters in combat
+;Set to 1 to control all critters in combat (allowed only in sfall debugging mode)
 ;Set to 2 to control all party members
 ControlCombat=0
 ;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
@@ -742,10 +742,6 @@ CreateObjectSidFix=0
 ;Note that enabling this option will cause problems for existing grave scripts
 GraveContainersFix=0
 
-;Set to 1 to fix the issue with the division operator treating negative integers as unsigned
-;Note: To perform the unsigned integer division, use the new 'div' operator
-DivisionOperatorFix=1
-
 ;Set to 1 to fix the priority score calculation for choosing the best weapon for NPCs
 ;Note that enabling this option can affect the weapon of choice for some NPCs
 AIBestWeaponFix=1
@@ -805,7 +801,7 @@ DisableSpecialAreas=0
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Debugging]
 ;Extra sfall configuration settings that can be used by modders
-;This section is not effected by the 'UseCommandLine' option. It will always be read from the main ini
+;This section is not affected by the 'UseCommandLine' option. It will always be read from the main ddraw.ini file
 
 ;Set to 1 to enable sfall debugging mode
 Enable=0
@@ -852,6 +848,9 @@ MapGridToggleKey=0
 ;Has pretty nasty side effects when saving/reloading, so don't use for regular gameplay
 DontDeleteProtos=0
 
+;Set to 1 to force sfall to inject all hooks code into the game, even if corresponding hook scripts don't exist
+InjectAllGameHooks=0
+
 ;Set to 1 to force sfall to search for global/hook scripts every time the game loads rather than only the first time
 AlwaysFindScripts=0
 

artifacts/example_mods/AmmoMod/gl_ammomod.ssl

@@ -1,14 +1,14 @@
 /*
 
-Ammo INI Loader mod for Fallout 2 by NovaRain
----------------------------------------------
+Ammo INI Loader mod v1.1 for Fallout 2 by NovaRain
+--------------------------------------------------
 
 - modifies ammo protos with data from an INI file:
   * AmmoGlovz.ini if DamageFormula=1 or 2 in ddraw.ini
   * AmmoYAAM.ini if DamageFormula=5 in ddraw.ini
   * AmmoMod.ini if not using any bulit-in damage formula
 
-Requires sfall 3.5 or higher
+Requires sfall 4.0/3.8.29 or higher
 
 */
 
@@ -23,7 +23,7 @@ variable ammoData;
 variable enabled;
 
 procedure start begin
-   variable i := 1, ammo, ammoPid, dmgMod;
+   variable i := 1, ammo, ammoSection, dmgMod;
    if game_loaded then begin
       enabled := get_ini_setting("ddraw.ini|Misc|DamageFormula");
       if (enabled == 1 or enabled == 2) then
@@ -37,19 +37,19 @@ procedure start begin
       if (enabled <= 0) then return;
 
       ammoData := create_array_map;
-      ammoPid := enabled; // pid from the first section
-      while (ammoPid > 0) do begin
+      ammoSection := get_ini_section(ammoIni, "" + i);
+      while (ammoSection.pid > 0) do begin
          ammo := create_array_map; // create permanent arrays
-         ammo.ac_adjust := get_ini_setting(ammoIni + "|" + i + "|ac_adjust");
-         ammo.dr_adjust := get_ini_setting(ammoIni + "|" + i + "|dr_adjust");
+         ammo.ac_adjust := atoi(ammoSection.ac_adjust);
+         ammo.dr_adjust := atoi(ammoSection.dr_adjust);
          // dam_mult and dam_div must be positive integers
-         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_mult");
+         dmgMod := atoi(ammoSection.dam_mult);
          ammo.dam_mult := dmgMod if (dmgMod > 0) else 1;
-         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_div");
+         dmgMod := atoi(ammoSection.dam_div);
          ammo.dam_div := dmgMod if (dmgMod > 0) else 1;
-         ammoData[ammoPid] := ammo;
+         ammoData[atoi(ammoSection.pid)] := ammo;
          i++;
-         ammoPid := get_ini_setting(ammoIni + "|" + i + "|pid");
+         ammoSection := get_ini_section(ammoIni, "" + i);
       end
       call map_enter_p_proc;
       debug_msg("Ammo INI Loader mod: " + ammoIni + " - set " + (i - 1) + " ammo protos.");

artifacts/example_mods/AmmoMod/readme.txt

@@ -1,5 +1,5 @@
-Ammo INI Loader mod for Fallout 2 by NovaRain
----------------------------------------------
+Ammo INI Loader mod v1.1 for Fallout 2 by NovaRain
+--------------------------------------------------
 
 - modifies ammo protos with data from an INI file:
   * AmmoGlovz.ini if DamageFormula=1 or 2 in ddraw.ini
@@ -7,6 +7,6 @@ Ammo INI Loader mod for Fallout 2 by NovaRain
   * AmmoMod.ini if not using any bulit-in damage formula
 
 
-Requires sfall 3.5 or higher.
+Requires sfall 4.0/3.8.29 or higher.
 
 To use, copy gl_ammomod.int to your scripts folder, and copy the INI files to the same directory as sfall.

artifacts/example_mods/ItemHighlight_Lite/sfall-mods.ini

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

artifacts/example_mods/NPCArmor_Lite/npcarmor.ini

@@ -72,7 +72,7 @@ Power=16777349
 [5]
 PID=16777720
 WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-Default=16777353
+Default=16777346
 Jacket=16777346
 Leather=16777347
 Metal=16777348

artifacts/scripting/README.md

@@ -21,5 +21,5 @@ This folder contains documentation about sfall scripting extensions.
     hookscripts.md - detailed manual for using hook scripts to modify engine behavior
     arrays.md - manual for sfall arrays
 
-If you are/will be using sfall Script Editor, don't forget to check out new compiler documentation in **.\compiler\sslc_readme.txt**.
-There are numerious new syntax features and extensions to SSL (Star-Trek Scripting language).
+If you are/will be using sfall Script Editor, don't forget to check out new compiler documentation in **.\compiler\sslc_readme.md**.
+There are numerious new syntax features and extensions to SSL (Star-Trek Scripting Language).

artifacts/scripting/README.txt

@@ -16,10 +16,10 @@ This folder contains documentation about sfall scripting extensions.
         lib.strings.h - search in strings, join, repeat, etc.
         lib.misc.h - misc stuff
 
-    sfall function notes.txt - incomplete reference for new opcodes
+    sfall function notes.html - incomplete reference for new opcodes
     sfall opcode list.txt - list of all sfall opcodes (w/o descriptions)
-    hookscripts.txt - detailed manual for using hook scripts to modify engine behavior
-    arrays.txt - manual for sfall arrays
+    hookscripts.html - detailed manual for using hook scripts to modify engine behavior
+    arrays.html - manual for sfall arrays
 
-If you are/will be using sfall Script Editor, don't forget to check out new compiler documentation in .\compiler\sslc_readme.txt.
-There are numerious new syntax features and extensions to SSL (Star-Trek Scripting language).
+If you are/will be using sfall Script Editor, don't forget to check out new compiler documentation in .\compiler\sslc_readme.html.
+There are numerious new syntax features and extensions to SSL (Star-Trek Scripting Language).

artifacts/scripting/arrays.md

@@ -201,7 +201,7 @@ _*mixed means any type_
 
 #### `mixed scan_array(int arrayID, mixed value)`
 - searches for a first occurence of given value inside given array
-- if value is found, returns it's index (for lists) or key (for maps)
+- if value is found, returns its index (for lists) or key (for maps)
 - if value is not found, returns -1 (be careful, as -1 can be a valid key for a map)
 
 #### `int len_array(int arrayID)`

artifacts/scripting/compiler/optimization.txt

@@ -1,99 +0,0 @@
-The executation speed of scripts is not typically important in an unmodded game, given the difference in performance between a modern computer and what Fallout was designed for. When you start adding mods to the mix there's the potential for problems again, since sfall's global script system means that you can have a large amount of scripts being run every single frame.
-
-======================
-=== sslc -O option ===
-======================
-
-The sfall build of sslc supports a -O command line option to perform an optimization pass over the generated code. This isn't a magic make-my-code-go-faster bullet; most of what it does is very limited in scope. It's primary purpose was to strip out the procedures and variables which get automatically pulled into every script that includes define.h, whether you use them or not, and to do something about the additional variables that get created by foreach loops.
-
-There are several levels of optimization available:
--O1 - Basic, only removes unreferenced globals variables and procedures, code itself remains untouched.
--O2 - Full, most code optimizations are on, but only those that were tested on complex scripts.
--O3 - Experimental, provides most efficiency, but tend to break some complex code due to bugs.
-
-The following optimizations are performed:
-
-> constant expression folding: if an expression depends only on values which are known at compile time, then the expression is replaced by its result.
-
-a:=2+2; -> a:=4;
-
-> constant variable initialization: All variables are initialised to some value, ('0', if you don't specify anything else,) so sslc attempts to make use of that fact to remove the first assignment to a variable if the first assignment is a constant expression.
-
-variable a;  -> variable a:=4;
-a:=4;        -> 
-
-> constant propagation: checks for values assigned to variables which can be computed at compile time, and replaces relevent references to the symbol by the constant. The original store is not removed by this optimization. Global variables are considered for this optimization only if they are not marked import or export, and are not assigned to anywhere in the script.
-
-a:=4     -> a:=4
-foo(a);  -> foo(4);
-
-> dead code removal: Checks for and removes code which cannot be reached, either because it is hidden behind a return or because the argument to an if statement can be computed at compile time.
-
-if 1 then begin        -> display_msg("foo");
-  display_msg("foo");  ->
-end else begin         ->
-  display_msg("bar");  ->
-end                    ->
-
-> unreferenced variable elimination: Checks for variables which are never referenced, and removes them. Also applies to global variables, as long as they are not marked for export.
-
-variable i, j, k;  -> variable i;
-i:=1;              -> i:=1;
-return;            -> return;
-
-> unreferenced procedure elimination: Checks for any procedures which are never called, and removes them.
-
-procedure foo begin return "foo"; end   -> procedure foo begin return "foo"; end
-procedure bar begin return "bar"; end   -> procedure start begin
-procedure start begin                   ->   display_msg(foo);
-  display_msg(foo);                     -> end
-end                                     ->
-
-> dead store removal: Removes variable assignments if the result of the variable is unused, and if the expression used to compute the value of the variable is provably free of side effects. (See 'pure' keyword)
-
-a:="moo";         -> a:="foo";
-a:="foo";         -> display_msg(a);
-display_msg(a);   ->
-a:="bar";         ->
-
-> store combination: Where there are two stores in a row to the same variable, the two expressions are combined.
-
-var1 := var2; -> var1 := var2 + var3;
-var1 += var3; -> 
-
-> variable combination: Where usage regions of variables do not overlap, combine the variables to provide additional candidates for unreferenced variable elimination. Very useful for scripts containing multiple foreach loops, which generate 2 or 3 hidden variables each.
-
-a:="foo";         -> a:="foo";
-display_msg(a);   -> display_msg(a);
-b:="bar";         -> a:="bar";
-display_msg(b);   -> display_msg(a);
-
-> namelist compression: Fallout stores the names of all file scope variables and procedures in a namelist which is saved into the .int. Any of these that are unreferenced can be removed, and the names of global variables can be modified to make them shorter.
-
-=============================
-=== writing your own code ===
-=============================
-
-Don't have global scripts running any more often that you need them to. Not everything needs to be run every single frame.
-
-Never concat constant strings with the '+' operator, as it forces the operation to be done at runtime. The compiler can cope with constant strings being placed next to each other without the need for a +, which results in far more efficient code as the combination is done at lex time.
-
-#define GLOB_PREFIX "ts__"                    -> #define GLOB_PREFIX "ts__"
-
-procedure start begin                         -> procedure start begin
-  set_sfall_global(GLOB_PREFIX + "foo1", 0);  ->   set_sfall_global(GLOB_PREFIX "foo1", 0);
-end                                           -> end
-
-
-Avoid function calls in while loops. function calls are expensive in comparison to variable lookups, so it's more efficient to move the function call out of the loop and store the result in a variable
-
-while i < len_array(array) do begin           -> tmp:= len_array(array);
-  ...                                         -> while i < tmp do begin
-end                                           ->   ...
-                                              -> end
-
-Mark functions with pure or inline where relevent.
-
-'pure' is a hint to the optimizer that a procedure has no side effects. (i.e. there's no way to tell that it's been called aside from its return value.) Pure procedures cannot modify global variables, or call any other procedure that isn't itself pure. Functions marked with pure can only be used in expressions (i.e. you cannot use the 'call <procedure>' syntax to call them.) If there are non-pure terms in an expression, it prevents that expression being considered for dead store removal. Where no such optimizations can be performed, or if optimization is disabled, marking a procedure with pure will have no effect on the compiled code.
-
-'inline' is an instruction to the compiler to replace calls to the marked procedure with a copy of the procedures code instead of having a seperate call. inlined procedures cannot use the 'return' command, cannot be predefined, and cannot be used as part of an expression. inlining if a procedure is only going to be called once is always a win, but if there are multiple calls to a procedure you will end up bloating the size of the generated code.

artifacts/scripting/compiler/sslc_readme.md

@@ -11,7 +11,7 @@ When compiling global or hook scripts for sfall 3.4 or below, you _must_ include
 
 This version of compiler was designed primarily for new sfall functions, but it can safely (and is recommended) to be used with non-sfall scripts as well, as long as you don't use any of the arrays syntax and any sfall script functions.
 
-The original unmodified sslc source is over here: [http://www.teamx.ru/site_arc/utils/index.html](http://www.teamx.ru/site_arc/utils/index.html)
+The original unmodified sslc source is over here: [https://teamx.ru/site_arc/utils/index.html](https://teamx.ru/site_arc/utils/index.html)
 
 ### Command line options
 
@@ -79,7 +79,7 @@ Syntax which requires sfall for compiled scripts to be interpreted is marked by
 - Conditional expressions (Python-inspired), also known as ternary operator:
   - new:
     ```
-    X := value1 if condition else value2
+    X := value1 if (condition) else value2
     ```
   - old:
     ```
@@ -121,7 +121,7 @@ Syntax which requires sfall for compiled scripts to be interpreted is marked by
     ```
   __NOTE:__ If your expression starts with a constant (eg. `2 + 2`), enclose it in parentheses, otherwise compiler will be confused and give you errors.
 
-- Hexadecimal numerical constants: Simply prefix a number with `0x` to create a hexadecimal. The numbers 0 to 9 and A-F are allowed in the number. The number may not have a decimal point.
+- Hexadecimal numerical constants: Simply prefix a number with `0x` to create a hexadecimal. The numbers 0 to 9 and letters A to F are allowed in the number. The number may not have a decimal point.
   - new:
     ```
     a := 0x1000;
@@ -234,12 +234,12 @@ Syntax which requires sfall for compiled scripts to be interpreted is marked by
   - old:
     ```
     callbackVar := "Node000";
-    callbackVar();
+    call callbackVar;
     ```
   - new:
     ```
     callbackVar := @Node000;
-    callbackVar();
+    call callbackVar;
     ```
   Not many people know that since vanilla Fallout you can call procedures by "calling a variable" containing it's name as a string value. There was a couple of problems using this:
   - optimizer wasn't aware that you are referencing a procedure, and could remove it, if you don't call it explicitly (can be solved by adding making procedure `critical`)

artifacts/scripting/compiler/sslc_readme.txt

@@ -1,411 +0,0 @@
-This is a modified copy of sslc, that has a few bugfixes from the original, that will recognise and compile the additional script functions provided by sfall, that can also understand some additional syntax, and that has an integrated preprocessor and optimizer.
-
-Unlike the original script compiler, this has not been compiled as a dos program. When using this in place of the original compile.exe but still using p.bat, you need to either get rid of the dos4gw.exe reference from p.bat or replace the original dos4gw.exe with the one in this archive.
-
-If you use fallout script editor, you can extract compile.exe and dos4gw.exe to its \binary folder, or extract them somewhere else and change your preferences in FSE to point there. FSE doesn't seem to be able to tell when errors occur when using this compiler though, so I'd recommend either using sfall's script editor instead or compiling by hand if possible.
-
-When compiling global or hook scripts for sfall 3.4 or below, you _must_ include the line 'procedure start;' before any #includes that define procedures to avoid a few weird problems. (this is no longer required starting from 3.5)
-
-This version of compiler was designed primarily for new sfall functions, but it can safely (and is recommended) to be used with non-sfall scripts as well, as long as you don't use any of the arrays syntax and any sfall script functions.
-
-The original unmodified sslc source is over here:
-http://www.teamx.ru/eng/files/srcs/index.shtml
-
-============================
-=== command line options ===
-============================
-
--q  don't wait for input on error
--n  no warnings
--b  backward compatibility mode
--l  no logo
--p  preprocess source
--O  optimize code (full, see optimization.txt)
--O<N> set specific level of optimization (0 - off, 1 - basic, 2 - full, 3 - experimental)
--d  print debug messages
--D  output an abstract syntax tree of the program
--o  set output path (follows the input file name)
--s  enable short-circuit evaluation for all AND, OR operators
--m<macro[=val]> define a macro named "macro" for conditional compilation
--I<path> specify an additional directory to search for include files
-
-The original command line option -w to turn on warnings no longer has an effect, since warnings are now on by default
-
-===================================
-=== Additional supported syntax ===
-===================================
-
-Syntax which requires sfall for compiled scripts to be interpreted, is marked by asterix (*).
-
-> Optional arguments in user-defined procedures. You can only use constants for default values. It basically puts those constants in place of omitted arguments.
-
-new:
-    procedure test(variable x, variable y := 0, variable z := -1) begin
-    ...
-    end
-    ...
-    call test("value");
-
-old:
-    procedure test(variable x, variable y, variable z) begin
-    ...
-    end
-    ...
-    call test("value", 0, -1);
-
-
-> New logical operators "AndAlso", "OrElse" for short-circuit evaluation of logical expressions.
-Using these operators allow the right part of logical expressions not to be evaluated (executed, computed) if the result is already known. This can improve the performance of running scripts.
-
-Example:
-    if (obj andAlso obj_pid(obj) == PID_STIMPAK) then ...
-
-if obj is null, the second condition will not be checked and your script won't fail with "obj is null" error in debug.log
-
-This also has an effect that a value of last computed argument is returned as a result of whole expressions, instead of always 0 (false) or 1 (true):
-    obj := false;
-    display_msg(obj orElse "something");  // will print "something"
-
-You can also use the -s option to enable short-circuit evaluation for all the AND, OR operators in the script.
-NOTE: Be aware that it may break some old scripts because operators behavior is changed slightly.
-
-
-> Conditional expressions (Python-inspired), also known as ternary operator:
-
-new:
-    X := value1 if condition else value2
-
-old:
-    if (condition) then
-        X := value1;
-    else
-        X := value2;
-
-
-> To assign values, you can use the alternative assignment operator from C/Java instead of Pascal syntax.
-
-new:
-  x = 5;
-old:
-  x := 5;
-
-
-> Multiple variable declaration: Multiple variables can be declared on one line, seperated by commas. This is an alterative to the ugly begin/end block, or the bulky single variable per line style.
-
-new:
-  variable a, b, c;
-old:
-  variable begin a; b; c; end
-
-
-> Variable initialization with expressions: You can now initialize local variables with complex expressions instead of constants.
-
-new:
-  variable tile := tile_num(dude_obj);
-
-old:
-  variable tile;
-  tile := tile_num(dude_obj);
-
-NOTE: if your expression starts with a constant (eg. 2+2), enclose it in parentheses, otherwise compiler will be confused and give you errors.
-
-
-> Hexadecimal numerical constants: Simply prefix a number with 0x to create a hexadecimal. The numbers 0 to 9 and a-f are allowed in the number. The number may not have a decimal point.
-
-new:
-  a := 0x1000;
-old:
-  a := 4096;
-
-
-> increment/decrement operators: ++ and -- can be used as shorthand for +=1 and -=1 respectively. They are mearly a syntactic shorthand to improve readability, and so their use is only allowed where +=1 would normally be allowed.
-
-new:
-  a++;
-old:
-  a += 1;
-
-
-> "break" & "continue" statements: they work just like in most high-level languages. "break" jumps out of the loop. "continue" jumps right to the beginning of the next iteration (see "for" and "foreach" sections for additional details).
-
-new:
-  while (i < N) begin
-    // ...
-    if (/* some condition */) then break;
-    // ...
-  end
-
-old:
-  while (i < N and not(breakFlag)) begin
-    // ...
-    if (/* condition */) then breakFlag := true;
-    // ...
-  end
-
-new:
-  for (i := 0; i < N; i++) begin
-    // ...
-    if (/* condition */) then begin
-      // action
-      continue;
-    end
-    // else actions
-  end
-
-old:
-  for (i := 0; i < N; i++) begin
-    // ...
-    if (/* condition */) then begin
-      // action
-    end else begin
-      // else actions
-    end
-  end
-
-
-> "for" loops: Another piece of syntactic shorthand, to shorten while loops in many cases. Parentheses around the loop statements are recommended but not required (when not using parentheses, a semicolon is required after the 3rd loop statement).
-new:
-  for (i := 0; i < 5; i++) begin
-    display_msg("i = "+i);
-  end
-old
-  i := 0;
-  while (i < 5) do begin
-    display_msg("i = "+i);
-    i++;
-  end
-
-NOTE: "continue" statement in a "for" loop will recognize increment statement (third statement in parentheses) and will execute it before jumping back to the beginning of loop. This way you will not get an endless loop.
-
-
-> switch statements: A shorthand way of writing big 'if then else if...' blocks
-new:
-  switch get_attack_type begin
-  case ATKTYPE_PUNCH: display_msg("punch");
-  case ATKTYPE_KICK: display_msg("kick");
-  default: display_msg("something else");
-  end
-old:
-  variable tmp;
-  tmp := get_attack_type;
-  if tmp == ATKTYPE_PUNCH then begin
-    display_msg("punch");
-  end else if tmp == ATKTYPE_KICK then begin
-    display_msg("kick");
-  end else begin
-    display_msg("something else");
-  end
-
-
-> **Does not work currently** empty statements in blocks are allowed: This is just a convenience to save scripters a bit of memory. Some of the macros in the fallout headers include their own semicolons while others do not. With the original compiler you had to remember which was which, and if you got it wrong the script would not compile. Now it's always safe to include your own semicolon, even if the macro already had its own. For example, this would not compile with the original sslc, but will with the sfall edition:
-
-#define my_macro diplay_msg("foo");
-
-procedure start begin
-  my_macro;
-end
-
-
-> Procedure stringify operator "@": designed to make callback-procedures a better option and allow for basic functional programming. Basically it replaces procedure names preceeded by "@" by a string constant.
-Not many people know that since vanilla Fallout you can call procedures by "calling a variable" containing it's name as a string value. There was a couple of problems using this:
-- optimizer wasn't aware that you are referencing a procedure, and could remove it, if you don't call it explicitly (can be solved by adding making procedure "critical")
-- you couldn't see all references of a procedure from a Script Editor
-- it was completely not obvious that you could do such a thing, it was a confusing syntax
-
-old:
-    callbackVar := "Node000";
-    callbackVar();
-
-new:
-    callbackVar := @Node000;
-    callbackVar();
-
-
-> *arrays: In vanilla fallout arrays had to be constructed by reserving a block of global/map variables. Since sfall 2.7, specific array targeted functions have been available, but they are fairly messy and long winded to use. The compiler provides additional syntactic shorthand for accessing and setting array variables, as well as for array creation. When declaring an array variable, put a constant integer in []'s to give the number of elements in the array. (before sfall 3.4 you had to specify size in bytes for array elements, now it's not required, see "arrays.txt" for more information)
-
-new:
-  procedure bingle begin
-    variable a[2];
-    a[0] := 5;
-    a[a[0] - 4] := a[0] + 4;
-    display_msg("a[0]=" + a[0] + ", a[1]=" + a[1]);
-  end
-old:
-  procedure bingle begin
-    variable a;
-    a := temp_array(2, 4);
-    set_array(a, 0, 5);
-    set_array(a, get_array(a, 0) - 4, get_array(a, 0) + 4);
-    display_msg("a[0]=" + get_array(a, 0) + ", a[1]=" + get_array(a, 1));
-  end
-
-
-> *array expressions: sometimes you need to construct an array of elements and you will probably want to do it in just one expression. This is now possible:
-new:
-  list := ["A", "B", "C", "D"];
-
-old:
-  list := temp_array(4, 2);
-  list[0] := "A";
-  list[1] := "B";
-  list[2] := "C";
-  list[3] := "D";
-
-
-Syntax specific for associative arrays is also available. (see "arrays.txt" for full introduction to this type of arrays).
-
-> *map array expressions:
-
-  map := {5: "five", 10: "ten", 15: "fifteen", 20: "twelve"};
-
-
-> * "dot" syntax to access elements of associative arrays. "dot" syntax allows to work with arrays like objects:
-  trap.radius := 3;
-  trap.tile := tile_num(dude_obj);
-
-you can chain dot and bracket syntax to access elements of multi-dimensional arrays:
-  collectionList[5].objectList[5].name += " foo";
-
-NOTE: when using incremental operators like +=, *=, ++, -- compiler will use additional temp variable to get an array at penultimate level in order to avoid making the same chain of "get_array" calls twice.
-
-
-> * "foreach" loops: A shorthand method of looping over all elements in an array. Syntax is 'foreach (<symbol> in <expression>) '
-new:
-  procedure bingle begin
-    variable critter;
-    foreach (critter in list_as_array(LIST_CRITTERS)) begin
-      display_msg(""+critter);
-    end
-  end
-old:
-  procedure bingle begin
-    variable begin critter; array; len; count; end
-    array := list_as_array(LIST_CRITTERS);
-    len := len_array(array);
-    count := 0;
-    while count < len do begin
-      critter := array[count];
-      display_msg("" + critter);
-    end
-  end
-
-If you want an index array element (or key for "maps") at each iteration, use syntax: 'foreach (<symbol>: <symbol> in <expression>) '
-  foreach (pid: price in itemPriceMap) begin
-    if (itemPid == pid) then
-      itemPrice := price;
-  end
-
-If you want to add additional condition for continuing the loop, use syntax: 'foreach (<symbol> in <expression> while <expression>) '. In this case loop will iterate over elements of an array until last element or until "while" expression is true (whatever comes first).
-
-NOTE: just like "for" loop, "continue" statement will respect increments of a hidden counter variable, so you can safely use it inside "foreach".
-
-
-
-
-====================
-=== int2ssl note ===
-====================
-
-int2ssl by Anchorite (TeamX) is included in sfall modderspack package. It was updated to support all additional opcodes of sfall, along with some syntax features. You can use it to decompile any sfall or non-sfall script.
-
-=============
-=== Fixes ===
-=============
-
-playmoviealpharect was using the token for playmoviealpha, breaking both functions in the process.
-
-addbuttonflag had an entry in the token table, and could be parsed, but was missing an entry in the emit list. This resulted in the compiler accepting it as a valid function, but not outputting any code for it into the compiled script.
-
-The function tokenize was missing an entry in the token table, and so would not be recognised by the compiler.
-
-fixed the check for the 'call "foo"' syntax so that non-string constants will no longer be accepted.
-
-==============================
-=== Backward compatibility ===
-==============================
-
-There are several changes in this version of sslc which may result in problems for previously working scripts. A new command line option '-b' is available, which will turn off all new fixes and features which have the possibility of causing a previously compiling script to change its behaviour. (And only those features; anything which would not compile under the old sslc is not affected.) This includes the following:
-
-- Since 'for', 'foreach', 'break', 'continue', 'in' and 'tokenize' are now hardcoded names, existing scripts that use any of them as a variable or procedure name will no longer compile.
-
-- Missing a semicolon after a variable declaration is now a hard error. (Originally sslc would check for the semicolon, but would not complain if it was missing.)
-
-- The function addbuttonflag used to be recognised by the compiler, but would not emit any code into the int file.
-
-- The function playmoviealpharect compiled as playmoviealpha
-
-
-=================
-=== Changelog ===
-=================
-
-> sfall 4.2.9
-- added support for additional universal opcodes sfall_func7 and sfall_func8
-- fixed a compilation error when the script has a UTF-8 BOM
-
-> sfall 4.2.7
-- added ability to declare local variables anywhere in the procedure body
-
-> sfall 4.2.3
-- fixed compiler giving "assignment operator expected" error when a variable-like macro is not being defined properly
-- added new logical operators "AndAlso", "OrElse" for short-circuit evaluation of logical expressions
-- added an alternative (C/Java-style) assignment operator "="
-- added support for new "div" operator (unsigned integer division)
-
-> sfall 4.2.2
-- added support for new opcode "reg_anim_callback"
-
-> sfall 4.2.1
-- the basic optimization is now enabled by default when not specifying any optimization options
-- added -m<macro[=val]> option to define a macro named "macro" for conditional compilation
-- added -I<path> option to specify an additional directory to search for include files
-- unreferenced "critical" procedures and procedures with the names "Node998" and "Node999" are now removed by the optimizer
-
-> sfall 4.2
-- now it is possible to run preprocess or optimization passes in backward compatibility mode
-- added support for new opcode "register_hook_proc_spec"
-
-> sfall 4.0:
-- enabled code for "ceil" math function
-- fixed missing argument for "how_much" function
-- added "desc_p_proc" (from Fallout 1) to protected procedures that should not be removed by the optimizer
-- fixed compiler giving "division by zero" error when using zero as the second factor in multiplication
-
-> sfall 3.8
-- added support for new universal opcodes sfall_funcX
-
-> sfall 3.6:
-- added Python-style ternary operator (conditional expression)
-- added -s short-circuit evalution option for AND, OR expressions
-- int2ssl will detect and decompile conditional expressions and short-circuit logical operators
-- added -F option to include full file paths in "#line" directives after preprocessing
-- added -D option to write abstract syntax tree into .txt file
-- fixed compiler crash when number of arguments in procedure declaration does not match definition
-- fixed incorrect constant folding of "bwnot" operator
-- fixed more invalid results in constant folding
-- implemented optional arguments for user-defined procedures
-- implemented stringify procedure names using @ operator, which is helpful to pass procedures around to call them from variables (it will properly handle references)
-- logic for procedures passed as arguments to script functions was moved from code generation to parsing stage
-- now it is possible to call user-defined procedures inside argument list of script functions, without compiler attempting to treat them as procedure references and probably fail (procedures will still be passed, but only to appropriate script functions at appropriate argument positions)
-- int2ssl will now place empty parantheses after a call to user-defined procedure - this will distinct calls from passing procedures to some script functions (like giq_option)
-- fixed inline procedure "calls" not working when optimization is enabled
-- added column numbers to error/warning output
-- added code to simplify adding sfall opcodes into compiler (need to add code in 3 places, instead of 7 places for each opcode)
-- fixed bug when initializing variable with expression starting from a symbol
-- added division by zero constant check
-
-> sfall 3.5:
-- completed namespace compression optimization with respect to imported/exported variables
-- changed 'for' and 'foreach' syntax to allow parentheses which are easier to read IMHO
-- heavy code refactoring - split "parse.c" into several files, replaced all dirty workaround code in "lex()" (some syntax features) with parser-level equivalents
-- added syntax to reference elements in multi-dimensional arrays (unlimited sequence of brackets [] and dots . )
-- added fully featured "break" and "continue" statements for loops
-- moved some optimizations (namely constant propagation and variable reuse) to "experimental" because they were breaking my scripts
-- added ability to initialize variables with expressions
-
-> sfall 3.4:
-- added "foreach .. while .." syntax
-- added array expressions for lists and maps
-- added "foreach (key: value in ...)" syntax for convenience
-- fixed crash bug in "for" loop parsing function
-- added ability to access array elements with string keys using OOP-like dot (".") syntax

artifacts/scripting/headers/define_extra.h

@@ -121,9 +121,12 @@
 #define MSGBOX_YESNO               (0x10) // use YES/NO buttons instead of DONE
 #define MSGBOX_CLEAN               (0x20) // no buttons
 
-// remove inven obj defines for the 4th argument to HOOK_REMOVEINVOBJ
+// Some possible defines for the 4th argument to HOOK_REMOVEINVOBJ
+#define RMOBJ_DROP                4831349  // If the object is dropped manually by the player from the inventory screen
+#define RMOBJ_TRADE               4683293  // If the object is offered up as a trade
+#define RMOBJ_DROPMULTI           4571599  // When dropping a part of a stack (RMOBJ_DROP occurs first)
 #define RMOBJ_CONSUME_DRUG        4666772  // (inven_action_cursor_)
-#define RMOBJ_CONTAINER           4683293  // same as RMOBJ_TRADE (item_move_func_)
+//#define RMOBJ_CONTAINER         4683293  // same as RMOBJ_TRADE (item_move_func_)
 #define RMOBJ_USE_OBJ             4666865  // (inven_action_cursor_)
 #define RMOBJ_EQUIP_ARMOR         4658121  // (inven_pickup_)
 #define RMOBJ_EQUIP_WEAPON        4658675  // (switch_hand_)
@@ -134,16 +137,20 @@
 //#define RMOBJ_DROP_DYNAMITE     4666865  // same as RMOBJ_USE_OBJ
 #define RMOBJ_ITEM_DESTROYED      4543215  // (op_destroy_object_)
 #define RMOBJ_ITEM_REMOVED        4548572  // (op_rm_obj_from_inven_)
-#define RMOBJ_ARMOR_EQUIPED       4651961  // (setup_inventory_)
-#define RMOBJ_LEFT_HAND_EQUIPED   4651899  // (setup_inventory_)
-#define RMOBJ_RIGHT_HAND_EQUIPED  4651934  // (setup_inventory_)
+#define RMOBJ_ARMOR_EQUIPED       4651961  // removing armor from the player's slot when entering INVENTORY/LOOT/BARTER/USE inventory
+#define RMOBJ_LEFT_HAND_EQUIPED   4651899  // removing item from the player's left slot when entering INVENTORY/LOOT/BARTER/USE inventory
+#define RMOBJ_RIGHT_HAND_EQUIPED  4651934  // removing item from the player's right slot when entering INVENTORY/LOOT/BARTER/USE inventory
 #define RMOBJ_RM_MULT_OBJS        4563866  // (op_rm_mult_objs_from_inven_)
 #define RMOBJ_REPLACE_WEAPON      4658526  // (switch_hand_)
 #define RMOBJ_THROW               4266040  // (action_ranged_)
-#define RMOBJ_SUB_CONTAINER       4683191  // search and remove the item from nested containers in the inventory (item_remove_mult_)
-#define RMOBJ_AI_USE_DRUG_ON      4359920  // remove before AI uses the drug in combat (ai_check_drugs_)
+#define RMOBJ_SUB_CONTAINER       4683191  // search and remove the item from nested containers in the inventory
+#define RMOBJ_AI_USE_DRUG_ON      4359920  // removing before AI uses the drug in combat
 //#define RMOBJ_AI_USE_DRUG_ON_1  4359639  // same as RMOBJ_AI_USE_DRUG_ON (obsolete, use only for sfall before 4.3.1/3.8.31)
 //#define RMOBJ_AI_USE_DRUG_ON_2  4360176  // same as RMOBJ_AI_USE_DRUG_ON (obsolete, use only for sfall before 4.3.1/3.8.31)
+#define RMOBJ_BARTER_ARMOR        4675656  // removing armor from NPC's slot before entering the barter screen
+#define RMOBJ_BARTER_WEAPON       4675722  // removing weapon from NPC's slot before entering the barter screen
+#define RMOBJ_INVEN_DROP_CAPS     4667295  // if money/caps are dropped manually by the player from the inventory screen
+#define RMOBJ_DROP_INTO_CONTAINER 4678833  // when dropping items into a container item (bag/backpack)
 
 // common prototype offsets for get/set_proto_data
 #define PROTO_PID             (1)

artifacts/scripting/headers/sfall.h

@@ -104,11 +104,6 @@
 #define ATKTYPE_HOOKKICK       (18)
 #define ATKTYPE_PIERCINGKICK   (19)
 
-// Some possible values for the 4th argument to hs_removeinvobj
-#define RMOBJ_DROP             (0x49B875)  // If the object is dropped manually by the player from the inventory screen
-#define RMOBJ_TRADE            (0x47761D)  // If the object is offered up as a trade
-#define RMOBJ_DROPMULTI        (0x45C1CF)  // When dropping a part of a stack (RMOBJ_DROP occurs first)
-
 // Return values for "typeof"
 #define VALTYPE_NONE  (0) // not used yet
 #define VALTYPE_INT   (1)
@@ -191,6 +186,7 @@
 #define GAME_MSG_STAT       (17)
 #define GAME_MSG_TRAIT      (18)
 #define GAME_MSG_WORLDMAP   (19)
+#define GAME_MSG_EDITOR     (20)
 #define GAME_MSG_PRO_ITEM   (0x1000)
 #define GAME_MSG_PRO_CRIT   (0x1001)
 #define GAME_MSG_PRO_SCEN   (0x1002)
@@ -231,6 +227,7 @@
 #define mstr_stat(x)        (message_str_game(GAME_MSG_STAT, x))
 #define mstr_trait(x)       (message_str_game(GAME_MSG_TRAIT, x))
 #define mstr_worldmap(x)    (message_str_game(GAME_MSG_WORLDMAP, x))
+#define mstr_character(x)   (message_str_game(GAME_MSG_EDITOR, x))
 
 
 #define BLOCKING_TYPE_BLOCK     (0)
@@ -283,6 +280,7 @@
 #define create_win(winName, x, y, w, h)                         sfall_func5("create_win", winName, x, y, w, h)
 #define create_win_flag(winName, x, y, w, h, flag)              sfall_func6("create_win", winName, x, y, w, h, flag)
 #define critter_inven_obj2(obj, type)                           sfall_func2("critter_inven_obj2", obj, type)
+#define dialog_message(text)                                    sfall_func1("dialog_message", text)
 #define dialog_obj                                              sfall_func0("dialog_obj")
 #define display_stats                                           sfall_func0("display_stats")
 #define draw_image(artFile, frame, x, y, noTrans)               sfall_func5("draw_image", artFile, frame, x, y, noTrans)
@@ -290,6 +288,7 @@
 #define exec_map_update_scripts                                 sfall_func0("exec_map_update_scripts")
 #define floor2(value)                                           sfall_func1("floor2", value)
 #define get_current_inven_size(obj)                             sfall_func1("get_current_inven_size", obj)
+#define get_current_terrain_name                                sfall_func0("get_terrain_name")
 #define get_cursor_mode                                         sfall_func0("get_cursor_mode")
 #define get_flags(obj)                                          sfall_func1("get_flags", obj)
 #define get_ini_section(file, sect)                             sfall_func2("get_ini_section", file, sect)
@@ -309,6 +308,7 @@
 #define get_npc_stat_max(stat)                                  sfall_func2("get_stat_max", stat, 1)
 #define get_npc_stat_min(stat)                                  sfall_func2("get_stat_min", stat, 1)
 #define get_sfall_arg_at(argNum)                                sfall_func1("get_sfall_arg_at", argNum)
+#define get_terrain_name(x, y)                                  sfall_func2("get_terrain_name", x, y)
 #define get_text_width(text)                                    sfall_func1("get_text_width", text)
 #define hide_win                                                sfall_func0("hide_window")
 #define hide_window(winName)                                    sfall_func1("hide_window", winName)