Check back button to RMB emulation

Closes #152

.gitattributes

@@ -2,14 +2,23 @@
 *.c text eol=lf
 *.cc text eol=lf
 *.cmake text eol=lf
+*.gradle text eol=lf
 *.h text eol=lf
-*.md text eol=lf
+*.java text eol=lf
 *.json text eol=lf
+*.md text eol=lf
 *.plist text eol=lf
+*.pro text eol=lf
+*.properties text eol=lf
+*.xml text eol=lf
 *.yml text eol=lf
 .clang-format text eol=lf
 .editorconfig text eol=lf
 .gitattributes text eol=lf
 .gitignore text eol=lf
+gradlew text eol=lf
 CMakeLists.txt text eol=lf
 LICENSE text eol=lf
+
+# Force CRLF
+*.bat text eol=crlf

.github/workflows/ci-build.yml

@@ -2,19 +2,12 @@ name: Build
 
 on:
   push:
-    paths:
-      - '.github/workflows/ci-build.yml'
-      - 'src/**.cc'
-      - 'src/**.h'
-      - '**/CMakeLists.txt'
-      - '**/*.cmake'
+    branches:
+      - main
   pull_request:
-    paths:
-      - '.github/workflows/ci-build.yml'
-      - 'src/**.cc'
-      - 'src/**.h'
-      - '**/CMakeLists.txt'
-      - '**/*.cmake'
+    types:
+      - opened
+      - synchronize
 
 defaults:
   run:
@@ -38,6 +31,50 @@ jobs:
       - name: cppcheck
         run: cppcheck --std=c++17 src/
 
+  android:
+    name: Android
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: gradle
+
+      - name: Cache cmake build
+        uses: actions/cache@v3
+        with:
+          path: os/android/app/.cxx
+          key: android-cmake-v1
+
+      - name: Setup signing config
+        if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
+        run: |
+          cd os/android
+          echo "$KEYSTORE_FILE_BASE64" | base64 --decode > debug.keystore
+          echo "$KEYSTORE_PROPERTIES_FILE_BASE64" | base64 --decode > debug-keystore.properties
+        env:
+          KEYSTORE_FILE_BASE64: ${{ secrets.ANDROID_DEBUG_KEYSTORE_FILE_BASE64 }}
+          KEYSTORE_PROPERTIES_FILE_BASE64: ${{ secrets.ANDROID_DEBUG_KEYSTORE_PROPERTIES_FILE_BASE64 }}
+
+      - name: Build
+        run: |
+          cd os/android
+          ./gradlew assembleDebug
+
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: fallout2-ce-debug.apk
+          path: os/android/app/build/outputs/apk/debug/app-debug.apk
+          retention-days: 7
+
   linux:
     name: Linux (${{ matrix.arch }})
 

.github/workflows/release.yml

@@ -10,6 +10,52 @@ defaults:
     shell: bash
 
 jobs:
+  android:
+    name: Android
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: gradle
+
+      - name: Cache cmake build
+        uses: actions/cache@v3
+        with:
+          path: os/android/app/.cxx
+          key: android-cmake-v1
+
+      - name: Setup signing config
+        if: env.KEYSTORE_FILE_BASE64 != '' && env.KEYSTORE_PROPERTIES_FILE_BASE64 != ''
+        run: |
+          cd os/android
+          echo "$KEYSTORE_FILE_BASE64" | base64 --decode > release.keystore
+          echo "$KEYSTORE_PROPERTIES_FILE_BASE64" | base64 --decode > release-keystore.properties
+        env:
+          KEYSTORE_FILE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_FILE_BASE64 }}
+          KEYSTORE_PROPERTIES_FILE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_PROPERTIES_FILE_BASE64 }}
+
+      - name: Build
+        run: |
+          cd os/android
+          ./gradlew assembleRelease
+
+      - name: Upload
+        run: |
+          cd os/android/app/build/outputs/apk/release
+          cp app-release.apk fallout2-ce-android.apk
+          gh release upload ${{ github.ref_name }} fallout2-ce-android.apk
+          rm fallout2-ce-android.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   linux:
     name: Linux (${{ matrix.arch }})
 

CMakeLists.txt

@@ -170,6 +170,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/palette.h"
     "src/party_member.cc"
     "src/party_member.h"
+    "src/pcx.cc"
+    "src/pcx.h"
     "src/perk_defs.h"
     "src/perk.cc"
     "src/perk.h"
@@ -237,8 +239,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/window.h"
     "src/word_wrap.cc"
     "src/word_wrap.h"
-    "src/world_map.cc"
-    "src/world_map.h"
+    "src/worldmap.cc"
+    "src/worldmap.h"
     "src/xfile.cc"
     "src/xfile.h"
 )
@@ -274,11 +276,24 @@ if(WIN32)
     )
 endif()
 
+if (WIN32)
+    target_sources(${EXECUTABLE_NAME} PUBLIC
+        "os/windows/fallout2-ce.ico"
+        "os/windows/fallout2-ce.rc"
+    )
+endif()
+
 if(APPLE)
+    target_sources(${EXECUTABLE_NAME} PUBLIC "os/macos/fallout2-ce.icns")
+    set_source_files_properties("os/macos/fallout2-ce.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
     set_target_properties(${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/macos/Info.plist")
     set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.alexbatalov.fallout2-ce")
     set(MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE_NAME}")
+    set(MACOSX_BUNDLE_ICON_FILE "fallout2-ce.icns")
     set(MACOSX_BUNDLE_DISPLAY_NAME "Fallout 2")
+    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.1.0")
+    set(MACOSX_BUNDLE_BUNDLE_VERSION "1.1.0")
 endif()
 
 add_subdirectory("third_party/fpattern")

LICENSE.md

@@ -0,0 +1,51 @@
+# Sustainable Use License
+
+Version 1.0
+
+## Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+## Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations below.
+
+## Limitations
+
+You may use or modify the software only for your own internal business purposes or for non-commercial or personal use. You may distribute the software or provide it to others only if you do so free of charge for non-commercial purposes. You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
+
+## Patents
+
+The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
+
+## Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms. If you modify the software, you must include in any modified copies of the software a prominent notice stating that you have modified the software.
+
+## No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in these terms.
+
+## Termination
+
+If you use the software in violation of these terms, such use is not licensed, and your license will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your license will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your license to terminate automatically and permanently.
+
+## No Liability
+
+As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
+
+## Definitions
+
+The "licensor" is the entity offering these terms.
+
+The "software" is the software the licensor makes available under these terms, including any portion of it.
+
+"You" refers to the individual or entity agreeing to these terms.
+
+"Your company" is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. Control means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+
+"Your license" is the license granted to you for the software under these terms.
+
+"Use" means anything you do with the software requiring your license.
+
+"Trademark" means trademarks, service marks, and similar rights.

README.md

@@ -34,6 +34,16 @@ $ sudo apt install libsdl2-2.0-0
 
 - Run `fallout2-ce.app`.
 
+### Android
+
+> **NOTE**: Fallout 2 was designed with mouse in mind. There are many controls that require precise cursor positioning, which is not possible with fingers. When playing on Android you'll use fingers to move mouse cursor, not a character, or a map. Double tap to "click" left mouse button in the current cursor position, triple tap to "click" right mouse button. It might feel awkward at first, but it's super handy - you can play with just a thumb. This is not set in stone and might change in the future.
+
+- Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder to your device, for example to `Downloads`. You need `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder.
+
+- Download `fallout2-ce.apk` and copy it to your device. Open it with file explorer, follow instructions (install from unknown source).
+
+- When you run the game for the first time it will immediately present file picker. Select the folder from the first step. Wait until this data is copied. A loading dialog will appear, just wait for about 30 seconds. The game will start automatically.
+
 ## Contributing
 
 Integrating Sfall goodies is the top priority. Quality of life updates are OK too. Please no large scale refactorings at this time as we need to reconcile changes from Reference Edition, which will make this process slow and error-prone. In any case open up an issue with your suggestion or to notify other people that something is being worked on.
@@ -42,6 +52,6 @@ Integrating Sfall goodies is the top priority. Quality of life updates are OK to
 
 There are literally hundreds if not thousands of fixes and features in sfall. I guess not all of them are needed in Community Edition, but for the sake of compatibility with big mods out there, let's integrate them all.
 
-## Legal & License
+## License
 
-See [Fallout 2 Reference Edition](https://github.com/alexbatalov/fallout2-re). Same conditions apply until the source code in this repository is changed significantly.
+The source code is this repository is available under the [Sustainable Use License](LICENSE.md).

os/android/.gitignore

@@ -7,3 +7,7 @@
 /.idea/navEditor.xml
 /.idea/workspace.xml
 /local.properties
+/debug-keystore.properties
+/debug.keystore
+/release-keystore.properties
+/release.keystore

os/android/app/.gitignore

@@ -1,2 +1,5 @@
 /.cxx
 /build
+
+# TODO: Cleanup root .gitignore
+!/src/debug

os/android/app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId 'com.alexbatalov.fallout2ce'
         minSdk 21
         targetSdk 32
-        versionCode 1
-        versionName '1.0'
+        versionCode 2
+        versionName '1.1.0'
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static'
@@ -26,10 +26,49 @@ android {
         }
     }
 
+    signingConfigs {
+        // Override default debug signing config to make sure every CI runner
+        // uses the same key for painless updates.
+        def debugKeystorePropertiesFile = rootProject.file('debug-keystore.properties')
+        if (debugKeystorePropertiesFile.exists()) {
+            def debugKeystoreProperties = new Properties()
+            debugKeystoreProperties.load(new FileInputStream(debugKeystorePropertiesFile))
+
+            debug {
+                storeFile rootProject.file(debugKeystoreProperties.getProperty('storeFile'))
+                storePassword debugKeystoreProperties.getProperty('storePassword')
+                keyAlias debugKeystoreProperties.getProperty('keyAlias')
+                keyPassword debugKeystoreProperties.getProperty('keyPassword')
+            }
+        }
+
+        def releaseKeystoreProperties = new Properties()
+        def releaseKeystorePropertiesFile = rootProject.file('release-keystore.properties')
+        if (releaseKeystorePropertiesFile.exists()) {
+            releaseKeystoreProperties.load(new FileInputStream(releaseKeystorePropertiesFile))
+
+            release {
+                storeFile rootProject.file(releaseKeystoreProperties.getProperty('storeFile'))
+                storePassword releaseKeystoreProperties.getProperty('storePassword')
+                keyAlias releaseKeystoreProperties.getProperty('keyAlias')
+                keyPassword releaseKeystoreProperties.getProperty('keyPassword')
+            }
+        }
+    }
+
     buildTypes {
+        debug {
+            // Prevents signing keys clashes between debug and release versions
+            // for painless development.
+            applicationIdSuffix '.debug'
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            // Release signing config is optional and might not be present in CI
+            // builds, hence `findByName`.
+            signingConfig signingConfigs.findByName('release')
         }
     }
 
@@ -57,4 +96,5 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.documentfile:documentfile:1.0.1'
 }

os/android/app/src/debug/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Fallout 2 (Debug)</string>
+</resources>

os/android/app/src/main/AndroidManifest.xml

@@ -58,6 +58,7 @@
          An example Java class can be found in README-android.md
     -->
     <application android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
         android:hardwareAccelerated="true" >
@@ -92,6 +93,10 @@
             </intent-filter>
             -->
         </activity>
+
+        <activity android:name=".ImportActivity"
+            android:theme="@style/AppTheme">
+        </activity>
     </application>
 
 </manifest>

os/android/app/src/main/java/com/alexbatalov/fallout2ce/FileUtils.java

@@ -0,0 +1,56 @@
+package com.alexbatalov.fallout2ce;
+
+import android.content.ContentResolver;
+
+import androidx.documentfile.provider.DocumentFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class FileUtils {
+
+    static boolean copyRecursively(ContentResolver contentResolver, DocumentFile src, File dest) {
+        final DocumentFile[] documentFiles = src.listFiles();
+        for (final DocumentFile documentFile : documentFiles) {
+            if (documentFile.isFile()) {
+                if (!copyFile(contentResolver, documentFile, new File(dest, documentFile.getName()))) {
+                    return false;
+                }
+            } else if (documentFile.isDirectory()) {
+                final File subdirectory = new File(dest, documentFile.getName());
+                if (!subdirectory.exists()) {
+                    subdirectory.mkdir();
+                }
+
+                if (!copyRecursively(contentResolver, documentFile, subdirectory)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private static boolean copyFile(ContentResolver contentResolver, DocumentFile src, File dest) {
+        try {
+            final InputStream inputStream = contentResolver.openInputStream(src.getUri());
+            final OutputStream outputStream = new FileOutputStream(dest);
+
+            final byte[] buffer = new byte[16384];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, bytesRead);
+            }
+
+            inputStream.close();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
+}

os/android/app/src/main/java/com/alexbatalov/fallout2ce/ImportActivity.java

@@ -0,0 +1,74 @@
+package com.alexbatalov.fallout2ce;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.documentfile.provider.DocumentFile;
+
+import java.io.File;
+
+public class ImportActivity extends Activity {
+    private static final int IMPORT_REQUEST_CODE = 1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        startActivityForResult(intent, IMPORT_REQUEST_CODE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent resultData) {
+        if (requestCode == IMPORT_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                final Uri treeUri = resultData.getData();
+                if (treeUri != null) {
+                    final DocumentFile treeDocument = DocumentFile.fromTreeUri(this, treeUri);
+                    if (treeDocument != null) {
+                        copyFiles(treeDocument);
+                        return;
+                    }
+                }
+            }
+
+            finish();
+        } else {
+            super.onActivityResult(requestCode, resultCode, resultData);
+        }
+    }
+
+    private void copyFiles(DocumentFile treeDocument) {
+        ProgressDialog dialog = createProgressDialog();
+        dialog.show();
+
+        new Thread(() -> {
+            ContentResolver contentResolver = getContentResolver();
+            File externalFilesDir = getExternalFilesDir(null);
+            FileUtils.copyRecursively(contentResolver, treeDocument, externalFilesDir);
+
+            startMainActivity();
+            dialog.dismiss();
+            finish();
+        }).start();
+    }
+
+    private void startMainActivity() {
+        Intent intent = new Intent(this, MainActivity.class);
+        startActivity(intent);
+    }
+
+    private ProgressDialog createProgressDialog() {
+        ProgressDialog progressDialog = new ProgressDialog(this,
+            android.R.style.Theme_Material_Light_Dialog);
+        progressDialog.setTitle(R.string.loading_dialog_title);
+        progressDialog.setMessage(getString(R.string.loading_dialog_message));
+        progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+        progressDialog.setCancelable(false);
+
+        return progressDialog;
+    }
+}

os/android/app/src/main/java/com/alexbatalov/fallout2ce/MainActivity.java

@@ -1,18 +1,47 @@
 package com.alexbatalov.fallout2ce;
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import org.libsdl.app.SDLActivity;
 
-public class MainActivity extends SDLActivity {
-    protected void onCreate(Bundle savedInstanceState) {
-        // Needed to initialize `files` folder (and make it publicly accessible
-        // for file managers) for user to upload assets.
-        getExternalFilesDir(null);
+import java.io.File;
 
+public class MainActivity extends SDLActivity {
+    private boolean noExit = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        final File externalFilesDir = getExternalFilesDir(null);
+
+        final File configFile = new File(externalFilesDir, "fallout2.cfg");
+        if (!configFile.exists()) {
+            final File masterDatFile = new File(externalFilesDir, "master.dat");
+            final File critterDatFile = new File(externalFilesDir, "critter.dat");
+            if (!masterDatFile.exists() || !critterDatFile.exists()) {
+                final Intent intent = new Intent(this, ImportActivity.class);
+                startActivity(intent);
+
+                noExit = true;
+                finish();
+            }
+        }
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (!noExit) {
+            // Needed to make sure libc calls exit handlers, which releases
+            // in-game resources.
+            System.exit(0);
+        }
+    }
+
+    @Override
     protected String[] getLibraries() {
         return new String[]{
             "fallout2-ce",

os/android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -2036,6 +2036,14 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
                 switch (event.getAction()) {
                 case KeyEvent.ACTION_DOWN:
                 case KeyEvent.ACTION_UP:
+                    if (keyCode == KeyEvent.KEYCODE_BACK) {
+                        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                            SDLActivity.onNativeMouse(MotionEvent.BUTTON_SECONDARY, MotionEvent.ACTION_DOWN, 0, 0, true);
+                        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                            SDLActivity.onNativeMouse(MotionEvent.BUTTON_SECONDARY, MotionEvent.ACTION_UP, 0, 0, true);
+                        }
+                    }
+
                     // mark the event as handled or it will be handled by system
                     // handling KEYCODE_BACK by system will call onBackPressed()
                     return true;

os/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

os/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

os/android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>

os/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,5 @@
 <resources>
-    <string name="app_name">Fallout 2 Community Edition</string>
+    <string name="app_name">Fallout 2</string>
+    <string name="loading_dialog_title">PLEASE STAND BY</string>
+    <string name="loading_dialog_message">Copying files…</string>
 </resources>

os/windows/fallout2-ce.rc

@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "fallout2-ce.ico"

src/actions.h

@@ -4,6 +4,8 @@
 #include "combat_defs.h"
 #include "obj_types.h"
 
+namespace fallout {
+
 int _action_attack(Attack* attack);
 int _action_use_an_item_on_object(Object* a1, Object* a2, Object* a3);
 int _action_use_an_object(Object* a1, Object* a2);
@@ -16,9 +18,11 @@ bool _can_see(Object* a1, Object* a2);
 bool _action_explode_running();
 int actionExplode(int tile, int elevation, int minDamage, int maxDamage, Object* a5, bool a6);
 int actionTalk(Object* a1, Object* a2);
-void _action_dmg(int tile, int elevation, int minDamage, int maxDamage, int damageType, bool animated, bool bypassArmor);
+void actionDamage(int tile, int elevation, int minDamage, int maxDamage, int damageType, bool animated, bool bypassArmor);
 bool actionCheckPush(Object* a1, Object* a2);
 int actionPush(Object* a1, Object* a2);
 int _action_can_talk_to(Object* a1, Object* a2);
 
+} // namespace fallout
+
 #endif /* ACTIONS_H */

src/animation.h

@@ -3,36 +3,16 @@
 
 #include "combat_defs.h"
 #include "obj_types.h"
-#include "sound.h"
 
-typedef enum AnimKind {
-    ANIM_KIND_OBJ_MOVE_TO_OBJ = 0,
-    ANIM_KIND_OBJ_MOVE_TO_TILE = 1,
-    ANIM_KIND_2 = 2,
-    ANIM_KIND_KNOCKDOWN = 3,
-    ANIM_KIND_ANIMATE = 4,
-    ANIM_KIND_ANIMATE_REVERSE = 5,
-    ANIM_KIND_6 = 6,
-    ANIM_KIND_SET_ROTATION_TO_TILE = 7,
-    ANIM_KIND_ROTATE_CLOCKWISE = 8,
-    ANIM_KIND_ROTATE_COUNTER_CLOCKWISE = 9,
-    ANIM_KIND_HIDE = 10,
-    ANIM_KIND_EXEC = 11,
-    ANIM_KIND_EXEC_2 = 12,
-    ANIM_KIND_14 = 14,
-    ANIM_KIND_15 = 15,
-    ANIM_KIND_16 = 16,
-    ANIM_KIND_17 = 17,
-    ANIM_KIND_18 = 18,
-    ANIM_KIND_19 = 19,
-    ANIM_KIND_20 = 20,
-    ANIM_KIND_23 = 23,
-    ANIM_KIND_24 = 24,
-    ANIM_KIND_ANIMATE_FOREVER = 25,
-    ANIM_KIND_26 = 26,
-    ANIM_KIND_27 = 27,
-    ANIM_KIND_28 = 28,
-} AnimKind;
+namespace fallout {
+
+typedef enum AnimationRequestOptions {
+    ANIMATION_REQUEST_UNRESERVED = 0x01,
+    ANIMATION_REQUEST_RESERVED = 0x02,
+    ANIMATION_REQUEST_NO_STAND = 0x04,
+    ANIMATION_REQUEST_0x100 = 0x100,
+    ANIMATION_REQUEST_INSIGNIFICANT = 0x200,
+} AnimationRequestOptions;
 
 // Basic animations: 0-19
 // Knockdown and death: 20-35
@@ -112,9 +92,13 @@ typedef enum AnimationType {
     LAST_SF_DEATH_ANIM = ANIM_FALL_FRONT_BLOOD_SF,
 } AnimationType;
 
-typedef int AnimationProc(Object*, Object*);
-typedef int AnimationSoundProc(Sound*);
-typedef int AnimationProc2(Object*, Object*, void*);
+#define FID_ANIM_TYPE(value) ((value) & 0xFF0000) >> 16
+
+// Signature of animation callback accepting 2 parameters.
+typedef int(AnimationCallback)(void* a1, void* a2);
+
+// Signature of animation callback accepting 3 parameters.
+typedef int(AnimationCallback3)(void* a1, void* a2, void* a3);
 
 typedef struct STRUCT_530014_28 {
     int tile;
@@ -133,28 +117,31 @@ int _register_priority(int a1);
 int reg_anim_clear(Object* a1);
 int reg_anim_end();
 int animationIsBusy(Object* a1);
-int reg_anim_obj_move_to_obj(Object* a1, Object* a2, int actionPoints, int delay);
-int reg_anim_obj_run_to_obj(Object* owner, Object* destination, int actionPoints, int delay);
-int reg_anim_obj_move_to_tile(Object* obj, int tile_num, int elev, int actionPoints, int delay);
-int reg_anim_obj_run_to_tile(Object* obj, int tile_num, int elev, int actionPoints, int delay);
-int reg_anim_2(Object* obj, int tile_num, int elev, int a4, int a5);
-int reg_anim_knockdown(Object* obj, int tile, int elev, int anim, int delay);
-int reg_anim_animate(Object* obj, int anim, int delay);
-int reg_anim_animate_reverse(Object* obj, int anim, int delay);
-int reg_anim_6(Object* obj, int anim, int delay);
-int reg_anim_set_rotation_to_tile(Object* owner, int tile);
-int reg_anim_rotate_clockwise(Object* obj);
-int reg_anim_rotate_counter_clockwise(Object* obj);
-int reg_anim_hide(Object* obj);
-int reg_anim_11_0(Object* a1, Object* a2, AnimationProc* proc, int delay);
-int reg_anim_12(Object* a1, Object* a2, void* a3, AnimationProc2* proc, int delay);
-int reg_anim_11_1(Object* a1, Object* a2, AnimationProc* proc, int delay);
-int reg_anim_15(Object* obj, int a2, int a3);
-int reg_anim_17(Object* obj, int fid, int a3);
-int reg_anim_18(Object* obj, int a2, int a3);
-int reg_anim_update_light(Object* obj, int fid, int a3);
-int reg_anim_play_sfx(Object* obj, const char* a2, int a3);
-int reg_anim_animate_forever(Object* obj, int a2, int a3);
+int animationRegisterMoveToObject(Object* owner, Object* destination, int actionPoints, int delay);
+int animationRegisterRunToObject(Object* owner, Object* destination, int actionPoints, int delay);
+int animationRegisterMoveToTile(Object* owner, int tile, int elevation, int actionPoints, int delay);
+int animationRegisterRunToTile(Object* owner, int tile, int elevation, int actionPoints, int delay);
+int animationRegisterMoveToTileStraight(Object* object, int tile, int elevation, int anim, int delay);
+int animationRegisterMoveToTileStraightAndWaitForComplete(Object* owner, int tile, int elev, int anim, int delay);
+int animationRegisterAnimate(Object* owner, int anim, int delay);
+int animationRegisterAnimateReversed(Object* owner, int anim, int delay);
+int animationRegisterAnimateAndHide(Object* owner, int anim, int delay);
+int animationRegisterRotateToTile(Object* owner, int tile);
+int animationRegisterRotateClockwise(Object* owner);
+int animationRegisterRotateCounterClockwise(Object* owner);
+int animationRegisterHideObject(Object* object);
+int animationRegisterHideObjectForced(Object* object);
+int animationRegisterCallback(void* a1, void* a2, AnimationCallback* proc, int delay);
+int animationRegisterCallback3(void* a1, void* a2, void* a3, AnimationCallback3* proc, int delay);
+int animationRegisterCallbackForced(void* a1, void* a2, AnimationCallback* proc, int delay);
+int animationRegisterSetFlag(Object* object, int flag, int delay);
+int animationRegisterUnsetFlag(Object* object, int flag, int delay);
+int animationRegisterSetFid(Object* owner, int fid, int delay);
+int animationRegisterTakeOutWeapon(Object* owner, int weaponAnimationCode, int delay);
+int animationRegisterSetLightDistance(Object* owner, int lightDistance, int delay);
+int animationRegisterToggleOutline(Object* object, bool outline, int delay);
+int animationRegisterPlaySoundEffect(Object* owner, const char* soundEffectName, int delay);
+int animationRegisterAnimateForever(Object* owner, int anim, int delay);
 int reg_anim_26(int a1, int a2);
 int _make_path(Object* object, int from, int to, unsigned char* a4, int a5);
 int pathfinderFindPath(Object* object, int from, int to, unsigned char* rotations, int a5, PathBuilderCallback* callback);
@@ -169,4 +156,8 @@ void _dude_stand(Object* obj, int rotation, int fid);
 void _dude_standup(Object* a1);
 void animationStop();
 
+int animationRegisterSetLightIntensity(Object* owner, int lightDistance, int lightIntensity, int delay);
+
+} // namespace fallout
+
 #endif /* ANIMATION_H */

src/art.cc

@@ -1,17 +1,20 @@
 #include "art.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "animation.h"
 #include "debug.h"
 #include "draw.h"
+#include "game.h"
 #include "game_config.h"
 #include "memory.h"
 #include "object.h"
 #include "proto.h"
 #include "sfall_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+namespace fallout {
 
 typedef struct ArtListDescription {
     int flags;
@@ -126,10 +129,8 @@ static int* gArtCritterFidShoudRunData;
 int artInit()
 {
     char path[COMPAT_MAX_PATH];
-    int i;
     File* stream;
-    char str[200];
-    char *ptr, *curr;
+    char string[200];
 
     int cacheSize;
     if (!configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_ART_CACHE_SIZE_KEY, &cacheSize)) {
@@ -147,20 +148,36 @@ int artInit()
         gArtLanguageInitialized = true;
     }
 
-    for (i = 0; i < 11; i++) {
-        gArtListDescriptions[i].flags = 0;
-        sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[i].name, gArtListDescriptions[i].name);
+    bool critterDbSelected = false;
+    for (int objectType = 0; objectType < OBJ_TYPE_COUNT; objectType++) {
+        gArtListDescriptions[objectType].flags = 0;
+        sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[objectType].name, gArtListDescriptions[objectType].name);
 
-        if (artReadList(path, &(gArtListDescriptions[i].fileNames), &(gArtListDescriptions[i].fileNamesLength)) != 0) {
+        int oldDb;
+        if (objectType == OBJ_TYPE_CRITTER) {
+            oldDb = _db_current();
+            critterDbSelected = true;
+            _db_select(_critter_db_handle);
+        }
+
+        if (artReadList(path, &(gArtListDescriptions[objectType].fileNames), &(gArtListDescriptions[objectType].fileNamesLength)) != 0) {
             debugPrint("art_read_lst failed in art_init\n");
+            if (critterDbSelected) {
+                _db_select(oldDb);
+            }
             cacheFree(&gArtCache);
             return -1;
         }
+
+        if (objectType == OBJ_TYPE_CRITTER) {
+            critterDbSelected = false;
+            _db_select(oldDb);
+        }
     }
 
-    _anon_alias = (int*)internal_malloc(sizeof(*_anon_alias) * gArtListDescriptions[1].fileNamesLength);
+    _anon_alias = (int*)internal_malloc(sizeof(*_anon_alias) * gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength);
     if (_anon_alias == NULL) {
-        gArtListDescriptions[1].fileNamesLength = 0;
+        gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength = 0;
         debugPrint("Out of memory for anon_alias in art_init\n");
         cacheFree(&gArtCache);
         return -1;
@@ -168,17 +185,17 @@ int artInit()
 
     gArtCritterFidShoudRunData = (int*)internal_malloc(sizeof(*gArtCritterFidShoudRunData) * gArtListDescriptions[1].fileNamesLength);
     if (gArtCritterFidShoudRunData == NULL) {
-        gArtListDescriptions[1].fileNamesLength = 0;
+        gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength = 0;
         debugPrint("Out of memory for artCritterFidShouldRunData in art_init\n");
         cacheFree(&gArtCache);
         return -1;
     }
 
-    for (i = 0; i < gArtListDescriptions[1].fileNamesLength; i++) {
-        gArtCritterFidShoudRunData[i] = 0;
+    for (int critterIndex = 0; critterIndex < gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength; critterIndex++) {
+        gArtCritterFidShoudRunData[critterIndex] = 0;
     }
 
-    sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[1].name, gArtListDescriptions[1].name);
+    sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[OBJ_TYPE_CRITTER].name, gArtListDescriptions[OBJ_TYPE_CRITTER].name);
 
     stream = fileOpen(path, "rt");
     if (stream == NULL) {
@@ -206,75 +223,70 @@ int artInit()
         tribalMaleFileName = gDefaultTribalMaleFileName;
     }
 
-    char *tribalFemaleFileName = NULL;
+    char* tribalFemaleFileName = NULL;
     configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_DUDE_NATIVE_LOOK_TRIBAL_FEMALE_KEY, &tribalFemaleFileName);
     if (tribalFemaleFileName == NULL || tribalFemaleFileName[0] == '\0') {
         tribalFemaleFileName = gDefaultTribalFemaleFileName;
     }
 
-    ptr = gArtListDescriptions[1].fileNames;
-    for (i = 0; i < gArtListDescriptions[1].fileNamesLength; i++) {
-        if (compat_stricmp(ptr, jumpsuitMaleFileName) == 0) {
-            _art_vault_person_nums[DUDE_NATIVE_LOOK_JUMPSUIT][GENDER_MALE] = i;
-        } else if (compat_stricmp(ptr, jumpsuitFemaleFileName) == 0) {
-            _art_vault_person_nums[DUDE_NATIVE_LOOK_JUMPSUIT][GENDER_FEMALE] = i;
+    char* critterFileNames = gArtListDescriptions[OBJ_TYPE_CRITTER].fileNames;
+    for (int critterIndex = 0; critterIndex < gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength; critterIndex++) {
+        if (compat_stricmp(critterFileNames, "hmjmps") == 0) {
+            _art_vault_person_nums[DUDE_NATIVE_LOOK_JUMPSUIT][GENDER_MALE] = critterIndex;
+        } else if (compat_stricmp(critterFileNames, "hfjmps") == 0) {
+            _art_vault_person_nums[DUDE_NATIVE_LOOK_JUMPSUIT][GENDER_FEMALE] = critterIndex;
         }
 
-        if (compat_stricmp(ptr, tribalMaleFileName) == 0) {
-            _art_vault_person_nums[DUDE_NATIVE_LOOK_TRIBAL][GENDER_MALE] = i;
-            _art_vault_guy_num = i;
-        } else if (compat_stricmp(ptr, tribalFemaleFileName) == 0) {
-            _art_vault_person_nums[DUDE_NATIVE_LOOK_TRIBAL][GENDER_FEMALE] = i;
+        if (compat_stricmp(critterFileNames, "hmwarr") == 0) {
+            _art_vault_person_nums[DUDE_NATIVE_LOOK_TRIBAL][GENDER_MALE] = critterIndex;
+            _art_vault_guy_num = critterIndex;
+        } else if (compat_stricmp(critterFileNames, "hfprim") == 0) {
+            _art_vault_person_nums[DUDE_NATIVE_LOOK_TRIBAL][GENDER_FEMALE] = critterIndex;
         }
 
-        ptr += 13;
+        critterFileNames += 13;
     }
 
-    for (i = 0; i < gArtListDescriptions[1].fileNamesLength; i++) {
-        if (!fileReadString(str, sizeof(str), stream)) {
+    for (int critterIndex = 0; critterIndex < gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength; critterIndex++) {
+        if (!fileReadString(string, sizeof(string), stream)) {
             break;
         }
 
-        ptr = str;
-        curr = ptr;
-        while (*curr != '\0' && *curr != ',') {
-            curr++;
-        }
+        char* sep1 = strchr(string, ',');
+        if (sep1 != NULL) {
+            _anon_alias[critterIndex] = atoi(sep1 + 1);
 
-        if (*curr != '\0') {
-            _anon_alias[i] = atoi(curr + 1);
-
-            ptr = curr + 1;
-            curr = ptr;
-            while (*curr != '\0' && *curr != ',') {
-                curr++;
+            char* sep2 = strchr(sep1 + 1, ',');
+            if (sep2 != NULL) {
+                gArtCritterFidShoudRunData[critterIndex] = atoi(sep2 + 1);
+            } else {
+                gArtCritterFidShoudRunData[critterIndex] = 0;
             }
-
-            gArtCritterFidShoudRunData[i] = *curr != '\0' ? atoi(ptr) : 0;
         } else {
-            _anon_alias[i] = _art_vault_guy_num;
-            gArtCritterFidShoudRunData[i] = 1;
+            _anon_alias[critterIndex] = _art_vault_guy_num;
+            gArtCritterFidShoudRunData[critterIndex] = 1;
         }
     }
 
     fileClose(stream);
 
-    ptr = gArtListDescriptions[4].fileNames;
-    for (i = 0; i < gArtListDescriptions[4].fileNamesLength; i++) {
-        if (compat_stricmp(ptr, "grid001.frm") == 0) {
-            _art_mapper_blank_tile = i;
+    char* tileFileNames = gArtListDescriptions[OBJ_TYPE_TILE].fileNames;
+    for (int tileIndex = 0; tileIndex < gArtListDescriptions[OBJ_TYPE_TILE].fileNamesLength; tileIndex++) {
+        if (compat_stricmp(tileFileNames, "grid001.frm") == 0) {
+            _art_mapper_blank_tile = tileIndex;
         }
+        tileFileNames += 13;
     }
 
-    gHeadDescriptions = (HeadDescription*)internal_malloc(sizeof(HeadDescription) * gArtListDescriptions[8].fileNamesLength);
+    gHeadDescriptions = (HeadDescription*)internal_malloc(sizeof(*gHeadDescriptions) * gArtListDescriptions[OBJ_TYPE_HEAD].fileNamesLength);
     if (gHeadDescriptions == NULL) {
-        gArtListDescriptions[8].fileNamesLength = 0;
+        gArtListDescriptions[OBJ_TYPE_HEAD].fileNamesLength = 0;
         debugPrint("Out of memory for head_info in art_init\n");
         cacheFree(&gArtCache);
         return -1;
     }
 
-    sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[8].name, gArtListDescriptions[8].name);
+    sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[OBJ_TYPE_HEAD].name, gArtListDescriptions[OBJ_TYPE_HEAD].name);
 
     stream = fileOpen(path, "rt");
     if (stream == NULL) {
@@ -283,46 +295,42 @@ int artInit()
         return -1;
     }
 
-    for (i = 0; i < gArtListDescriptions[8].fileNamesLength; i++) {
-        if (!fileReadString(str, sizeof(str), stream)) {
+    for (int headIndex = 0; headIndex < gArtListDescriptions[OBJ_TYPE_HEAD].fileNamesLength; headIndex++) {
+        if (!fileReadString(string, sizeof(string), stream)) {
             break;
         }
 
-        ptr = str;
-        curr = ptr;
-        while (*curr != '\0' && *curr != ',') {
-            curr++;
+        char* sep1 = strchr(string, ',');
+        if (sep1 != NULL) {
+            *sep1 = '\0';
+        } else {
+            sep1 = string;
         }
 
-        if (*curr != '\0') {
-            ptr = curr + 1;
-            curr = ptr;
-            while (*curr != '\0' && *curr != ',') {
-                curr++;
-            }
-
-            if (*curr != '\0') {
-                gHeadDescriptions[i].goodFidgetCount = atoi(ptr);
-
-                ptr = curr + 1;
-                curr = ptr;
-                while (*curr != '\0' && *curr != ',') {
-                    curr++;
-                }
-
-                if (*curr != '\0') {
-                    gHeadDescriptions[i].neutralFidgetCount = atoi(ptr);
-
-                    ptr = curr + 1;
-                    curr = strpbrk(ptr, " ,;\t\n");
-                    if (curr != NULL) {
-                        *curr = '\0';
-                    }
-
-                    gHeadDescriptions[i].badFidgetCount = atoi(ptr);
-                }
-            }
+        char* sep2 = strchr(sep1, ',');
+        if (sep2 != NULL) {
+            *sep2 = '\0';
+        } else {
+            sep2 = sep1;
         }
+
+        gHeadDescriptions[headIndex].goodFidgetCount = atoi(sep1 + 1);
+
+        char* sep3 = strchr(sep2, ',');
+        if (sep3 != NULL) {
+            *sep3 = '\0';
+        } else {
+            sep3 = sep2;
+        }
+
+        gHeadDescriptions[headIndex].neutralFidgetCount = atoi(sep2 + 1);
+
+        char* sep4 = strpbrk(sep3 + 1, " ,;\t\n");
+        if (sep4 != NULL) {
+            *sep4 = '\0';
+        }
+
+        gHeadDescriptions[headIndex].badFidgetCount = atoi(sep3 + 1);
     }
 
     fileClose(stream);
@@ -357,19 +365,19 @@ void artExit()
 // 0x418F1C
 char* artGetObjectTypeName(int objectType)
 {
-    return objectType >= 0 && objectType < OBJ_TYPE_COUNT ? gArtListDescriptions[objectType].name : NULL;
+    return objectType >= OBJ_TYPE_ITEM && objectType < OBJ_TYPE_COUNT ? gArtListDescriptions[objectType].name : NULL;
 }
 
 // 0x418F34
 int artIsObjectTypeHidden(int objectType)
 {
-    return objectType >= 0 && objectType < OBJ_TYPE_COUNT ? gArtListDescriptions[objectType].flags & 1 : 0;
+    return objectType >= OBJ_TYPE_ITEM && objectType < OBJ_TYPE_COUNT ? gArtListDescriptions[objectType].flags & 1 : 0;
 }
 
 // 0x418F7C
 int artGetFidgetCount(int headFid)
 {
-    if ((headFid & 0xF000000) >> 24 != OBJ_TYPE_HEAD) {
+    if (FID_TYPE(headFid) != OBJ_TYPE_HEAD) {
         return 0;
     }
 
@@ -522,15 +530,15 @@ int artCacheFlush()
 }
 
 // 0x4192B0
-int artCopyFileName(int type, int id, char* dest)
+int artCopyFileName(int objectType, int id, char* dest)
 {
     ArtListDescription* ptr;
 
-    if (type < 0 && type >= 11) {
+    if (objectType < OBJ_TYPE_ITEM && objectType >= OBJ_TYPE_COUNT) {
         return -1;
     }
 
-    ptr = &(gArtListDescriptions[type]);
+    ptr = &(gArtListDescriptions[objectType]);
 
     if (id >= ptr->fileNamesLength) {
         return -1;
@@ -622,7 +630,7 @@ char* artBuildFilePath(int fid)
 
     v10 = (fid & 0x70000000) >> 28;
 
-    v1 = _art_alias_fid(fid);
+    v1 = artAliasFid(fid);
     if (v1 != -1) {
         v2 = v1;
     }
@@ -630,15 +638,15 @@ char* artBuildFilePath(int fid)
     *_art_name = '\0';
 
     v3 = v2 & 0xFFF;
-    v4 = (v2 & 0xFF0000) >> 16;
+    v4 = FID_ANIM_TYPE(v2);
     v5 = (v2 & 0xF000) >> 12;
-    type = (v2 & 0xF000000) >> 24;
+    type = FID_TYPE(v2);
 
     if (v3 >= gArtListDescriptions[type].fileNamesLength) {
         return NULL;
     }
 
-    if (type < 0 || type >= 11) {
+    if (type < OBJ_TYPE_ITEM || type >= OBJ_TYPE_COUNT) {
         return NULL;
     }
 
@@ -669,55 +677,45 @@ char* artBuildFilePath(int fid)
 
 // art_read_lst
 // 0x419664
-static int artReadList(const char* path, char** out_arr, int* out_count)
+static int artReadList(const char* path, char** artListPtr, int* artListSizePtr)
 {
-    File* stream;
-    char str[200];
-    char* arr;
-    int count;
-    char* brk;
-
-    stream = fileOpen(path, "rt");
+    File* stream = fileOpen(path, "rt");
     if (stream == NULL) {
         return -1;
     }
 
-    count = 0;
-    while (fileReadString(str, sizeof(str), stream)) {
+    int count = 0;
+    char string[200];
+    while (fileReadString(string, sizeof(string), stream)) {
         count++;
     }
 
     fileSeek(stream, 0, SEEK_SET);
 
-    *out_count = count;
+    *artListSizePtr = count;
 
-    arr = (char*)internal_malloc(13 * count);
-    *out_arr = arr;
-    if (arr == NULL) {
-        goto err;
+    char* artList = (char*)internal_malloc(13 * count);
+    *artListPtr = artList;
+    if (artList == NULL) {
+        fileClose(stream);
+        return -1;
     }
 
-    while (fileReadString(str, sizeof(str), stream)) {
-        brk = strpbrk(str, " ,;\r\t\n");
+    while (fileReadString(string, sizeof(string), stream)) {
+        char* brk = strpbrk(string, " ,;\r\t\n");
         if (brk != NULL) {
             *brk = '\0';
         }
 
-        strncpy(arr, str, 12);
-        arr[12] = '\0';
+        strncpy(artList, string, 12);
+        artList[12] = '\0';
 
-        arr += 13;
+        artList += 13;
     }
 
     fileClose(stream);
 
     return 0;
-
-err:
-
-    fileClose(stream);
-
-    return -1;
 }
 
 // 0x419760
@@ -864,54 +862,55 @@ ArtFrame* artGetFrame(Art* art, int frame, int rotation)
 // 0x4198C8
 bool artExists(int fid)
 {
-    int v3;
-    bool result;
+    bool result = false;
+    int oldDb = -1;
 
-    v3 = -1;
-    result = false;
-
-    if ((fid & 0xF000000) >> 24 == 1) {
-        v3 = _db_current(1);
-        // _db_current(_critter_db_handle);
-        _db_current(0);
+    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
+        oldDb = _db_current();
+        _db_select(_critter_db_handle);
     }
 
     char* filePath = artBuildFilePath(fid);
-    if (filePath == NULL) {
-        goto out;
+    if (filePath != NULL) {
+        int fileSize;
+        if (dbGetFileSize(filePath, &fileSize) != -1) {
+            result = true;
+        }
     }
 
-    int fileSize;
-    if (dbGetFileSize(filePath, &fileSize) == -1) {
-        goto out;
-    }
-
-    result = true;
-
-out:
-
-    if (v3 != -1) {
-        _db_current(v3);
+    if (oldDb != -1) {
+        _db_select(oldDb);
     }
 
     return result;
 }
 
+// NOTE: Exactly the same implementation as `artExists`.
+//
 // 0x419930
 bool _art_fid_valid(int fid)
 {
-    // NOTE: Original Code involves calling some unknown function. Check in debugger in mapper.
+    bool result = false;
+    int oldDb = -1;
+
+    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
+        oldDb = _db_current();
+        _db_select(_critter_db_handle);
+    }
+
     char* filePath = artBuildFilePath(fid);
-    if (filePath == NULL) {
-        return false;
+    if (filePath != NULL) {
+        int fileSize;
+        if (dbGetFileSize(filePath, &fileSize) != -1) {
+            result = true;
+        }
     }
 
-    int fileSize;
-    if (dbGetFileSize(filePath, &fileSize) == -1) {
-        return false;
+    if (oldDb != -1) {
+        _db_select(oldDb);
     }
 
-    return true;
+    return result;
 }
 
 // 0x419998
@@ -923,7 +922,7 @@ int _art_alias_num(int index)
 // 0x4199AC
 int artCritterFidShouldRun(int fid)
 {
-    if ((fid & 0xF000000) >> 24 == 1) {
+    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
         return gArtCritterFidShoudRunData[fid & 0xFFF];
     }
 
@@ -931,64 +930,61 @@ int artCritterFidShouldRun(int fid)
 }
 
 // 0x4199D4
-int _art_alias_fid(int fid)
+int artAliasFid(int fid)
 {
-    int v2;
-    int v3;
-    int result;
+    int type = FID_TYPE(fid);
+    int anim = FID_ANIM_TYPE(fid);
+    if (type == OBJ_TYPE_CRITTER) {
+        if (anim == ANIM_ELECTRIFY
+            || anim == ANIM_BURNED_TO_NOTHING
+            || anim == ANIM_ELECTRIFIED_TO_NOTHING
+            || anim == ANIM_ELECTRIFY_SF
+            || anim == ANIM_BURNED_TO_NOTHING_SF
+            || anim == ANIM_ELECTRIFIED_TO_NOTHING_SF
+            || anim == ANIM_FIRE_DANCE
+            || anim == ANIM_CALLED_SHOT_PIC) {
+            // NOTE: Original code is slightly different. It uses many mutually
+            // mirrored bitwise operators. Probably result of some macros for
+            // getting/setting individual bits on fid.
+            return (fid & 0x70000000) | ((anim << 16) & 0xFF0000) | 0x1000000 | (fid & 0xF000) | (_anon_alias[fid & 0xFFF] & 0xFFF);
+        }
+    }
 
-    v2 = (fid & 0xF000000) >> 24;
-    v3 = (fid & 0xFF0000) >> 16;
-
-    if (v2 != 1 || v3 != 27 && v3 != 29 && v3 != 30 && v3 != 55 && v3 != 57 && v3 != 58 && v3 != 33 && v3 != 64)
-        result = -1;
-    else
-        result = ((fid & 0x70000000) >> 28 << 28) & 0x70000000 | (v3 << 16) & 0xFF0000 | 0x1000000 | (((fid & 0xF000) >> 12) << 12) & 0xF000 | _anon_alias[fid & 0xFFF] & 0xFFF;
-
-    return result;
+    return -1;
 }
 
 // 0x419A78
 static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
 {
-    int v4;
-    char* str;
-    char* ptr;
-    int result;
-    char path[COMPAT_MAX_PATH];
-    bool loaded;
-    int fileSize;
+    int oldDb = -1;
+    int result = -1;
 
-    v4 = -1;
-    result = -1;
-
-    if ((fid & 0xF000000) >> 24 == 1) {
-        v4 = _db_current(1);
-        // _db_current(_critter_db_handle);
-        _db_current(0);
+    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
+        oldDb = _db_current();
+        _db_select(_critter_db_handle);
     }
 
-    str = artBuildFilePath(fid);
-    if (str != NULL) {
-        loaded = false;
+    char* artFilePath = artBuildFilePath(fid);
+    if (artFilePath != NULL) {
+        int fileSize;
+        bool loaded = false;
+
         if (gArtLanguageInitialized) {
-            ptr = str;
-            while (*ptr != '\0' && *ptr != '\\') {
-                ptr++;
+            char* pch = strchr(artFilePath, '\\');
+            if (pch == NULL) {
+                pch = artFilePath;
             }
 
-            if (*ptr == '\0') {
-                ptr = str;
-            }
+            char localizedPath[COMPAT_MAX_PATH];
+            sprintf(localizedPath, "art\\%s\\%s", gArtLanguage, pch);
 
-            sprintf(path, "art\\%s\\%s", gArtLanguage, ptr);
-            if (dbGetFileSize(path, &fileSize) == 0) {
+            if (dbGetFileSize(localizedPath, &fileSize) == 0) {
                 loaded = true;
             }
         }
 
         if (!loaded) {
-            if (dbGetFileSize(str, &fileSize) == 0) {
+            if (dbGetFileSize(artFilePath, &fileSize) == 0) {
                 loaded = true;
             }
         }
@@ -999,8 +995,8 @@ static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
         }
     }
 
-    if (v4 != -1) {
-        _db_current(v4);
+    if (oldDb != -1) {
+        _db_select(oldDb);
     }
 
     return result;
@@ -1009,43 +1005,33 @@ static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
 // 0x419B78
 static int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
 {
-    int v4;
-    char* str;
-    char* ptr;
-    int result;
-    char path[COMPAT_MAX_PATH];
-    bool loaded;
+    int oldDb = -1;
+    int result = -1;
 
-    v4 = -1;
-    result = -1;
-
-    if ((fid & 0xF000000) >> 24 == 1) {
-        v4 = _db_current(1);
-        // _db_current(_critter_db_handle);
-        _db_current(0);
+    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
+        oldDb = _db_current();
+        _db_select(_critter_db_handle);
     }
 
-    str = artBuildFilePath(fid);
-    if (str != NULL) {
-        loaded = false;
+    char* artFileName = artBuildFilePath(fid);
+    if (artFileName != NULL) {
+        bool loaded = false;
         if (gArtLanguageInitialized) {
-            ptr = str;
-            while (*ptr != '\0' && *ptr != '\\') {
-                ptr++;
+            char* pch = strchr(artFileName, '\\');
+            if (pch == NULL) {
+                pch = artFileName;
             }
 
-            if (*ptr == '\0') {
-                ptr = str;
-            }
+            char localizedPath[COMPAT_MAX_PATH];
+            sprintf(localizedPath, "art\\%s\\%s", gArtLanguage, pch);
 
-            sprintf(path, "art\\%s\\%s", gArtLanguage, ptr);
-            if (artRead(str, data) == 0) {
+            if (artRead(localizedPath, data) == 0) {
                 loaded = true;
             }
         }
 
         if (!loaded) {
-            if (artRead(str, data) == 0) {
+            if (artRead(artFileName, data) == 0) {
                 loaded = true;
             }
         }
@@ -1057,8 +1043,8 @@ static int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
         }
     }
 
-    if (v4 != -1) {
-        _db_current(v4);
+    if (oldDb != -1) {
+        _db_select(oldDb);
     }
 
     return result;
@@ -1071,7 +1057,7 @@ static void artCacheFreeImpl(void* ptr)
 }
 
 // 0x419C88
-int buildFid(int objectType, int a2, int anim, int a3, int rotation)
+int buildFid(int objectType, int frmId, int animType, int a3, int rotation)
 {
     int v7, v8, v9, v10;
 
@@ -1081,13 +1067,13 @@ int buildFid(int objectType, int a2, int anim, int a3, int rotation)
         goto zero;
     }
 
-    if (anim == 33 || anim < 20 || anim > 35) {
+    if (animType == ANIM_FIRE_DANCE || animType < ANIM_FALL_BACK || animType > ANIM_FALL_FRONT_BLOOD) {
         goto zero;
     }
 
-    v7 = ((a3 << 12) & 0xF000) | (anim << 16) & 0xFF0000 | 0x1000000;
-    v8 = (rotation << 28) & 0x70000000 | v7;
-    v9 = a2 & 0xFFF;
+    v7 = ((a3 << 12) & 0xF000) | ((animType << 16) & 0xFF0000) | 0x1000000;
+    v8 = ((rotation << 28) & 0x70000000) | v7;
+    v9 = frmId & 0xFFF;
 
     if (artExists(v9 | v8) != 0) {
         goto out;
@@ -1108,7 +1094,7 @@ zero:
 
 out:
 
-    return (v10 << 28) & 0x70000000 | (objectType << 24) | (anim << 16) & 0xFF0000 | (a3 << 12) & 0xF000 | a2 & 0xFFF;
+    return ((v10 << 28) & 0x70000000) | (objectType << 24) | ((animType << 16) & 0xFF0000) | ((a3 << 12) & 0xF000) | (frmId & 0xFFF);
 }
 
 // 0x419D60
@@ -1172,3 +1158,115 @@ int artRead(const char* path, unsigned char* data)
     fileClose(stream);
     return 0;
 }
+
+// NOTE: Unused.
+//
+// 0x41A070
+int artWriteFrameData(unsigned char* data, File* stream, int count)
+{
+    unsigned char* ptr = data;
+    for (int index = 0; index < count; index++) {
+        ArtFrame* frame = (ArtFrame*)ptr;
+
+        if (fileWriteInt16(stream, frame->width) == -1) return -1;
+        if (fileWriteInt16(stream, frame->height) == -1) return -1;
+        if (fileWriteInt32(stream, frame->size) == -1) return -1;
+        if (fileWriteInt16(stream, frame->x) == -1) return -1;
+        if (fileWriteInt16(stream, frame->y) == -1) return -1;
+        if (fileWrite(ptr + sizeof(ArtFrame), frame->size, 1, stream) != 1) return -1;
+
+        ptr += sizeof(ArtFrame) + frame->size;
+    }
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x41A138
+int artWriteHeader(Art* art, File* stream)
+{
+    if (fileWriteInt32(stream, art->field_0) == -1) return -1;
+    if (fileWriteInt16(stream, art->framesPerSecond) == -1) return -1;
+    if (fileWriteInt16(stream, art->actionFrame) == -1) return -1;
+    if (fileWriteInt16(stream, art->frameCount) == -1) return -1;
+    if (fileWriteInt16List(stream, art->xOffsets, ROTATION_COUNT) == -1) return -1;
+    if (fileWriteInt16List(stream, art->yOffsets, ROTATION_COUNT) == -1) return -1;
+    if (fileWriteInt32List(stream, art->dataOffsets, ROTATION_COUNT) == -1) return -1;
+    if (fileWriteInt32(stream, art->field_3A) == -1) return -1;
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x41A1E8
+int artWrite(const char* path, unsigned char* data)
+{
+    if (data == NULL) {
+        return -1;
+    }
+
+    File* stream = fileOpen(path, "wb");
+    if (stream == NULL) {
+        return -1;
+    }
+
+    Art* art = (Art*)data;
+    if (artWriteHeader(art, stream) == -1) {
+        fileClose(stream);
+        return -1;
+    }
+
+    for (int index = 0; index < ROTATION_COUNT; index++) {
+        if (index == 0 || art->dataOffsets[index - 1] != art->dataOffsets[index]) {
+            if (artWriteFrameData(data + sizeof(Art) + art->dataOffsets[index], stream, art->frameCount) != 0) {
+                fileClose(stream);
+                return -1;
+            }
+        }
+    }
+
+    fileClose(stream);
+    return 0;
+}
+
+FrmImage::FrmImage()
+{
+    _key = nullptr;
+    _data = nullptr;
+    _width = 0;
+    _height = 0;
+}
+
+FrmImage::~FrmImage()
+{
+    unlock();
+}
+
+bool FrmImage::lock(unsigned int fid)
+{
+    if (isLocked()) {
+        return false;
+    }
+
+    _data = artLockFrameDataReturningSize(fid, &_key, &_width, &_height);
+    if (!_data) {
+        return false;
+    }
+
+    return true;
+}
+
+void FrmImage::unlock()
+{
+    if (isLocked()) {
+        artUnlock(_key);
+        _key = nullptr;
+        _data = nullptr;
+        _width = 0;
+        _height = 0;
+    }
+}
+
+} // namespace fallout

src/art.h

@@ -8,6 +8,8 @@
 #include "platform_compat.h"
 #include "proto_types.h"
 
+namespace fallout {
+
 typedef enum Head {
     HEAD_INVALID,
     HEAD_MARCUS,
@@ -127,7 +129,7 @@ unsigned char* artLockFrameData(int fid, int frame, int direction, CacheEntry**
 unsigned char* artLockFrameDataReturningSize(int fid, CacheEntry** out_cache_entry, int* widthPtr, int* heightPtr);
 int artUnlock(CacheEntry* cache_entry);
 int artCacheFlush();
-int artCopyFileName(int a1, int a2, char* a3);
+int artCopyFileName(int objectType, int a2, char* a3);
 int _art_get_code(int a1, int a2, char* a3, char* a4);
 char* artBuildFilePath(int a1);
 int artGetFramesPerSecond(Art* art);
@@ -144,8 +146,31 @@ bool artExists(int fid);
 bool _art_fid_valid(int fid);
 int _art_alias_num(int a1);
 int artCritterFidShouldRun(int a1);
-int _art_alias_fid(int a1);
-int buildFid(int a1, int a2, int a3, int a4, int a5);
+int artAliasFid(int fid);
+int buildFid(int objectType, int frmId, int animType, int a4, int rotation);
 int artRead(const char* path, unsigned char* data);
+int artWrite(const char* path, unsigned char* data);
+
+class FrmImage {
+public:
+    FrmImage();
+    ~FrmImage();
+
+    bool isLocked() const { return _key != nullptr; }
+    bool lock(unsigned int fid);
+    void unlock();
+
+    int getWidth() const { return _width; }
+    int getHeight() const { return _height; }
+    unsigned char* getData() const { return _data; }
+
+private:
+    CacheEntry* _key;
+    unsigned char* _data;
+    int _width;
+    int _height;
+};
+
+} // namespace fallout
 
 #endif

src/audio.cc

@@ -1,14 +1,16 @@
 #include "audio.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "db.h"
 #include "debug.h"
 #include "memory_manager.h"
 #include "pointer_registry.h"
 #include "sound.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+namespace fallout {
 
 static bool _defaultCompressionFunc(char* filePath);
 static int audioSoundDecoderReadHandler(int fileHandle, void* buf, unsigned int size);
@@ -252,3 +254,5 @@ void audioExit()
     gAudioListLength = 0;
     gAudioList = NULL;
 }
+
+} // namespace fallout

src/audio.h

@@ -3,6 +3,8 @@
 
 #include "audio_file.h"
 
+namespace fallout {
+
 int audioOpen(const char* fname, int mode, ...);
 int audioClose(int fileHandle);
 int audioRead(int fileHandle, void* buffer, unsigned int size);
@@ -13,4 +15,6 @@ int audioWrite(int handle, const void* buf, unsigned int size);
 int audioInit(AudioFileIsCompressedProc* isCompressedProc);
 void audioExit();
 
+} // namespace fallout
+
 #endif /* AUDIO_H */

src/audio_engine.cc

@@ -6,6 +6,8 @@
 
 #include <SDL.h>
 
+namespace fallout {
+
 #define AUDIO_ENGINE_SOUND_BUFFERS 8
 
 struct AudioEngineSoundBuffer {
@@ -430,3 +432,5 @@ bool audioEngineSoundBufferGetStatus(int soundBufferIndex, unsigned int* statusP
 
     return true;
 }
+
+} // namespace fallout

src/audio_engine.h

@@ -1,6 +1,8 @@
 #ifndef AUDIO_ENGINE_H
 #define AUDIO_ENGINE_H
 
+namespace fallout {
+
 #define AUDIO_ENGINE_SOUND_BUFFER_LOCK_FROM_WRITE_POS 0x00000001
 #define AUDIO_ENGINE_SOUND_BUFFER_LOCK_ENTIRE_BUFFER 0x00000002
 
@@ -26,4 +28,6 @@ bool audioEngineSoundBufferLock(int soundBufferIndex, unsigned int writePos, uns
 bool audioEngineSoundBufferUnlock(int soundBufferIndex, void* audioPtr1, unsigned int audioBytes1, void* audioPtr2, unsigned int audioBytes2);
 bool audioEngineSoundBufferGetStatus(int soundBufferIndex, unsigned int* status);
 
+} // namespace fallout
+
 #endif /* AUDIO_ENGINE_H */

src/audio_file.cc

@@ -1,14 +1,16 @@
 #include "audio_file.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "debug.h"
 #include "memory_manager.h"
 #include "platform_compat.h"
 #include "pointer_registry.h"
 #include "sound.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+namespace fallout {
 
 static bool _defaultCompressionFunc__(char* filePath);
 static int audioFileSoundDecoderReadHandler(int fileHandle, void* buffer, unsigned int size);
@@ -103,7 +105,7 @@ int audioFileOpen(const char* fname, int flags, ...)
         audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize));
         audioFile->fileSize *= 2;
     } else {
-        audioFile->fileSize = compat_filelength(fileno(stream));
+        audioFile->fileSize = getFileSize(stream);
     }
 
     audioFile->position = 0;
@@ -249,3 +251,5 @@ void audioFileExit()
     gAudioFileListLength = 0;
     gAudioFileList = NULL;
 }
+
+} // namespace fallout

src/audio_file.h

@@ -3,6 +3,8 @@
 
 #include "sound_decoder.h"
 
+namespace fallout {
+
 typedef enum AudioFileFlags {
     AUDIO_FILE_IN_USE = 0x01,
     AUDIO_FILE_COMPRESSED = 0x02,
@@ -30,4 +32,6 @@ int audioFileWrite(int handle, const void* buf, unsigned int size);
 int audioFileInit(AudioFileIsCompressedProc* isCompressedProc);
 void audioFileExit();
 
+} // namespace fallout
+
 #endif /* AUDIO_FILE_H */

src/automap.cc

@@ -1,5 +1,10 @@
 #include "automap.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "color.h"
 #include "config.h"
@@ -20,10 +25,7 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
+namespace fallout {
 
 #define AUTOMAP_OFFSET_COUNT (AUTOMAP_MAP_COUNT * ELEVATION_COUNT)
 
@@ -66,7 +68,7 @@ static const int _defam[AUTOMAP_MAP_COUNT][ELEVATION_COUNT] = {
 };
 
 // 0x41B560
-static const int _displayMapList[AUTOMAP_MAP_COUNT] = {
+static int _displayMapList[AUTOMAP_MAP_COUNT] = {
     -1,
     -1,
     -1,
@@ -299,15 +301,10 @@ void automapShow(bool isInGame, bool isUsingScanner)
     int frmIds[AUTOMAP_FRM_COUNT];
     memcpy(frmIds, gAutomapFrmIds, sizeof(gAutomapFrmIds));
 
-    unsigned char* frmData[AUTOMAP_FRM_COUNT];
-    CacheEntry* frmHandle[AUTOMAP_FRM_COUNT];
+    FrmImage frmImages[AUTOMAP_FRM_COUNT];
     for (int index = 0; index < AUTOMAP_FRM_COUNT; index++) {
-        int fid = buildFid(6, frmIds[index], 0, 0, 0);
-        frmData[index] = artLockFrameData(fid, 0, 0, &(frmHandle[index]));
-        if (frmData[index] == NULL) {
-            while (--index >= 0) {
-                artUnlock(frmHandle[index]);
-            }
+        int fid = buildFid(OBJ_TYPE_INTERFACE, frmIds[index], 0, 0, 0);
+        if (!frmImages[index].lock(fid)) {
             return;
         }
     }
@@ -327,17 +324,53 @@ void automapShow(bool isInGame, bool isUsingScanner)
     int automapWindowY = (screenGetHeight() - AUTOMAP_WINDOW_HEIGHT) / 2;
     int window = windowCreate(automapWindowX, automapWindowY, AUTOMAP_WINDOW_WIDTH, AUTOMAP_WINDOW_HEIGHT, color, WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
 
-    int scannerBtn = buttonCreate(window, 111, 454, 15, 16, -1, -1, -1, KEY_LOWERCASE_S, frmData[AUTOMAP_FRM_BUTTON_UP], frmData[AUTOMAP_FRM_BUTTON_DOWN], NULL, BUTTON_FLAG_TRANSPARENT);
+    int scannerBtn = buttonCreate(window,
+        111,
+        454,
+        15,
+        16,
+        -1,
+        -1,
+        -1,
+        KEY_LOWERCASE_S,
+        frmImages[AUTOMAP_FRM_BUTTON_UP].getData(),
+        frmImages[AUTOMAP_FRM_BUTTON_DOWN].getData(),
+        NULL,
+        BUTTON_FLAG_TRANSPARENT);
     if (scannerBtn != -1) {
         buttonSetCallbacks(scannerBtn, _gsound_red_butt_press, _gsound_red_butt_release);
     }
 
-    int cancelBtn = buttonCreate(window, 277, 454, 15, 16, -1, -1, -1, KEY_ESCAPE, frmData[AUTOMAP_FRM_BUTTON_UP], frmData[AUTOMAP_FRM_BUTTON_DOWN], NULL, BUTTON_FLAG_TRANSPARENT);
+    int cancelBtn = buttonCreate(window,
+        277,
+        454,
+        15,
+        16,
+        -1,
+        -1,
+        -1,
+        KEY_ESCAPE,
+        frmImages[AUTOMAP_FRM_BUTTON_UP].getData(),
+        frmImages[AUTOMAP_FRM_BUTTON_DOWN].getData(),
+        NULL,
+        BUTTON_FLAG_TRANSPARENT);
     if (cancelBtn != -1) {
         buttonSetCallbacks(cancelBtn, _gsound_red_butt_press, _gsound_red_butt_release);
     }
 
-    int switchBtn = buttonCreate(window, 457, 340, 42, 74, -1, -1, KEY_LOWERCASE_L, KEY_LOWERCASE_H, frmData[AUTOMAP_FRM_SWITCH_UP], frmData[AUTOMAP_FRM_SWITCH_DOWN], NULL, BUTTON_FLAG_TRANSPARENT | BUTTON_FLAG_0x01);
+    int switchBtn = buttonCreate(window,
+        457,
+        340,
+        42,
+        74,
+        -1,
+        -1,
+        KEY_LOWERCASE_L,
+        KEY_LOWERCASE_H,
+        frmImages[AUTOMAP_FRM_SWITCH_UP].getData(),
+        frmImages[AUTOMAP_FRM_SWITCH_DOWN].getData(),
+        NULL,
+        BUTTON_FLAG_TRANSPARENT | BUTTON_FLAG_0x01);
     if (switchBtn != -1) {
         buttonSetCallbacks(switchBtn, _gsound_toggle_butt_press_, _gsound_toggle_butt_press_);
     }
@@ -358,7 +391,7 @@ void automapShow(bool isInGame, bool isUsingScanner)
         gAutomapFlags |= AUTOMAP_WITH_SCANNER;
     }
 
-    automapRenderInMapWindow(window, elevation, frmData[AUTOMAP_FRM_BACKGROUND], gAutomapFlags);
+    automapRenderInMapWindow(window, elevation, frmImages[AUTOMAP_FRM_BACKGROUND].getData(), gAutomapFlags);
 
     bool isoWasEnabled = isoDisable();
     gameMouseSetCursor(MOUSE_CURSOR_ARROW);
@@ -442,7 +475,7 @@ void automapShow(bool isInGame, bool isUsingScanner)
         }
 
         if (needsRefresh) {
-            automapRenderInMapWindow(window, elevation, frmData[AUTOMAP_FRM_BACKGROUND], gAutomapFlags);
+            automapRenderInMapWindow(window, elevation, frmImages[AUTOMAP_FRM_BACKGROUND].getData(), gAutomapFlags);
             needsRefresh = false;
         }
     }
@@ -453,10 +486,6 @@ void automapShow(bool isInGame, bool isUsingScanner)
 
     windowDestroy(window);
     fontSetCurrent(oldFont);
-
-    for (int index = 0; index < AUTOMAP_FRM_COUNT; index++) {
-        artUnlock(frmHandle[index]);
-    }
 }
 
 // Renders automap in Map window.
@@ -482,7 +511,7 @@ static void automapRenderInMapWindow(int window, int elevation, unsigned char* b
             continue;
         }
 
-        int objectType = (object->fid & 0xF000000) >> 24;
+        int objectType = FID_TYPE(object->fid);
         unsigned char objectColor;
 
         if ((flags & AUTOMAP_IN_GAME) != 0) {
@@ -1048,7 +1077,7 @@ static void _decode_map_data(int elevation)
         if (object->tile != -1 && (object->flags & OBJECT_SEEN) != 0) {
             int contentType;
 
-            int objectType = (object->fid & 0xF000000) >> 24;
+            int objectType = FID_TYPE(object->fid);
             if (objectType == OBJ_TYPE_SCENERY && object->pid != PROTO_ID_0x2000158) {
                 contentType = 2;
             } else if (objectType == OBJ_TYPE_WALL) {
@@ -1153,3 +1182,12 @@ int automapGetHeader(AutomapHeader** automapHeaderPtr)
 
     return 0;
 }
+
+void automapSetDisplayMap(int map, bool available)
+{
+    if (map >= 0 && map < AUTOMAP_MAP_COUNT) {
+        _displayMapList[map] = available ? 0 : -1;
+    }
+}
+
+} // namespace fallout

src/automap.h

@@ -4,6 +4,8 @@
 #include "db.h"
 #include "map_defs.h"
 
+namespace fallout {
+
 #define AUTOMAP_DB ("AUTOMAP.DB")
 #define AUTOMAP_TMP ("AUTOMAP.TMP")
 
@@ -54,4 +56,8 @@ int automapRenderInPipboyWindow(int win, int map, int elevation);
 int automapSaveCurrent();
 int automapGetHeader(AutomapHeader** automapHeaderPtr);
 
+void automapSetDisplayMap(int map, bool available);
+
+} // namespace fallout
+
 #endif /* AUTOMAP_H */

src/autorun.cc

@@ -11,6 +11,8 @@
 static HANDLE gInterplayGenericAutorunMutex;
 #endif
 
+namespace fallout {
+
 // 0x4139C0
 bool autorunMutexCreate()
 {
@@ -34,3 +36,5 @@ void autorunMutexClose()
     }
 #endif
 }
+
+} // namespace fallout

src/autorun.h

@@ -1,7 +1,11 @@
 #ifndef AUTORUN_H
 #define AUTORUN_H
 
+namespace fallout {
+
 bool autorunMutexCreate();
 void autorunMutexClose();
 
+} // namespace fallout
+
 #endif /* AUTORUN_H */

src/cache.cc

@@ -1,13 +1,15 @@
 #include "cache.h"
 
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "debug.h"
 #include "memory.h"
 #include "sound.h"
 
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+namespace fallout {
 
 // The initial number of cache entries in new cache.
 #define CACHE_ENTRIES_INITIAL_CAPACITY (100)
@@ -613,3 +615,5 @@ static int cacheEntriesCompareByMostRecentHit(const void* a1, const void* a2)
         return 0;
     }
 }
+
+} // namespace fallout

src/cache.h

@@ -3,6 +3,8 @@
 
 #include "heap.h"
 
+namespace fallout {
+
 #define INVALID_CACHE_ENTRY ((CacheEntry*)-1)
 
 typedef enum CacheEntryFlags {
@@ -66,4 +68,6 @@ bool cacheUnlock(Cache* cache, CacheEntry* cacheEntry);
 bool cacheFlush(Cache* cache);
 bool cachePrintStats(Cache* cache, char* dest);
 
+} // namespace fallout
+
 #endif /* CACHE_H */

src/character_editor.h

@@ -3,6 +3,8 @@
 
 #include "db.h"
 
+namespace fallout {
+
 extern int gCharacterEditorRemainingCharacterPoints;
 
 int characterEditorShow(bool isCreationMode);
@@ -13,4 +15,6 @@ int characterEditorSave(File* stream);
 int characterEditorLoad(File* stream);
 void characterEditorReset();
 
+} // namespace fallout
+
 #endif /* CHARACTER_EDITOR_H */

src/character_selector.cc

@@ -1,5 +1,11 @@
 #include "character_selector.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+#include <vector>
+
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
@@ -9,6 +15,7 @@
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
+#include "game_config.h"
 #include "game_sound.h"
 #include "memory.h"
 #include "message.h"
@@ -17,14 +24,14 @@
 #include "palette.h"
 #include "platform_compat.h"
 #include "proto.h"
+#include "sfall_config.h"
 #include "skill.h"
 #include "stat.h"
 #include "text_font.h"
 #include "trait.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
+namespace fallout {
 
 #define CS_WINDOW_WIDTH (640)
 #define CS_WINDOW_HEIGHT (480)
@@ -57,12 +64,28 @@
 #define CS_WINDOW_SECONDARY_STAT_MID_X (379)
 #define CS_WINDOW_BIO_X (438)
 
+typedef enum PremadeCharacter {
+    PREMADE_CHARACTER_NARG,
+    PREMADE_CHARACTER_CHITSA,
+    PREMADE_CHARACTER_MINGUN,
+    PREMADE_CHARACTER_COUNT,
+} PremadeCharacter;
+
+typedef struct PremadeCharacterDescription {
+    char fileName[20];
+    int face;
+    char field_18[20];
+} PremadeCharacterDescription;
+
 static bool characterSelectorWindowInit();
 static void characterSelectorWindowFree();
 static bool characterSelectorWindowRefresh();
 static bool characterSelectorWindowRenderFace();
 static bool characterSelectorWindowRenderStats();
 static bool characterSelectorWindowRenderBio();
+static bool characterSelectorWindowFatalError(bool result);
+
+static void premadeCharactersLocalizePath(char* path);
 
 // 0x51C84C
 static int gCurrentPremadeCharacter = PREMADE_CHARACTER_NARG;
@@ -75,7 +98,7 @@ static PremadeCharacterDescription gPremadeCharacterDescriptions[PREMADE_CHARACT
 };
 
 // 0x51C8D4
-static const int gPremadeCharacterCount = PREMADE_CHARACTER_COUNT;
+static int gPremadeCharacterCount = PREMADE_CHARACTER_COUNT;
 
 // 0x51C7F8
 static int gCharacterSelectorWindow = -1;
@@ -89,92 +112,35 @@ static unsigned char* gCharacterSelectorBackground = NULL;
 // 0x51C804
 static int gCharacterSelectorWindowPreviousButton = -1;
 
-// 0x51C808
-static CacheEntry* gCharacterSelectorWindowPreviousButtonUpFrmHandle = NULL;
-
-// 0x51C80C
-static CacheEntry* gCharacterSelectorWindowPreviousButtonDownFrmHandle = NULL;
-
 // 0x51C810
 static int gCharacterSelectorWindowNextButton = -1;
 
-// 0x51C814
-static CacheEntry* gCharacterSelectorWindowNextButtonUpFrmHandle = NULL;
-
-// 0x51C818
-static CacheEntry* gCharacterSelectorWindowNextButtonDownFrmHandle = NULL;
-
 // 0x51C81C
 static int gCharacterSelectorWindowTakeButton = -1;
 
-// 0x51C820
-static CacheEntry* gCharacterSelectorWindowTakeButtonUpFrmHandle = NULL;
-
-// 0x51C824
-static CacheEntry* gCharacterSelectorWindowTakeButtonDownFrmHandle = NULL;
-
 // 0x51C828
 static int gCharacterSelectorWindowModifyButton = -1;
 
-// 0x51C82C
-static CacheEntry* gCharacterSelectorWindowModifyButtonUpFrmHandle = NULL;
-
-// 0x51C830
-static CacheEntry* gCharacterSelectorWindowModifyButtonDownFrmHandle = NULL;
-
 // 0x51C834
 static int gCharacterSelectorWindowCreateButton = -1;
 
-// 0x51C838
-static CacheEntry* gCharacterSelectorWindowCreateButtonUpFrmHandle = NULL;
-
-// 0x51C83C
-static CacheEntry* gCharacterSelectorWindowCreateButtonDownFrmHandle = NULL;
-
 // 0x51C840
 static int gCharacterSelectorWindowBackButton = -1;
 
-// 0x51C844
-static CacheEntry* gCharacterSelectorWindowBackButtonUpFrmHandle = NULL;
+static FrmImage _takeButtonNormalFrmImage;
+static FrmImage _takeButtonPressedFrmImage;
+static FrmImage _modifyButtonNormalFrmImage;
+static FrmImage _modifyButtonPressedFrmImage;
+static FrmImage _createButtonNormalFrmImage;
+static FrmImage _createButtonPressedFrmImage;
+static FrmImage _backButtonNormalFrmImage;
+static FrmImage _backButtonPressedFrmImage;
+static FrmImage _nextButtonNormalFrmImage;
+static FrmImage _nextButtonPressedFrmImage;
+static FrmImage _previousButtonNormalFrmImage;
+static FrmImage _previousButtonPressedFrmImage;
 
-// 0x51C848
-static CacheEntry* gCharacterSelectorWindowBackButtonDownFrmHandle = NULL;
-
-// 0x667764
-static unsigned char* gCharacterSelectorWindowTakeButtonUpFrmData;
-
-// 0x667768
-static unsigned char* gCharacterSelectorWindowModifyButtonDownFrmData;
-
-// 0x66776C
-static unsigned char* gCharacterSelectorWindowBackButtonUpFrmData;
-
-// 0x667770
-static unsigned char* gCharacterSelectorWindowCreateButtonUpFrmData;
-
-// 0x667774
-static unsigned char* gCharacterSelectorWindowModifyButtonUpFrmData;
-
-// 0x667778
-static unsigned char* gCharacterSelectorWindowBackButtonDownFrmData;
-
-// 0x66777C
-static unsigned char* gCharacterSelectorWindowCreateButtonDownFrmData;
-
-// 0x667780
-static unsigned char* gCharacterSelectorWindowTakeButtonDownFrmData;
-
-// 0x667784
-static unsigned char* gCharacterSelectorWindowNextButtonDownFrmData;
-
-// 0x667788
-static unsigned char* gCharacterSelectorWindowNextButtonUpFrmData;
-
-// 0x66778C
-static unsigned char* gCharacterSelectorWindowPreviousButtonUpFrmData;
-
-// 0x667790
-static unsigned char* gCharacterSelectorWindowPreviousButtonDownFrmData;
+static std::vector<PremadeCharacterDescription> gCustomPremadeCharacterDescriptions;
 
 // 0x4A71D0
 int characterSelectorOpen()
@@ -221,6 +187,8 @@ int characterSelectorOpen()
             if (characterEditorShow(1) == 0) {
                 rc = 2;
                 done = true;
+            } else {
+                characterSelectorWindowRefresh();
             }
 
             break;
@@ -229,6 +197,8 @@ int characterSelectorOpen()
             if (!characterEditorShow(1)) {
                 rc = 2;
                 done = true;
+            } else {
+                characterSelectorWindowRefresh();
             }
 
             break;
@@ -279,9 +249,6 @@ int characterSelectorOpen()
 // 0x4A7468
 static bool characterSelectorWindowInit()
 {
-    int backgroundFid;
-    unsigned char* backgroundFrmData;
-
     if (gCharacterSelectorWindow != -1) {
         return false;
     }
@@ -290,22 +257,21 @@ static bool characterSelectorWindowInit()
     int characterSelectorWindowY = (screenGetHeight() - CS_WINDOW_HEIGHT) / 2;
     gCharacterSelectorWindow = windowCreate(characterSelectorWindowX, characterSelectorWindowY, CS_WINDOW_WIDTH, CS_WINDOW_HEIGHT, _colorTable[0], 0);
     if (gCharacterSelectorWindow == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowBuffer = windowGetBuffer(gCharacterSelectorWindow);
     if (gCharacterSelectorWindowBuffer == NULL) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
-    CacheEntry* backgroundFrmHandle;
-    backgroundFid = buildFid(6, 174, 0, 0, 0);
-    backgroundFrmData = artLockFrameData(backgroundFid, 0, 0, &backgroundFrmHandle);
-    if (backgroundFrmData == NULL) {
-        goto err;
+    FrmImage backgroundFrmImage;
+    int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, 174, 0, 0, 0);
+    if (!backgroundFrmImage.lock(backgroundFid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
-    blitBufferToBuffer(backgroundFrmData,
+    blitBufferToBuffer(backgroundFrmImage.getData(),
         CS_WINDOW_WIDTH,
         CS_WINDOW_HEIGHT,
         CS_WINDOW_WIDTH,
@@ -314,30 +280,28 @@ static bool characterSelectorWindowInit()
 
     gCharacterSelectorBackground = (unsigned char*)internal_malloc(CS_WINDOW_BACKGROUND_WIDTH * CS_WINDOW_BACKGROUND_HEIGHT);
     if (gCharacterSelectorBackground == NULL)
-        goto err;
+        return characterSelectorWindowFatalError(false);
 
-    blitBufferToBuffer(backgroundFrmData + CS_WINDOW_WIDTH * CS_WINDOW_BACKGROUND_Y + CS_WINDOW_BACKGROUND_X,
+    blitBufferToBuffer(backgroundFrmImage.getData() + CS_WINDOW_WIDTH * CS_WINDOW_BACKGROUND_Y + CS_WINDOW_BACKGROUND_X,
         CS_WINDOW_BACKGROUND_WIDTH,
         CS_WINDOW_BACKGROUND_HEIGHT,
         CS_WINDOW_WIDTH,
         gCharacterSelectorBackground,
         CS_WINDOW_BACKGROUND_WIDTH);
 
-    artUnlock(backgroundFrmHandle);
+    backgroundFrmImage.unlock();
 
     int fid;
 
     // Setup "Previous" button.
-    fid = buildFid(6, 122, 0, 0, 0);
-    gCharacterSelectorWindowPreviousButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowPreviousButtonUpFrmHandle);
-    if (gCharacterSelectorWindowPreviousButtonUpFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 122, 0, 0, 0);
+    if (!_previousButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
-    fid = buildFid(6, 123, 0, 0, 0);
-    gCharacterSelectorWindowPreviousButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowPreviousButtonDownFrmHandle);
-    if (gCharacterSelectorWindowPreviousButtonDownFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 123, 0, 0, 0);
+    if (!_previousButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowPreviousButton = buttonCreate(gCharacterSelectorWindow,
@@ -349,27 +313,25 @@ static bool characterSelectorWindowInit()
         -1,
         -1,
         500,
-        gCharacterSelectorWindowPreviousButtonUpFrmData,
-        gCharacterSelectorWindowPreviousButtonDownFrmData,
+        _previousButtonNormalFrmImage.getData(),
+        _previousButtonPressedFrmImage.getData(),
         NULL,
         0);
     if (gCharacterSelectorWindowPreviousButton == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     buttonSetCallbacks(gCharacterSelectorWindowPreviousButton, _gsound_med_butt_press, _gsound_med_butt_release);
 
     // Setup "Next" button.
-    fid = buildFid(6, 124, 0, 0, 0);
-    gCharacterSelectorWindowNextButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowNextButtonUpFrmHandle);
-    if (gCharacterSelectorWindowNextButtonUpFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 124, 0, 0, 0);
+    if (!_nextButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
-    fid = buildFid(6, 125, 0, 0, 0);
-    gCharacterSelectorWindowNextButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowNextButtonDownFrmHandle);
-    if (gCharacterSelectorWindowNextButtonDownFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 125, 0, 0, 0);
+    if (!_nextButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowNextButton = buttonCreate(gCharacterSelectorWindow,
@@ -381,27 +343,25 @@ static bool characterSelectorWindowInit()
         -1,
         -1,
         501,
-        gCharacterSelectorWindowNextButtonUpFrmData,
-        gCharacterSelectorWindowNextButtonDownFrmData,
+        _nextButtonNormalFrmImage.getData(),
+        _nextButtonPressedFrmImage.getData(),
         NULL,
         0);
     if (gCharacterSelectorWindowNextButton == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     buttonSetCallbacks(gCharacterSelectorWindowNextButton, _gsound_med_butt_press, _gsound_med_butt_release);
 
     // Setup "Take" button.
-    fid = buildFid(6, 8, 0, 0, 0);
-    gCharacterSelectorWindowTakeButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowTakeButtonUpFrmHandle);
-    if (gCharacterSelectorWindowTakeButtonUpFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
+    if (!_takeButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
-    fid = buildFid(6, 9, 0, 0, 0);
-    gCharacterSelectorWindowTakeButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowTakeButtonDownFrmHandle);
-    if (gCharacterSelectorWindowTakeButtonDownFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
+    if (!_takeButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowTakeButton = buttonCreate(gCharacterSelectorWindow,
@@ -413,26 +373,24 @@ static bool characterSelectorWindowInit()
         -1,
         -1,
         KEY_LOWERCASE_T,
-        gCharacterSelectorWindowTakeButtonUpFrmData,
-        gCharacterSelectorWindowTakeButtonDownFrmData,
+        _takeButtonNormalFrmImage.getData(),
+        _takeButtonPressedFrmImage.getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (gCharacterSelectorWindowTakeButton == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     buttonSetCallbacks(gCharacterSelectorWindowTakeButton, _gsound_red_butt_press, _gsound_red_butt_release);
 
     // Setup "Modify" button.
-    fid = buildFid(6, 8, 0, 0, 0);
-    gCharacterSelectorWindowModifyButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowModifyButtonUpFrmHandle);
-    if (gCharacterSelectorWindowModifyButtonUpFrmData == NULL)
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
+    if (!_modifyButtonNormalFrmImage.lock(fid))
+        return characterSelectorWindowFatalError(false);
 
-    fid = buildFid(6, 9, 0, 0, 0);
-    gCharacterSelectorWindowModifyButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowModifyButtonDownFrmHandle);
-    if (gCharacterSelectorWindowModifyButtonDownFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
+    if (!_modifyButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowModifyButton = buttonCreate(gCharacterSelectorWindow,
@@ -444,27 +402,25 @@ static bool characterSelectorWindowInit()
         -1,
         -1,
         KEY_LOWERCASE_M,
-        gCharacterSelectorWindowModifyButtonUpFrmData,
-        gCharacterSelectorWindowModifyButtonDownFrmData,
+        _modifyButtonNormalFrmImage.getData(),
+        _modifyButtonPressedFrmImage.getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (gCharacterSelectorWindowModifyButton == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     buttonSetCallbacks(gCharacterSelectorWindowModifyButton, _gsound_red_butt_press, _gsound_red_butt_release);
 
     // Setup "Create" button.
-    fid = buildFid(6, 8, 0, 0, 0);
-    gCharacterSelectorWindowCreateButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowCreateButtonUpFrmHandle);
-    if (gCharacterSelectorWindowCreateButtonUpFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
+    if (!_createButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
-    fid = buildFid(6, 9, 0, 0, 0);
-    gCharacterSelectorWindowCreateButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowCreateButtonDownFrmHandle);
-    if (gCharacterSelectorWindowCreateButtonDownFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
+    if (!_createButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowCreateButton = buttonCreate(gCharacterSelectorWindow,
@@ -476,27 +432,25 @@ static bool characterSelectorWindowInit()
         -1,
         -1,
         KEY_LOWERCASE_C,
-        gCharacterSelectorWindowCreateButtonUpFrmData,
-        gCharacterSelectorWindowCreateButtonDownFrmData,
+        _createButtonNormalFrmImage.getData(),
+        _createButtonPressedFrmImage.getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (gCharacterSelectorWindowCreateButton == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     buttonSetCallbacks(gCharacterSelectorWindowCreateButton, _gsound_red_butt_press, _gsound_red_butt_release);
 
     // Setup "Back" button.
-    fid = buildFid(6, 8, 0, 0, 0);
-    gCharacterSelectorWindowBackButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowBackButtonUpFrmHandle);
-    if (gCharacterSelectorWindowBackButtonUpFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
+    if (!_backButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
-    fid = buildFid(6, 9, 0, 0, 0);
-    gCharacterSelectorWindowBackButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowBackButtonDownFrmHandle);
-    if (gCharacterSelectorWindowBackButtonDownFrmData == NULL) {
-        goto err;
+    fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
+    if (!_backButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowBackButton = buttonCreate(gCharacterSelectorWindow,
@@ -508,12 +462,12 @@ static bool characterSelectorWindowInit()
         -1,
         -1,
         KEY_ESCAPE,
-        gCharacterSelectorWindowBackButtonUpFrmData,
-        gCharacterSelectorWindowBackButtonDownFrmData,
+        _backButtonNormalFrmImage.getData(),
+        _backButtonPressedFrmImage.getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (gCharacterSelectorWindowBackButton == -1) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     buttonSetCallbacks(gCharacterSelectorWindowBackButton, _gsound_red_butt_press, _gsound_red_butt_release);
@@ -523,16 +477,10 @@ static bool characterSelectorWindowInit()
     windowRefresh(gCharacterSelectorWindow);
 
     if (!characterSelectorWindowRefresh()) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     return true;
-
-err:
-
-    characterSelectorWindowFree();
-
-    return false;
 }
 
 // 0x4A7AD4
@@ -547,102 +495,48 @@ static void characterSelectorWindowFree()
         gCharacterSelectorWindowPreviousButton = -1;
     }
 
-    if (gCharacterSelectorWindowPreviousButtonDownFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowPreviousButtonDownFrmHandle);
-        gCharacterSelectorWindowPreviousButtonDownFrmHandle = NULL;
-        gCharacterSelectorWindowPreviousButtonDownFrmData = NULL;
-    }
-
-    if (gCharacterSelectorWindowPreviousButtonUpFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowPreviousButtonUpFrmHandle);
-        gCharacterSelectorWindowPreviousButtonUpFrmHandle = NULL;
-        gCharacterSelectorWindowPreviousButtonUpFrmData = NULL;
-    }
+    _previousButtonNormalFrmImage.unlock();
+    _previousButtonPressedFrmImage.unlock();
 
     if (gCharacterSelectorWindowNextButton != -1) {
         buttonDestroy(gCharacterSelectorWindowNextButton);
         gCharacterSelectorWindowNextButton = -1;
     }
 
-    if (gCharacterSelectorWindowNextButtonDownFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowNextButtonDownFrmHandle);
-        gCharacterSelectorWindowNextButtonDownFrmHandle = NULL;
-        gCharacterSelectorWindowNextButtonDownFrmData = NULL;
-    }
-
-    if (gCharacterSelectorWindowNextButtonUpFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowNextButtonUpFrmHandle);
-        gCharacterSelectorWindowNextButtonUpFrmHandle = NULL;
-        gCharacterSelectorWindowNextButtonUpFrmData = NULL;
-    }
+    _nextButtonNormalFrmImage.unlock();
+    _nextButtonPressedFrmImage.unlock();
 
     if (gCharacterSelectorWindowTakeButton != -1) {
         buttonDestroy(gCharacterSelectorWindowTakeButton);
         gCharacterSelectorWindowTakeButton = -1;
     }
 
-    if (gCharacterSelectorWindowTakeButtonDownFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowTakeButtonDownFrmHandle);
-        gCharacterSelectorWindowTakeButtonDownFrmHandle = NULL;
-        gCharacterSelectorWindowTakeButtonDownFrmData = NULL;
-    }
-
-    if (gCharacterSelectorWindowTakeButtonUpFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowTakeButtonUpFrmHandle);
-        gCharacterSelectorWindowTakeButtonUpFrmHandle = NULL;
-        gCharacterSelectorWindowTakeButtonUpFrmData = NULL;
-    }
+    _takeButtonNormalFrmImage.unlock();
+    _takeButtonPressedFrmImage.unlock();
 
     if (gCharacterSelectorWindowModifyButton != -1) {
         buttonDestroy(gCharacterSelectorWindowModifyButton);
         gCharacterSelectorWindowModifyButton = -1;
     }
 
-    if (gCharacterSelectorWindowModifyButtonDownFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowModifyButtonDownFrmHandle);
-        gCharacterSelectorWindowModifyButtonDownFrmHandle = NULL;
-        gCharacterSelectorWindowModifyButtonDownFrmData = NULL;
-    }
-
-    if (gCharacterSelectorWindowModifyButtonUpFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowModifyButtonUpFrmHandle);
-        gCharacterSelectorWindowModifyButtonUpFrmHandle = NULL;
-        gCharacterSelectorWindowModifyButtonUpFrmData = NULL;
-    }
+    _modifyButtonNormalFrmImage.unlock();
+    _modifyButtonPressedFrmImage.unlock();
 
     if (gCharacterSelectorWindowCreateButton != -1) {
         buttonDestroy(gCharacterSelectorWindowCreateButton);
         gCharacterSelectorWindowCreateButton = -1;
     }
 
-    if (gCharacterSelectorWindowCreateButtonDownFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowCreateButtonDownFrmHandle);
-        gCharacterSelectorWindowCreateButtonDownFrmHandle = NULL;
-        gCharacterSelectorWindowCreateButtonDownFrmData = NULL;
-    }
-
-    if (gCharacterSelectorWindowCreateButtonUpFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowCreateButtonUpFrmHandle);
-        gCharacterSelectorWindowCreateButtonUpFrmHandle = NULL;
-        gCharacterSelectorWindowCreateButtonUpFrmData = NULL;
-    }
+    _createButtonNormalFrmImage.unlock();
+    _createButtonPressedFrmImage.unlock();
 
     if (gCharacterSelectorWindowBackButton != -1) {
         buttonDestroy(gCharacterSelectorWindowBackButton);
         gCharacterSelectorWindowBackButton = -1;
     }
 
-    if (gCharacterSelectorWindowBackButtonDownFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowBackButtonDownFrmHandle);
-        gCharacterSelectorWindowBackButtonDownFrmHandle = NULL;
-        gCharacterSelectorWindowBackButtonDownFrmData = NULL;
-    }
-
-    if (gCharacterSelectorWindowBackButtonUpFrmData != NULL) {
-        artUnlock(gCharacterSelectorWindowBackButtonUpFrmHandle);
-        gCharacterSelectorWindowBackButtonUpFrmHandle = NULL;
-        gCharacterSelectorWindowBackButtonUpFrmData = NULL;
-    }
+    _backButtonNormalFrmImage.unlock();
+    _backButtonPressedFrmImage.unlock();
 
     if (gCharacterSelectorBackground != NULL) {
         internal_free(gCharacterSelectorBackground);
@@ -657,7 +551,9 @@ static void characterSelectorWindowFree()
 static bool characterSelectorWindowRefresh()
 {
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s.gcd", gPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
+    sprintf(path, "%s.gcd", gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
+    premadeCharactersLocalizePath(path);
+
     if (_proto_dude_init(path) == -1) {
         debugPrint("\n ** Error in dude init! **\n");
         return false;
@@ -687,18 +583,17 @@ static bool characterSelectorWindowRenderFace()
 {
     bool success = false;
 
-    CacheEntry* faceFrmHandle;
-    int faceFid = buildFid(6, gPremadeCharacterDescriptions[gCurrentPremadeCharacter].face, 0, 0, 0);
-    Art* frm = artLock(faceFid, &faceFrmHandle);
-    if (frm != NULL) {
-        unsigned char* data = artGetFrameData(frm, 0, 0);
+    FrmImage faceFrmImage;
+    int faceFid = buildFid(OBJ_TYPE_INTERFACE, gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].face, 0, 0, 0);
+    if (faceFrmImage.lock(faceFid)) {
+        unsigned char* data = faceFrmImage.getData();
         if (data != NULL) {
-            int width = artGetWidth(frm, 0, 0);
-            int height = artGetHeight(frm, 0, 0);
+            int width = faceFrmImage.getWidth();
+            int height = faceFrmImage.getHeight();
             blitBufferToBufferTrans(data, width, height, width, (gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * 23 + 27), CS_WINDOW_WIDTH);
             success = true;
         }
-        artUnlock(faceFrmHandle);
+        faceFrmImage.unlock();
     }
 
     return success;
@@ -963,7 +858,8 @@ static bool characterSelectorWindowRenderBio()
     fontSetCurrent(101);
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s.bio", gPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
+    sprintf(path, "%s.bio", gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
+    premadeCharactersLocalizePath(path);
 
     File* stream = fileOpen(path, "rt");
     if (stream != NULL) {
@@ -983,3 +879,124 @@ static bool characterSelectorWindowRenderBio()
 
     return true;
 }
+
+// NOTE: Inlined.
+//
+// 0x4A8BD0
+static bool characterSelectorWindowFatalError(bool result)
+{
+    characterSelectorWindowFree();
+    return result;
+}
+
+void premadeCharactersInit()
+{
+    char* fileNamesString;
+    configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_PREMADE_CHARACTERS_FILE_NAMES_KEY, &fileNamesString);
+    if (fileNamesString != NULL && *fileNamesString == '\0') {
+        fileNamesString = NULL;
+    }
+
+    char* faceFidsString;
+    configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_PREMADE_CHARACTERS_FACE_FIDS_KEY, &faceFidsString);
+    if (faceFidsString != NULL && *faceFidsString == '\0') {
+        faceFidsString = NULL;
+    }
+
+    if (fileNamesString != NULL && faceFidsString != NULL) {
+        int fileNamesLength = 0;
+        for (char* pch = fileNamesString; pch != NULL; pch = strchr(pch + 1, ',')) {
+            fileNamesLength++;
+        }
+
+        int faceFidsLength = 0;
+        for (char* pch = faceFidsString; pch != NULL; pch = strchr(pch + 1, ',')) {
+            faceFidsLength++;
+        }
+
+        int premadeCharactersCount = std::min(fileNamesLength, faceFidsLength);
+        gCustomPremadeCharacterDescriptions.resize(premadeCharactersCount);
+
+        for (int index = 0; index < premadeCharactersCount; index++) {
+            char* pch;
+
+            pch = strchr(fileNamesString, ',');
+            if (pch != NULL) {
+                *pch = '\0';
+            }
+
+            if (strlen(fileNamesString) > 11) {
+                // Sfall fails here.
+                continue;
+            }
+
+            sprintf(gCustomPremadeCharacterDescriptions[index].fileName, "premade\\%s", fileNamesString);
+
+            if (pch != NULL) {
+                *pch = ',';
+            }
+
+            fileNamesString = pch + 1;
+
+            pch = strchr(faceFidsString, ',');
+            if (pch != NULL) {
+                *pch = '\0';
+            }
+
+            gCustomPremadeCharacterDescriptions[index].face = atoi(faceFidsString);
+
+            if (pch != NULL) {
+                *pch = ',';
+            }
+
+            faceFidsString = pch + 1;
+
+            gCustomPremadeCharacterDescriptions[index].field_18[0] = '\0';
+        }
+    }
+
+    if (gCustomPremadeCharacterDescriptions.empty()) {
+        gCustomPremadeCharacterDescriptions.resize(PREMADE_CHARACTER_COUNT);
+
+        for (int index = 0; index < PREMADE_CHARACTER_COUNT; index++) {
+            strcpy(gCustomPremadeCharacterDescriptions[index].fileName, gPremadeCharacterDescriptions[index].fileName);
+            gCustomPremadeCharacterDescriptions[index].face = gPremadeCharacterDescriptions[index].face;
+            strcpy(gCustomPremadeCharacterDescriptions[index].field_18, gPremadeCharacterDescriptions[index].field_18);
+        }
+    }
+
+    gPremadeCharacterCount = gCustomPremadeCharacterDescriptions.size();
+}
+
+void premadeCharactersExit()
+{
+    gCustomPremadeCharacterDescriptions.clear();
+}
+
+static void premadeCharactersLocalizePath(char* path)
+{
+    if (compat_strnicmp(path, "premade\\", 8) != 0) {
+        return;
+    }
+
+    char* language;
+    if (!configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language)) {
+        return;
+    }
+
+    if (compat_stricmp(language, ENGLISH) == 0) {
+        return;
+    }
+
+    char localizedPath[COMPAT_MAX_PATH];
+    strncpy(localizedPath, path, 8);
+    strcpy(localizedPath + 8, language);
+    strcpy(localizedPath + 8 + strlen(language), path + 7);
+
+    int fileSize;
+    if (dbGetFileSize(localizedPath, &fileSize) == 0) {
+        strcpy(path, localizedPath);
+    }
+}
+
+} // namespace fallout

src/character_selector.h

@@ -1,19 +1,13 @@
 #ifndef CHARACTER_SELECTOR_H
 #define CHARACTER_SELECTOR_H
 
-typedef enum PremadeCharacter {
-    PREMADE_CHARACTER_NARG,
-    PREMADE_CHARACTER_CHITSA,
-    PREMADE_CHARACTER_MINGUN,
-    PREMADE_CHARACTER_COUNT,
-} PremadeCharacter;
-
-typedef struct PremadeCharacterDescription {
-    char fileName[20];
-    int face;
-    char field_18[20];
-} PremadeCharacterDescription;
+namespace fallout {
 
 int characterSelectorOpen();
 
+void premadeCharactersInit();
+void premadeCharactersExit();
+
+} // namespace fallout
+
 #endif /* CHARACTER_SELECTOR_H */

src/color.cc

@@ -1,11 +1,21 @@
 #include "color.h"
 
+#include <math.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "core.h"
 
-#include <string.h>
-#include <math.h>
+namespace fallout {
 
-#include <algorithm>
+#define COLOR_PALETTE_STACK_CAPACITY 16
+
+typedef struct ColorPaletteStackEntry {
+    unsigned char mappedColors[256];
+    unsigned char cmap[768];
+    unsigned char colorTable[32768];
+} ColorPaletteStackEntry;
 
 static int colorPaletteFileOpen(const char* filePath, int flags);
 static int colorPaletteFileRead(int fd, void* buffer, size_t size);
@@ -25,6 +35,12 @@ static char _aColor_cNoError[] = "color.c: No errors\n";
 // 0x50F95C
 static char _aColor_cColorTa[] = "color.c: color table not found\n";
 
+// 0x50F984
+static char _aColor_cColorpa[] = "color.c: colorpalettestack overflow";
+
+// 0x50F9AC
+static char aColor_cColor_0[] = "color.c: colorpalettestack underflow";
+
 // 0x51DF10
 static char* _errorStr = _aColor_cNoError;
 
@@ -54,6 +70,9 @@ unsigned char _cmap[768] = {
     0x3F, 0x3F, 0x3F
 };
 
+// 0x673050
+static ColorPaletteStackEntry* gColorPaletteStack[COLOR_PALETTE_STACK_CAPACITY];
+
 // 0x673090
 unsigned char _systemCmap[256 * 3];
 
@@ -78,6 +97,9 @@ unsigned char _colorMixMulTable[65536];
 // 0x6A38D0
 unsigned char _colorTable[32768];
 
+// 0x6AB8D0
+static int gColorPaletteStackSize;
+
 // 0x6AB928
 static ColorPaletteFileReadProc* gColorPaletteFileReadProc;
 
@@ -572,6 +594,60 @@ void colorSetBrightness(double value)
     _setSystemPalette(_systemCmap);
 }
 
+// NOTE: Unused.
+//
+// 0x4C8828
+bool colorPushColorPalette()
+{
+    if (gColorPaletteStackSize >= COLOR_PALETTE_STACK_CAPACITY) {
+        _errorStr = _aColor_cColorpa;
+        return false;
+    }
+
+    ColorPaletteStackEntry* entry = (ColorPaletteStackEntry*)malloc(sizeof(*entry));
+    gColorPaletteStack[gColorPaletteStackSize] = entry;
+
+    memcpy(entry->mappedColors, _mappedColor, sizeof(_mappedColor));
+    memcpy(entry->cmap, _cmap, sizeof(_cmap));
+    memcpy(entry->colorTable, _colorTable, sizeof(_colorTable));
+
+    gColorPaletteStackSize++;
+
+    return true;
+}
+
+// NOTE: Unused.
+//
+// 0x4C88E0
+bool colorPopColorPalette()
+{
+    if (gColorPaletteStackSize == 0) {
+        _errorStr = aColor_cColor_0;
+        return false;
+    }
+
+    gColorPaletteStackSize--;
+
+    ColorPaletteStackEntry* entry = gColorPaletteStack[gColorPaletteStackSize];
+
+    memcpy(_mappedColor, entry->mappedColors, sizeof(_mappedColor));
+    memcpy(_cmap, entry->cmap, sizeof(_cmap));
+    memcpy(_colorTable, entry->colorTable, sizeof(_colorTable));
+
+    free(entry);
+    gColorPaletteStack[gColorPaletteStackSize] = NULL;
+
+    _setIntensityTables();
+
+    for (int index = 0; index < 256; index++) {
+        _setMixTableColor(index);
+    }
+
+    _rebuildColorBlendTables();
+
+    return true;
+}
+
 // 0x4C89CC
 bool _initColors()
 {
@@ -599,5 +675,11 @@ void _colorsClose()
         _freeColorBlendTable(index);
     }
 
-    // TODO: Incomplete.
+    for (int index = 0; index < gColorPaletteStackSize; index++) {
+        free(gColorPaletteStack[index]);
+    }
+
+    gColorPaletteStackSize = 0;
 }
+
+} // namespace fallout

src/color.h

@@ -3,6 +3,8 @@
 
 #include "memory_defs.h"
 
+namespace fallout {
+
 typedef const char*(ColorFileNameManger)(const char*);
 typedef void(ColorTransitionCallback)();
 
@@ -35,7 +37,11 @@ unsigned char* _getColorBlendTable(int ch);
 void _freeColorBlendTable(int a1);
 void colorPaletteSetMemoryProcs(MallocProc* mallocProc, ReallocProc* reallocProc, FreeProc* freeProc);
 void colorSetBrightness(double value);
+bool colorPushColorPalette();
+bool colorPopColorPalette();
 bool _initColors();
 void _colorsClose();
 
+} // namespace fallout
+
 #endif /* COLOR_H */

src/combat.h

@@ -1,11 +1,13 @@
 #ifndef COMBAT_H
 #define COMBAT_H
 
-#include "db.h"
 #include "combat_defs.h"
+#include "db.h"
 #include "obj_types.h"
 #include "proto_types.h"
 
+namespace fallout {
+
 extern int _combatNumTurns;
 extern unsigned int gCombatState;
 
@@ -17,16 +19,16 @@ void combatExit();
 int _find_cid(int a1, int a2, Object** a3, int a4);
 int combatLoad(File* stream);
 int combatSave(File* stream);
-bool _combat_safety_invalidate_weapon(Object* a1, Object* a2, int hitMode, Object* a4, int* a5);
-bool _combatTestIncidentalHit(Object* a1, Object* a2, Object* a3, Object* a4);
+bool _combat_safety_invalidate_weapon(Object* attacker, Object* weapon, int hitMode, Object* defender, int* safeDistancePtr);
+bool _combatTestIncidentalHit(Object* attacker, Object* defender, Object* attackerFriend, Object* weapon);
 Object* _combat_whose_turn();
 void _combat_data_init(Object* obj);
-Object* _combatAIInfoGetFriendlyDead(Object* obj);
-int _combatAIInfoSetFriendlyDead(Object* a1, Object* a2);
-Object* _combatAIInfoGetLastTarget(Object* obj);
-int _combatAIInfoSetLastTarget(Object* a1, Object* a2);
-Object* _combatAIInfoGetLastItem(Object* obj);
-int _combatAIInfoSetLastItem(Object* obj, Object* a2);
+Object* aiInfoGetFriendlyDead(Object* obj);
+int aiInfoSetFriendlyDead(Object* a1, Object* a2);
+Object* aiInfoGetLastTarget(Object* obj);
+int aiInfoSetLastTarget(Object* a1, Object* a2);
+Object* aiInfoGetLastItem(Object* obj);
+int aiInfoSetLastItem(Object* obj, Object* a2);
 void _combat_update_critter_outline_for_los(Object* critter, bool a2);
 void _combat_over_from_load();
 void _combat_give_exps(int exp_points);
@@ -35,7 +37,7 @@ void _combat(STRUCT_664980* attack);
 void attackInit(Attack* attack, Object* a2, Object* a3, int a4, int a5);
 int _combat_attack(Object* a1, Object* a2, int a3, int a4);
 int _combat_bullet_start(const Object* a1, const Object* a2);
-void _compute_explosion_on_extras(Attack* attack, int a2, int a3, int a4);
+void _compute_explosion_on_extras(Attack* attack, int a2, bool isGrenade, int a4);
 int _determine_to_hit(Object* a1, Object* a2, int hitLocation, int hitMode);
 int _determine_to_hit_no_range(Object* a1, Object* a2, int a3, int a4, unsigned char* a5);
 int _determine_to_hit_from_tile(Object* a1, int a2, Object* a3, int a4, int a5);
@@ -56,9 +58,31 @@ int _combat_explode_scenery(Object* a1, Object* a2);
 void _combat_delete_critter(Object* obj);
 void _combatKillCritterOutsideCombat(Object* critter_obj, char* msg);
 
+int criticalsGetValue(int killType, int hitLocation, int effect, int dataMember);
+void criticalsSetValue(int killType, int hitLocation, int effect, int dataMember, int value);
+void criticalsResetValue(int killType, int hitLocation, int effect, int dataMember);
+int unarmedGetDamage(int hitMode, int* minDamagePtr, int* maxDamagePtr);
+int unarmedGetBonusCriticalChance(int hitMode);
+int unarmedGetActionPointCost(int hitMode);
+bool unarmedIsPenetrating(int hitMode);
+int unarmedGetPunchHitMode(bool isSecondary);
+int unarmedGetKickHitMode(bool isSecondary);
+bool unarmedIsPenetrating(int hitMode);
+bool damageModGetBonusHthDamageFix();
+bool damageModGetDisplayBonusDamage();
+
 static inline bool isInCombat()
 {
     return (gCombatState & COMBAT_STATE_0x01) != 0;
 }
 
+static inline bool isUnarmedHitMode(int hitMode)
+{
+    return hitMode == HIT_MODE_PUNCH
+        || hitMode == HIT_MODE_KICK
+        || (hitMode >= FIRST_ADVANCED_UNARMED_HIT_MODE && hitMode <= LAST_ADVANCED_UNARMED_HIT_MODE);
+}
+
+} // namespace fallout
+
 #endif /* COMBAT_H */

src/combat_ai.h

@@ -6,6 +6,8 @@
 #include "db.h"
 #include "obj_types.h"
 
+namespace fallout {
+
 typedef enum AiMessageType {
     AI_MESSAGE_TYPE_RUN,
     AI_MESSAGE_TYPE_MOVE,
@@ -48,7 +50,7 @@ void _caiTeamCombatExit();
 Object* _ai_search_inven_weap(Object* critter, int a2, Object* a3);
 Object* _ai_search_inven_armor(Object* critter);
 int _cAIPrepWeaponItem(Object* critter, Object* item);
-void _cai_attempt_w_reload(Object* critter_obj, int a2);
+void aiAttemptWeaponReload(Object* critter, int animate);
 void _combat_ai_begin(int a1, void* a2);
 void _combat_ai_over();
 int _cai_perform_distance_prefs(Object* a1, Object* a2);
@@ -66,4 +68,6 @@ void _combatai_notify_onlookers(Object* a1);
 void _combatai_notify_friends(Object* a1);
 void _combatai_delete_critter(Object* obj);
 
+} // namespace fallout
+
 #endif /* COMBAT_AI_H */

src/combat_ai_defs.h

@@ -1,6 +1,8 @@
 #ifndef COMBAT_AI_DEFS_H
 #define COMBAT_AI_DEFS_H
 
+namespace fallout {
+
 typedef enum AreaAttackMode {
     AREA_ATTACK_MODE_ALWAYS,
     AREA_ATTACK_MODE_SOMETIMES,
@@ -79,4 +81,6 @@ typedef enum HurtTooMuch {
     HURT_COUNT,
 } HurtTooMuch;
 
+} // namespace fallout
+
 #endif /* COMBAT_AI_DEFS_H */

src/combat_defs.h

@@ -10,6 +10,8 @@
 #define WEAPON_CRITICAL_FAILURE_TYPE_COUNT (7)
 #define WEAPON_CRITICAL_FAILURE_EFFECT_COUNT (5)
 
+namespace fallout {
+
 typedef enum CombatState {
     COMBAT_STATE_0x01 = 0x01,
     COMBAT_STATE_0x02 = 0x02,
@@ -84,13 +86,6 @@ typedef enum HitLocation {
     HIT_LOCATION_SPECIFIC_COUNT = HIT_LOCATION_COUNT - 1,
 } HitLocation;
 
-typedef struct STRUCT_510948 {
-    Object* field_0;
-    Object* field_4;
-    Object* field_8;
-    int field_C;
-} STRUCT_510948;
-
 typedef struct STRUCT_664980 {
     Object* attacker;
     Object* defender;
@@ -128,25 +123,54 @@ typedef struct Attack {
     int extrasKnockback[EXPLOSION_TARGET_COUNT];
 } Attack;
 
+typedef enum CriticalHitDescriptionDataMember {
+    CRIT_DATA_MEMBER_DAMAGE_MULTIPLIER,
+    CRIT_DATA_MEMBER_FLAGS,
+    CRIT_DATA_MEMBER_MASSIVE_CRITICAL_STAT,
+    CRIT_DATA_MEMBER_MASSIVE_CRITICAL_STAT_MODIFIER,
+    CRIT_DATA_MEMBER_MASSIVE_CRITICAL_FLAGS,
+    CRIT_DATA_MEMBER_MESSAGE_ID,
+    CRIT_DATA_MEMBER_MASSIVE_CRITICAL_MESSAGE_ID,
+    CRIT_DATA_MEMBER_COUNT,
+} CriticalHitDescriptionDataMember;
+
 // Provides metadata about critical hit effect.
-typedef struct CriticalHitDescription {
-    int damageMultiplier;
+typedef union CriticalHitDescription {
+    struct {
+        int damageMultiplier;
 
-    // Damage flags that will be applied to defender.
-    int flags;
+        // Damage flags that will be applied to defender.
+        int flags;
 
-    // Stat to check to upgrade this critical hit to massive critical hit or
-    // -1 if there is no massive critical hit.
-    int massiveCriticalStat;
+        // Stat to check to upgrade this critical hit to massive critical hit or
+        // -1 if there is no massive critical hit.
+        int massiveCriticalStat;
 
-    // Bonus/penalty to massive critical stat.
-    int massiveCriticalStatModifier;
+        // Bonus/penalty to massive critical stat.
+        int massiveCriticalStatModifier;
 
-    // Additional damage flags if this critical hit become massive critical.
-    int massiveCriticalFlags;
+        // Additional damage flags if this critical hit become massive critical.
+        int massiveCriticalFlags;
 
-    int messageId;
-    int massiveCriticalMessageId;
+        int messageId;
+        int massiveCriticalMessageId;
+    };
+
+    // SFALL: Allow indexed access to the data above.
+    int values[CRIT_DATA_MEMBER_COUNT];
 } CriticalHitDescription;
 
+typedef enum CombatBadShot {
+    COMBAT_BAD_SHOT_OK = 0,
+    COMBAT_BAD_SHOT_NO_AMMO = 1,
+    COMBAT_BAD_SHOT_OUT_OF_RANGE = 2,
+    COMBAT_BAD_SHOT_NOT_ENOUGH_AP = 3,
+    COMBAT_BAD_SHOT_ALREADY_DEAD = 4,
+    COMBAT_BAD_SHOT_AIM_BLOCKED = 5,
+    COMBAT_BAD_SHOT_ARM_CRIPPLED = 6,
+    COMBAT_BAD_SHOT_BOTH_ARMS_CRIPPLED = 7,
+} CombatBadShot;
+
+} // namespace fallout
+
 #endif /* COMBAT_DEFS_H */

src/config.cc

@@ -1,9 +1,5 @@
 #include "config.h"
 
-#include "db.h"
-#include "memory.h"
-#include "platform_compat.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -11,6 +7,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "db.h"
+#include "memory.h"
+#include "platform_compat.h"
+
+namespace fallout {
+
 #define CONFIG_FILE_MAX_LINE_LENGTH (256)
 
 // The initial number of sections (or key-value) pairs in the config.
@@ -81,25 +83,20 @@ bool configParseCommandLineArguments(Config* config, int argc, char** argv)
     }
 
     for (int arg = 0; arg < argc; arg++) {
-        char* pch = argv[arg];
+        char* pch;
+        char* string = argv[arg];
 
         // Find opening bracket.
-        while (*pch != '\0' && *pch != '[') {
-            pch++;
-        }
-
-        if (*pch == '\0') {
+        pch = strchr(string, '[');
+        if (pch == NULL) {
             continue;
         }
 
         char* sectionKey = pch + 1;
 
         // Find closing bracket.
-        while (*pch != '\0' && *pch != ']') {
-            pch++;
-        }
-
-        if (*pch == '\0') {
+        pch = strchr(sectionKey, ']');
+        if (pch == NULL) {
             continue;
         }
 
@@ -188,8 +185,8 @@ bool configSetString(Config* config, const char* sectionKey, const char* key, co
     return true;
 }
 
-// 0x42C05C customized: atoi() replaced with strtol()
-bool configGetInt(Config* config, const char* sectionKey, const char* key, int* valuePtr, unsigned char base /* = 0 */ )
+// 0x42C05C
+bool configGetInt(Config* config, const char* sectionKey, const char* key, int* valuePtr, unsigned char base /* = 0 */)
 {
     if (valuePtr == NULL) {
         return false;
@@ -203,8 +200,17 @@ bool configGetInt(Config* config, const char* sectionKey, const char* key, int*
     char* end;
     errno = 0;
     long l = strtol(stringValue, &end, base); // see https://stackoverflow.com/a/6154614
-    if (((errno == ERANGE && 1 == LONG_MAX) || l > INT_MAX) || ((errno == ERANGE && l == LONG_MIN) || l < INT_MIN) || (*stringValue == '\0' || *end != '\0'))
-        return false;
+
+    // The link above says right things about converting strings to numbers,
+    // however we need to maintain compatibility with atoi implementation and
+    // original game data. One example of the problem is worldmap.txt where
+    // frequency values expressed as percentages (Frequent=38%). If we handle
+    // the result like the link above suggests (and what previous implementation
+    // provided), we'll simply end up returning `false`, since there will be
+    // unconverted characters left. On the other hand, this function is also
+    // used to parse Sfall config values, which uses hexadecimal notation to
+    // represent colors. We're not going to need any of these in the long run so
+    // for now simply ignore any error that could arise during conversion.
 
     *valuePtr = l;
 
@@ -224,36 +230,30 @@ bool configGetIntList(Config* config, const char* sectionKey, const char* key, i
     }
 
     char temp[CONFIG_FILE_MAX_LINE_LENGTH];
-    strncpy(temp, string, CONFIG_FILE_MAX_LINE_LENGTH - 1);
+    string = strncpy(temp, string, CONFIG_FILE_MAX_LINE_LENGTH - 1);
 
-    char* beginning = temp;
-    char* pch = beginning;
-    while (*pch != '\0') {
-        if (*pch == ',') {
-            *pch = '\0';
-
-            *arr++ = atoi(beginning);
-
-            *pch = ',';
-
-            pch++;
-            beginning = pch;
-
-            count--;
-
-            if (count < 0) {
-                break;
-            }
+    while (1) {
+        char* pch = strchr(string, ',');
+        if (pch == NULL) {
+            break;
         }
 
-        pch++;
+        count--;
+        if (count == 0) {
+            break;
+        }
+
+        *pch = '\0';
+        *arr++ = atoi(string);
+        string = pch + 1;
     }
 
     if (count <= 1) {
-        *arr = atoi(beginning);
+        *arr = atoi(string);
+        return true;
     }
 
-    return true;
+    return false;
 }
 
 // 0x42C160
@@ -374,30 +374,19 @@ static bool configParseLine(Config* config, char* string)
     char* pch;
 
     // Find comment marker and truncate the string.
-    pch = string;
-    while (*pch != '\0' && *pch != ';') {
-        pch++;
-    }
-
-    if (*pch != '\0') {
+    pch = strchr(string, ';');
+    if (pch != NULL) {
         *pch = '\0';
     }
 
     // Find opening bracket.
-    pch = string;
-    while (*pch != '\0' && *pch != '[') {
-        pch++;
-    }
-
-    if (*pch == '[') {
+    pch = strchr(string, '[');
+    if (pch != NULL) {
         char* sectionKey = pch + 1;
 
         // Find closing bracket.
-        while (*pch != '\0' && *pch != ']') {
-            pch++;
-        }
-
-        if (*pch == ']') {
+        pch = strchr(sectionKey, ']');
+        if (pch != NULL) {
             *pch = '\0';
             strcpy(gConfigLastSectionKey, sectionKey);
             return configTrimString(gConfigLastSectionKey);
@@ -426,12 +415,8 @@ static bool configParseKeyValue(char* string, char* key, char* value)
     }
 
     // Find equals character.
-    char* pch = string;
-    while (*pch != '\0' && *pch != '=') {
-        pch++;
-    }
-
-    if (*pch == '\0') {
+    char* pch = strchr(string, '=');
+    if (pch == NULL) {
         return false;
     }
 
@@ -564,3 +549,5 @@ bool configSetBool(Config* config, const char* sectionKey, const char* key, bool
 {
     return configSetInt(config, sectionKey, key, value ? 1 : 0);
 }
+
+} // namespace fallout

src/config.h

@@ -3,6 +3,8 @@
 
 #include "dictionary.h"
 
+namespace fallout {
+
 // A representation of .INI file.
 //
 // It's implemented as a [Dictionary] whos keys are section names of .INI file,
@@ -31,4 +33,6 @@ bool configSetDouble(Config* config, const char* sectionKey, const char* key, do
 bool configGetBool(Config* config, const char* sectionKey, const char* key, bool* valuePtr);
 bool configSetBool(Config* config, const char* sectionKey, const char* key, bool value);
 
+} // namespace fallout
+
 #endif /* CONFIG_H */

src/core.cc

@@ -1,8 +1,13 @@
 #include "core.h"
 
+#include <limits.h>
+#include <string.h>
+
+#include <SDL.h>
+
 #include "audio_engine.h"
-#include "config.h"
 #include "color.h"
+#include "config.h"
 #include "dinput.h"
 #include "draw.h"
 #include "interface.h"
@@ -13,15 +18,15 @@
 #include "window_manager.h"
 #include "window_manager_private.h"
 
-#include <limits.h>
-#include <string.h>
-#include <SDL.h>
+namespace fallout {
 
-// NOT USED.
-void (*_idle_func)() = NULL;
+static void idleImpl();
 
-// NOT USED.
-void (*_focus_func)(int) = NULL;
+// 0x51E234
+IdleFunc* _idle_func = NULL;
+
+// 0x51E238
+FocusFunc* _focus_func = NULL;
 
 // 0x51E23C
 int gKeyboardKeyRepeatRate = 80;
@@ -116,39 +121,48 @@ int gModifierKeysState = 0;
 int (*_kb_scan_to_ascii)() = keyboardDequeueLogicalKeyCode;
 
 // 0x51E2F0
-STRUCT_51E2F0* _vcr_buffer = NULL;
+VcrEntry* _vcr_buffer = NULL;
 
 // number of entries in _vcr_buffer
 // 0x51E2F4
 int _vcr_buffer_index = 0;
 
 // 0x51E2F8
-int _vcr_state = 2;
+unsigned int gVcrState = VCR_STATE_TURNED_OFF;
 
 // 0x51E2FC
-int _vcr_time = 0;
+unsigned int _vcr_time = 0;
 
 // 0x51E300
-int _vcr_counter = 0;
+unsigned int _vcr_counter = 0;
 
 // 0x51E304
-int _vcr_terminate_flags = 0;
+unsigned int gVcrTerminateFlags = 0;
 
 // 0x51E308
-int _vcr_terminated_condition = 0;
+int gVcrPlaybackCompletionReason = VCR_PLAYBACK_COMPLETION_REASON_NONE;
 
 // 0x51E30C
-int _vcr_start_time = 0;
+unsigned int _vcr_start_time = 0;
 
 // 0x51E310
 int _vcr_registered_atexit = 0;
 
 // 0x51E314
-File* _vcr_file = NULL;
+File* gVcrFile = NULL;
 
 // 0x51E318
 int _vcr_buffer_end = 0;
 
+// 0x51E31C
+VcrPlaybackCompletionCallback* gVcrPlaybackCompletionCallback = NULL;
+
+// 0x51E320
+unsigned int gVcrRequestedTerminationFlags = 0;
+
+// 0x51E324
+int gVcrOldKeyboardLayout = 0;
+
 // A map of SDL_SCANCODE_* constants normalized for QWERTY keyboard.
 //
 // 0x6ABC70
@@ -355,12 +369,18 @@ int gKeyboardLayout;
 // 0x6AD93C
 unsigned char gPressedPhysicalKeysCount;
 
+// 0x6AD940
+VcrEntry stru_6AD940;
+
 SDL_Window* gSdlWindow = NULL;
 SDL_Surface* gSdlSurface = NULL;
 SDL_Renderer* gSdlRenderer = NULL;
 SDL_Texture* gSdlTexture = NULL;
 SDL_Surface* gSdlTextureSurface = NULL;
 
+static int gMouseWheelX = 0;
+static int gMouseWheelY = 0;
+
 // 0x4C8A70
 int coreInit(int a1)
 {
@@ -396,6 +416,10 @@ int coreInit(int a1)
     gTickerListHead = NULL;
     gScreenshotKeyCode = KEY_ALT_C;
 
+    // SFALL: Set idle function.
+    // CE: Prevents frying CPU when window is not focused.
+    inputSetIdleFunc(idleImpl);
+
     return 0;
 }
 
@@ -446,7 +470,7 @@ void _process_bk()
 
     tickersExecute();
 
-    if (_vcr_update() != 3) {
+    if (vcrUpdate() != 3) {
         _mouse_info();
     }
 
@@ -629,31 +653,37 @@ void pauseGame()
 // 0x4C8E38
 int pauseHandlerDefaultImpl()
 {
-    int len;
-    int v1;
-    int v2;
-    int win;
-    unsigned char* buf;
-    int v6;
-    int v7;
+    int windowWidth = fontGetStringWidth("Paused") + 32;
+    int windowHeight = 3 * fontGetLineHeight() + 16;
 
-    len = fontGetStringWidth("Paused") + 32;
-    v1 = fontGetLineHeight();
-    v2 = 3 * v1 + 16;
-
-    win = windowCreate((_scr_size.right - _scr_size.left + 1 - len) / 2, (_scr_size.bottom - _scr_size.top + 1 - v2) / 2, len, v2, 256, 20);
+    int win = windowCreate((rectGetWidth(&_scr_size) - windowWidth) / 2,
+        (rectGetHeight(&_scr_size) - windowHeight) / 2,
+        windowWidth,
+        windowHeight,
+        256,
+        WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
     if (win == -1) {
         return -1;
     }
 
     windowDrawBorder(win);
-    buf = windowGetBuffer(win);
-    fontDrawText(buf + 8 * len + 16, "Paused", len, len, _colorTable[31744]);
 
-    v6 = v2 - 8 - v1;
-    v7 = fontGetStringWidth("Done");
-    // TODO: Incomplete.
-    // _win_register_text_button(win, (len - v7 - 16) / 2, v6 - 6, -1, -1, -1, 27, "Done", 0);
+    unsigned char* windowBuffer = windowGetBuffer(win);
+    fontDrawText(windowBuffer + 8 * windowWidth + 16,
+        "Paused",
+        windowWidth,
+        windowWidth,
+        _colorTable[31744]);
+
+    _win_register_text_button(win,
+        (windowWidth - fontGetStringWidth("Done") - 16) / 2,
+        windowHeight - 8 - fontGetLineHeight() - 6,
+        -1,
+        -1,
+        -1,
+        KEY_ESCAPE,
+        "Done",
+        0);
 
     windowRefresh(win);
 
@@ -720,7 +750,7 @@ int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, uns
 
     for (index = 0; index < 100000; index++) {
         sprintf(fileName, "scr%.5d.bmp", index);
-        
+
         stream = compat_fopen(fileName, "rb");
         if (stream == NULL) {
             break;
@@ -784,7 +814,7 @@ int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, uns
     // biCompression
     intValue = 0;
     fwrite(&intValue, sizeof(intValue), 1, stream);
-    
+
     // biSizeImage
     intValue = 0;
     fwrite(&intValue, sizeof(intValue), 1, stream);
@@ -901,6 +931,70 @@ unsigned int _get_bk_time()
     return gTickerLastTimestamp;
 }
 
+// NOTE: Unused.
+//
+// 0x4C9418
+void inputSetKeyboardKeyRepeatRate(int value)
+{
+    gKeyboardKeyRepeatRate = value;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9420
+int inputGetKeyboardKeyRepeatRate()
+{
+    return gKeyboardKeyRepeatRate;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9428
+void inputSetKeyboardKeyRepeatDelay(int value)
+{
+    gKeyboardKeyRepeatDelay = value;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9430
+int inputGetKeyboardKeyRepeatDelay()
+{
+    return gKeyboardKeyRepeatDelay;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9438
+void inputSetFocusFunc(FocusFunc* func)
+{
+    _focus_func = func;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9440
+FocusFunc* inputGetFocusFunc()
+{
+    return _focus_func;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9448
+void inputSetIdleFunc(IdleFunc* func)
+{
+    _idle_func = func;
+}
+
+// NOTE: Unused.
+//
+// 0x4C9450
+IdleFunc* inputGetIdleFunc()
+{
+    return _idle_func;
+}
+
 // 0x4C9490
 void buildNormalizedQwertyKeys()
 {
@@ -1251,8 +1345,13 @@ void _GNW95_process_message()
         case SDL_MOUSEMOTION:
         case SDL_MOUSEBUTTONDOWN:
         case SDL_MOUSEBUTTONUP:
-            // The data is accumulated in SDL itself and will be processed
-            // in `_mouse_info`.
+        case SDL_MOUSEWHEEL:
+            handleMouseEvent(&e);
+            break;
+        case SDL_FINGERDOWN:
+        case SDL_FINGERMOTION:
+        case SDL_FINGERUP:
+            handleTouchEvent(&e);
             break;
         case SDL_KEYDOWN:
         case SDL_KEYUP:
@@ -1324,10 +1423,10 @@ void _GNW95_process_key(KeyboardData* data)
 {
     data->key = gNormalizedQwertyKeys[data->key];
 
-    if (_vcr_state == 1) {
-        if (_vcr_terminate_flags & 1) {
-            _vcr_terminated_condition = 2;
-            _vcr_stop();
+    if (gVcrState == VCR_STATE_PLAYING) {
+        if ((gVcrTerminateFlags & VCR_TERMINATE_ON_KEY_PRESS) != 0) {
+            gVcrPlaybackCompletionReason = VCR_PLAYBACK_COMPLETION_REASON_TERMINATED;
+            vcrStop();
         }
     } else {
         STRUCT_6ABF50* ptr = &(_GNW95_key_time_stamps[data->key]);
@@ -1346,7 +1445,7 @@ void _GNW95_process_key(KeyboardData* data)
 void _GNW95_lost_focus()
 {
     if (_focus_func != NULL) {
-        _focus_func(0);
+        _focus_func(false);
     }
 
     while (!gProgramIsActive) {
@@ -1358,7 +1457,7 @@ void _GNW95_lost_focus()
     }
 
     if (_focus_func != NULL) {
-        _focus_func(1);
+        _focus_func(true);
     }
 }
 
@@ -1643,10 +1742,11 @@ void _mouse_info()
     x = (int)(x * gMouseSensitivity);
     y = (int)(y * gMouseSensitivity);
 
-    if (_vcr_state == 1) {
-        if (((_vcr_terminate_flags & 4) && buttons) || ((_vcr_terminate_flags & 2) && (x || y))) {
-            _vcr_terminated_condition = 2;
-            _vcr_stop();
+    if (gVcrState == VCR_STATE_PLAYING) {
+        if (((gVcrTerminateFlags & VCR_TERMINATE_ON_MOUSE_PRESS) != 0 && buttons != 0)
+            || ((gVcrTerminateFlags & VCR_TERMINATE_ON_MOUSE_MOVE) != 0 && (x != 0 || y != 0))) {
+            gVcrPlaybackCompletionReason = VCR_PLAYBACK_COMPLETION_REASON_TERMINATED;
+            vcrStop();
             return;
         }
         x = 0;
@@ -1655,6 +1755,16 @@ void _mouse_info()
     }
 
     _mouse_simulate_input(x, y, buttons);
+
+    // TODO: Move to `_mouse_simulate_input`.
+    // TODO: Record wheel event in VCR.
+    gMouseWheelX = mouseData.wheelX;
+    gMouseWheelY = mouseData.wheelY;
+
+    if (gMouseWheelX != 0 || gMouseWheelY != 0) {
+        gMouseEvent |= MOUSE_EVENT_WHEEL;
+        _raw_buttons |= MOUSE_EVENT_WHEEL;
+    }
 }
 
 // 0x4CA698
@@ -1665,18 +1775,18 @@ void _mouse_simulate_input(int delta_x, int delta_y, int buttons)
     }
 
     if (delta_x || delta_y || buttons != gMouseButtonsState) {
-        if (_vcr_state == 0) {
-            if (_vcr_buffer_index == 4095) {
-                _vcr_dump_buffer();
+        if (gVcrState == 0) {
+            if (_vcr_buffer_index == VCR_BUFFER_CAPACITY - 1) {
+                vcrDump();
             }
 
-            STRUCT_51E2F0* ptr = &(_vcr_buffer[_vcr_buffer_index]);
-            ptr->type = 3;
-            ptr->field_4 = _vcr_time;
-            ptr->field_8 = _vcr_counter;
-            ptr->dx = delta_x;
-            ptr->dy = delta_y;
-            ptr->buttons = buttons;
+            VcrEntry* vcrEntry = &(_vcr_buffer[_vcr_buffer_index]);
+            vcrEntry->type = VCR_ENTRY_TYPE_MOUSE_EVENT;
+            vcrEntry->time = _vcr_time;
+            vcrEntry->counter = _vcr_counter;
+            vcrEntry->mouseEvent.dx = delta_x;
+            vcrEntry->mouseEvent.dy = delta_y;
+            vcrEntry->mouseEvent.buttons = buttons;
 
             _vcr_buffer_index++;
         }
@@ -1996,10 +2106,10 @@ int _GNW95_init_mode_ex(int width, int height, int bpp)
         _zero_mem = _GNW95_zero_vid_mem;
         _mouse_blit = _GNW95_ShowRect;
     } else {
-         _zero_mem = NULL;
-         _mouse_blit = _GNW95_MouseShowRect16;
-         _mouse_blit_trans = _GNW95_MouseShowTransRect16;
-         _scr_blit = _GNW95_ShowRect16;
+        _zero_mem = NULL;
+        _mouse_blit = _GNW95_MouseShowRect16;
+        _mouse_blit_trans = _GNW95_MouseShowTransRect16;
+        _scr_blit = _GNW95_ShowRect16;
     }
 
     return 0;
@@ -2036,7 +2146,7 @@ int _GNW95_init_window(int width, int height, bool fullscreen)
         if (gSdlRenderer == NULL) {
             goto err;
         }
-        
+
         if (SDL_RenderSetLogicalSize(gSdlRenderer, width, height) != 0) {
             goto err;
         }
@@ -2214,7 +2324,7 @@ void directDrawSetPaletteInRange(unsigned char* palette, int start, int count)
 void directDrawSetPalette(unsigned char* palette)
 {
     if (gSdlSurface != NULL && gSdlSurface->format->palette != NULL) {
-            SDL_Color colors[256];
+        SDL_Color colors[256];
 
         for (int index = 0; index < 256; index++) {
             colors[index].r = palette[index * 3] << 2;
@@ -2251,7 +2361,6 @@ void directDrawSetPalette(unsigned char* palette)
         windowRefreshAll(&_scr_size);
     }
 
-
     if (_update_palette_func != NULL) {
         _update_palette_func();
     }
@@ -2555,13 +2664,14 @@ int keyboardGetLayout()
 // TODO: Key type is likely short.
 void _kb_simulate_key(KeyboardData* data)
 {
-    if (_vcr_state == 0) {
-        if (_vcr_buffer_index != 4095) {
-            STRUCT_51E2F0* ptr = &(_vcr_buffer[_vcr_buffer_index]);
-            ptr->type = 2;
-            ptr->type_2_field_C = data->key & 0xFFFF;
-            ptr->field_4 = _vcr_time;
-            ptr->field_8 = _vcr_counter;
+    if (gVcrState == 0) {
+        if (_vcr_buffer_index != VCR_BUFFER_CAPACITY - 1) {
+            VcrEntry* vcrEntry = &(_vcr_buffer[_vcr_buffer_index]);
+            vcrEntry->type = VCR_ENTRY_TYPE_KEYBOARD_EVENT;
+            vcrEntry->keyboardEvent.key = data->key & 0xFFFF;
+            vcrEntry->time = _vcr_time;
+            vcrEntry->counter = _vcr_counter;
+
             _vcr_buffer_index++;
         }
     }
@@ -4359,9 +4469,9 @@ int keyboardPeekEvent(int index, KeyboardEvent** keyboardEventPtr)
 }
 
 // 0x4D2680
-bool _vcr_record(const char* fileName)
+bool vcrRecord(const char* fileName)
 {
-    if (_vcr_state != 2) {
+    if (gVcrState != VCR_STATE_TURNED_OFF) {
         return false;
     }
 
@@ -4369,77 +4479,260 @@ bool _vcr_record(const char* fileName)
         return false;
     }
 
-    if (_vcr_buffer != NULL) {
+    // NOTE: Uninline.
+    if (!vcrInitBuffer()) {
         return false;
     }
 
-    _vcr_buffer = (STRUCT_51E2F0*)internal_malloc(sizeof(*_vcr_buffer) * 4096);
-    if (_vcr_buffer == NULL) {
-        return false;
-    }
-
-    _vcr_clear_buffer();
-
-    _vcr_file = fileOpen(fileName, "wb");
-    if (_vcr_file == NULL) {
-        if (_vcr_buffer != NULL) {
-            _vcr_clear_buffer();
-            internal_free(_vcr_buffer);
-            _vcr_buffer = NULL;
-        }
+    gVcrFile = fileOpen(fileName, "wb");
+    if (gVcrFile == NULL) {
+        // NOTE: Uninline.
+        vcrFreeBuffer();
         return false;
     }
 
     if (_vcr_registered_atexit == 0) {
-        _vcr_registered_atexit = atexit(_vcr_stop);
+        _vcr_registered_atexit = atexit(vcrStop);
     }
 
-    STRUCT_51E2F0* entry = &(_vcr_buffer[_vcr_buffer_index]);
-    entry->type = 1;
-    entry->field_4 = 0;
-    entry->field_8 = 0;
-    entry->type_1_field_14 = keyboardGetLayout();
+    VcrEntry* vcrEntry = &(_vcr_buffer[_vcr_buffer_index]);
+    vcrEntry->type = VCR_ENTRY_TYPE_INITIAL_STATE;
+    vcrEntry->time = 0;
+    vcrEntry->counter = 0;
+    vcrEntry->initial.keyboardLayout = keyboardGetLayout();
 
     while (mouseGetEvent() != 0) {
         _mouse_info();
     }
 
-    mouseGetPosition(&(entry->type_1_field_C), &(entry->type_1_field_10));
+    mouseGetPosition(&(vcrEntry->initial.mouseX), &(vcrEntry->initial.mouseY));
 
     _vcr_counter = 1;
     _vcr_buffer_index++;
     _vcr_start_time = _get_time();
     keyboardReset();
-    _vcr_state = 0;
-    
+    gVcrState = VCR_STATE_RECORDING;
+
+    return true;
+}
+
+// 0x4D27EC
+bool vcrPlay(const char* fileName, unsigned int terminationFlags, VcrPlaybackCompletionCallback* callback)
+{
+    if (gVcrState != VCR_STATE_TURNED_OFF) {
+        return false;
+    }
+
+    if (fileName == NULL) {
+        return false;
+    }
+
+    // NOTE: Uninline.
+    if (!vcrInitBuffer()) {
+        return false;
+    }
+
+    gVcrFile = fileOpen(fileName, "rb");
+    if (gVcrFile == NULL) {
+        // NOTE: Uninline.
+        vcrFreeBuffer();
+        return false;
+    }
+
+    if (!vcrLoad()) {
+        fileClose(gVcrFile);
+        // NOTE: Uninline.
+        vcrFreeBuffer();
+        return false;
+    }
+
+    while (mouseGetEvent() != 0) {
+        _mouse_info();
+    }
+
+    keyboardReset();
+
+    gVcrRequestedTerminationFlags = terminationFlags;
+    gVcrPlaybackCompletionCallback = callback;
+    gVcrPlaybackCompletionReason = VCR_PLAYBACK_COMPLETION_REASON_COMPLETED;
+    gVcrTerminateFlags = 0;
+    _vcr_counter = 0;
+    _vcr_time = 0;
+    _vcr_start_time = _get_time();
+    gVcrState = VCR_STATE_PLAYING;
+    stru_6AD940.time = 0;
+    stru_6AD940.counter = 0;
+
     return true;
 }
 
 // 0x4D28F4
-void _vcr_stop()
+void vcrStop()
 {
-    if (_vcr_state == 0 || _vcr_state == 1) {
-        _vcr_state |= 0x80000000;
+    if (gVcrState == VCR_STATE_RECORDING || gVcrState == VCR_STATE_PLAYING) {
+        gVcrState |= VCR_STATE_STOP_REQUESTED;
     }
 
     keyboardReset();
 }
 
 // 0x4D2918
-int _vcr_status()
+int vcrGetState()
 {
-    return _vcr_state;
+    return gVcrState;
 }
 
 // 0x4D2930
-int _vcr_update()
+int vcrUpdate()
 {
-    // TODO: Incomplete.
+    if ((gVcrState & VCR_STATE_STOP_REQUESTED) != 0) {
+        gVcrState &= ~VCR_STATE_STOP_REQUESTED;
+
+        switch (gVcrState) {
+        case VCR_STATE_RECORDING:
+            vcrDump();
+
+            fileClose(gVcrFile);
+            gVcrFile = NULL;
+
+            // NOTE: Uninline.
+            vcrFreeBuffer();
+
+            break;
+        case VCR_STATE_PLAYING:
+            fileClose(gVcrFile);
+            gVcrFile = NULL;
+
+            // NOTE: Uninline.
+            vcrFreeBuffer();
+
+            keyboardSetLayout(gVcrOldKeyboardLayout);
+
+            if (gVcrPlaybackCompletionCallback != NULL) {
+                gVcrPlaybackCompletionCallback(gVcrPlaybackCompletionReason);
+            }
+            break;
+        }
+
+        gVcrState = VCR_STATE_TURNED_OFF;
+    }
+
+    switch (gVcrState) {
+    case VCR_STATE_RECORDING:
+        _vcr_counter++;
+        _vcr_time = getTicksSince(_vcr_start_time);
+        if (_vcr_buffer_index == VCR_BUFFER_CAPACITY - 1) {
+            vcrDump();
+        }
+        break;
+    case VCR_STATE_PLAYING:
+        if (_vcr_buffer_index < _vcr_buffer_end || vcrLoad()) {
+            VcrEntry* vcrEntry = &(_vcr_buffer[_vcr_buffer_index]);
+            if (stru_6AD940.counter < vcrEntry->counter) {
+                if (vcrEntry->time > stru_6AD940.time) {
+                    unsigned int delay = stru_6AD940.time;
+                    delay += (_vcr_counter - stru_6AD940.counter)
+                        * (vcrEntry->time - stru_6AD940.time)
+                        / (vcrEntry->counter - stru_6AD940.counter);
+
+                    while (getTicksSince(_vcr_start_time) < delay) {
+                    }
+                }
+            }
+
+            _vcr_counter++;
+
+            int rc = 0;
+            while (_vcr_counter >= _vcr_buffer[_vcr_buffer_index].counter) {
+                _vcr_time = getTicksSince(_vcr_start_time);
+                if (_vcr_time > _vcr_buffer[_vcr_buffer_index].time + 5
+                    || _vcr_time < _vcr_buffer[_vcr_buffer_index].time - 5) {
+                    _vcr_start_time += _vcr_time - _vcr_buffer[_vcr_buffer_index].time;
+                }
+
+                switch (_vcr_buffer[_vcr_buffer_index].type) {
+                case VCR_ENTRY_TYPE_INITIAL_STATE:
+                    gVcrState = VCR_STATE_TURNED_OFF;
+                    gVcrOldKeyboardLayout = keyboardGetLayout();
+                    keyboardSetLayout(_vcr_buffer[_vcr_buffer_index].initial.keyboardLayout);
+                    while (mouseGetEvent() != 0) {
+                        _mouse_info();
+                    }
+                    gVcrState = VCR_ENTRY_TYPE_INITIAL_STATE;
+                    mouseHideCursor();
+                    _mouse_set_position(_vcr_buffer[_vcr_buffer_index].initial.mouseX, _vcr_buffer[_vcr_buffer_index].initial.mouseY);
+                    mouseShowCursor();
+                    keyboardReset();
+                    gVcrTerminateFlags = gVcrRequestedTerminationFlags;
+                    _vcr_start_time = _get_time();
+                    _vcr_counter = 0;
+                    break;
+                case VCR_ENTRY_TYPE_KEYBOARD_EVENT:
+                    if (1) {
+                        KeyboardData keyboardData;
+                        keyboardData.key = _vcr_buffer[_vcr_buffer_index].keyboardEvent.key;
+                        _kb_simulate_key(&keyboardData);
+                    }
+                    break;
+                case VCR_ENTRY_TYPE_MOUSE_EVENT:
+                    rc = 3;
+                    _mouse_simulate_input(_vcr_buffer[_vcr_buffer_index].mouseEvent.dx, _vcr_buffer[_vcr_buffer_index].mouseEvent.dy, _vcr_buffer[_vcr_buffer_index].mouseEvent.buttons);
+                    break;
+                }
+
+                memcpy(&stru_6AD940, &(_vcr_buffer[_vcr_buffer_index]), sizeof(stru_6AD940));
+                _vcr_buffer_index++;
+            }
+
+            return rc;
+        } else {
+            // NOTE: Uninline.
+            vcrStop();
+        }
+        break;
+    }
+
     return 0;
 }
 
+// NOTE: Inlined.
+//
+// 0x4D2C64
+bool vcrInitBuffer()
+{
+    if (_vcr_buffer == NULL) {
+        _vcr_buffer = (VcrEntry*)internal_malloc(sizeof(*_vcr_buffer) * VCR_BUFFER_CAPACITY);
+        if (_vcr_buffer == NULL) {
+            return false;
+        }
+    }
+
+    // NOTE: Uninline.
+    vcrClear();
+
+    return true;
+}
+
+// NOTE: Inlined.
+//
+// 0x4D2C98
+bool vcrFreeBuffer()
+{
+    if (_vcr_buffer == NULL) {
+        return false;
+    }
+
+    // NOTE: Uninline.
+    vcrClear();
+
+    internal_free(_vcr_buffer);
+    _vcr_buffer = NULL;
+
+    return true;
+}
+
 // 0x4D2CD0
-bool _vcr_clear_buffer()
+bool vcrClear()
 {
     if (_vcr_buffer == NULL) {
         return false;
@@ -4451,81 +4744,104 @@ bool _vcr_clear_buffer()
 }
 
 // 0x4D2CF0
-int _vcr_dump_buffer()
+bool vcrDump()
 {
-    if (!_vcr_buffer || !_vcr_file) {
-        return 0;
+    if (_vcr_buffer == NULL) {
+        return false;
+    }
+
+    if (gVcrFile == NULL) {
+        return false;
     }
 
     for (int index = 0; index < _vcr_buffer_index; index++) {
-        if (_vcr_save_record(&(_vcr_buffer[index]), _vcr_file)) {
-            _vcr_buffer_index = 0;
-            return 1;
+        if (!vcrWriteEntry(&(_vcr_buffer[index]), gVcrFile)) {
+            return false;
         }
     }
 
-    return 0;
+    // NOTE: Uninline.
+    if (!vcrClear()) {
+        return false;
+    }
+
+    return true;
+}
+
+// 0x4D2D74
+bool vcrLoad()
+{
+    if (gVcrFile == NULL) {
+        return false;
+    }
+
+    // NOTE: Uninline.
+    if (!vcrClear()) {
+        return false;
+    }
+
+    for (_vcr_buffer_end = 0; _vcr_buffer_end < VCR_BUFFER_CAPACITY; _vcr_buffer_end++) {
+        if (!vcrReadEntry(&(_vcr_buffer[_vcr_buffer_end]), gVcrFile)) {
+            break;
+        }
+    }
+
+    if (_vcr_buffer_end == 0) {
+        return false;
+    }
+
+    return true;
 }
 
 // 0x4D2E00
-bool _vcr_save_record(STRUCT_51E2F0* ptr, File* stream)
+bool vcrWriteEntry(VcrEntry* vcrEntry, File* stream)
 {
-    if (_db_fwriteLong(stream, ptr->type) == -1) goto err;
-    if (_db_fwriteLong(stream, ptr->field_4) == -1) goto err;
-    if (_db_fwriteLong(stream, ptr->field_8) == -1) goto err;
-
-    switch (ptr->type) {
-    case 1:
-        if (_db_fwriteLong(stream, ptr->type_1_field_C) == -1) goto err;
-        if (_db_fwriteLong(stream, ptr->type_1_field_10) == -1) goto err;
-        if (_db_fwriteLong(stream, ptr->type_1_field_14) == -1) goto err;
+    if (fileWriteUInt32(stream, vcrEntry->type) == -1) return false;
+    if (fileWriteUInt32(stream, vcrEntry->time) == -1) return false;
+    if (fileWriteUInt32(stream, vcrEntry->counter) == -1) return false;
 
+    switch (vcrEntry->type) {
+    case VCR_ENTRY_TYPE_INITIAL_STATE:
+        if (fileWriteInt32(stream, vcrEntry->initial.mouseX) == -1) return false;
+        if (fileWriteInt32(stream, vcrEntry->initial.mouseY) == -1) return false;
+        if (fileWriteInt32(stream, vcrEntry->initial.keyboardLayout) == -1) return false;
         return true;
-    case 2:
-        if (fileWriteInt16(stream, ptr->type_2_field_C) == -1) goto err;
-
+    case VCR_ENTRY_TYPE_KEYBOARD_EVENT:
+        if (fileWriteInt16(stream, vcrEntry->keyboardEvent.key) == -1) return false;
         return true;
-    case 3:
-        if (_db_fwriteLong(stream, ptr->dx) == -1) goto err;
-        if (_db_fwriteLong(stream, ptr->dy) == -1) goto err;
-        if (_db_fwriteLong(stream, ptr->buttons) == -1) goto err;
-
+    case VCR_ENTRY_TYPE_MOUSE_EVENT:
+        if (fileWriteInt32(stream, vcrEntry->mouseEvent.dx) == -1) return false;
+        if (fileWriteInt32(stream, vcrEntry->mouseEvent.dy) == -1) return false;
+        if (fileWriteInt32(stream, vcrEntry->mouseEvent.buttons) == -1) return false;
         return true;
     }
 
-err:
-
     return false;
 }
 
 // 0x4D2EE4
-bool _vcr_load_record(STRUCT_51E2F0* ptr, File* stream)
+bool vcrReadEntry(VcrEntry* vcrEntry, File* stream)
 {
-    if (_db_freadInt(stream, &(ptr->type)) == -1) goto err;
-    if (_db_freadInt(stream, &(ptr->field_4)) == -1) goto err;
-    if (_db_freadInt(stream, &(ptr->field_8)) == -1) goto err;
-
-    switch (ptr->type) {
-    case 1:
-        if (_db_freadInt(stream, &(ptr->type_1_field_C)) == -1) goto err;
-        if (_db_freadInt(stream, &(ptr->type_1_field_10)) == -1) goto err;
-        if (_db_freadInt(stream, &(ptr->type_1_field_14)) == -1) goto err;
+    if (fileReadUInt32(stream, &(vcrEntry->type)) == -1) return false;
+    if (fileReadUInt32(stream, &(vcrEntry->time)) == -1) return false;
+    if (fileReadUInt32(stream, &(vcrEntry->counter)) == -1) return false;
 
+    switch (vcrEntry->type) {
+    case VCR_ENTRY_TYPE_INITIAL_STATE:
+        if (fileReadInt32(stream, &(vcrEntry->initial.mouseX)) == -1) return false;
+        if (fileReadInt32(stream, &(vcrEntry->initial.mouseY)) == -1) return false;
+        if (fileReadInt32(stream, &(vcrEntry->initial.keyboardLayout)) == -1) return false;
         return true;
-    case 2:
-        if (fileReadInt16(stream, &(ptr->type_2_field_C)) == -1) goto err;
-
+    case VCR_ENTRY_TYPE_KEYBOARD_EVENT:
+        if (fileReadInt16(stream, &(vcrEntry->keyboardEvent.key)) == -1) return false;
         return true;
-    case 3:
-        if (_db_freadInt(stream, &(ptr->dx)) == -1) goto err;
-        if (_db_freadInt(stream, &(ptr->dy)) == -1) goto err;
-        if (_db_freadInt(stream, &(ptr->buttons)) == -1) goto err;
-
+    case VCR_ENTRY_TYPE_MOUSE_EVENT:
+        if (fileReadInt32(stream, &(vcrEntry->mouseEvent.dx)) == -1) return false;
+        if (fileReadInt32(stream, &(vcrEntry->mouseEvent.dy)) == -1) return false;
+        if (fileReadInt32(stream, &(vcrEntry->mouseEvent.buttons)) == -1) return false;
         return true;
     }
 
-err:
-
     return false;
 }
 
@@ -4574,3 +4890,33 @@ bool mouseHitTestInWindow(int win, int left, int top, int right, int bottom)
 
     return _mouse_click_in(left, top, right, bottom);
 }
+
+void mouseGetWheel(int* x, int* y)
+{
+    *x = gMouseWheelX;
+    *y = gMouseWheelY;
+}
+
+void convertMouseWheelToArrowKey(int* keyCodePtr)
+{
+    if (*keyCodePtr == -1) {
+        if ((mouseGetEvent() & MOUSE_EVENT_WHEEL) != 0) {
+            int wheelX;
+            int wheelY;
+            mouseGetWheel(&wheelX, &wheelY);
+
+            if (wheelY > 0) {
+                *keyCodePtr = KEY_ARROW_UP;
+            } else if (wheelY < 0) {
+                *keyCodePtr = KEY_ARROW_DOWN;
+            }
+        }
+    }
+}
+
+static void idleImpl()
+{
+    SDL_Delay(125);
+}
+
+} // namespace fallout

src/core.h

@@ -1,12 +1,14 @@
 #ifndef CORE_H
 #define CORE_H
 
+#include <SDL.h>
+
 #include "db.h"
 #include "dinput.h"
 #include "geometry.h"
 #include "window.h"
 
-#include <SDL.h>
+namespace fallout {
 
 #define MOUSE_DEFAULT_CURSOR_WIDTH 8
 #define MOUSE_DEFAULT_CURSOR_HEIGHT 8
@@ -26,6 +28,7 @@
 #define MOUSE_EVENT_ANY_BUTTON_UP (MOUSE_EVENT_LEFT_BUTTON_UP | MOUSE_EVENT_RIGHT_BUTTON_UP)
 #define MOUSE_EVENT_LEFT_BUTTON_DOWN_REPEAT (MOUSE_EVENT_LEFT_BUTTON_DOWN | MOUSE_EVENT_LEFT_BUTTON_REPEAT)
 #define MOUSE_EVENT_RIGHT_BUTTON_DOWN_REPEAT (MOUSE_EVENT_RIGHT_BUTTON_DOWN | MOUSE_EVENT_RIGHT_BUTTON_REPEAT)
+#define MOUSE_EVENT_WHEEL 0x40
 
 #define BUTTON_REPEAT_TIME 250
 
@@ -360,6 +363,44 @@ typedef enum KeyboardLayout {
     KEYBOARD_LAYOUT_SPANISH,
 } KeyboardLayout;
 
+#define VCR_BUFFER_CAPACITY 4096
+
+typedef enum VcrState {
+    VCR_STATE_RECORDING,
+    VCR_STATE_PLAYING,
+    VCR_STATE_TURNED_OFF,
+} VcrState;
+
+#define VCR_STATE_STOP_REQUESTED 0x80000000
+
+typedef enum VcrTerminationFlags {
+    // Specifies that VCR playback should stop if any key is pressed.
+    VCR_TERMINATE_ON_KEY_PRESS = 0x01,
+
+    // Specifies that VCR playback should stop if mouse is mouved.
+    VCR_TERMINATE_ON_MOUSE_MOVE = 0x02,
+
+    // Specifies that VCR playback should stop if any mouse button is pressed.
+    VCR_TERMINATE_ON_MOUSE_PRESS = 0x04,
+} VcrTerminationFlags;
+
+typedef enum VcrPlaybackCompletionReason {
+    VCR_PLAYBACK_COMPLETION_REASON_NONE = 0,
+
+    // Indicates that VCR playback completed normally.
+    VCR_PLAYBACK_COMPLETION_REASON_COMPLETED = 1,
+
+    // Indicates that VCR playback terminated according to termination flags.
+    VCR_PLAYBACK_COMPLETION_REASON_TERMINATED = 2,
+} VcrPlaybackCompletionReason;
+
+typedef enum VcrEntryType {
+    VCR_ENTRY_TYPE_NONE = 0,
+    VCR_ENTRY_TYPE_INITIAL_STATE = 1,
+    VCR_ENTRY_TYPE_KEYBOARD_EVENT = 2,
+    VCR_ENTRY_TYPE_MOUSE_EVENT = 3,
+} VcrEntryType;
+
 typedef struct STRUCT_6ABF50 {
     // Time when appropriate key was pressed down or -1 if it's up.
     int tick;
@@ -375,7 +416,9 @@ typedef struct InputEvent {
     int mouseY;
 } InputEvent;
 
-typedef void TickerProc();
+typedef void(IdleFunc)();
+typedef void(FocusFunc)(bool focus);
+typedef void(TickerProc)();
 
 typedef struct TickerListNode {
     int flags;
@@ -383,26 +426,26 @@ typedef struct TickerListNode {
     struct TickerListNode* next;
 } TickerListNode;
 
-typedef struct STRUCT_51E2F0 {
-    int type;
-    int field_4;
-    int field_8;
+typedef struct VcrEntry {
+    unsigned int type;
+    unsigned int time;
+    unsigned int counter;
     union {
         struct {
-            int type_1_field_C; // mouse x
-            int type_1_field_10; // mouse y
-            int type_1_field_14; // keyboard layout
-        };
+            int mouseX;
+            int mouseY;
+            int keyboardLayout;
+        } initial;
         struct {
-            short type_2_field_C;
-        };
+            short key;
+        } keyboardEvent;
         struct {
             int dx;
             int dy;
             int buttons;
-        };
+        } mouseEvent;
     };
-} STRUCT_51E2F0;
+} VcrEntry;
 
 typedef struct LogicalKeyEntry {
     short field_0;
@@ -420,9 +463,10 @@ typedef struct KeyboardEvent {
 
 typedef int(PauseHandler)();
 typedef int(ScreenshotHandler)(int width, int height, unsigned char* buffer, unsigned char* palette);
+typedef void(VcrPlaybackCompletionCallback)(int reason);
 
-extern void (*_idle_func)();
-extern void (*_focus_func)(int);
+extern IdleFunc* _idle_func;
+extern FocusFunc* _focus_func;
 extern int gKeyboardKeyRepeatRate;
 extern int gKeyboardKeyRepeatDelay;
 extern bool _keyboard_hooked;
@@ -448,17 +492,20 @@ extern int gKeyboardEventQueueReadIndex;
 extern short word_51E2E8;
 extern int gModifierKeysState;
 extern int (*_kb_scan_to_ascii)();
-extern STRUCT_51E2F0* _vcr_buffer;
+extern VcrEntry* _vcr_buffer;
 extern int _vcr_buffer_index;
-extern int _vcr_state;
-extern int _vcr_time;
-extern int _vcr_counter;
-extern int _vcr_terminate_flags;
-extern int _vcr_terminated_condition;
-extern int _vcr_start_time;
+extern unsigned int gVcrState;
+extern unsigned int _vcr_time;
+extern unsigned int _vcr_counter;
+extern unsigned int gVcrTerminateFlags;
+extern int gVcrPlaybackCompletionReason;
+extern unsigned int _vcr_start_time;
 extern int _vcr_registered_atexit;
-extern File* _vcr_file;
+extern File* gVcrFile;
 extern int _vcr_buffer_end;
+extern VcrPlaybackCompletionCallback* gVcrPlaybackCompletionCallback;
+extern unsigned int gVcrRequestedTerminationFlags;
+extern int gVcrOldKeyboardLayout;
 
 extern int gNormalizedQwertyKeys[SDL_NUM_SCANCODES];
 extern InputEvent gInputEventQueue[40];
@@ -520,6 +567,7 @@ extern unsigned int _kb_idle_start_time;
 extern KeyboardEvent gLastKeyboardEvent;
 extern int gKeyboardLayout;
 extern unsigned char gPressedPhysicalKeysCount;
+extern VcrEntry stru_6AD940;
 
 extern SDL_Window* gSdlWindow;
 extern SDL_Surface* gSdlSurface;
@@ -552,6 +600,14 @@ void coreDelay(unsigned int ms);
 unsigned int getTicksSince(unsigned int a1);
 unsigned int getTicksBetween(unsigned int a1, unsigned int a2);
 unsigned int _get_bk_time();
+void inputSetKeyboardKeyRepeatRate(int value);
+int inputGetKeyboardKeyRepeatRate();
+void inputSetKeyboardKeyRepeatDelay(int value);
+int inputGetKeyboardKeyRepeatDelay();
+void inputSetFocusFunc(FocusFunc* func);
+FocusFunc* inputGetFocusFunc();
+void inputSetIdleFunc(IdleFunc* func);
+IdleFunc* inputGetIdleFunc();
 void buildNormalizedQwertyKeys();
 int _GNW95_input_init();
 void _GNW95_process_message();
@@ -621,19 +677,27 @@ void keyboardBuildItalianConfiguration();
 void keyboardBuildSpanishConfiguration();
 void _kb_init_lock_status();
 int keyboardPeekEvent(int index, KeyboardEvent** keyboardEventPtr);
-bool _vcr_record(const char* fileName);
-void _vcr_stop();
-int _vcr_status();
-int _vcr_update();
-bool _vcr_clear_buffer();
-int _vcr_dump_buffer();
-bool _vcr_save_record(STRUCT_51E2F0* ptr, File* stream);
-bool _vcr_load_record(STRUCT_51E2F0* ptr, File* stream);
+bool vcrRecord(const char* fileName);
+bool vcrPlay(const char* fileName, unsigned int terminationFlags, VcrPlaybackCompletionCallback* callback);
+void vcrStop();
+int vcrGetState();
+int vcrUpdate();
+bool vcrInitBuffer();
+bool vcrFreeBuffer();
+bool vcrClear();
+bool vcrDump();
+bool vcrLoad();
+bool vcrWriteEntry(VcrEntry* ptr, File* stream);
+bool vcrReadEntry(VcrEntry* ptr, File* stream);
 
 int screenGetWidth();
 int screenGetHeight();
 int screenGetVisibleHeight();
 void mouseGetPositionInWindow(int win, int* x, int* y);
 bool mouseHitTestInWindow(int win, int left, int top, int right, int bottom);
+void mouseGetWheel(int* x, int* y);
+void convertMouseWheelToArrowKey(int* keyCodePtr);
+
+} // namespace fallout
 
 #endif /* CORE_H */

src/credits.cc

@@ -1,5 +1,7 @@
 #include "credits.h"
 
+#include <string.h>
+
 #include "art.h"
 #include "color.h"
 #include "core.h"
@@ -16,7 +18,7 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <string.h>
+namespace fallout {
 
 #define CREDITS_WINDOW_WIDTH (640)
 #define CREDITS_WINDOW_HEIGHT (480)
@@ -274,3 +276,5 @@ static bool creditsFileParseNextLine(char* dest, int* font, int* color)
 
     return false;
 }
+
+} // namespace fallout

src/credits.h

@@ -1,6 +1,10 @@
 #ifndef CREDITS_H
 #define CREDITS_H
 
+namespace fallout {
+
 void creditsOpen(const char* path, int fid, bool useReversedStyle);
 
+} // namespace fallout
+
 #endif /* CREDITS_H */

src/critter.cc

@@ -1,5 +1,8 @@
 #include "critter.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "character_editor.h"
@@ -26,10 +29,9 @@
 #include "stat.h"
 #include "tile.h"
 #include "trait.h"
-#include "world_map.h"
+#include "worldmap.h"
 
-#include <stdio.h>
-#include <string.h>
+namespace fallout {
 
 // Maximum length of dude's name length.
 #define DUDE_NAME_MAX_LENGTH (32)
@@ -68,6 +70,7 @@ typedef enum RadiationLevel {
 } RadiationLevel;
 
 static int _get_rad_damage_level(Object* obj, void* data);
+static int critter_kill_count_clear();
 static int _critterClearObjDrugs(Object* obj, void* data);
 
 // 0x50141C
@@ -159,7 +162,8 @@ int critterInit()
 {
     dudeResetName();
 
-    memset(gKillsByType, 0, sizeof(gKillsByType));
+    // NOTE: Uninline;
+    critter_kill_count_clear();
 
     if (!messageListInit(&gCritterMessageList)) {
         debugPrint("\nError: Initing critter name message file!");
@@ -181,7 +185,9 @@ int critterInit()
 void critterReset()
 {
     dudeResetName();
-    memset(gKillsByType, 0, sizeof(gKillsByType));
+
+    // NOTE: Uninline;
+    critter_kill_count_clear();
 }
 
 // 0x42D004
@@ -276,18 +282,18 @@ void dudeResetName()
 // 0x42D18C
 int critterGetHitPoints(Object* critter)
 {
-    return (critter->pid >> 24) == OBJ_TYPE_CRITTER ? critter->data.critter.hp : 0;
+    return PID_TYPE(critter->pid) == OBJ_TYPE_CRITTER ? critter->data.critter.hp : 0;
 }
 
 // 0x42D1A4
-int critterAdjustHitPoints(Object* critter, int a2)
+int critterAdjustHitPoints(Object* critter, int hp)
 {
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return 0;
     }
 
     int maximumHp = critterGetStat(critter, STAT_MAXIMUM_HIT_POINTS);
-    int newHp = critter->data.critter.hp + a2;
+    int newHp = critter->data.critter.hp + hp;
 
     critter->data.critter.hp = newHp;
     if (maximumHp >= newHp) {
@@ -304,7 +310,7 @@ int critterAdjustHitPoints(Object* critter, int a2)
 // 0x42D1F8
 int critterGetPoison(Object* critter)
 {
-    return (critter->pid >> 24) == OBJ_TYPE_CRITTER ? critter->data.critter.poison : 0;
+    return PID_TYPE(critter->pid) == OBJ_TYPE_CRITTER ? critter->data.critter.poison : 0;
 }
 
 // Adjust critter's current poison by specified amount.
@@ -396,7 +402,7 @@ int poisonEventProcess(Object* obj, void* data)
 // 0x42D38C
 int critterGetRadiation(Object* obj)
 {
-    return (obj->pid >> 24) == OBJ_TYPE_CRITTER ? obj->data.critter.radiation : 0;
+    return PID_TYPE(obj->pid) == OBJ_TYPE_CRITTER ? obj->data.critter.radiation : 0;
 }
 
 // 0x42D3A4
@@ -416,7 +422,7 @@ int critterAdjustRadiation(Object* obj, int amount)
     }
 
     if (amount > 0) {
-        proto->critter.data.flags |= 0x02;
+        proto->critter.data.flags |= CRITTER_FLAG_0x2;
     }
 
     if (amount > 0) {
@@ -483,7 +489,7 @@ int _critter_check_rads(Object* obj)
 
     Proto* proto;
     protoGetProto(obj->pid, &proto);
-    if ((proto->critter.data.flags & 0x02) == 0) {
+    if ((proto->critter.data.flags & CRITTER_FLAG_0x2) == 0) {
         return 0;
     }
 
@@ -521,10 +527,10 @@ int _critter_check_rads(Object* obj)
 
         radiationEvent->radiationLevel = radiationLevel;
         radiationEvent->isHealing = 0;
-        queueAddEvent(36000 * randomBetween(4, 18), obj, radiationEvent, EVENT_TYPE_RADIATION);
+        queueAddEvent(GAME_TIME_TICKS_PER_HOUR * randomBetween(4, 18), obj, radiationEvent, EVENT_TYPE_RADIATION);
     }
 
-    proto->critter.data.flags &= ~(0x02);
+    proto->critter.data.flags &= ~(CRITTER_FLAG_0x2);
 
     return 0;
 }
@@ -568,6 +574,13 @@ void _process_rads(Object* obj, int radiationLevel, bool isHealing)
     if (obj == gDude) {
         // Radiation level message, higher is worse.
         messageListItem.num = 1000 + radiationLevelIndex;
+
+        // SFALL: Fix radiation message when removing radiation effects.
+        if (isHealing) {
+            // You feel better.
+            messageListItem.num = 3003;
+        }
+
         if (messageListGetItem(&gMiscMessageList, &messageListItem)) {
             displayMonitorAddMessage(messageListItem.text);
         }
@@ -579,15 +592,18 @@ void _process_rads(Object* obj, int radiationLevel, bool isHealing)
         critterSetBonusStat(obj, gRadiationEffectStats[effect], value);
     }
 
-    if ((obj->data.critter.combat.results & DAM_DEAD) == 0) {
-        // Loop thru effects affecting primary stats. If any of the primary stat
-        // dropped below minimal value, kill it.
-        for (int effect = 0; effect < RADIATION_EFFECT_PRIMARY_STAT_COUNT; effect++) {
-            int base = critterGetBaseStatWithTraitModifier(obj, gRadiationEffectStats[effect]);
-            int bonus = critterGetBonusStat(obj, gRadiationEffectStats[effect]);
-            if (base + bonus < PRIMARY_STAT_MIN) {
-                critterKill(obj, -1, 1);
-                break;
+    // SFALL: Prevent death when removing radiation effects.
+    if (!isHealing) {
+        if ((obj->data.critter.combat.results & DAM_DEAD) == 0) {
+            // Loop thru effects affecting primary stats. If any of the primary stat
+            // dropped below minimal value, kill it.
+            for (int effect = 0; effect < RADIATION_EFFECT_PRIMARY_STAT_COUNT; effect++) {
+                int base = critterGetBaseStatWithTraitModifier(obj, gRadiationEffectStats[effect]);
+                int bonus = critterGetBonusStat(obj, gRadiationEffectStats[effect]);
+                if (base + bonus < PRIMARY_STAT_MIN) {
+                    critterKill(obj, -1, 1);
+                    break;
+                }
             }
         }
     }
@@ -597,7 +613,8 @@ void _process_rads(Object* obj, int radiationLevel, bool isHealing)
             // You have died from radiation sickness.
             messageListItem.num = 1006;
             if (messageListGetItem(&gMiscMessageList, &messageListItem)) {
-                displayMonitorAddMessage(messageListItem.text);
+                // SFALL: Display a pop-up message box about death from radiation.
+                gameShowDeathDialog(messageListItem.text);
             }
         }
     }
@@ -657,7 +674,7 @@ int radiationEventWrite(File* stream, void* data)
 // 0x42D82C
 int critterGetDamageType(Object* obj)
 {
-    if ((obj->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(obj->pid) != OBJ_TYPE_CRITTER) {
         return 0;
     }
 
@@ -669,6 +686,15 @@ int critterGetDamageType(Object* obj)
     return proto->critter.data.damageType;
 }
 
+// NOTE: Inlined.
+//
+// 0x42D860
+static int critter_kill_count_clear()
+{
+    memset(gKillsByType, 0, sizeof(gKillsByType));
+    return 0;
+}
+
 // 0x42D878
 int killsIncByType(int killType)
 {
@@ -723,7 +749,7 @@ int critterGetKillType(Object* obj)
         return KILL_TYPE_MAN;
     }
 
-    if ((obj->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(obj->pid) != OBJ_TYPE_CRITTER) {
         return -1;
     }
 
@@ -766,7 +792,7 @@ char* killTypeGetDescription(int killType)
 // 0x42D9F4
 int _critter_heal_hours(Object* critter, int a2)
 {
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return -1;
     }
 
@@ -788,7 +814,7 @@ static int _critterClearObjDrugs(Object* obj, void* data)
 // 0x42DA64
 void critterKill(Object* critter, int anim, bool a3)
 {
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return;
     }
 
@@ -800,20 +826,20 @@ void critterKill(Object* critter, int anim, bool a3)
     bool shouldChangeFid = false;
     int fid;
     if (_critter_is_prone(critter)) {
-        int current = (critter->fid & 0xFF0000) >> 16;
+        int current = FID_ANIM_TYPE(critter->fid);
         if (current == ANIM_FALL_BACK || current == ANIM_FALL_FRONT) {
             bool back = false;
             if (current == ANIM_FALL_BACK) {
                 back = true;
             } else {
-                fid = buildFid(1, critter->fid & 0xFFF, ANIM_FALL_FRONT_SF, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
+                fid = buildFid(OBJ_TYPE_CRITTER, critter->fid & 0xFFF, ANIM_FALL_FRONT_SF, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
                 if (!artExists(fid)) {
                     back = true;
                 }
             }
 
             if (back) {
-                fid = buildFid(1, critter->fid & 0xFFF, ANIM_FALL_BACK_SF, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
+                fid = buildFid(OBJ_TYPE_CRITTER, critter->fid & 0xFFF, ANIM_FALL_BACK_SF, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
             }
 
             shouldChangeFid = true;
@@ -828,12 +854,12 @@ void critterKill(Object* critter, int anim, bool a3)
             anim = LAST_SF_DEATH_ANIM;
         }
 
-        fid = buildFid(1, critter->fid & 0xFFF, anim, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
+        fid = buildFid(OBJ_TYPE_CRITTER, critter->fid & 0xFFF, anim, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
         _obj_fix_violence_settings(&fid);
         if (!artExists(fid)) {
             debugPrint("\nError: Critter Kill: Can't match fid!");
 
-            fid = buildFid(1, critter->fid & 0xFFF, ANIM_FALL_BACK_BLOOD_SF, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
+            fid = buildFid(OBJ_TYPE_CRITTER, critter->fid & 0xFFF, ANIM_FALL_BACK_BLOOD_SF, (critter->fid & 0xF000) >> 12, critter->rotation + 1);
             _obj_fix_violence_settings(&fid);
         }
 
@@ -850,7 +876,7 @@ void critterKill(Object* critter, int anim, bool a3)
         rectUnion(&updatedRect, &tempRect, &updatedRect);
     }
 
-    if (!_critter_flag_check(critter->pid, 2048)) {
+    if (!_critter_flag_check(critter->pid, CRITTER_FLAG_0x800)) {
         critter->flags |= OBJECT_NO_BLOCK;
         _obj_toggle_flat(critter, &tempRect);
     }
@@ -873,7 +899,7 @@ void critterKill(Object* critter, int anim, bool a3)
     _critterClearObj = critter;
     _queue_clear_type(EVENT_TYPE_DRUG, _critterClearObjDrugs);
 
-    _item_destroy_all_hidden(critter);
+    itemDestroyAllHidden(critter);
 
     if (a3) {
         tileWindowRefreshRect(&updatedRect, elevation);
@@ -902,7 +928,7 @@ bool critterIsActive(Object* critter)
         return false;
     }
 
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return false;
     }
 
@@ -924,7 +950,7 @@ bool critterIsDead(Object* critter)
         return false;
     }
 
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return false;
     }
 
@@ -946,7 +972,7 @@ bool critterIsCrippled(Object* critter)
         return false;
     }
 
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return false;
     }
 
@@ -960,15 +986,15 @@ bool _critter_is_prone(Object* critter)
         return false;
     }
 
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return false;
     }
 
-    int anim = (critter->fid & 0xFF0000) >> 16;
+    int anim = FID_ANIM_TYPE(critter->fid);
 
     return (critter->data.critter.combat.results & (DAM_KNOCKED_OUT | DAM_KNOCKED_DOWN)) != 0
-        || anim >= FIRST_KNOCKDOWN_AND_DEATH_ANIM && anim <= LAST_KNOCKDOWN_AND_DEATH_ANIM
-        || anim >= FIRST_SF_DEATH_ANIM && anim <= LAST_SF_DEATH_ANIM;
+    || (anim >= FIRST_KNOCKDOWN_AND_DEATH_ANIM && anim <= LAST_KNOCKDOWN_AND_DEATH_ANIM)
+    || (anim >= FIRST_SF_DEATH_ANIM && anim <= LAST_SF_DEATH_ANIM);
 }
 
 // critter_body_type
@@ -980,7 +1006,7 @@ int critterGetBodyType(Object* critter)
         return 0;
     }
 
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return 0;
     }
 
@@ -1236,7 +1262,7 @@ int knockoutEventProcess(Object* obj, void* data)
 // 0x42E460
 int _critter_wake_clear(Object* obj, void* data)
 {
-    if ((obj->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(obj->pid) != OBJ_TYPE_CRITTER) {
         return 0;
     }
 
@@ -1246,7 +1272,7 @@ int _critter_wake_clear(Object* obj, void* data)
 
     obj->data.critter.combat.results &= ~(DAM_KNOCKED_OUT | DAM_KNOCKED_DOWN);
 
-    int fid = buildFid((obj->fid & 0xF000000) >> 24, obj->fid & 0xFFF, ANIM_STAND, (obj->fid & 0xF000) >> 12, obj->rotation + 1);
+    int fid = buildFid(FID_TYPE(obj->fid), obj->fid & 0xFFF, ANIM_STAND, (obj->fid & 0xF000) >> 12, obj->rotation + 1);
     objectSetFid(obj, fid, 0);
 
     return 0;
@@ -1259,12 +1285,12 @@ int _critter_set_who_hit_me(Object* a1, Object* a2)
         return -1;
     }
 
-    if (a2 != NULL && ((a2->fid & 0xF000000) >> 24) != OBJ_TYPE_CRITTER) {
+    if (a2 != NULL && FID_TYPE(a2->fid) != OBJ_TYPE_CRITTER) {
         return -1;
     }
 
-    if ((a1->pid >> 24) == OBJ_TYPE_CRITTER) {
-        if (a2 == NULL || a1->data.critter.combat.team != a2->data.critter.combat.team || statRoll(a1, STAT_INTELLIGENCE, -1, NULL) < 2 && (!objectIsPartyMember(a1) || !objectIsPartyMember(a2))) {
+    if (PID_TYPE(a1->pid) == OBJ_TYPE_CRITTER) {
+        if (a2 == NULL || a1->data.critter.combat.team != a2->data.critter.combat.team || (statRoll(a1, STAT_INTELLIGENCE, -1, NULL) < 2 && (!objectIsPartyMember(a1) || !objectIsPartyMember(a2)))) {
             a1->data.critter.combat.whoHitMe = a2;
             if (a2 == gDude) {
                 reactionSetValue(a1, -3);
@@ -1279,7 +1305,7 @@ int _critter_set_who_hit_me(Object* a1, Object* a2)
 bool _critter_can_obj_dude_rest()
 {
     bool v1 = false;
-    if (!_wmMapCanRestHere(gElevation)) {
+    if (!wmMapCanRestHere(gElevation)) {
         v1 = true;
     }
 
@@ -1319,7 +1345,7 @@ bool _critter_can_obj_dude_rest()
 // 0x42E62C
 int critterGetMovementPointCostAdjustedForCrippledLegs(Object* critter, int actionPoints)
 {
-    if ((critter->pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(critter->pid) != OBJ_TYPE_CRITTER) {
         return 0;
     }
 
@@ -1358,7 +1384,7 @@ bool _critter_flag_check(int pid, int flag)
         return false;
     }
 
-    if ((pid >> 24) != OBJ_TYPE_CRITTER) {
+    if (PID_TYPE(pid) != OBJ_TYPE_CRITTER) {
         return false;
     }
 
@@ -1366,3 +1392,5 @@ bool _critter_flag_check(int pid, int flag)
     protoGetProto(pid, &proto);
     return (proto->critter.data.flags & flag) != 0;
 }
+
+} // namespace fallout

src/critter.h

@@ -5,6 +5,8 @@
 #include "obj_types.h"
 #include "proto_types.h"
 
+namespace fallout {
+
 typedef enum DudeState {
     DUDE_STATE_SNEAKING = 0,
     DUDE_STATE_LEVEL_UP_AVAILABLE = 3,
@@ -21,7 +23,7 @@ void critterProtoDataCopy(CritterProtoData* dest, CritterProtoData* src);
 int dudeSetName(const char* name);
 void dudeResetName();
 int critterGetHitPoints(Object* critter);
-int critterAdjustHitPoints(Object* critter, int amount);
+int critterAdjustHitPoints(Object* critter, int hp);
 int critterGetPoison(Object* critter);
 int critterAdjustPoison(Object* obj, int amount);
 int poisonEventProcess(Object* obj, void* data);
@@ -69,4 +71,6 @@ bool critterIsEncumbered(Object* critter);
 bool critterIsFleeing(Object* a1);
 bool _critter_flag_check(int pid, int flag);
 
+} // namespace fallout
+
 #endif /* CRITTER_H */

src/cycle.cc

@@ -5,6 +5,8 @@
 #include "game_config.h"
 #include "palette.h"
 
+namespace fallout {
+
 #define COLOR_CYCLE_PERIOD_1 (200U)
 #define COLOR_CYCLE_PERIOD_2 (142U)
 #define COLOR_CYCLE_PERIOD_3 (100U)
@@ -332,3 +334,5 @@ void colorCycleTicker()
         paletteSetEntriesInRange(palette + 229 * 3, 229, 255);
     }
 }
+
+} // namespace fallout

src/cycle.h

@@ -1,6 +1,8 @@
 #ifndef CYCLE_H
 #define CYCLE_H
 
+namespace fallout {
+
 void colorCycleInit();
 void colorCycleReset();
 void colorCycleFree();
@@ -10,4 +12,6 @@ bool colorCycleEnabled();
 void cycleSetSpeedFactor(int value);
 void colorCycleTicker();
 
+} // namespace fallout
+
 #endif /* CYCLE_H */

src/datafile.cc

@@ -1,10 +1,199 @@
 #include "datafile.h"
 
+#include <string.h>
+
+#include "color.h"
+#include "db.h"
+#include "memory_manager.h"
+#include "pcx.h"
+#include "platform_compat.h"
+
+namespace fallout {
+
+// 0x5184AC
+DatafileLoader* gDatafileLoader = NULL;
+
+// 0x5184B0
+DatafileNameMangler* gDatafileNameMangler = datafileDefaultNameManglerImpl;
+
 // 0x56D7E0
-unsigned char _pal[768];
+unsigned char gDatafilePalette[768];
+
+// 0x42EE70
+char* datafileDefaultNameManglerImpl(char* path)
+{
+    return path;
+}
+
+// NOTE: Unused.
+//
+// 0x42EE74
+void datafileSetNameMangler(DatafileNameMangler* mangler)
+{
+    gDatafileNameMangler = mangler;
+}
+
+// NOTE: Unused.
+//
+// 0x42EE7C
+void datafileSetLoader(DatafileLoader* loader)
+{
+    gDatafileLoader = loader;
+}
+
+// 0x42EE84
+void sub_42EE84(unsigned char* data, unsigned char* palette, int width, int height)
+{
+    unsigned char indexedPalette[256];
+
+    indexedPalette[0] = 0;
+    for (int index = 1; index < 256; index++) {
+        // TODO: Check.
+        int r = palette[index * 3 + 2] >> 3;
+        int g = palette[index * 3 + 1] >> 3;
+        int b = palette[index * 3] >> 3;
+        int colorTableIndex = (r << 10) | (g << 5) | b;
+        indexedPalette[index] = _colorTable[colorTableIndex];
+    }
+
+    int size = width * height;
+    for (int index = 0; index < size; index++) {
+        data[index] = indexedPalette[data[index]];
+    }
+}
+
+// NOTE: Unused.
+//
+// 0x42EEF8
+void sub_42EEF8(unsigned char* data, unsigned char* palette, int width, int height)
+{
+    unsigned char indexedPalette[256];
+
+    indexedPalette[0] = 0;
+    for (int index = 1; index < 256; index++) {
+        // TODO: Check.
+        int r = palette[index * 3 + 2] >> 1;
+        int g = palette[index * 3 + 1] >> 1;
+        int b = palette[index * 3] >> 1;
+        int colorTableIndex = (r << 10) | (g << 5) | b;
+        indexedPalette[index] = _colorTable[colorTableIndex];
+    }
+
+    int size = width * height;
+    for (int index = 0; index < size; index++) {
+        data[index] = indexedPalette[data[index]];
+    }
+}
+
+// 0x42EF60
+unsigned char* datafileReadRaw(char* path, int* widthPtr, int* heightPtr)
+{
+    char* mangledPath = gDatafileNameMangler(path);
+    char* dot = strrchr(mangledPath, '.');
+    if (dot != NULL) {
+        if (compat_stricmp(dot + 1, "pcx") == 0) {
+            return pcxRead(mangledPath, widthPtr, heightPtr, gDatafilePalette);
+        }
+    }
+
+    if (gDatafileLoader != NULL) {
+        return gDatafileLoader(mangledPath, gDatafilePalette, widthPtr, heightPtr);
+    }
+
+    return NULL;
+}
+
+// 0x42EFCC
+unsigned char* datafileRead(char* path, int* widthPtr, int* heightPtr)
+{
+    unsigned char* v1 = datafileReadRaw(path, widthPtr, heightPtr);
+    if (v1 != NULL) {
+        sub_42EE84(v1, gDatafilePalette, *widthPtr, *heightPtr);
+    }
+    return v1;
+}
+
+// NOTE: Unused
+//
+// 0x42EFF4
+unsigned char* sub_42EFF4(char* path)
+{
+    int width;
+    int height;
+    unsigned char* v3 = datafileReadRaw(path, &width, &height);
+    if (v3 != NULL) {
+        internal_free_safe(v3, __FILE__, __LINE__); // "..\\int\\DATAFILE.C", 148
+        return gDatafilePalette;
+    }
+
+    return NULL;
+}
+
+// NOTE: Unused.
+//
+// 0x42F024
+void sub_42F024(unsigned char* data, int* widthPtr, int* heightPtr)
+{
+    int width = *widthPtr;
+    int height = *heightPtr;
+    unsigned char* temp = (unsigned char*)internal_malloc_safe(width * height, __FILE__, __LINE__); // "..\\int\\DATAFILE.C", 157
+
+    // NOTE: Original code does not initialize `x`.
+    int y = 0;
+    int x = 0;
+    unsigned char* src1 = data;
+
+    for (y = 0; y < height; y++) {
+        if (*src1 == 0) {
+            break;
+        }
+
+        unsigned char* src2 = src1;
+        for (x = 0; x < width; x++) {
+            if (*src2 == 0) {
+                break;
+            }
+
+            *temp++ = *src2++;
+        }
+
+        src1 += width;
+    }
+
+    memcpy(data, temp, x * y);
+    internal_free_safe(temp, __FILE__, __LINE__); // // "..\\int\\DATAFILE.C", 171
+}
 
 // 0x42F0E4
-unsigned char* _datafileGetPalette()
+unsigned char* datafileGetPalette()
 {
-    return _pal;
+    return gDatafilePalette;
 }
+
+// NOTE: Unused.
+//
+// 0x42F0EC
+unsigned char* datafileLoad(char* path, int* sizePtr)
+{
+    const char* mangledPath = gDatafileNameMangler(path);
+    File* stream = fileOpen(mangledPath, "rb");
+    if (stream == NULL) {
+        return NULL;
+    }
+
+    int size = fileGetSize(stream);
+    unsigned char* data = (unsigned char*)internal_malloc_safe(size, __FILE__, __LINE__); // "..\\int\\DATAFILE.C", 185
+    if (data == NULL) {
+        // NOTE: This code is unreachable, internal_malloc_safe never fails.
+        // Otherwise it leaks stream.
+        *sizePtr = 0;
+        return NULL;
+    }
+
+    fileRead(data, 1, size, stream);
+    fileClose(stream);
+    *sizePtr = size;
+    return data;
+}
+
+} // namespace fallout

src/datafile.h

@@ -1,8 +1,28 @@
 #ifndef DATAFILE_H
 #define DATAFILE_H
 
-extern unsigned char _pal[768];
+namespace fallout {
 
-unsigned char* _datafileGetPalette();
+typedef unsigned char*(DatafileLoader)(char* path, unsigned char* palette, int* widthPtr, int* heightPtr);
+typedef char*(DatafileNameMangler)(char* path);
+
+extern DatafileLoader* gDatafileLoader;
+extern DatafileNameMangler* gDatafileNameMangler;
+
+extern unsigned char gDatafilePalette[768];
+
+char* datafileDefaultNameManglerImpl(char* path);
+void datafileSetNameMangler(DatafileNameMangler* mangler);
+void datafileSetLoader(DatafileLoader* loader);
+void sub_42EE84(unsigned char* data, unsigned char* palette, int width, int height);
+void sub_42EEF8(unsigned char* data, unsigned char* palette, int width, int height);
+unsigned char* datafileReadRaw(char* path, int* widthPtr, int* heightPtr);
+unsigned char* datafileRead(char* path, int* widthPtr, int* heightPtr);
+unsigned char* sub_42EFF4(char* path);
+void sub_42F024(unsigned char* data, int* widthPtr, int* heightPtr);
+unsigned char* datafileGetPalette();
+unsigned char* datafileLoad(char* path, int* sizePtr);
+
+} // namespace fallout
 
 #endif /* DATAFILE_H */

src/db.cc

@@ -1,12 +1,14 @@
 #include "db.h"
 
-#include "platform_compat.h"
-#include "xfile.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "platform_compat.h"
+#include "xfile.h"
+
+namespace fallout {
+
 typedef struct FileList {
     XList xlist;
     struct FileList* next;
@@ -61,20 +63,22 @@ int dbOpen(const char* filePath1, int a2, const char* filePath2, int a4)
     return 0;
 }
 
-// NOTE: This function simply returns 0, but it definitely accept one parameter
-// via eax, as seen at every call site. This value is ignored. It's impossible
-// to guess it's name.
-//
 // 0x4C5D54
-int _db_current(int a1)
+int _db_select(int dbHandle)
+{
+    return 0;
+}
+
+// NOTE: Uncollapsed 0x4C5D54.
+int _db_current()
 {
     return 0;
 }
 
 // 0x4C5D58
-bool _db_total()
+int _db_total()
 {
-    return true;
+    return 0;
 }
 
 // 0x4C5D60
@@ -638,7 +642,7 @@ int fileNameListInit(const char* pattern, char*** fileNameListPtr, int a3, int a
             }
         }
 
-        bool v1 = *pattern == '*';
+        bool isWildcard = *pattern == '*';
 
         for (int index = 0; index < fileNamesLength; index += 1) {
             const char* name = xlist->fileNames[index];
@@ -647,22 +651,13 @@ int fileNameListInit(const char* pattern, char*** fileNameListPtr, int a3, int a
             char extension[COMPAT_MAX_EXT];
             compat_splitpath(name, NULL, dir, fileName, extension);
 
-            bool v2 = false;
-            if (v1) {
-                char* pch = dir;
-                while (*pch != '\0' && *pch != '\\') {
-                    pch++;
-                }
-                v2 = *pch != '\0';
-            }
-
-            if (!v2) {
+            if (!isWildcard || *dir == '\0' || strchr(dir, '\\') == NULL) {
                 // NOTE: Quick and dirty fix to buffer overflow. See RE to
                 // understand the problem.
                 char path[COMPAT_MAX_PATH];
                 sprintf(path, "%s%s", fileName, extension);
                 free(xlist->fileNames[length]);
-                xlist->fileNames[length] = strdup(path);
+                xlist->fileNames[length] = compat_strdup(path);
                 length++;
             }
         }
@@ -745,3 +740,5 @@ int _db_list_compare(const void* p1, const void* p2)
 {
     return compat_stricmp(*(const char**)p1, *(const char**)p2);
 }
+
+} // namespace fallout

src/db.h

@@ -1,18 +1,21 @@
 #ifndef DB_H
 #define DB_H
 
+#include <stddef.h>
+
 #include "memory_defs.h"
 #include "xfile.h"
 
-#include <stddef.h>
+namespace fallout {
 
 typedef XFile File;
 typedef void FileReadProgressHandler();
 typedef char* StrdupProc(const char* string);
 
 int dbOpen(const char* filePath1, int a2, const char* filePath2, int a4);
-int _db_current(int a1);
-bool _db_total();
+int _db_select(int dbHandle);
+int _db_current();
+int _db_total();
 void dbExit();
 int dbGetFileSize(const char* filePath, int* sizePtr);
 int dbGetFileContents(const char* filePath, void* ptr);
@@ -65,4 +68,6 @@ int fileGetSize(File* stream);
 void fileSetReadProgressHandler(FileReadProgressHandler* handler, int size);
 void _db_enable_hash_table_();
 
+} // namespace fallout
+
 #endif /* DB_H */

src/dbox.cc

@@ -1,5 +1,10 @@
 #include "dbox.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
@@ -14,10 +19,7 @@
 #include "window_manager.h"
 #include "word_wrap.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
+namespace fallout {
 
 #define FILE_DIALOG_LINE_COUNT 12
 
@@ -193,81 +195,67 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
             : DIALOG_TYPE_MEDIUM;
     }
 
-    CacheEntry* backgroundHandle;
-    int backgroundWidth;
-    int backgroundHeight;
-    int fid = buildFid(6, gDialogBoxBackgroundFrmIds[dialogType], 0, 0, 0);
-    unsigned char* background = artLockFrameDataReturningSize(fid, &backgroundHandle, &backgroundWidth, &backgroundHeight);
-    if (background == NULL) {
+    FrmImage backgroundFrmImage;
+    int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, gDialogBoxBackgroundFrmIds[dialogType], 0, 0, 0);
+    if (!backgroundFrmImage.lock(backgroundFid)) {
         fontSetCurrent(savedFont);
         return -1;
     }
 
     // Maintain original position in original resolution, otherwise center it.
-    if (screenGetWidth() != 640) x = (screenGetWidth() - backgroundWidth) / 2;
-    if (screenGetHeight() != 480) y = (screenGetHeight() - backgroundHeight) / 2;
-    int win = windowCreate(x, y, backgroundWidth, backgroundHeight, 256, WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
+    if (screenGetWidth() != 640) x = (screenGetWidth() - backgroundFrmImage.getWidth()) / 2;
+    if (screenGetHeight() != 480) y = (screenGetHeight() - backgroundFrmImage.getHeight()) / 2;
+    int win = windowCreate(x,
+        y,
+        backgroundFrmImage.getWidth(),
+        backgroundFrmImage.getHeight(),
+        256,
+        WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
     if (win == -1) {
-        artUnlock(backgroundHandle);
         fontSetCurrent(savedFont);
         return -1;
     }
 
     unsigned char* windowBuf = windowGetBuffer(win);
-    memcpy(windowBuf, background, backgroundWidth * backgroundHeight);
+    memcpy(windowBuf, backgroundFrmImage.getData(), backgroundFrmImage.getWidth() * backgroundFrmImage.getHeight());
 
-    CacheEntry* doneBoxHandle = NULL;
-    unsigned char* doneBox = NULL;
-    int doneBoxWidth;
-    int doneBoxHeight;
-
-    CacheEntry* downButtonHandle = NULL;
-    unsigned char* downButton = NULL;
-    int downButtonWidth;
-    int downButtonHeight;
-
-    CacheEntry* upButtonHandle = NULL;
-    unsigned char* upButton = NULL;
+    FrmImage doneBoxFrmImage;
+    FrmImage buttonNormalFrmImage;
+    FrmImage buttonPressedFrmImage;
 
     if ((flags & DIALOG_BOX_0x20) == 0) {
-        int doneBoxFid = buildFid(6, 209, 0, 0, 0);
-        doneBox = artLockFrameDataReturningSize(doneBoxFid, &doneBoxHandle, &doneBoxWidth, &doneBoxHeight);
-        if (doneBox == NULL) {
-            artUnlock(backgroundHandle);
+        int doneBoxFid = buildFid(OBJ_TYPE_INTERFACE, 209, 0, 0, 0);
+        if (!doneBoxFrmImage.lock(doneBoxFid)) {
             fontSetCurrent(savedFont);
             windowDestroy(win);
             return -1;
         }
 
-        int downButtonFid = buildFid(6, 9, 0, 0, 0);
-        downButton = artLockFrameDataReturningSize(downButtonFid, &downButtonHandle, &downButtonWidth, &downButtonHeight);
-        if (downButton == NULL) {
-            artUnlock(doneBoxHandle);
-            artUnlock(backgroundHandle);
+        int pressedFid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
+        if (!buttonPressedFrmImage.lock(pressedFid)) {
             fontSetCurrent(savedFont);
             windowDestroy(win);
             return -1;
         }
 
-        int upButtonFid = buildFid(6, 8, 0, 0, 0);
-        upButton = artLockFrameData(upButtonFid, 0, 0, &upButtonHandle);
-        if (upButton == NULL) {
-            artUnlock(downButtonHandle);
-            artUnlock(doneBoxHandle);
-            artUnlock(backgroundHandle);
+        int normalFid = buildFid(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
+        if (!buttonNormalFrmImage.lock(normalFid)) {
             fontSetCurrent(savedFont);
             windowDestroy(win);
             return -1;
         }
 
-        int v27 = hasTwoButtons ? _doneX[dialogType] : (backgroundWidth - doneBoxWidth) / 2;
-        blitBufferToBuffer(doneBox, doneBoxWidth, doneBoxHeight, doneBoxWidth, windowBuf + backgroundWidth * _doneY[dialogType] + v27, backgroundWidth);
+        int v27 = hasTwoButtons
+            ? _doneX[dialogType]
+            : (backgroundFrmImage.getWidth() - doneBoxFrmImage.getWidth()) / 2;
+        blitBufferToBuffer(doneBoxFrmImage.getData(),
+            doneBoxFrmImage.getWidth(),
+            doneBoxFrmImage.getHeight(),
+            doneBoxFrmImage.getWidth(),
+            windowBuf + backgroundFrmImage.getWidth() * _doneY[dialogType] + v27,
+            backgroundFrmImage.getWidth());
 
         if (!messageListInit(&messageList)) {
-            artUnlock(upButtonHandle);
-            artUnlock(downButtonHandle);
-            artUnlock(doneBoxHandle);
-            artUnlock(backgroundHandle);
             fontSetCurrent(savedFont);
             windowDestroy(win);
             return -1;
@@ -277,10 +265,6 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
         sprintf(path, "%s%s", asc_5186C8, "DBOX.MSG");
 
         if (!messageListLoad(&messageList, path)) {
-            artUnlock(upButtonHandle);
-            artUnlock(downButtonHandle);
-            artUnlock(doneBoxHandle);
-            artUnlock(backgroundHandle);
             fontSetCurrent(savedFont);
             // FIXME: Window is not removed.
             return -1;
@@ -292,10 +276,26 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
         // 101 - YES
         messageListItem.num = (flags & DIALOG_BOX_YES_NO) == 0 ? 100 : 101;
         if (messageListGetItem(&messageList, &messageListItem)) {
-            fontDrawText(windowBuf + backgroundWidth * (_doneY[dialogType] + 3) + v27 + 35, messageListItem.text, backgroundWidth, backgroundWidth, _colorTable[18979]);
+            fontDrawText(windowBuf + backgroundFrmImage.getWidth() * (_doneY[dialogType] + 3) + v27 + 35,
+                messageListItem.text,
+                backgroundFrmImage.getWidth(),
+                backgroundFrmImage.getWidth(),
+                _colorTable[18979]);
         }
 
-        int btn = buttonCreate(win, v27 + 13, _doneY[dialogType] + 4, downButtonWidth, downButtonHeight, -1, -1, -1, 500, upButton, downButton, NULL, BUTTON_FLAG_TRANSPARENT);
+        int btn = buttonCreate(win,
+            v27 + 13,
+            _doneY[dialogType] + 4,
+            buttonPressedFrmImage.getWidth(),
+            buttonPressedFrmImage.getHeight(),
+            -1,
+            -1,
+            -1,
+            500,
+            buttonNormalFrmImage.getData(),
+            buttonPressedFrmImage.getData(),
+            NULL,
+            BUTTON_FLAG_TRANSPARENT);
         if (btn != -1) {
             buttonSetCallbacks(btn, _gsound_red_butt_press, _gsound_red_butt_release);
         }
@@ -311,61 +311,58 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 
             fontSetCurrent(103);
 
-            blitBufferToBufferTrans(doneBox,
-                doneBoxWidth,
-                doneBoxHeight,
-                doneBoxWidth,
-                windowBuf + backgroundWidth * _doneY[dialogType] + _doneX[dialogType] + doneBoxWidth + 24,
-                backgroundWidth);
+            blitBufferToBufferTrans(doneBoxFrmImage.getData(),
+                doneBoxFrmImage.getWidth(),
+                doneBoxFrmImage.getHeight(),
+                doneBoxFrmImage.getWidth(),
+                windowBuf + backgroundFrmImage.getWidth() * _doneY[dialogType] + _doneX[dialogType] + doneBoxFrmImage.getWidth() + 24,
+                backgroundFrmImage.getWidth());
 
-            fontDrawText(windowBuf + backgroundWidth * (_doneY[dialogType] + 3) + _doneX[dialogType] + doneBoxWidth + 59,
-                a8, backgroundWidth, backgroundWidth, _colorTable[18979]);
+            fontDrawText(windowBuf + backgroundFrmImage.getWidth() * (_doneY[dialogType] + 3) + _doneX[dialogType] + doneBoxFrmImage.getWidth() + 59,
+                a8,
+                backgroundFrmImage.getWidth(),
+                backgroundFrmImage.getWidth(),
+                _colorTable[18979]);
 
             int btn = buttonCreate(win,
-                doneBoxWidth + _doneX[dialogType] + 37,
+                doneBoxFrmImage.getWidth() + _doneX[dialogType] + 37,
                 _doneY[dialogType] + 4,
-                downButtonWidth,
-                downButtonHeight,
-                -1, -1, -1, 501, upButton, downButton, 0, BUTTON_FLAG_TRANSPARENT);
+                buttonPressedFrmImage.getWidth(),
+                buttonPressedFrmImage.getHeight(),
+                -1,
+                -1,
+                -1,
+                501,
+                buttonNormalFrmImage.getData(),
+                buttonPressedFrmImage.getData(),
+                0,
+                BUTTON_FLAG_TRANSPARENT);
             if (btn != -1) {
                 buttonSetCallbacks(btn, _gsound_red_butt_press, _gsound_red_butt_release);
             }
         } else {
-            int doneBoxFid = buildFid(6, 209, 0, 0, 0);
-            unsigned char* doneBox = artLockFrameDataReturningSize(doneBoxFid, &doneBoxHandle, &doneBoxWidth, &doneBoxHeight);
-            if (doneBox == NULL) {
-                artUnlock(backgroundHandle);
+            int doneBoxFid = buildFid(OBJ_TYPE_INTERFACE, 209, 0, 0, 0);
+            if (!doneBoxFrmImage.lock(doneBoxFid)) {
                 fontSetCurrent(savedFont);
                 windowDestroy(win);
                 return -1;
             }
 
-            int downButtonFid = buildFid(6, 9, 0, 0, 0);
-            unsigned char* downButton = artLockFrameDataReturningSize(downButtonFid, &downButtonHandle, &downButtonWidth, &downButtonHeight);
-            if (downButton == NULL) {
-                artUnlock(doneBoxHandle);
-                artUnlock(backgroundHandle);
+            int pressedFid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
+            if (!buttonPressedFrmImage.lock(pressedFid)) {
                 fontSetCurrent(savedFont);
                 windowDestroy(win);
                 return -1;
             }
 
-            int upButtonFid = buildFid(6, 8, 0, 0, 0);
-            unsigned char* upButton = artLockFrameData(upButtonFid, 0, 0, &upButtonHandle);
-            if (upButton == NULL) {
-                artUnlock(downButtonHandle);
-                artUnlock(doneBoxHandle);
-                artUnlock(backgroundHandle);
+            int normalFid = buildFid(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
+            if (!buttonNormalFrmImage.lock(normalFid)) {
                 fontSetCurrent(savedFont);
                 windowDestroy(win);
                 return -1;
             }
 
             if (!messageListInit(&messageList)) {
-                artUnlock(upButtonHandle);
-                artUnlock(downButtonHandle);
-                artUnlock(doneBoxHandle);
-                artUnlock(backgroundHandle);
                 fontSetCurrent(savedFont);
                 windowDestroy(win);
                 return -1;
@@ -375,38 +372,34 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
             sprintf(path, "%s%s", asc_5186C8, "DBOX.MSG");
 
             if (!messageListLoad(&messageList, path)) {
-                artUnlock(upButtonHandle);
-                artUnlock(downButtonHandle);
-                artUnlock(doneBoxHandle);
-                artUnlock(backgroundHandle);
                 fontSetCurrent(savedFont);
                 windowDestroy(win);
                 return -1;
             }
 
-            blitBufferToBufferTrans(doneBox,
-                doneBoxWidth,
-                doneBoxHeight,
-                doneBoxWidth,
-                windowBuf + backgroundWidth * _doneY[dialogType] + _doneX[dialogType],
-                backgroundWidth);
+            blitBufferToBufferTrans(doneBoxFrmImage.getData(),
+                doneBoxFrmImage.getWidth(),
+                doneBoxFrmImage.getHeight(),
+                doneBoxFrmImage.getWidth(),
+                windowBuf + backgroundFrmImage.getWidth() * _doneY[dialogType] + _doneX[dialogType],
+                backgroundFrmImage.getWidth());
 
             fontSetCurrent(103);
 
-            fontDrawText(windowBuf + backgroundWidth * (_doneY[dialogType] + 3) + _doneX[dialogType] + 35,
-                a8, backgroundWidth, backgroundWidth, _colorTable[18979]);
+            fontDrawText(windowBuf + backgroundFrmImage.getWidth() * (_doneY[dialogType] + 3) + _doneX[dialogType] + 35,
+                a8, backgroundFrmImage.getWidth(), backgroundFrmImage.getWidth(), _colorTable[18979]);
 
             int btn = buttonCreate(win,
                 _doneX[dialogType] + 13,
                 _doneY[dialogType] + 4,
-                downButtonWidth,
-                downButtonHeight,
+                buttonPressedFrmImage.getWidth(),
+                buttonPressedFrmImage.getHeight(),
                 -1,
                 -1,
                 -1,
                 501,
-                upButton,
-                downButton,
+                buttonNormalFrmImage.getData(),
+                buttonPressedFrmImage.getData(),
                 NULL,
                 BUTTON_FLAG_TRANSPARENT);
             if (btn != -1) {
@@ -428,28 +421,44 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 
     if (hasTitle) {
         if ((flags & DIALOG_BOX_NO_HORIZONTAL_CENTERING) != 0) {
-            fontDrawText(windowBuf + backgroundWidth * v23 + _xtable[dialogType], title, backgroundWidth, backgroundWidth, titleColor);
+            fontDrawText(windowBuf + backgroundFrmImage.getWidth() * v23 + _xtable[dialogType],
+                title,
+                backgroundFrmImage.getWidth(),
+                backgroundFrmImage.getWidth(),
+                titleColor);
         } else {
             int length = fontGetStringWidth(title);
-            fontDrawText(windowBuf + backgroundWidth * v23 + (backgroundWidth - length) / 2, title, backgroundWidth, backgroundWidth, titleColor);
+            fontDrawText(windowBuf + backgroundFrmImage.getWidth() * v23 + (backgroundFrmImage.getWidth() - length) / 2,
+                title,
+                backgroundFrmImage.getWidth(),
+                backgroundFrmImage.getWidth(),
+                titleColor);
         }
         v23 += fontGetLineHeight();
     }
 
     for (int v94 = 0; v94 < bodyLength; v94++) {
         int len = fontGetStringWidth(body[v94]);
-        if (len <= backgroundWidth - 26) {
+        if (len <= backgroundFrmImage.getWidth() - 26) {
             if ((flags & DIALOG_BOX_NO_HORIZONTAL_CENTERING) != 0) {
-                fontDrawText(windowBuf + backgroundWidth * v23 + _xtable[dialogType], body[v94], backgroundWidth, backgroundWidth, bodyColor);
+                fontDrawText(windowBuf + backgroundFrmImage.getWidth() * v23 + _xtable[dialogType],
+                    body[v94],
+                    backgroundFrmImage.getWidth(),
+                    backgroundFrmImage.getWidth(),
+                    bodyColor);
             } else {
                 int length = fontGetStringWidth(body[v94]);
-                fontDrawText(windowBuf + backgroundWidth * v23 + (backgroundWidth - length) / 2, body[v94], backgroundWidth, backgroundWidth, bodyColor);
+                fontDrawText(windowBuf + backgroundFrmImage.getWidth() * v23 + (backgroundFrmImage.getWidth() - length) / 2,
+                    body[v94],
+                    backgroundFrmImage.getWidth(),
+                    backgroundFrmImage.getWidth(),
+                    bodyColor);
             }
             v23 += fontGetLineHeight();
         } else {
             short beginnings[WORD_WRAP_MAX_COUNT];
             short count;
-            if (wordWrap(body[v94], backgroundWidth - 26, beginnings, &count) != 0) {
+            if (wordWrap(body[v94], backgroundFrmImage.getWidth() - 26, beginnings, &count) != 0) {
                 debugPrint("\nError: dialog_out");
             }
 
@@ -464,10 +473,18 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
                 string[v51] = '\0';
 
                 if ((flags & DIALOG_BOX_NO_HORIZONTAL_CENTERING) != 0) {
-                    fontDrawText(windowBuf + backgroundWidth * v23 + _xtable[dialogType], string, backgroundWidth, backgroundWidth, bodyColor);
+                    fontDrawText(windowBuf + backgroundFrmImage.getWidth() * v23 + _xtable[dialogType],
+                        string,
+                        backgroundFrmImage.getWidth(),
+                        backgroundFrmImage.getWidth(),
+                        bodyColor);
                 } else {
                     int length = fontGetStringWidth(string);
-                    fontDrawText(windowBuf + backgroundWidth * v23 + (backgroundWidth - length) / 2, string, backgroundWidth, backgroundWidth, bodyColor);
+                    fontDrawText(windowBuf + backgroundFrmImage.getWidth() * v23 + (backgroundFrmImage.getWidth() - length) / 2,
+                        string,
+                        backgroundFrmImage.getWidth(),
+                        backgroundFrmImage.getWidth(),
+                        bodyColor);
                 }
                 v23 += fontGetLineHeight();
             }
@@ -503,13 +520,9 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
     }
 
     windowDestroy(win);
-    artUnlock(backgroundHandle);
     fontSetCurrent(savedFont);
 
     if (v86) {
-        artUnlock(doneBoxHandle);
-        artUnlock(downButtonHandle);
-        artUnlock(upButtonHandle);
         messageListFree(&messageList);
     }
 
@@ -517,7 +530,7 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 }
 
 // 0x41DE90
-int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLength, int x, int y, int flags)
+int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLength, int x, int y, int flags)
 {
     int oldFont = fontGetCurrent();
 
@@ -536,49 +549,34 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
         }
     }
 
-    unsigned char* frmBuffers[FILE_DIALOG_FRM_COUNT];
-    CacheEntry* frmHandles[FILE_DIALOG_FRM_COUNT];
-    Size frmSizes[FILE_DIALOG_FRM_COUNT];
+    FrmImage frmImages[FILE_DIALOG_FRM_COUNT];
 
     for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-        int fid = buildFid(6, gLoadFileDialogFrmIds[index], 0, 0, 0);
-        frmBuffers[index] = artLockFrameDataReturningSize(fid, &(frmHandles[index]), &(frmSizes[index].width), &(frmSizes[index].height));
-        if (frmBuffers[index] == NULL) {
-            while (--index >= 0) {
-                artUnlock(frmHandles[index]);
-            }
+        int fid = buildFid(OBJ_TYPE_INTERFACE, gLoadFileDialogFrmIds[index], 0, 0, 0);
+        if (!frmImages[index].lock(fid)) {
             return -1;
         }
     }
 
-    
-    int backgroundWidth = frmSizes[FILE_DIALOG_FRM_BACKGROUND].width;
-    int backgroundHeight = frmSizes[FILE_DIALOG_FRM_BACKGROUND].height;
+    int backgroundWidth = frmImages[FILE_DIALOG_FRM_BACKGROUND].getWidth();
+    int backgroundHeight = frmImages[FILE_DIALOG_FRM_BACKGROUND].getHeight();
 
     // Maintain original position in original resolution, otherwise center it.
     if (screenGetWidth() != 640) x = (screenGetWidth() - backgroundWidth) / 2;
     if (screenGetHeight() != 480) y = (screenGetHeight() - backgroundHeight) / 2;
     int win = windowCreate(x, y, backgroundWidth, backgroundHeight, 256, WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
     if (win == -1) {
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
         return -1;
     }
 
     unsigned char* windowBuffer = windowGetBuffer(win);
-    memcpy(windowBuffer, frmBuffers[FILE_DIALOG_FRM_BACKGROUND], backgroundWidth * backgroundHeight);
+    memcpy(windowBuffer, frmImages[FILE_DIALOG_FRM_BACKGROUND].getData(), backgroundWidth * backgroundHeight);
 
     MessageList messageList;
     MessageListItem messageListItem;
 
     if (!messageListInit(&messageList)) {
         windowDestroy(win);
-
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
-
         return -1;
     }
 
@@ -587,11 +585,6 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
 
     if (!messageListLoad(&messageList, path)) {
         windowDestroy(win);
-
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
-
         return -1;
     }
 
@@ -608,14 +601,14 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
     int doneBtn = buttonCreate(win,
         LOAD_FILE_DIALOG_DONE_BUTTON_X,
         LOAD_FILE_DIALOG_DONE_BUTTON_Y,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].height,
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getHeight(),
         -1,
         -1,
         -1,
         500,
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED],
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (doneBtn != -1) {
@@ -625,14 +618,14 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
     int cancelBtn = buttonCreate(win,
         LOAD_FILE_DIALOG_CANCEL_BUTTON_X,
         LOAD_FILE_DIALOG_CANCEL_BUTTON_Y,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].height,
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getHeight(),
         -1,
         -1,
         -1,
         501,
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED],
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (cancelBtn != -1) {
@@ -642,14 +635,14 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
     int scrollUpBtn = buttonCreate(win,
         FILE_DIALOG_SCROLL_BUTTON_X,
         FILE_DIALOG_SCROLL_BUTTON_Y,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].height,
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getHeight(),
         -1,
         505,
         506,
         505,
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_UP_ARROW_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED],
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (scrollUpBtn != -1) {
@@ -658,15 +651,15 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
 
     int scrollDownButton = buttonCreate(win,
         FILE_DIALOG_SCROLL_BUTTON_X,
-        FILE_DIALOG_SCROLL_BUTTON_Y + frmSizes[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].height,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].height,
+        FILE_DIALOG_SCROLL_BUTTON_Y + frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getHeight(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].getHeight(),
         -1,
         503,
         504,
         503,
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED],
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (scrollUpBtn != -1) {
@@ -708,6 +701,8 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
         int scrollCounter = 0;
         bool isScrolling = false;
 
+        convertMouseWheelToArrowKey(&keyCode);
+
         if (keyCode == 500) {
             if (fileListLength != 0) {
                 strncpy(dest, fileList[selectedFileIndex + pageOffset], 16);
@@ -887,10 +882,6 @@ int showLoadFileDialog(char *title, char** fileList, char* dest, int fileListLen
 
     windowDestroy(win);
 
-    for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-        artUnlock(frmHandles[index]);
-    }
-
     messageListFree(&messageList);
     fontSetCurrent(oldFont);
 
@@ -917,48 +908,34 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
         }
     }
 
-    unsigned char* frmBuffers[FILE_DIALOG_FRM_COUNT];
-    CacheEntry* frmHandles[FILE_DIALOG_FRM_COUNT];
-    Size frmSizes[FILE_DIALOG_FRM_COUNT];
+    FrmImage frmImages[FILE_DIALOG_FRM_COUNT];
 
     for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-        int fid = buildFid(6, gSaveFileDialogFrmIds[index], 0, 0, 0);
-        frmBuffers[index] = artLockFrameDataReturningSize(fid, &(frmHandles[index]), &(frmSizes[index].width), &(frmSizes[index].height));
-        if (frmBuffers[index] == NULL) {
-            while (--index >= 0) {
-                artUnlock(frmHandles[index]);
-            }
+        int fid = buildFid(OBJ_TYPE_INTERFACE, gSaveFileDialogFrmIds[index], 0, 0, 0);
+        if (!frmImages[index].lock(fid)) {
             return -1;
         }
     }
 
-    int backgroundWidth = frmSizes[FILE_DIALOG_FRM_BACKGROUND].width;
-    int backgroundHeight = frmSizes[FILE_DIALOG_FRM_BACKGROUND].height;
+    int backgroundWidth = frmImages[FILE_DIALOG_FRM_BACKGROUND].getWidth();
+    int backgroundHeight = frmImages[FILE_DIALOG_FRM_BACKGROUND].getHeight();
 
     // Maintain original position in original resolution, otherwise center it.
     if (screenGetWidth() != 640) x = (screenGetWidth() - backgroundWidth) / 2;
     if (screenGetHeight() != 480) y = (screenGetHeight() - backgroundHeight) / 2;
     int win = windowCreate(x, y, backgroundWidth, backgroundHeight, 256, WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
     if (win == -1) {
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
         return -1;
     }
 
     unsigned char* windowBuffer = windowGetBuffer(win);
-    memcpy(windowBuffer, frmBuffers[FILE_DIALOG_FRM_BACKGROUND], backgroundWidth * backgroundHeight);
+    memcpy(windowBuffer, frmImages[FILE_DIALOG_FRM_BACKGROUND].getData(), backgroundWidth * backgroundHeight);
 
     MessageList messageList;
     MessageListItem messageListItem;
 
     if (!messageListInit(&messageList)) {
         windowDestroy(win);
-
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
-
         return -1;
     }
 
@@ -967,11 +944,6 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
 
     if (!messageListLoad(&messageList, path)) {
         windowDestroy(win);
-
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
-
         return -1;
     }
 
@@ -988,14 +960,14 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
     int doneBtn = buttonCreate(win,
         SAVE_FILE_DIALOG_DONE_BUTTON_X,
         SAVE_FILE_DIALOG_DONE_BUTTON_Y,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].height,
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getHeight(),
         -1,
         -1,
         -1,
         500,
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED],
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (doneBtn != -1) {
@@ -1005,14 +977,14 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
     int cancelBtn = buttonCreate(win,
         SAVE_FILE_DIALOG_CANCEL_BUTTON_X,
         SAVE_FILE_DIALOG_CANCEL_BUTTON_Y,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].height,
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getHeight(),
         -1,
         -1,
         -1,
         501,
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED],
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_LITTLE_RED_BUTTON_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (cancelBtn != -1) {
@@ -1022,14 +994,14 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
     int scrollUpBtn = buttonCreate(win,
         FILE_DIALOG_SCROLL_BUTTON_X,
         FILE_DIALOG_SCROLL_BUTTON_Y,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].height,
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getHeight(),
         -1,
         505,
         506,
         505,
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_UP_ARROW_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED],
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (scrollUpBtn != -1) {
@@ -1038,15 +1010,15 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
 
     int scrollDownButton = buttonCreate(win,
         FILE_DIALOG_SCROLL_BUTTON_X,
-        FILE_DIALOG_SCROLL_BUTTON_Y + frmSizes[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].height,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].width,
-        frmSizes[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].height,
+        FILE_DIALOG_SCROLL_BUTTON_Y + frmImages[FILE_DIALOG_FRM_SCROLL_UP_ARROW_PRESSED].getHeight(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].getWidth(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].getHeight(),
         -1,
         503,
         504,
         503,
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_NORMAL],
-        frmBuffers[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED],
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_NORMAL].getData(),
+        frmImages[FILE_DIALOG_FRM_SCROLL_DOWN_ARROW_PRESSED].getData(),
         NULL,
         BUTTON_FLAG_TRANSPARENT);
     if (scrollUpBtn != -1) {
@@ -1090,8 +1062,8 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
 
     char fileNameCopy[32];
     strncpy(fileNameCopy, dest, 32);
-    
-    int fileNameCopyLength = strlen(fileNameCopy);
+
+    size_t fileNameCopyLength = strlen(fileNameCopy);
     fileNameCopy[fileNameCopyLength + 1] = '\0';
     fileNameCopy[fileNameCopyLength] = ' ';
 
@@ -1116,6 +1088,8 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
         int scrollCounter = 0;
         bool isScrolling = false;
 
+        convertMouseWheelToArrowKey(&keyCode);
+
         if (keyCode == 500) {
             rc = 0;
         } else if (keyCode == KEY_RETURN) {
@@ -1371,11 +1345,6 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
     }
 
     windowDestroy(win);
-
-    for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-        artUnlock(frmHandles[index]);
-    }
-
     messageListFree(&messageList);
     fontSetCurrent(oldFont);
 
@@ -1400,3 +1369,5 @@ static void fileDialogRenderFileList(unsigned char* buffer, char** fileList, int
         }
     }
 }
+
+} // namespace fallout

src/dbox.h

@@ -1,6 +1,8 @@
 #ifndef DBOX_H
 #define DBOX_H
 
+namespace fallout {
+
 typedef enum DialogBoxOptions {
     DIALOG_BOX_LARGE = 0x01,
     DIALOG_BOX_MEDIUM = 0x02,
@@ -14,4 +16,6 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLength, int x, int y, int flags);
 int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLength, int x, int y, int flags);
 
+} // namespace fallout
+
 #endif /* DBOX_H */

src/debug.cc

@@ -1,9 +1,5 @@
 #include "debug.h"
 
-#include "memory.h"
-#include "platform_compat.h"
-#include "window_manager_private.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,12 +10,19 @@
 #include <windows.h>
 #endif
 
+#include "memory.h"
+#include "platform_compat.h"
+#include "window_manager_private.h"
+
+namespace fallout {
+
 static int _debug_puts(char* string);
 static void _debug_clear();
 static int _debug_mono(char* string);
 static int _debug_log(char* string);
 static int _debug_screen(char* string);
-static void _debug_putc(char ch);
+static void _debug_putc(int ch);
+static void _debug_scroll();
 
 // 0x51DEF8
 static FILE* _fd = NULL;
@@ -174,7 +177,28 @@ static int _debug_puts(char* string)
 // 0x4C6FAC
 static void _debug_clear()
 {
-    // TODO: Something with segments.
+    char* buffer;
+    int x;
+    int y;
+
+    buffer = NULL;
+
+    if (gDebugPrintProc == _debug_mono) {
+        buffer = (char*)0xB0000;
+    } else if (gDebugPrintProc == _debug_screen) {
+        buffer = (char*)0xB8000;
+    }
+
+    if (buffer != NULL) {
+        for (y = 0; y < 25; y++) {
+            for (x = 0; x < 80; x++) {
+                *buffer++ = ' ';
+                *buffer++ = 7;
+            }
+        }
+        _cury = 0;
+        _curx = 0;
+    }
 }
 
 // 0x4C7004
@@ -220,15 +244,72 @@ static int _debug_screen(char* string)
 }
 
 // 0x4C709C
-static void _debug_putc(char ch)
+static void _debug_putc(int ch)
 {
-    // TODO: Something with segments.
+    char* buffer;
+
+    buffer = (char*)0xB0000;
+
+    switch (ch) {
+    case 7:
+        printf("\x07");
+        return;
+    case 8:
+        if (_curx > 0) {
+            _curx--;
+            buffer += 2 * _curx + 2 * 80 * _cury;
+            *buffer++ = ' ';
+            *buffer = 7;
+        }
+        return;
+    case 9:
+        do {
+            _debug_putc(' ');
+        } while ((_curx - 1) % 4 != 0);
+        return;
+    case 13:
+        _curx = 0;
+        return;
+    default:
+        buffer += 2 * _curx + 2 * 80 * _cury;
+        *buffer++ = ch;
+        *buffer = 7;
+        _curx++;
+        if (_curx < 80) {
+            return;
+        }
+        // FALLTHROUGH
+    case 10:
+        _curx = 0;
+        _cury++;
+        if (_cury > 24) {
+            _cury = 24;
+            _debug_scroll();
+        }
+        return;
+    }
 }
 
 // 0x4C71AC
-void _debug_scroll()
+static void _debug_scroll()
 {
-    // TODO: Something with segments.
+    char* buffer;
+    int x;
+    int y;
+
+    buffer = (char*)0xB0000;
+
+    for (y = 0; y < 24; y++) {
+        for (x = 0; x < 80 * 2; x++) {
+            buffer[0] = buffer[80 * 2];
+            buffer++;
+        }
+    }
+
+    for (x = 0; x < 80; x++) {
+        *buffer++ = ' ';
+        *buffer++ = 7;
+    }
 }
 
 // 0x4C71E8
@@ -238,3 +319,5 @@ void _debug_exit(void)
         fclose(_fd);
     }
 }
+
+} // namespace fallout

src/debug.h

@@ -1,6 +1,8 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
+namespace fallout {
+
 typedef int(DebugPrintProc)(char* string);
 
 void _GNW_debug_init();
@@ -12,4 +14,6 @@ void _debug_register_func(DebugPrintProc* proc);
 int debugPrint(const char* format, ...);
 void _debug_exit(void);
 
+} // namespace fallout
+
 #endif /* DEBUG_H */

src/dfile.cc

@@ -1,14 +1,16 @@
 #include "dfile.h"
 
-#include "platform_compat.h"
-
-#include <fpattern.h>
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <fpattern.h>
+
+#include "platform_compat.h"
+
+namespace fallout {
+
 // The size of decompression buffer for reading compressed [DFile]s.
 #define DFILE_DECOMPRESSION_BUFFER_SIZE (0x400)
 
@@ -61,7 +63,7 @@ DBase* dbaseOpen(const char* filePath)
 
     // Get file size, and reposition stream to read footer, which contains two
     // 32-bits ints.
-    int fileSize = compat_filelength(fileno(stream));
+    int fileSize = getFileSize(stream);
     if (fseek(stream, fileSize - sizeof(int) * 2, SEEK_SET) != 0) {
         goto err;
     }
@@ -141,7 +143,7 @@ DBase* dbaseOpen(const char* filePath)
         goto err;
     }
 
-    dbase->path = strdup(filePath);
+    dbase->path = compat_strdup(filePath);
     dbase->dataOffset = fileSize - dbaseDataSize;
 
     fclose(stream);
@@ -852,3 +854,5 @@ static void dfileUngetCompressed(DFile* stream, int ch)
     stream->flags |= DFILE_HAS_COMPRESSED_UNGETC;
     stream->position--;
 }
+
+} // namespace fallout

src/dfile.h

@@ -1,10 +1,13 @@
 #ifndef DFILE_H
 #define DFILE_H
 
+#include <stdio.h>
+
+#include <zlib.h>
+
 #include "platform_compat.h"
 
-#include <stdio.h>
-#include <zlib.h>
+namespace fallout {
 
 typedef struct DBase DBase;
 typedef struct DBaseEntry DBaseEntry;
@@ -127,4 +130,6 @@ long dfileTell(DFile* stream);
 void dfileRewind(DFile* stream);
 int dfileEof(DFile* stream);
 
+} // namespace fallout
+
 #endif /* DFILE_H */

src/dialog.cc

@@ -1,14 +1,15 @@
 #include "dialog.h"
 
+#include <string.h>
+
 #include "core.h"
 #include "memory_manager.h"
 #include "movie.h"
 #include "platform_compat.h"
 #include "text_font.h"
-#include "widget.h"
 #include "window_manager.h"
 
-#include <string.h>
+namespace fallout {
 
 // 0x501623
 const float flt_501623 = 31.0;
@@ -76,7 +77,7 @@ int dword_56DB6C;
 int dword_56DB70;
 
 // 0x56DB74
-int _rand2plus;
+char* off_56DB74;
 
 // 0x56DB7C
 int dword_56DB7C;
@@ -91,7 +92,7 @@ int dword_56DB84;
 int dword_56DB88;
 
 // 0x56DB8C
-int dword_56DB8C;
+char* off_56DB8C;
 
 // 0x56DB90
 int _replyPlaying;
@@ -127,16 +128,16 @@ int dword_56DBB8;
 int dword_56DBBC;
 
 // 0x56DBC0
-void* off_56DBC0;
+char* off_56DBC0;
 
 // 0x56DBC4
-void* off_56DBC4;
+char* off_56DBC4;
 
 // 0x56DBC8
-void* off_56DBC8;
+char* off_56DBC8;
 
 // 0x56DBCC
-void* off_56DBCC;
+char* off_56DBCC;
 
 // 0x56DBD0
 char* gDialogReplyTitle;
@@ -151,16 +152,16 @@ int dword_56DBD8;
 int dword_56DBDC;
 
 // 0x56DBE0
-void* off_56DBE0;
+char* off_56DBE0;
 
 // 0x56DBE4
-void* off_56DBE4;
+char* off_56DBE4;
 
 // 0x56DBE8
-void* off_56DBE8;
+char* off_56DBE8;
 
 // 0x56DBEC
-void* off_56DBEC;
+char* off_56DBEC;
 
 // 0x42F434
 STRUCT_56DAE0_FIELD_4* _getReply()
@@ -191,7 +192,7 @@ void _replyAddOption(const char* a1, const char* a2, int a3)
 
     v18 = _getReply();
     v17 = v18->field_14 - 1;
-    v18->field_C[v17].field_8 = 2;
+    v18->field_C[v17].kind = 2;
 
     if (a1 != NULL) {
         v14 = (char*)internal_malloc_safe(strlen(a1) + 1, __FILE__, __LINE__); // "..\\int\\DIALOG.C", 805
@@ -204,18 +205,18 @@ void _replyAddOption(const char* a1, const char* a2, int a3)
     if (a2 != NULL) {
         v15 = (char*)internal_malloc_safe(strlen(a2) + 1, __FILE__, __LINE__); // "..\\int\\DIALOG.C", 810
         strcpy(v15, a2);
-        v18->field_C[v17].field_4 = v15;
+        v18->field_C[v17].string = v15;
     } else {
-        v18->field_C[v17].field_4 = NULL;
+        v18->field_C[v17].string = NULL;
     }
 
-    v18->field_C[v17].field_18 = widgetGetFont();
+    v18->field_C[v17].field_18 = windowGetFont();
     v18->field_C[v17].field_1A = word_56DB60;
     v18->field_C[v17].field_14 = a3;
 }
 
 // 0x42F624
-void _replyAddOptionProc(const char* a1, const char* a2, int a3)
+void _replyAddOptionProc(const char* a1, int a2, int a3)
 {
     STRUCT_56DAE0_FIELD_4* v5;
     int v13;
@@ -224,7 +225,7 @@ void _replyAddOptionProc(const char* a1, const char* a2, int a3)
     v5 = _getReply();
     v13 = v5->field_14 - 1;
 
-    v5->field_C[v13].field_8 = 1;
+    v5->field_C[v13].kind = 1;
 
     if (a1 != NULL) {
         v11 = (char*)internal_malloc_safe(strlen(a1) + 1, __FILE__, __LINE__); // "..\\int\\DIALOG.C", 830
@@ -234,9 +235,9 @@ void _replyAddOptionProc(const char* a1, const char* a2, int a3)
         v5->field_C[v13].field_0 = NULL;
     }
 
-    v5->field_C[v13].field_4 = (char*)a2;
+    v5->field_C[v13].proc = a2;
 
-    v5->field_C[v13].field_18 = widgetGetFont();
+    v5->field_C[v13].field_18 = windowGetFont();
     v5->field_C[v13].field_1A = word_56DB60;
     v5->field_C[v13].field_14 = a3;
 }
@@ -248,9 +249,9 @@ void _optionFree(STRUCT_56DAE0_FIELD_4_FIELD_C* a1)
         internal_free_safe(a1->field_0, __FILE__, __LINE__); // "..\\int\\DIALOG.C", 844
     }
 
-    if (a1->field_8 == 2) {
-        if (a1->field_4 != NULL) {
-            internal_free_safe(a1->field_4, __FILE__, __LINE__); // "..\\int\\DIALOG.C", 846
+    if (a1->kind == 2) {
+        if (a1->string != NULL) {
+            internal_free_safe(a1->string, __FILE__, __LINE__); // "..\\int\\DIALOG.C", 846
         }
     }
 }
@@ -388,8 +389,8 @@ void _drawStr(int win, char* str, int font, int width, int height, int left, int
     int old_font;
     Rect rect;
 
-    old_font = widgetGetFont();
-    widgetSetFont(font);
+    old_font = windowGetFont();
+    windowSetFont(font);
 
     _printStr(win, str, width, height, left, top, a8, a9, a10);
 
@@ -398,7 +399,7 @@ void _drawStr(int win, char* str, int font, int width, int height, int left, int
     rect.right = width + left;
     rect.bottom = height + top;
     windowRefreshRect(win, &rect);
-    widgetSetFont(old_font);
+    windowSetFont(old_font);
 }
 
 // 0x430D40
@@ -503,7 +504,7 @@ int _dialogOption(const char* a1, const char* a2)
 }
 
 // 0x430F38
-int _dialogOptionProc(const char* a1, const char* a2)
+int _dialogOptionProc(const char* a1, int a2)
 {
     if (_dialog[_tods].field_C == -1) {
         return 1;
@@ -514,6 +515,20 @@ int _dialogOptionProc(const char* a1, const char* a2)
     return 0;
 }
 
+// 0x430FD4
+int sub_430FD4(const char* a1, const char* a2, int timeout)
+{
+    // TODO: Incomplete.
+    return -1;
+}
+
+// 0x431088
+int sub_431088(int a1)
+{
+    // TODO: Incomplete.
+    return -1;
+}
+
 // 0x431184
 int _dialogGetExitPoint()
 {
@@ -533,24 +548,24 @@ int _dialogQuit()
 }
 
 // 0x4311B8
-int dialogSetOptionWindow(int a1, int a2, int a3, int a4, int a5)
+int dialogSetOptionWindow(int a1, int a2, int a3, int a4, char* a5)
 {
     dword_56DB6C = a1;
     dword_56DB70 = a2;
     dword_56DB64 = a3;
     dword_56DB68 = a4;
-    _rand2plus = a5;
+    off_56DB74 = a5;
     return 0;
 }
 
 // 0x4311E0
-int dialogSetReplyWindow(int a1, int a2, int a3, int a4, int a5)
+int dialogSetReplyWindow(int a1, int a2, int a3, int a4, char* a5)
 {
     dword_56DB84 = a1;
     dword_56DB88 = a2;
     dword_56DB7C = a3;
     dword_56DB80 = a4;
-    dword_56DB8C = a5;
+    off_56DB8C = a5;
 
     return 0;
 }
@@ -565,7 +580,7 @@ int dialogSetBorder(int a1, int a2)
 }
 
 // 0x431218
-int _dialogSetScrollUp(int a1, int a2, void* a3, void* a4, void* a5, void* a6, int a7)
+int _dialogSetScrollUp(int a1, int a2, char* a3, char* a4, char* a5, char* a6, int a7)
 {
     _upButton = a1;
     dword_56DBD8 = a2;
@@ -596,7 +611,7 @@ int _dialogSetScrollUp(int a1, int a2, void* a3, void* a4, void* a5, void* a6, i
 }
 
 // 0x4312C0
-int _dialogSetScrollDown(int a1, int a2, void* a3, void* a4, void* a5, void* a6, int a7)
+int _dialogSetScrollDown(int a1, int a2, char* a3, char* a4, char* a5, char* a6, int a7)
 {
     _downButton = a1;
     dword_56DBB8 = a2;
@@ -666,6 +681,11 @@ int _dialogSetOptionFlags(int flags)
     return 1;
 }
 
+// 0x431430
+void dialogInit()
+{
+}
+
 // 0x431434
 void _dialogClose()
 {
@@ -732,3 +752,5 @@ int _dialogGetMediaFlag()
 {
     return _mediaFlag;
 }
+
+} // namespace fallout

src/dialog.h

@@ -3,13 +3,18 @@
 
 #include "interpreter.h"
 
+namespace fallout {
+
 typedef void DialogFunc1(int win);
 typedef void DialogFunc2(int win);
 
 typedef struct STRUCT_56DAE0_FIELD_4_FIELD_C {
     char* field_0;
-    char* field_4;
-    int field_8;
+    union {
+        int proc;
+        char* string;
+    };
+    int kind;
     int field_C;
     int field_10;
     int field_14;
@@ -60,12 +65,12 @@ extern int dword_56DB64;
 extern int dword_56DB68;
 extern int dword_56DB6C;
 extern int dword_56DB70;
-extern int _rand2plus;
+extern char* off_56DB74;
 extern int dword_56DB7C;
 extern int dword_56DB80;
 extern int dword_56DB84;
 extern int dword_56DB88;
-extern int dword_56DB8C;
+extern char* off_56DB8C;
 extern int _replyPlaying;
 extern int _replyWin;
 extern int gDialogReplyColorG;
@@ -77,22 +82,22 @@ extern int gDialogOptionColorR;
 extern int _downButton;
 extern int dword_56DBB8;
 extern int dword_56DBBC;
-extern void* off_56DBC0;
-extern void* off_56DBC4;
-extern void* off_56DBC8;
-extern void* off_56DBCC;
+extern char* off_56DBC0;
+extern char* off_56DBC4;
+extern char* off_56DBC8;
+extern char* off_56DBCC;
 extern char* gDialogReplyTitle;
 extern int _upButton;
 extern int dword_56DBD8;
 extern int dword_56DBDC;
-extern void* off_56DBE0;
-extern void* off_56DBE4;
-extern void* off_56DBE8;
-extern void* off_56DBEC;
+extern char* off_56DBE0;
+extern char* off_56DBE4;
+extern char* off_56DBE8;
+extern char* off_56DBEC;
 
 STRUCT_56DAE0_FIELD_4* _getReply();
 void _replyAddOption(const char* a1, const char* a2, int a3);
-void _replyAddOptionProc(const char* a1, const char* a2, int a3);
+void _replyAddOptionProc(const char* a1, int a2, int a3);
 void _optionFree(STRUCT_56DAE0_FIELD_4_FIELD_C* a1);
 void _replyFree();
 int _endDialog();
@@ -107,22 +112,27 @@ int _dialogGotoReply(const char* a1);
 int dialogSetReplyTitle(const char* a1);
 int _dialogReply(const char* a1, const char* a2);
 int _dialogOption(const char* a1, const char* a2);
-int _dialogOptionProc(const char* a1, const char* a2);
+int _dialogOptionProc(const char* a1, int a2);
+int sub_430FD4(const char* a1, const char* a2, int timeout);
+int sub_431088(int a1);
 int _dialogGetExitPoint();
 int _dialogQuit();
-int dialogSetOptionWindow(int a1, int a2, int a3, int a4, int a5);
-int dialogSetReplyWindow(int a1, int a2, int a3, int a4, int a5);
+int dialogSetOptionWindow(int a1, int a2, int a3, int a4, char* a5);
+int dialogSetReplyWindow(int a1, int a2, int a3, int a4, char* a5);
 int dialogSetBorder(int a1, int a2);
-int _dialogSetScrollUp(int a1, int a2, void* a3, void* a4, void* a5, void* a6, int a7);
-int _dialogSetScrollDown(int a1, int a2, void* a3, void* a4, void* a5, void* a6, int a7);
+int _dialogSetScrollUp(int a1, int a2, char* a3, char* a4, char* a5, char* a6, int a7);
+int _dialogSetScrollDown(int a1, int a2, char* a3, char* a4, char* a5, char* a6, int a7);
 int dialogSetOptionSpacing(int value);
 int dialogSetOptionColor(float a1, float a2, float a3);
 int dialogSetReplyColor(float a1, float a2, float a3);
 int _dialogSetOptionFlags(int flags);
+void dialogInit();
 void _dialogClose();
 int _dialogGetDialogDepth();
 void _dialogRegisterWinDrawCallbacks(DialogFunc1* a1, DialogFunc2* a2);
 int _dialogToggleMediaFlag(int a1);
 int _dialogGetMediaFlag();
 
+} // namespace fallout
+
 #endif /* DIALOG_H */

src/dictionary.cc

@@ -1,11 +1,13 @@
 #include "dictionary.h"
 
-#include "platform_compat.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "platform_compat.h"
+
+namespace fallout {
+
 // NOTE: I guess this marker is used as a type discriminator for implementing
 // nested dictionaries. That's why every dictionary-related function starts
 // with a check for this value.
@@ -44,24 +46,19 @@ static void dictionaryFreeDefaultImpl(void* ptr)
 }
 
 // 0x4D9BA8
-int dictionaryInit(Dictionary* dictionary, int initialCapacity, size_t valueSize, void* a4)
+int dictionaryInit(Dictionary* dictionary, int initialCapacity, size_t valueSize, DictionaryIO* io)
 {
     dictionary->entriesCapacity = initialCapacity;
     dictionary->valueSize = valueSize;
     dictionary->entriesLength = 0;
 
-    if (a4 != NULL) {
-        // NOTE: There is some structure pointed by [a4] with 5 fields. They are
-        // either memcopied or assigned one by one into field_10 - field_20
-        // respectively. This parameter is always NULL, so I doubt it's possible
-        // to understand it's meaning. There are some hints in the unused
-        // functions though.
-        assert(false && "Not implemented");
+    if (io != NULL) {
+        memcpy(&(dictionary->io), io, sizeof(*io));
     } else {
-        dictionary->field_10 = 0;
-        dictionary->field_14 = 0;
-        dictionary->field_18 = 0;
-        dictionary->field_1C = 0;
+        dictionary->io.readProc = NULL;
+        dictionary->io.writeProc = NULL;
+        dictionary->io.field_8 = 0;
+        dictionary->io.field_C = 0;
     }
 
     int rc = 0;
@@ -302,6 +299,248 @@ int dictionaryRemoveValue(Dictionary* dictionary, const char* key)
     return 0;
 }
 
+// NOTE: Unused.
+//
+// 0x4D9F84
+int dictionaryCopy(Dictionary* dest, Dictionary* src)
+{
+    if (src->marker != DICTIONARY_MARKER) {
+        return -1;
+    }
+
+    if (dictionaryInit(dest, src->entriesCapacity, src->valueSize, &(src->io)) != 0) {
+        // FIXME: Should return -1, as we were unable to initialize dictionary.
+        return 0;
+    }
+
+    for (int index = 0; index < src->entriesLength; index++) {
+        DictionaryEntry* entry = &(src->entries[index]);
+        if (dictionaryAddValue(dest, entry->key, entry->value) == -1) {
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x4DA090
+int dictionaryReadInt(FILE* stream, int* valuePtr)
+{
+    int ch;
+    int value;
+
+    ch = fgetc(stream);
+    if (ch == -1) {
+        return -1;
+    }
+
+    value = (ch & 0xFF);
+
+    ch = fgetc(stream);
+    if (ch == -1) {
+        return -1;
+    }
+
+    value = (value << 8) | (ch & 0xFF);
+
+    ch = fgetc(stream);
+    if (ch == -1) {
+        return -1;
+    }
+
+    value = (value << 8) | (ch & 0xFF);
+
+    ch = fgetc(stream);
+    if (ch == -1) {
+        return -1;
+    }
+
+    value = (value << 8) | (ch & 0xFF);
+
+    *valuePtr = value;
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x4DA0F4
+int dictionaryReadHeader(FILE* stream, Dictionary* dictionary)
+{
+    int value;
+
+    if (dictionaryReadInt(stream, &value) != 0) return -1;
+    dictionary->entriesLength = value;
+
+    if (dictionaryReadInt(stream, &value) != 0) return -1;
+    dictionary->entriesCapacity = value;
+
+    if (dictionaryReadInt(stream, &value) != 0) return -1;
+    dictionary->valueSize = value;
+
+    // NOTE: Originally reads `values` pointer.
+    if (dictionaryReadInt(stream, &value) != 0) return -1;
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x4DA158
+int dictionaryLoad(FILE* stream, Dictionary* dictionary, int a3)
+{
+    if (dictionary->marker != DICTIONARY_MARKER) {
+        return -1;
+    }
+
+    for (int index = 0; index < dictionary->entriesLength; index++) {
+        DictionaryEntry* entry = &(dictionary->entries[index]);
+        if (entry->key != NULL) {
+            gDictionaryFreeProc(entry->key);
+        }
+
+        if (entry->value != NULL) {
+            gDictionaryFreeProc(entry->value);
+        }
+    }
+
+    if (dictionary->entries != NULL) {
+        gDictionaryFreeProc(dictionary->entries);
+    }
+
+    if (dictionaryReadHeader(stream, dictionary) != 0) {
+        return -1;
+    }
+
+    dictionary->entries = NULL;
+
+    if (dictionary->entriesCapacity <= 0) {
+        return 0;
+    }
+
+    dictionary->entries = (DictionaryEntry*)gDictionaryMallocProc(sizeof(*dictionary->entries) * dictionary->entriesCapacity);
+    if (dictionary->entries == NULL) {
+        return -1;
+    }
+
+    for (int index = 0; index < dictionary->entriesLength; index++) {
+        DictionaryEntry* entry = &(dictionary->entries[index]);
+        entry->key = NULL;
+        entry->value = NULL;
+    }
+
+    if (dictionary->entriesLength <= 0) {
+        return 0;
+    }
+
+    for (int index = 0; index < dictionary->entriesLength; index++) {
+        DictionaryEntry* entry = &(dictionary->entries[index]);
+        int keyLength = fgetc(stream);
+        if (keyLength == -1) {
+            return -1;
+        }
+
+        entry->key = (char*)gDictionaryMallocProc(keyLength + 1);
+        if (entry->key == NULL) {
+            return -1;
+        }
+
+        if (fgets(entry->key, keyLength, stream) == NULL) {
+            return -1;
+        }
+
+        if (dictionary->valueSize != 0) {
+            entry->value = gDictionaryMallocProc(dictionary->valueSize);
+            if (entry->value == NULL) {
+                return -1;
+            }
+
+            if (dictionary->io.readProc != NULL) {
+                if (dictionary->io.readProc(stream, entry->value, dictionary->valueSize, a3) != 0) {
+                    return -1;
+                }
+            } else {
+                if (fread(entry->value, dictionary->valueSize, 1, stream) != 1) {
+                    return -1;
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x4DA2EC
+int dictionaryWriteInt(FILE* stream, int value)
+{
+    if (fputc((value >> 24) & 0xFF, stream) == -1) return -1;
+    if (fputc((value >> 16) & 0xFF, stream) == -1) return -1;
+    if (fputc((value >> 8) & 0xFF, stream) == -1) return -1;
+    if (fputc(value & 0xFF, stream) == -1) return -1;
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x4DA360
+int dictionaryWriteHeader(FILE* stream, Dictionary* dictionary)
+{
+    if (dictionaryWriteInt(stream, dictionary->entriesLength) != 0) return -1;
+    if (dictionaryWriteInt(stream, dictionary->entriesCapacity) != 0) return -1;
+    if (dictionaryWriteInt(stream, dictionary->valueSize) != 0) return -1;
+    // NOTE: Originally writes `entries` pointer.
+    if (dictionaryWriteInt(stream, 0) != 0) return -1;
+
+    return 0;
+}
+
+// NOTE: Unused.
+//
+// 0x4DA3A4
+int dictionaryWrite(FILE* stream, Dictionary* dictionary, int a3)
+{
+    if (dictionary->marker != DICTIONARY_MARKER) {
+        return -1;
+    }
+
+    if (dictionaryWriteHeader(stream, dictionary) != 0) {
+        return -1;
+    }
+
+    for (int index = 0; index < dictionary->entriesLength; index++) {
+        DictionaryEntry* entry = &(dictionary->entries[index]);
+        int keyLength = strlen(entry->key);
+        if (fputc(keyLength, stream) == -1) {
+            return -1;
+        }
+
+        if (fputs(entry->key, stream) == -1) {
+            return -1;
+        }
+
+        if (dictionary->io.writeProc != NULL) {
+            if (dictionary->valueSize != 0) {
+                if (dictionary->io.writeProc(stream, entry->value, dictionary->valueSize, a3) != 0) {
+                    return -1;
+                }
+            }
+        } else {
+            if (dictionary->valueSize != 0) {
+                if (fwrite(entry->value, dictionary->valueSize, 1, stream) != 1) {
+                    return -1;
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
 // 0x4DA498
 void dictionarySetMemoryProcs(MallocProc* mallocProc, ReallocProc* reallocProc, FreeProc* freeProc)
 {
@@ -315,3 +554,5 @@ void dictionarySetMemoryProcs(MallocProc* mallocProc, ReallocProc* reallocProc,
         gDictionaryFreeProc = dictionaryFreeDefaultImpl;
     }
 }
+
+} // namespace fallout

src/dictionary.h

@@ -1,8 +1,24 @@
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
 
+#include <stdio.h>
+
 #include "memory_defs.h"
 
+namespace fallout {
+
+typedef int(DictionaryReadProc)(FILE* stream, void* buffer, unsigned int size, int a4);
+typedef int(DictionaryWriteProc)(FILE* stream, void* buffer, unsigned int size, int a4);
+
+// NOTE: Last unnamed fields are likely seek, tell, and filelength.
+typedef struct DictionaryIO {
+    DictionaryReadProc* readProc;
+    DictionaryWriteProc* writeProc;
+    int field_8;
+    int field_C;
+    int field_10;
+} DictionaryIO;
+
 // A tuple containing individual key-value pair of a dictionary.
 typedef struct DictionaryEntry {
     char* key;
@@ -27,22 +43,28 @@ typedef struct Dictionary {
     // The size of the dictionary values in bytes.
     size_t valueSize;
 
-    int field_10;
-    int field_14;
-    int field_18;
-    int field_1C;
-    int field_20;
+    // IO callbacks.
+    DictionaryIO io;
 
     // The array of key-value pairs.
     DictionaryEntry* entries;
 } Dictionary;
 
-int dictionaryInit(Dictionary* dictionary, int initialCapacity, size_t valueSize, void* a4);
+int dictionaryInit(Dictionary* dictionary, int initialCapacity, size_t valueSize, DictionaryIO* io);
 int dictionarySetCapacity(Dictionary* dictionary, int newCapacity);
 int dictionaryFree(Dictionary* dictionary);
 int dictionaryGetIndexByKey(Dictionary* dictionary, const char* key);
 int dictionaryAddValue(Dictionary* dictionary, const char* key, const void* value);
 int dictionaryRemoveValue(Dictionary* dictionary, const char* key);
+int dictionaryCopy(Dictionary* dest, Dictionary* src);
+int dictionaryReadInt(FILE* stream, int* valuePtr);
+int dictionaryReadHeader(FILE* stream, Dictionary* dictionary);
+int dictionaryLoad(FILE* stream, Dictionary* dictionary, int a3);
+int dictionaryWriteInt(FILE* stream, int value);
+int dictionaryWriteHeader(FILE* stream, Dictionary* dictionary);
+int dictionaryWrite(FILE* stream, Dictionary* dictionary, int a3);
 void dictionarySetMemoryProcs(MallocProc* mallocProc, ReallocProc* reallocProc, FreeProc* freeProc);
 
+} // namespace fallout
+
 #endif /* DICTIONARY_H */

src/dinput.cc

@@ -1,6 +1,30 @@
 #include "dinput.h"
 
-#include <SDL.h>
+namespace fallout {
+
+enum InputType {
+    INPUT_TYPE_MOUSE,
+    INPUT_TYPE_TOUCH,
+} InputType;
+
+static int gLastInputType = INPUT_TYPE_MOUSE;
+
+static int gTouchMouseLastX = 0;
+static int gTouchMouseLastY = 0;
+static int gTouchMouseDeltaX = 0;
+static int gTouchMouseDeltaY = 0;
+
+static int gTouchFingers = 0;
+static unsigned int gTouchGestureLastTouchDownTimestamp = 0;
+static unsigned int gTouchGestureLastTouchUpTimestamp = 0;
+static int gTouchGestureTaps = 0;
+static bool gTouchGestureHandled = false;
+
+static int gMouseWheelDeltaX = 0;
+static int gMouseWheelDeltaY = 0;
+
+extern int screenGetWidth();
+extern int screenGetHeight();
 
 // 0x4E0400
 bool directInputInit()
@@ -47,9 +71,49 @@ bool mouseDeviceUnacquire()
 // 0x4E053C
 bool mouseDeviceGetData(MouseData* mouseState)
 {
-    Uint32 buttons = SDL_GetRelativeMouseState(&(mouseState->x), &(mouseState->y));
-    mouseState->buttons[0] = (buttons & SDL_BUTTON(SDL_BUTTON_LEFT)) != 0;
-    mouseState->buttons[1] = (buttons & SDL_BUTTON(SDL_BUTTON_RIGHT)) != 0;
+    if (gLastInputType == INPUT_TYPE_TOUCH) {
+        mouseState->x = gTouchMouseDeltaX;
+        mouseState->y = gTouchMouseDeltaY;
+        mouseState->buttons[0] = 0;
+        mouseState->buttons[1] = 0;
+        mouseState->wheelX = 0;
+        mouseState->wheelY = 0;
+        gTouchMouseDeltaX = 0;
+        gTouchMouseDeltaY = 0;
+
+        if (gTouchFingers == 0) {
+            if (SDL_GetTicks() - gTouchGestureLastTouchUpTimestamp > 150) {
+                if (!gTouchGestureHandled) {
+                    if (gTouchGestureTaps == 2) {
+                        mouseState->buttons[0] = 1;
+                        gTouchGestureHandled = true;
+                    } else if (gTouchGestureTaps == 3) {
+                        mouseState->buttons[1] = 1;
+                        gTouchGestureHandled = true;
+                    }
+                }
+            }
+        } else if (gTouchFingers == 1) {
+            if (SDL_GetTicks() - gTouchGestureLastTouchDownTimestamp > 150) {
+                if (gTouchGestureTaps == 1) {
+                    mouseState->buttons[0] = 1;
+                    gTouchGestureHandled = true;
+                } else if (gTouchGestureTaps == 2) {
+                    mouseState->buttons[1] = 1;
+                    gTouchGestureHandled = true;
+                }
+            }
+        }
+    } else {
+        Uint32 buttons = SDL_GetRelativeMouseState(&(mouseState->x), &(mouseState->y));
+        mouseState->buttons[0] = (buttons & SDL_BUTTON(SDL_BUTTON_LEFT)) != 0;
+        mouseState->buttons[1] = (buttons & SDL_BUTTON(SDL_BUTTON_RIGHT)) != 0;
+        mouseState->wheelX = gMouseWheelDeltaX;
+        mouseState->wheelY = gMouseWheelDeltaY;
+
+        gMouseWheelDeltaX = 0;
+        gMouseWheelDeltaY = 0;
+    }
 
     return true;
 }
@@ -100,3 +164,80 @@ bool keyboardDeviceInit()
 void keyboardDeviceFree()
 {
 }
+
+void handleMouseEvent(SDL_Event* event)
+{
+    // Mouse movement and buttons are accumulated in SDL itself and will be
+    // processed later in `mouseDeviceGetData` via `SDL_GetRelativeMouseState`.
+
+    if (event->type == SDL_MOUSEWHEEL) {
+        gMouseWheelDeltaX += event->wheel.x;
+        gMouseWheelDeltaY += event->wheel.y;
+    }
+
+    if (gLastInputType != INPUT_TYPE_MOUSE) {
+        // Reset touch data.
+        gTouchMouseLastX = 0;
+        gTouchMouseLastY = 0;
+        gTouchMouseDeltaX = 0;
+        gTouchMouseDeltaY = 0;
+
+        gTouchFingers = 0;
+        gTouchGestureLastTouchDownTimestamp = 0;
+        gTouchGestureLastTouchUpTimestamp = 0;
+        gTouchGestureTaps = 0;
+        gTouchGestureHandled = false;
+
+        gLastInputType = INPUT_TYPE_MOUSE;
+    }
+}
+
+void handleTouchEvent(SDL_Event* event)
+{
+    int windowWidth = screenGetWidth();
+    int windowHeight = screenGetHeight();
+
+    if (event->tfinger.type == SDL_FINGERDOWN) {
+        gTouchFingers++;
+
+        gTouchMouseLastX = (int)(event->tfinger.x * windowWidth);
+        gTouchMouseLastY = (int)(event->tfinger.y * windowHeight);
+        gTouchMouseDeltaX = 0;
+        gTouchMouseDeltaY = 0;
+
+        if (event->tfinger.timestamp - gTouchGestureLastTouchDownTimestamp > 250) {
+            gTouchGestureTaps = 0;
+            gTouchGestureHandled = false;
+        }
+
+        gTouchGestureLastTouchDownTimestamp = event->tfinger.timestamp;
+    } else if (event->tfinger.type == SDL_FINGERMOTION) {
+        int prevX = gTouchMouseLastX;
+        int prevY = gTouchMouseLastY;
+        gTouchMouseLastX = (int)(event->tfinger.x * windowWidth);
+        gTouchMouseLastY = (int)(event->tfinger.y * windowHeight);
+        gTouchMouseDeltaX += gTouchMouseLastX - prevX;
+        gTouchMouseDeltaY += gTouchMouseLastY - prevY;
+    } else if (event->tfinger.type == SDL_FINGERUP) {
+        gTouchFingers--;
+
+        int prevX = gTouchMouseLastX;
+        int prevY = gTouchMouseLastY;
+        gTouchMouseLastX = (int)(event->tfinger.x * windowWidth);
+        gTouchMouseLastY = (int)(event->tfinger.y * windowHeight);
+        gTouchMouseDeltaX += gTouchMouseLastX - prevX;
+        gTouchMouseDeltaY += gTouchMouseLastY - prevY;
+
+        gTouchGestureTaps++;
+        gTouchGestureLastTouchUpTimestamp = event->tfinger.timestamp;
+    }
+
+    if (gLastInputType != INPUT_TYPE_TOUCH) {
+        // Reset mouse data.
+        SDL_GetRelativeMouseState(NULL, NULL);
+
+        gLastInputType = INPUT_TYPE_TOUCH;
+    }
+}
+
+} // namespace fallout

src/dinput.h

@@ -1,10 +1,16 @@
 #ifndef DINPUT_H
 #define DINPUT_H
 
+#include <SDL.h>
+
+namespace fallout {
+
 typedef struct MouseData {
     int x;
     int y;
     unsigned char buttons[2];
+    int wheelX;
+    int wheelY;
 } MouseData;
 
 typedef struct KeyboardData {
@@ -26,4 +32,9 @@ void mouseDeviceFree();
 bool keyboardDeviceInit();
 void keyboardDeviceFree();
 
+void handleMouseEvent(SDL_Event* event);
+void handleTouchEvent(SDL_Event* event);
+
+} // namespace fallout
+
 #endif /* DINPUT_H */

src/display_monitor.cc

@@ -1,5 +1,9 @@
 #include "display_monitor.h"
 
+#include <string.h>
+
+#include <fstream>
+
 #include "art.h"
 #include "color.h"
 #include "combat.h"
@@ -10,10 +14,11 @@
 #include "geometry.h"
 #include "interface.h"
 #include "memory.h"
+#include "sfall_config.h"
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <string.h>
+namespace fallout {
 
 // The maximum number of lines display monitor can hold. Once this value
 // is reached earlier messages are thrown away.
@@ -33,6 +38,7 @@
 
 #define DISPLAY_MONITOR_BEEP_DELAY (500U)
 
+static void display_clear();
 static void displayMonitorRefresh();
 static void displayMonitorScrollUpOnMouseDown(int btn, int keyCode);
 static void displayMonitorScrollDownOnMouseDown(int btn, int keyCode);
@@ -40,6 +46,12 @@ static void displayMonitorScrollUpOnMouseEnter(int btn, int keyCode);
 static void displayMonitorScrollDownOnMouseEnter(int btn, int keyCode);
 static void displayMonitorOnMouseExit(int btn, int keyCode);
 
+static void consoleFileInit();
+static void consoleFileReset();
+static void consoleFileExit();
+static void consoleFileAddMessage(const char* message);
+static void consoleFileFlush();
+
 // 0x51850C
 static bool gDisplayMonitorInitialized = false;
 
@@ -86,6 +98,9 @@ static int _disp_start;
 // 0x56FB58
 static unsigned int gDisplayMonitorLastBeepTimestamp;
 
+static std::ofstream gConsoleFileStream;
+static int gConsoleFilePrintCount = 0;
+
 // 0x431610
 int displayMonitorInit()
 {
@@ -105,7 +120,7 @@ int displayMonitorInit()
         }
 
         CacheEntry* backgroundFrmHandle;
-        int backgroundFid = buildFid(6, 16, 0, 0, 0);
+        int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, 16, 0, 0, 0);
         Art* backgroundFrm = artLock(backgroundFid, &backgroundFrmHandle);
         if (backgroundFrm == NULL) {
             internal_free(gDisplayMonitorBackgroundFrmData);
@@ -168,14 +183,11 @@ int displayMonitorInit()
         gDisplayMonitorEnabled = true;
         gDisplayMonitorInitialized = true;
 
-        for (int index = 0; index < gDisplayMonitorLinesCapacity; index++) {
-            gDisplayMonitorLines[index][0] = '\0';
-        }
+        // NOTE: Uninline.
+        display_clear();
 
-        _disp_start = 0;
-        _disp_curr = 0;
-
-        displayMonitorRefresh();
+        // SFALL
+        consoleFileInit();
     }
 
     return 0;
@@ -184,15 +196,12 @@ int displayMonitorInit()
 // 0x431800
 int displayMonitorReset()
 {
-    if (gDisplayMonitorInitialized) {
-        for (int index = 0; index < gDisplayMonitorLinesCapacity; index++) {
-            gDisplayMonitorLines[index][0] = '\0';
-        }
+    // NOTE: Uninline.
+    display_clear();
+
+    // SFALL
+    consoleFileReset();
 
-        _disp_start = 0;
-        _disp_curr = 0;
-        displayMonitorRefresh();
-    }
     return 0;
 }
 
@@ -200,6 +209,9 @@ int displayMonitorReset()
 void displayMonitorExit()
 {
     if (gDisplayMonitorInitialized) {
+        // SFALL
+        consoleFileExit();
+
         internal_free(gDisplayMonitorBackgroundFrmData);
         gDisplayMonitorInitialized = false;
     }
@@ -212,6 +224,9 @@ void displayMonitorAddMessage(char* str)
         return;
     }
 
+    // SFALL
+    consoleFileAddMessage(str);
+
     int oldFont = fontGetCurrent();
     fontSetCurrent(DISPLAY_MONITOR_FONT);
 
@@ -295,6 +310,24 @@ void displayMonitorAddMessage(char* str)
     displayMonitorRefresh();
 }
 
+// NOTE: Inlined.
+//
+// 0x431A2C
+static void display_clear()
+{
+    int index;
+
+    if (gDisplayMonitorInitialized) {
+        for (index = 0; index < gDisplayMonitorLinesCapacity; index++) {
+            gDisplayMonitorLines[index][0] = '\0';
+        }
+
+        _disp_start = 0;
+        _disp_curr = 0;
+        displayMonitorRefresh();
+    }
+}
+
 // 0x431A78
 static void displayMonitorRefresh()
 {
@@ -389,3 +422,53 @@ void displayMonitorEnable()
         gDisplayMonitorEnabled = true;
     }
 }
+
+static void consoleFileInit()
+{
+    char* consoleFilePath;
+    configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_CONSOLE_OUTPUT_FILE_KEY, &consoleFilePath);
+    if (consoleFilePath != NULL && *consoleFilePath == '\0') {
+        consoleFilePath = NULL;
+    }
+
+    if (consoleFilePath != NULL) {
+        gConsoleFileStream.open(consoleFilePath);
+    }
+}
+
+static void consoleFileReset()
+{
+    if (gConsoleFileStream.is_open()) {
+        gConsoleFilePrintCount = 0;
+        gConsoleFileStream.flush();
+    }
+}
+
+static void consoleFileExit()
+{
+    if (gConsoleFileStream.is_open()) {
+        gConsoleFileStream.close();
+    }
+}
+
+static void consoleFileAddMessage(const char* message)
+{
+    if (gConsoleFileStream.is_open()) {
+        gConsoleFileStream << message << '\n';
+
+        gConsoleFilePrintCount++;
+        if (gConsoleFilePrintCount >= 20) {
+            consoleFileFlush();
+        }
+    }
+}
+
+static void consoleFileFlush()
+{
+    if (gConsoleFileStream.is_open()) {
+        gConsoleFilePrintCount = 0;
+        gConsoleFileStream.flush();
+    }
+}
+
+} // namespace fallout

src/display_monitor.h

@@ -1,6 +1,8 @@
 #ifndef DISPLAY_MONITOR_H
 #define DISPLAY_MONITOR_H
 
+namespace fallout {
+
 int displayMonitorInit();
 int displayMonitorReset();
 void displayMonitorExit();
@@ -8,4 +10,6 @@ void displayMonitorAddMessage(char* string);
 void displayMonitorDisable();
 void displayMonitorEnable();
 
+} // namespace fallout
+
 #endif /* DISPLAY_MONITOR_H */

src/draw.cc

@@ -1,10 +1,12 @@
 #include "draw.h"
 
+#include <string.h>
+
 #include "color.h"
 #include "core.h"
 #include "mmx.h"
 
-#include <string.h>
+namespace fallout {
 
 // 0x4D2FC0
 void bufferDrawLine(unsigned char* buf, int pitch, int x1, int y1, int x2, int y2, int color)
@@ -326,3 +328,5 @@ void bufferOutline(unsigned char* buf, int width, int height, int pitch, int col
         }
     }
 }
+
+} // namespace fallout

src/draw.h

@@ -1,7 +1,9 @@
 #ifndef DRAW_H
 #define DRAW_H
 
-void bufferDrawLine(unsigned char* buf, int pitch, int left, int top, int right, int bottom, int color); 
+namespace fallout {
+
+void bufferDrawLine(unsigned char* buf, int pitch, int left, int top, int right, int bottom, int color);
 void bufferDrawRect(unsigned char* buf, int a2, int a3, int a4, int a5, int a6, int a7);
 void bufferDrawRectShadowed(unsigned char* buf, int a2, int a3, int a4, int a5, int a6, int a7, int a8);
 void blitBufferToBufferStretch(unsigned char* src, int srcWidth, int srcHeight, int srcPitch, unsigned char* dest, int destWidth, int destHeight, int destPitch);
@@ -14,4 +16,6 @@ void _lighten_buf(unsigned char* buf, int width, int height, int pitch);
 void _swap_color_buf(unsigned char* buf, int width, int height, int pitch, int color1, int color2);
 void bufferOutline(unsigned char* buf, int width, int height, int pitch, int a5);
 
+} // namespace fallout
+
 #endif /* DRAW_H */

src/electronic_registration.cc

@@ -1,13 +1,15 @@
 #include "electronic_registration.h"
 
-#include "game_config.h"
-#include "platform_compat.h"
-
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
+#include "game_config.h"
+#include "platform_compat.h"
+
+namespace fallout {
+
 // 0x440DD0
 void runElectronicRegistration()
 {
@@ -45,3 +47,5 @@ void runElectronicRegistration()
         }
     }
 }
+
+} // namespace fallout

src/electronic_registration.h

@@ -1,6 +1,10 @@
 #ifndef ELECTRONIC_REGISTRATION_H
 #define ELECTRONIC_REGISTRATION_H
 
+namespace fallout {
+
 void runElectronicRegistration();
 
+} // namespace fallout
+
 #endif /* ELECTRONIC_REGISTRATION_H */

src/elevator.cc

@@ -1,5 +1,10 @@
 #include "elevator.h"
 
+#include <ctype.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "core.h"
 #include "cycle.h"
@@ -12,19 +17,17 @@
 #include "map.h"
 #include "pipboy.h"
 #include "scripts.h"
+#include "sfall_config.h"
 #include "window_manager.h"
 
-#include <ctype.h>
-#include <string.h>
+namespace fallout {
 
 // The maximum number of elevator levels.
 #define ELEVATOR_LEVEL_MAX (4)
 
-// NOTE: There are two variables which hold background data used in the
-// elevator window - [gElevatorBackgroundFrmData] and [gElevatorPanelFrmData].
-// For unknown reason they are using -1 to denote that they are not set
-// (instead of using NULL).
-#define ELEVATOR_BACKGROUND_NULL ((unsigned char*)(-1))
+// Max number of elevators that can be loaded from elevators.ini. This limit is
+// emposed by Sfall.
+#define ELEVATORS_MAX 50
 
 typedef enum ElevatorFrm {
     ELEVATOR_FRM_BUTTON_DOWN,
@@ -56,7 +59,7 @@ static const int gElevatorFrmIds[ELEVATOR_FRM_COUNT] = {
 };
 
 // 0x43E95C
-static const ElevatorBackground gElevatorBackgrounds[ELEVATOR_COUNT] = {
+static ElevatorBackground gElevatorBackgrounds[ELEVATORS_MAX] = {
     { 143, -1 },
     { 143, 150 },
     { 144, -1 },
@@ -86,7 +89,7 @@ static const ElevatorBackground gElevatorBackgrounds[ELEVATOR_COUNT] = {
 // Number of levels for eleveators.
 //
 // 0x43EA1C
-static const int gElevatorLevels[ELEVATOR_COUNT] = {
+static int gElevatorLevels[ELEVATORS_MAX] = {
     4,
     2,
     3,
@@ -114,7 +117,7 @@ static const int gElevatorLevels[ELEVATOR_COUNT] = {
 };
 
 // 0x43EA7C
-static const ElevatorDescription gElevatorDescriptions[ELEVATOR_COUNT][ELEVATOR_LEVEL_MAX] = {
+static ElevatorDescription gElevatorDescriptions[ELEVATORS_MAX][ELEVATOR_LEVEL_MAX] = {
     {
         { 14, 0, 18940 },
         { 14, 1, 18936 },
@@ -264,7 +267,7 @@ static const ElevatorDescription gElevatorDescriptions[ELEVATOR_COUNT][ELEVATOR_
 // NOTE: These values are also used as key bindings.
 //
 // 0x43EEFC
-static const char gElevatorLevelLabels[ELEVATOR_COUNT][ELEVATOR_LEVEL_MAX] = {
+static char gElevatorLevelLabels[ELEVATORS_MAX][ELEVATOR_LEVEL_MAX] = {
     { '1', '2', '3', '4' },
     { 'G', '1', '\0', '\0' },
     { '1', '2', '3', '\0' },
@@ -313,57 +316,29 @@ static const char* gElevatorSoundEffects[ELEVATOR_LEVEL_MAX - 1][ELEVATOR_LEVEL_
     },
 };
 
-// 0x570A2C
-static Size gElevatorFrmSizes[ELEVATOR_FRM_COUNT];
-
-// 0x570A44
-static int gElevatorBackgroundFrmWidth;
-
-// 0x570A48
-static int gElevatorBackgroundFrmHeight;
-
-// 0x570A4C
-static int gElevatorPanelFrmWidth;
-
-// 0x570A50
-static int gElevatorPanelFrmHeight;
-
 // 0x570A54
 static int gElevatorWindow;
 
-// 0x570A58
-static CacheEntry* gElevatorFrmHandles[ELEVATOR_FRM_COUNT];
-
-// 0x570A64
-static CacheEntry* gElevatorBackgroundFrmHandle;
-
-// 0x570A68
-static CacheEntry* gElevatorPanelFrmHandle;
-
 // 0x570A6C
 static unsigned char* gElevatorWindowBuffer;
 
 // 0x570A70
 static bool gElevatorWindowIsoWasEnabled;
 
-// 0x570A74
-static unsigned char* gElevatorFrmData[ELEVATOR_FRM_COUNT];
-
-// 0x570A80
-static unsigned char* gElevatorBackgroundFrmData;
-
-// 0x570A84
-static unsigned char* gElevatorPanelFrmData;
+static FrmImage _elevatorFrmImages[ELEVATOR_FRM_COUNT];
+static FrmImage _elevatorBackgroundFrmImage;
+static FrmImage _elevatorPanelFrmImage;
 
 // Presents elevator dialog for player to pick a desired level.
 //
 // 0x43EF5C
 int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tilePtr)
 {
-    if (elevator < 0 || elevator >= ELEVATOR_COUNT) {
+    if (elevator < 0 || elevator >= ELEVATORS_MAX) {
         return -1;
     }
 
+    // SFALL
     if (elevatorWindowInit(elevator) == -1) {
         return -1;
     }
@@ -403,15 +378,15 @@ int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tileP
 
     debugPrint("\n the start elev level %d\n", *elevationPtr);
 
-    int v18 = (gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].width * gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].height) / 13;
+    int v18 = (_elevatorFrmImages[ELEVATOR_FRM_GAUGE].getWidth() * _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getHeight()) / 13;
     float v42 = 12.0f / (float)(gElevatorLevels[elevator] - 1);
     blitBufferToBuffer(
-        gElevatorFrmData[ELEVATOR_FRM_GAUGE] + v18 * (int)((float)(*elevationPtr) * v42),
-        gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].width,
-        gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].height / 13,
-        gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].width,
-        gElevatorWindowBuffer + gElevatorBackgroundFrmWidth * 41 + 121,
-        gElevatorBackgroundFrmWidth);
+        _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getData() + v18 * (int)((float)(*elevationPtr) * v42),
+        _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getWidth(),
+        _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getHeight() / 13,
+        _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getWidth(),
+        gElevatorWindowBuffer + _elevatorBackgroundFrmImage.getWidth() * 41 + 121,
+        _elevatorBackgroundFrmImage.getWidth());
     windowRefresh(gElevatorWindow);
 
     bool done = false;
@@ -460,12 +435,12 @@ int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tileP
                 unsigned int tick = _get_time();
                 v44 += v43;
                 blitBufferToBuffer(
-                    gElevatorFrmData[ELEVATOR_FRM_GAUGE] + v18 * (int)v44,
-                    gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].width,
-                    gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].height / 13,
-                    gElevatorFrmSizes[ELEVATOR_FRM_GAUGE].width,
-                    gElevatorWindowBuffer + gElevatorBackgroundFrmWidth * 41 + 121,
-                    gElevatorBackgroundFrmWidth);
+                    _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getData() + v18 * (int)v44,
+                    _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getWidth(),
+                    _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getHeight() / 13,
+                    _elevatorFrmImages[ELEVATOR_FRM_GAUGE].getWidth(),
+                    gElevatorWindowBuffer + _elevatorBackgroundFrmImage.getWidth() * 41 + 121,
+                    _elevatorBackgroundFrmImage.getWidth());
 
                 windowRefresh(gElevatorWindow);
 
@@ -503,16 +478,15 @@ static int elevatorWindowInit(int elevator)
 
     int index;
     for (index = 0; index < ELEVATOR_FRM_COUNT; index++) {
-        int fid = buildFid(6, gElevatorFrmIds[index], 0, 0, 0);
-        gElevatorFrmData[index] = artLockFrameDataReturningSize(fid, &(gElevatorFrmHandles[index]), &(gElevatorFrmSizes[index].width), &(gElevatorFrmSizes[index].height));
-        if (gElevatorFrmData[index] == NULL) {
+        int fid = buildFid(OBJ_TYPE_INTERFACE, gElevatorFrmIds[index], 0, 0, 0);
+        if (!_elevatorFrmImages[index].lock(fid)) {
             break;
         }
     }
 
     if (index != ELEVATOR_FRM_COUNT) {
         for (int reversedIndex = index - 1; reversedIndex >= 0; reversedIndex--) {
-            artUnlock(gElevatorFrmHandles[reversedIndex]);
+            _elevatorFrmImages[reversedIndex].unlock();
         }
 
         if (gElevatorWindowIsoWasEnabled) {
@@ -524,39 +498,27 @@ static int elevatorWindowInit(int elevator)
         return -1;
     }
 
-    gElevatorPanelFrmData = ELEVATOR_BACKGROUND_NULL;
-    gElevatorBackgroundFrmData = ELEVATOR_BACKGROUND_NULL;
-
     const ElevatorBackground* elevatorBackground = &(gElevatorBackgrounds[elevator]);
     bool backgroundsLoaded = true;
 
-    int backgroundFid = buildFid(6, elevatorBackground->backgroundFrmId, 0, 0, 0);
-    gElevatorBackgroundFrmData = artLockFrameDataReturningSize(backgroundFid, &gElevatorBackgroundFrmHandle, &gElevatorBackgroundFrmWidth, &gElevatorBackgroundFrmHeight);
-    if (gElevatorBackgroundFrmData != NULL) {
+    int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, elevatorBackground->backgroundFrmId, 0, 0, 0);
+    if (_elevatorBackgroundFrmImage.lock(backgroundFid)) {
         if (elevatorBackground->panelFrmId != -1) {
-            int panelFid = buildFid(6, elevatorBackground->panelFrmId, 0, 0, 0);
-            gElevatorPanelFrmData = artLockFrameDataReturningSize(panelFid, &gElevatorPanelFrmHandle, &gElevatorPanelFrmWidth, &gElevatorPanelFrmHeight);
-            if (gElevatorPanelFrmData == NULL) {
-                gElevatorPanelFrmData = ELEVATOR_BACKGROUND_NULL;
+            int panelFid = buildFid(OBJ_TYPE_INTERFACE, elevatorBackground->panelFrmId, 0, 0, 0);
+            if (!_elevatorPanelFrmImage.lock(panelFid)) {
                 backgroundsLoaded = false;
             }
         }
     } else {
-        gElevatorBackgroundFrmData = ELEVATOR_BACKGROUND_NULL;
         backgroundsLoaded = false;
     }
 
     if (!backgroundsLoaded) {
-        if (gElevatorBackgroundFrmData != ELEVATOR_BACKGROUND_NULL) {
-            artUnlock(gElevatorBackgroundFrmHandle);
-        }
-
-        if (gElevatorPanelFrmData != ELEVATOR_BACKGROUND_NULL) {
-            artUnlock(gElevatorPanelFrmHandle);
-        }
+        _elevatorBackgroundFrmImage.unlock();
+        _elevatorPanelFrmImage.unlock();
 
         for (int index = 0; index < ELEVATOR_FRM_COUNT; index++) {
-            artUnlock(gElevatorFrmHandles[index]);
+            _elevatorFrmImages[index].unlock();
         }
 
         if (gElevatorWindowIsoWasEnabled) {
@@ -568,26 +530,21 @@ static int elevatorWindowInit(int elevator)
         return -1;
     }
 
-    int elevatorWindowX = (screenGetWidth() - gElevatorBackgroundFrmWidth) / 2;
-    int elevatorWindowY = (screenGetHeight() - INTERFACE_BAR_HEIGHT - 1 - gElevatorBackgroundFrmHeight) / 2;
+    int elevatorWindowX = (screenGetWidth() - _elevatorBackgroundFrmImage.getWidth()) / 2;
+    int elevatorWindowY = (screenGetHeight() - INTERFACE_BAR_HEIGHT - 1 - _elevatorBackgroundFrmImage.getHeight()) / 2;
     gElevatorWindow = windowCreate(
         elevatorWindowX,
         elevatorWindowY,
-        gElevatorBackgroundFrmWidth,
-        gElevatorBackgroundFrmHeight,
+        _elevatorBackgroundFrmImage.getWidth(),
+        _elevatorBackgroundFrmImage.getHeight(),
         256,
         WINDOW_FLAG_0x10 | WINDOW_FLAG_0x02);
     if (gElevatorWindow == -1) {
-        if (gElevatorBackgroundFrmData != ELEVATOR_BACKGROUND_NULL) {
-            artUnlock(gElevatorBackgroundFrmHandle);
-        }
-
-        if (gElevatorPanelFrmData != ELEVATOR_BACKGROUND_NULL) {
-            artUnlock(gElevatorPanelFrmHandle);
-        }
+        _elevatorBackgroundFrmImage.unlock();
+        _elevatorPanelFrmImage.unlock();
 
         for (int index = 0; index < ELEVATOR_FRM_COUNT; index++) {
-            artUnlock(gElevatorFrmHandles[index]);
+            _elevatorFrmImages[index].unlock();
         }
 
         if (gElevatorWindowIsoWasEnabled) {
@@ -600,15 +557,15 @@ static int elevatorWindowInit(int elevator)
     }
 
     gElevatorWindowBuffer = windowGetBuffer(gElevatorWindow);
-    memcpy(gElevatorWindowBuffer, (unsigned char*)gElevatorBackgroundFrmData, gElevatorBackgroundFrmWidth * gElevatorBackgroundFrmHeight);
+    memcpy(gElevatorWindowBuffer, _elevatorBackgroundFrmImage.getData(), _elevatorBackgroundFrmImage.getWidth() * _elevatorBackgroundFrmImage.getHeight());
 
-    if (gElevatorPanelFrmData != ELEVATOR_BACKGROUND_NULL) {
-        blitBufferToBuffer((unsigned char*)gElevatorPanelFrmData,
-            gElevatorPanelFrmWidth,
-            gElevatorPanelFrmHeight,
-            gElevatorPanelFrmWidth,
-            gElevatorWindowBuffer + gElevatorBackgroundFrmWidth * (gElevatorBackgroundFrmHeight - gElevatorPanelFrmHeight),
-            gElevatorBackgroundFrmWidth);
+    if (_elevatorPanelFrmImage.isLocked()) {
+        blitBufferToBuffer(_elevatorPanelFrmImage.getData(),
+            _elevatorPanelFrmImage.getWidth(),
+            _elevatorPanelFrmImage.getHeight(),
+            _elevatorPanelFrmImage.getWidth(),
+            gElevatorWindowBuffer + _elevatorBackgroundFrmImage.getWidth() * (_elevatorBackgroundFrmImage.getHeight() - _elevatorPanelFrmImage.getHeight()),
+            _elevatorBackgroundFrmImage.getWidth());
     }
 
     int y = 40;
@@ -616,14 +573,14 @@ static int elevatorWindowInit(int elevator)
         int btn = buttonCreate(gElevatorWindow,
             13,
             y,
-            gElevatorFrmSizes[ELEVATOR_FRM_BUTTON_DOWN].width,
-            gElevatorFrmSizes[ELEVATOR_FRM_BUTTON_DOWN].height,
+            _elevatorFrmImages[ELEVATOR_FRM_BUTTON_DOWN].getWidth(),
+            _elevatorFrmImages[ELEVATOR_FRM_BUTTON_DOWN].getHeight(),
             -1,
             -1,
             -1,
             500 + level,
-            gElevatorFrmData[ELEVATOR_FRM_BUTTON_UP],
-            gElevatorFrmData[ELEVATOR_FRM_BUTTON_DOWN],
+            _elevatorFrmImages[ELEVATOR_FRM_BUTTON_UP].getData(),
+            _elevatorFrmImages[ELEVATOR_FRM_BUTTON_DOWN].getData(),
             NULL,
             BUTTON_FLAG_TRANSPARENT);
         if (btn != -1) {
@@ -640,16 +597,11 @@ static void elevatorWindowFree()
 {
     windowDestroy(gElevatorWindow);
 
-    if (gElevatorBackgroundFrmData != ELEVATOR_BACKGROUND_NULL) {
-        artUnlock(gElevatorBackgroundFrmHandle);
-    }
-
-    if (gElevatorPanelFrmData != ELEVATOR_BACKGROUND_NULL) {
-        artUnlock(gElevatorPanelFrmHandle);
-    }
+    _elevatorBackgroundFrmImage.unlock();
+    _elevatorPanelFrmImage.unlock();
 
     for (int index = 0; index < ELEVATOR_FRM_COUNT; index++) {
-        artUnlock(gElevatorFrmHandles[index]);
+        _elevatorFrmImages[index].unlock();
     }
 
     scriptsEnable();
@@ -681,3 +633,67 @@ static int elevatorGetLevelFromKeyCode(int elevator, int keyCode)
     }
     return 0;
 }
+
+void elevatorsInit()
+{
+    char* elevatorsFileName;
+    configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_ELEVATORS_FILE_KEY, &elevatorsFileName);
+    if (elevatorsFileName != NULL && *elevatorsFileName == '\0') {
+        elevatorsFileName = NULL;
+    }
+
+    if (elevatorsFileName != NULL) {
+        Config elevatorsConfig;
+        if (configInit(&elevatorsConfig)) {
+            if (configRead(&elevatorsConfig, elevatorsFileName, false)) {
+                char sectionKey[4];
+                char key[32];
+                for (int index = 0; index < ELEVATORS_MAX; index++) {
+                    sprintf(sectionKey, "%d", index);
+
+                    if (index >= ELEVATOR_COUNT) {
+                        int levels = 0;
+                        configGetInt(&elevatorsConfig, sectionKey, "ButtonCount", &levels);
+                        gElevatorLevels[index] = std::clamp(levels, 2, ELEVATOR_LEVEL_MAX);
+                    }
+
+                    configGetInt(&elevatorsConfig, sectionKey, "MainFrm", &(gElevatorBackgrounds[index].backgroundFrmId));
+                    configGetInt(&elevatorsConfig, sectionKey, "ButtonsFrm", &(gElevatorBackgrounds[index].panelFrmId));
+
+                    for (int level = 0; level < ELEVATOR_LEVEL_MAX; level++) {
+                        sprintf(key, "ID%d", level + 1);
+                        configGetInt(&elevatorsConfig, sectionKey, key, &(gElevatorDescriptions[index][level].map));
+
+                        sprintf(key, "Elevation%d", level + 1);
+                        configGetInt(&elevatorsConfig, sectionKey, key, &(gElevatorDescriptions[index][level].elevation));
+
+                        sprintf(key, "Tile%d", level + 1);
+                        configGetInt(&elevatorsConfig, sectionKey, key, &(gElevatorDescriptions[index][level].tile));
+                    }
+                }
+
+                // NOTE: Sfall implementation is slightly different. It uses one
+                // loop and stores `type` value in a separate lookup table. This
+                // value is then used in the certain places to remap from
+                // requested elevator to the new one.
+                for (int index = 0; index < ELEVATORS_MAX; index++) {
+                    sprintf(sectionKey, "%d", index);
+
+                    int type;
+                    if (configGetInt(&elevatorsConfig, sectionKey, "Image", &type)) {
+                        type = std::clamp(type, 0, ELEVATORS_MAX - 1);
+                        if (index != type) {
+                            memcpy(&(gElevatorBackgrounds[index]), &(gElevatorBackgrounds[type]), sizeof(*gElevatorBackgrounds));
+                            memcpy(&(gElevatorLevels[index]), &(gElevatorLevels[type]), sizeof(*gElevatorLevels));
+                            memcpy(&(gElevatorLevelLabels[index]), &(gElevatorLevelLabels[type]), sizeof(*gElevatorLevelLabels));
+                        }
+                    }
+                }
+            }
+
+            configFree(&elevatorsConfig);
+        }
+    }
+}
+
+} // namespace fallout