Included Define.h in FalloutEngine.h

* it removes the need to include Define.h separately across the code. (similar to Fallout2.h in 4.x code) Added StrNormalizePath() to Utils.cpp.
Minor edits to the built-in item highlighting function
2026-07-27 16:52:34 -07:00 · 2019-12-25 09:25:36 +08:00 · 2019-12-24 20:58:03 +08:00 · 2019-12-24 00:57:16 +08:00 · 2019-12-23 21:22:15 +08:00 · 2019-12-16 15:46:09 +08:00
595 changed files with 37617 additions and 82035 deletions
@@ -1 +0,0 @@
-*.ssl linguist-language=Pascal
@@ -1,12 +0,0 @@
-# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-
- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-   interval: "monthly"
-  # target-branch: "develop"
-  labels:
-  - "dependencies"
@@ -1,62 +0,0 @@
-name: Build
-
-on:
- push:
-  branches:
-  - 'master'
-  - 'develop'
-  - 'github-action'
-  paths:
-  - '.github/workflows/build.yml'
-  - 'action.yml'
-  - 'sfall/**'
- pull_request:
-  branches:
-  - 'master'
-  - 'develop'
-  paths:
-  - '.github/workflows/build.yml'
-  - 'action.yml'
-  - 'sfall/**'
-
-jobs:
- Build:
-  name:    sfall
-  runs-on: windows-2022
-  steps:
-
-  - name: Clone sfall
-    uses: actions/checkout@v4
-
-  # Action is used twice for self-testing only
-  # DevXP build results are intentionally *not* included in artifact
-
-  - name: ReleaseXP build
-    id:   build
-    uses: ./
-    with:
-     release-xp: true
-     dev-xp:     false
-
-  - name: DevXP build
-    uses: ./
-    with:
-     release-xp: false
-     dev-xp:     true
-
-  - name:  Prepare artifacts
-    run:   |
-           :
-           mkdir -p sfall-build
-
-           cp artifacts/ddraw.ini sfall-build
-           cp artifacts/sfall_dat/sfall.dat sfall-build
-           cp "${{ steps.build.outputs.release-xp }}" sfall-build
-    shell: bash
-
-  - name: Upload artifacts
-    uses: actions/upload-artifact@v4
-    with:
-     name:           sfall-build
-     path:           sfall-build
-     retention-days: 14
@@ -1,34 +0,0 @@
-name: github pages
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          sudo apt -y -qq install bundler python3-pip
-          pip3 install ruamel.yaml --user
-
-      - name: Build
-        run: ./docs/generate.sh
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/_site
-          user_name: 'github-actions[bot]'
-          user_email: 'github-actions[bot]@users.noreply.github.com'
@@ -26,7 +26,6 @@
 *.exe
 *.out
 *.app
-!ducible.exe

 # NetBeans
 nbproject/private/
@@ -47,8 +46,6 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
-*.VC.db
-*.VC.opendb

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -56,10 +53,8 @@ nb-configuration.xml
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
-[Dd]evXP/
 [Rr]elease/
 [Rr]eleases/
-[Rr]eleaseXP/
 x64/
 x86/
 build/
@@ -225,9 +220,3 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 sfall/postbuild.cmd
-
-# jekyll build files
-docs/_site
-docs/.sass-cache
-docs/.jekyll-metadata
-docs/pages/*.md
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}

    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
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

-    <program>  Copyright (C) <year>  <name of author>
+    {project}  Copyright (C) {year}  {fullname}
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -664,11 +664,12 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
@@ -23,7 +23,6 @@
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
            this.dataGridView1 = new System.Windows.Forms.DataGridView();
            this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -35,7 +34,6 @@
            this.bSGlobals = new System.Windows.Forms.Button();
            this.bArrays = new System.Windows.Forms.Button();
            this.bEdit = new System.Windows.Forms.Button();
-            this.redrawTimer = new System.Windows.Forms.Timer(this.components);
            this.bCrittersLvar = new System.Windows.Forms.Button();
            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
            this.SuspendLayout();
@@ -156,11 +154,6 @@
            this.bEdit.UseVisualStyleBackColor = true;
            this.bEdit.Click += new System.EventHandler(this.bEdit_Click);
            // 
-            // redrawTimer
-            // 
-            this.redrawTimer.Interval = 200;
-            this.redrawTimer.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
            // bCrittersLvar
            // 
            this.bCrittersLvar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -209,7 +202,6 @@
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        internal System.Windows.Forms.Timer redrawTimer;
        private System.Windows.Forms.Button bCrittersLvar;

    }
@@ -137,7 +137,6 @@ namespace FalloutClient {
                sr.Close();
            }
            Redraw();
-            redrawTimer.Start();
        }

        private void DebugEditor_FormClosing(object sender, FormClosingEventArgs e) {
@@ -189,7 +188,6 @@ namespace FalloutClient {
            default:
                return;
            }
-            redrawTimer.Stop();
            if (e.ColumnIndex == 2) {
                string str = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
                int val;
@@ -213,13 +211,11 @@ namespace FalloutClient {
                    connection.WriteInt(converter.GetAsInt(val));
                }
            }
-            redrawTimer.Start();
        }

        private void bEdit_Click(object sender, EventArgs e) {
            if (dataGridView1.SelectedRows.Count == 0) return;
            int i = (int)dataGridView1.SelectedRows[0].Tag;
-            redrawTimer.Stop();
            switch (mode) {
            case Mode.Arrays: {
                    DataType[] types = new DataType[connection.ArrayLengths[i]];
@@ -337,7 +333,6 @@ namespace FalloutClient {
                }
                break;
            }
-            redrawTimer.Start();
        }

        private void bCrittersLvar_Click(object sender, EventArgs e) {
@@ -386,9 +381,5 @@ namespace FalloutClient {
        private void dataGridView1_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) {
            dataGridView1.Rows[e.RowIndex].Tag = e.RowIndex;
        }
-
-        private void timer1_Tick(object sender, EventArgs e) {
-            connection.WriteDataType(DataTypeSend.RedrawGame);
-        }
    }
 }
@@ -129,7 +129,4 @@
  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
-  <metadata name="redrawTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
@@ -48,10 +48,8 @@ namespace FalloutClient {
        }

        public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) {
-            form.redrawTimer.Start();
            EditorWindow editor = new EditorWindow(names, types, values, isMap);
            editor.ShowDialog();
-            form.redrawTimer.Stop();
            if (editor.save) {
                if (valueInHex) editor.ConvertValues(false);
                return editor.values;
@@ -72,10 +70,8 @@ namespace FalloutClient {
        }

        public static string[] ShowEditor(DebugEditor form, string[] lvalues) {
-            form.redrawTimer.Start();
            EditorWindow editor = new EditorWindow(lvalues);
            editor.ShowDialog();
-            form.redrawTimer.Stop();
            if (editor.save) {
                if (valueInHex) editor.ConvertValues(false);
                return editor.values;
@@ -15,8 +15,7 @@ namespace FalloutClient {
            if (args.Length == 1 && args[0] == "-debugedit") {
                Application.Run(new DebugEditor(new EditorConnection()));
            } else {
-                MessageBox.Show("The debug editor can only be run from the game.\n" +
-                    "Use the key assigned to the DebugEditorKey option in ddraw.ini to run the debugger.",
+                MessageBox.Show("The debug editor can only be run from the game.",
                    "sfall Debug Editor", MessageBoxButtons.OK, MessageBoxIcon.Stop);
            }
        }
@@ -32,7 +31,6 @@ namespace FalloutClient {
        SetArray = 10,
        GetLocal = 11,
        SetLocal = 12,
-        Exit = 254,
-        RedrawGame = 255
+        Exit = 254
    }
 }
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("sfall")]
-[assembly: AssemblyCopyright("Copyright (C) 2022")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.1.9.1")]
-[assembly: AssemblyFileVersion("4.1.9.1")]
+[assembly: AssemblyVersion("4.1.9.0")]
+[assembly: AssemblyFileVersion("4.1.9.0")]
@@ -9,13 +9,14 @@
    <OutputType>WinExe</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>FalloutClient</RootNamespace>
-    <AssemblyName>FalloutDebug</AssemblyName>
+    <AssemblyName>FalloutClient</AssemblyName>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -28,7 +29,6 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>false</BootstrapperEnabled>
  </PropertyGroup>
@@ -42,14 +42,14 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
+    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DebugSymbols>false</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@@ -1,77 +1,16 @@
 # sfall

-[![License](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-[![Dev Build](https://github.com/sfall-team/sfall/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/phobos2077/sfall/actions/workflows/build.yml)
-[![GitHub Pages](https://github.com/sfall-team/sfall/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml)
+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.  

-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:**
+Engine modifications include:   
 - Better support for modern operating systems
 - Externalizing many settings like starting map and game time, skills, perks, critical hit tables, books, etc.
 - Bug fixes
 - Many additional features for users, such as item highlight button, party member control, etc.
 - Extended scripting capabilities for modders (many new opcodes to control sfall features as well as previously unavailable vanilla engine functions)

-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.
+Original author: timeslip  

-## Installation
+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.  

- Download `sfall_*.7z` from the [release archive](https://sourceforge.net/projects/sfall/files/).
-
- Extract `ddraw.dll`, `ddraw.ini`, `sfall.dat`, and the `mods` folder to Fallout's base directory (i.e. the one that contains `fallout2.exe`). Also, remove `gl_highlighting.int` and `gl_partycontrol.int` from Fallout's `data\scripts\` directory if you are updating from an older version.
-
- __Important Note:__\
-  If you are using a mod that already included sfall (e.g. killap's [Unofficial Patch](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch) or [Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project)), then that mod has probably included a custom modified `ddraw.ini`. In that case, overwriting it with sfall's vanilla `ddraw.ini` will be likely break your game. Instead, only overwrite `ddraw.dll`, and keep the mod's existing copy of `ddraw.ini`. (Or, if you know what you're doing, you can merge them together by hand.)
-
- The folder `translations` contains translations of some of the strings that sfall displays in the game. To use a translation, copy this folder to Fallout's base directory too, and then in `ddraw.ini` change the __TranslationsINI__ setting to `.\translations\<your language>.ini`.
-
-## Uninstallation
-
-Delete `ddraw.dll`, `ddraw.ini`, and `sfall.dat` from your Fallout directory, and delete `sfall-mods.ini` from the `mods` folder.
-
-## Usage
-
-This mod is configured via the `ddraw.ini` and `sfall-mods.ini` files, which can be opened with any text editor. Details of every configerable option are included in those files. Where a comment refers to a DX scancode, the complete list of codes can be found at the link below:\
-https://kippykip.com/b3ddocs/commands/scancodes.htm
-
-In a default installation using an unmodified copy of `ddraw.ini`, the middle mouse button will be set to switch between weapons and the mouse wheel will be set to scroll through any menus that respond to the up/down arrow keys. Holding **Ctrl** and hitting numpad keys 0 to 6 (with Num Lock off) will adjust the game speed. Holding **left Ctrl** will let you move items between inventory lists by simply clicking on them. Pressing **left Shift** will highlight items on the ground, and holding the key will let you move an entire stack of items at once. The script extender and any engine fixes are also enabled. Most of the options that change gameplay in some way not originally intended by the developers are disabled.
-
-For [__Wine__](https://www.winehq.org/) users:\
-You need to set DLL overrides for `ddraw.dll` to __"native, builtin"__ in `winecfg` or use `WINEDLLOVERRIDES="ddraw=n,b"` to run Fallout from the command line. If you want to play alternative sound files, you'll also need to install GStreamer Good 32-bit plugins.
-
-## Build Instructions
-
-### Prerequisites:
-
-* Visual Studio 2015 with **"Windows XP support for C++"** component. If you're using Visual Studio 2017/2019/2022, make sure to install **"VC++ 2015.3 v14.00 (v140) toolset for desktop"** component as well.
-* [DirectX SDK (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=6812). You will also need `ddraw.lib` from DXSDK February 2010 and `dinput.lib` from DXSDK August 2007. Both files can be found in the [DirectX SDK Collection repo](https://github.com/NovaRain/DXSDK_Collection).
-* [DirectX Runtime (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=8109). You can also install it from DirectX SDK installer.
-
-### Steps:
-
-1. Set up a `postbuild.cmd` using the template from the repo.
-2. Open the solution file and build with the **ReleaseXP** configuration (this is the one used for sfall releases).
-3. If everything is set up correctly, you should have a new sfall `ddraw.dll` in your Fallout 2 directory.
-
-### Minimalist Setup:
-
-If you don't need a full-fledged IDE, you can use Visual Studio Build Tools instead. Taking [Visual Studio 2017 Build Tools](https://aka.ms/vs/15/release/vs_buildtools.exe) for example:
-1. Install using the command line:
-   ```
-   vs_BuildTools.exe --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.MSBuildTools --add Microsoft.VisualStudio.Component.VC.140 --add Microsoft.VisualStudio.Component.WinXP --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --passive
-   ```
-2. Set up a `postbuild.cmd` using the template from the repo.
-3. Use MSBuild in **x86 Native Tools Command Prompt** to build sfall:
-   ```
-   MSBuild.exe ddraw.sln /t:Clean;Build /p:Configuration=ReleaseXP /p:Platform=Win32
-   ```
-
-## Additional info
-
-* [Changelog](CHANGELOG.md)
-* [Scripting Documentation](https://sfall-team.github.io/sfall/)
-* Fallout Engine IDA Database: [for IDA Pro 6.8](https://www.dropbox.com/s/tm0nyx0lnk4yui0/Fallout_1_and_2_IDA68.rar?dl=1 "Download from Dropbox") | [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)
-* [Fallout 2 Reference Edition](https://github.com/alexbatalov/fallout2-re)
--- a/Show More
+++ b/Show More