Bump version to 1.2.0

See #135, #122

.github/workflows/ci-build.yml

@@ -75,6 +75,51 @@ jobs:
           path: os/android/app/build/outputs/apk/debug/app-debug.apk
           retention-days: 7
 
+  ios:
+    name: iOS
+
+    runs-on: macos-11
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Cache cmake build
+        uses: actions/cache@v3
+        with:
+          path: build
+          key: ios-cmake-v1
+
+      - name: Configure
+        run: |
+          cmake \
+            -B build \
+            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+            -D CMAKE_TOOLCHAIN_FILE=cmake/toolchain/ios.toolchain.cmake \
+            -D ENABLE_BITCODE=0 \
+            -D PLATFORM=OS64 \
+            # EOL
+
+      - name: Build
+        run: |
+          cmake \
+            --build build \
+            -j $(sysctl -n hw.physicalcpu) \
+            --target package \
+            # EOL
+
+      # TODO: Should be a part of packaging.
+      - name: Prepare for uploading
+        run: |
+          cp build/fallout2-ce.zip build/fallout2-ce.ipa
+
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: fallout2-ce.ipa
+          path:  build/fallout2-ce.ipa
+          retention-days: 7
+
   linux:
     name: Linux (${{ matrix.arch }})
 

.github/workflows/release.yml

@@ -56,6 +56,48 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  ios:
+    name: iOS
+
+    runs-on: macos-11
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Cache cmake build
+        uses: actions/cache@v3
+        with:
+          path: build
+          key: ios-cmake-v1
+
+      - name: Configure
+        run: |
+          cmake \
+            -B build \
+            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+            -D CMAKE_TOOLCHAIN_FILE=cmake/toolchain/ios.toolchain.cmake \
+            -D ENABLE_BITCODE=0 \
+            -D PLATFORM=OS64 \
+            # EOL
+
+      - name: Build
+        run: |
+          cmake \
+            --build build \
+            -j $(sysctl -n hw.physicalcpu) \
+            --target package \
+            # EOL
+
+      - name: Upload
+        run: |
+          cd build
+          cp fallout2-ce.zip fallout2-ce-ios.ipa
+          gh release upload ${{ github.ref_name }} fallout2-ce-ios.ipa
+          rm fallout2-ce-ios.ipa
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   linux:
     name: Linux (${{ matrix.arch }})
 

CMakeLists.txt

@@ -5,8 +5,13 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(EXECUTABLE_NAME fallout2-ce)
 
 if (APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "")
-    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
+    if(IOS)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11" CACHE STRING "")
+        set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
+    else()
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "")
+        set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "")
+    endif()
 endif()
 
 project(${EXECUTABLE_NAME})
@@ -52,8 +57,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/combat.h"
     "src/config.cc"
     "src/config.h"
-    "src/core.cc"
-    "src/core.h"
     "src/credits.cc"
     "src/credits.h"
     "src/critter.cc"
@@ -80,8 +83,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/display_monitor.h"
     "src/draw.cc"
     "src/draw.h"
-    "src/electronic_registration.cc"
-    "src/electronic_registration.h"
     "src/elevator.cc"
     "src/elevator.h"
     "src/endgame.cc"
@@ -104,8 +105,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/game_mouse.h"
     "src/game_movie.cc"
     "src/game_movie.h"
-    "src/game_palette.cc"
-    "src/game_palette.h"
     "src/game_sound.cc"
     "src/game_sound.h"
     "src/game_vars.h"
@@ -115,10 +114,10 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/geometry.h"
     "src/graph_lib.cc"
     "src/graph_lib.h"
-    "src/grayscale.cc"
-    "src/grayscale.h"
     "src/heap.cc"
     "src/heap.h"
+    "src/input.cc"
+    "src/input.h"
     "src/interface.cc"
     "src/interface.h"
     "src/interpreter_extra.cc"
@@ -131,6 +130,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/inventory.h"
     "src/item.cc"
     "src/item.h"
+    "src/kb.cc"
+    "src/kb.h"
     "src/light.cc"
     "src/light.h"
     "src/lips.cc"
@@ -153,6 +154,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/mmx.h"
     "src/mouse_manager.cc"
     "src/mouse_manager.h"
+    "src/mouse.cc"
+    "src/mouse.h"
     "src/movie_effect.cc"
     "src/movie_effect.h"
     "src/movie_lib.cc"
@@ -214,6 +217,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/stat.h"
     "src/string_parsers.cc"
     "src/string_parsers.h"
+    "src/svga.cc"
+    "src/svga.h"
     "src/text_font.cc"
     "src/text_font.h"
     "src/text_object.cc"
@@ -223,8 +228,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/trait_defs.h"
     "src/trait.cc"
     "src/trait.h"
-    "src/trap.cc"
-    "src/trap.h"
+    "src/vcr.cc"
+    "src/vcr.h"
     "src/version.cc"
     "src/version.h"
     "src/widget.cc"
@@ -254,10 +259,25 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/platform_compat.h"
     "src/pointer_registry.cc"
     "src/pointer_registry.h"
+    "src/settings.cc"
+    "src/settings.h"
     "src/sfall_config.cc"
     "src/sfall_config.h"
+    "src/sfall_global_vars.cc"
+    "src/sfall_global_vars.h"
+    "src/sfall_lists.cc"
+    "src/sfall_lists.h"
+    "src/sfall_opcodes.cc"
+    "src/sfall_opcodes.h"
 )
 
+if(IOS)
+    target_sources(${EXECUTABLE_NAME} PUBLIC
+        "src/platform/ios/paths.h"
+        "src/platform/ios/paths.mm"
+    )
+endif()
+
 if(WIN32)
     target_compile_definitions(${EXECUTABLE_NAME} PUBLIC
         _CRT_SECURE_NO_WARNINGS
@@ -287,13 +307,21 @@ 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")
+    if(IOS)
+        target_sources(${EXECUTABLE_NAME} PUBLIC "os/ios/LaunchScreen.storyboard")
+        set_source_files_properties("os/ios/LaunchScreen.storyboard" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/ios/Info.plist")
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
+    else()
+        set_target_properties(${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/os/macos/Info.plist")
+    endif()
+
     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")
+    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.2.0")
+    set(MACOSX_BUNDLE_BUNDLE_VERSION "1.2.0")
 endif()
 
 add_subdirectory("third_party/fpattern")
@@ -315,23 +343,31 @@ target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
 
 if(APPLE)
-    install(TARGETS ${EXECUTABLE_NAME} DESTINATION .)
-    install(CODE "
-        include(BundleUtilities)
-        fixup_bundle(${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app \"\" \"\")
-        "
-        COMPONENT Runtime)
+    if(IOS)
+        install(TARGETS ${EXECUTABLE_NAME} DESTINATION "Payload")
 
-    if (CPACK_BUNDLE_APPLE_CERT_APP)
+        set(CPACK_GENERATOR "ZIP")
+        set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
+        set(CPACK_PACKAGE_FILE_NAME "fallout2-ce")
+    else()
+        install(TARGETS ${EXECUTABLE_NAME} DESTINATION .)
         install(CODE "
-            execute_process(COMMAND codesign --deep --force --options runtime --sign \"${CPACK_BUNDLE_APPLE_CERT_APP}\" ${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
+            include(BundleUtilities)
+            fixup_bundle(${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app \"\" \"\")
             "
             COMPONENT Runtime)
-    endif()
 
-    set(CPACK_GENERATOR "DragNDrop")
-    set(CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK ON)
-    set(CPACK_PACKAGE_FILE_NAME "fallout2-ce")
+        if (CPACK_BUNDLE_APPLE_CERT_APP)
+            install(CODE "
+                execute_process(COMMAND codesign --deep --force --options runtime --sign \"${CPACK_BUNDLE_APPLE_CERT_APP}\" ${CMAKE_BINARY_DIR}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
+                "
+                COMPONENT Runtime)
+        endif()
+
+        set(CPACK_GENERATOR "DragNDrop")
+        set(CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK ON)
+        set(CPACK_PACKAGE_FILE_NAME "fallout2-ce")
+    endif()
 
     include(CPack)
 endif()

README.md

@@ -44,6 +44,16 @@ $ sudo apt install libsdl2-2.0-0
 
 - 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.
 
+### iOS
+
+> **NOTE**: See Android note on controls.
+
+- Download `fallout2-ce.ipa`. Use sideloading applications ([AltStore](https://altstore.io/) or [Sideloadly](https://sideloadly.io/)) to install it to your device. Alternatively you can always build from source with your own signing certificate.
+
+- Run the game once. You'll see error message saying "Couldn't find/load text fonts". This step is needed for iOS to expose the game via File Sharing feature.
+
+- Use Finder (macOS Catalina and later) or iTunes (Windows and macOS Mojave or earlier) to copy `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder to "Fallout 2" app ([how-to](https://support.apple.com/HT210598)).
+
 ## 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.

os/android/app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId 'com.alexbatalov.fallout2ce'
         minSdk 21
         targetSdk 32
-        versionCode 2
-        versionName '1.1.0'
+        versionCode 3
+        versionName '1.2.0'
         externalNativeBuild {
             cmake {
                 arguments '-DANDROID_STL=c++_static'

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

@@ -15,13 +15,9 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.graphics.PixelFormat;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -37,11 +33,8 @@ import android.view.Display;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.PointerIcon;
 import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -51,6 +44,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -65,6 +59,9 @@ import java.util.Locale;
 */
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
+    private static final int SDL_MAJOR_VERSION = 2;
+    private static final int SDL_MINOR_VERSION = 26;
+    private static final int SDL_MICRO_VERSION = 1;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -213,7 +210,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     // Main components
     protected static SDLActivity mSingleton;
     protected static SDLSurface mSurface;
-    protected static View mTextEdit;
+    protected static DummyEdit mTextEdit;
     protected static boolean mScreenKeyboardShown;
     protected static ViewGroup mLayout;
     protected static SDLClipboardHandler mClipboardHandler;
@@ -314,6 +311,10 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         mNextNativeState = NativeState.INIT;
         mCurrentNativeState = NativeState.INIT;
     }
+    
+    protected SDLSurface createSDLSurface(Context context) {
+        return new SDLSurface(context);
+    }
 
     // Setup
     @Override
@@ -344,8 +345,18 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             errorMsgBrokenLib = e.getMessage();
         }
 
-        if (mBrokenLibraries)
-        {
+        if (!mBrokenLibraries) {
+            String expected_version = String.valueOf(SDL_MAJOR_VERSION) + "." +
+                                      String.valueOf(SDL_MINOR_VERSION) + "." +
+                                      String.valueOf(SDL_MICRO_VERSION);
+            String version = nativeGetVersion();
+            if (!version.equals(expected_version)) {
+                mBrokenLibraries = true;
+                errorMsgBrokenLib = "SDL C/Java version mismatch (expected " + expected_version + ", got " + version + ")";
+            }
+        }
+
+        if (mBrokenLibraries) {
             mSingleton = this;
             AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
             dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
@@ -382,7 +393,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         mHIDDeviceManager = HIDDeviceManager.acquire(this);
 
         // Set up the surface
-        mSurface = new SDLSurface(getApplication());
+        mSurface = createSDLSurface(getApplication());
 
         mLayout = new RelativeLayout(this);
         mLayout.addView(mSurface);
@@ -886,6 +897,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     }
 
     // C functions we call
+    public static native String nativeGetVersion();
     public static native int nativeSetupJNI();
     public static native int nativeRunMain(String library, String function, Object arguments);
     public static native void nativeLowMemory();
@@ -1220,8 +1232,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     }
 
     // This method is called by SDLControllerManager's API 26 Generic Motion Handler.
-    public static View getContentView()
-    {
+    public static View getContentView() {
         return mLayout;
     }
 
@@ -1292,6 +1303,77 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
     }
 
+    public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputConnection ic) {
+        int deviceId = event.getDeviceId();
+        int source = event.getSource();
+
+        if (source == InputDevice.SOURCE_UNKNOWN) {
+            InputDevice device = InputDevice.getDevice(deviceId);
+            if (device != null) {
+                source = device.getSources();
+            }
+        }
+
+//        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+//            Log.v("SDL", "key down: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+//            Log.v("SDL", "key up: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
+//        }
+
+        // Dispatch the different events depending on where they come from
+        // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+        // So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD
+        //
+        // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and
+        // SOURCE_JOYSTICK, while its key events arrive from the keyboard source
+        // So, retrieve the device itself and check all of its sources
+        if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
+            // Note that we process events with specific key codes here
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (SDLControllerManager.onNativePadDown(deviceId, keyCode) == 0) {
+                    return true;
+                }
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (SDLControllerManager.onNativePadUp(deviceId, keyCode) == 0) {
+                    return true;
+                }
+            }
+        }
+
+        if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (isTextInputEvent(event)) {
+                    if (ic != null) {
+                        ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                    } else {
+                        SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                    }
+                }
+                onNativeKeyDown(keyCode);
+                return true;
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                onNativeKeyUp(keyCode);
+                return true;
+            }
+        }
+
+        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
+            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
+            // they are ignored here because sending them as mouse input to SDL is messy
+            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
+                switch (event.getAction()) {
+                case KeyEvent.ACTION_DOWN:
+                case KeyEvent.ACTION_UP:
+                    // mark the event as handled or it will be handled by system
+                    // handling KEYCODE_BACK by system will call onBackPressed()
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * This method is called by SDL using JNI.
      */
@@ -1809,455 +1891,6 @@ class SDLMain implements Runnable {
     }
 }
 
-
-/**
-    SDLSurface. This is what we draw on, so we need to know when it's created
-    in order to do anything useful.
-
-    Because of this, that's where we set up the SDL thread
-*/
-class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
-    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
-
-    // Sensors
-    protected SensorManager mSensorManager;
-    protected Display mDisplay;
-
-    // Keep track of the surface size to normalize touch events
-    protected float mWidth, mHeight;
-
-    // Is SurfaceView ready for rendering
-    public boolean mIsSurfaceReady;
-
-    // Startup
-    public SDLSurface(Context context) {
-        super(context);
-        getHolder().addCallback(this);
-
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        requestFocus();
-        setOnKeyListener(this);
-        setOnTouchListener(this);
-
-        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
-
-        setOnGenericMotionListener(SDLActivity.getMotionListener());
-
-        // Some arbitrary defaults to avoid a potential division by zero
-        mWidth = 1.0f;
-        mHeight = 1.0f;
-
-        mIsSurfaceReady = false;
-    }
-
-    public void handlePause() {
-        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
-    }
-
-    public void handleResume() {
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        requestFocus();
-        setOnKeyListener(this);
-        setOnTouchListener(this);
-        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
-    }
-
-    public Surface getNativeSurface() {
-        return getHolder().getSurface();
-    }
-
-    // Called when we have a valid drawing surface
-    @Override
-    public void surfaceCreated(SurfaceHolder holder) {
-        Log.v("SDL", "surfaceCreated()");
-        SDLActivity.onNativeSurfaceCreated();
-    }
-
-    // Called when we lose the surface
-    @Override
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        Log.v("SDL", "surfaceDestroyed()");
-
-        // Transition to pause, if needed
-        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
-        SDLActivity.handleNativeState();
-
-        mIsSurfaceReady = false;
-        SDLActivity.onNativeSurfaceDestroyed();
-    }
-
-    // Called when the surface is resized
-    @Override
-    public void surfaceChanged(SurfaceHolder holder,
-                               int format, int width, int height) {
-        Log.v("SDL", "surfaceChanged()");
-
-        if (SDLActivity.mSingleton == null) {
-            return;
-        }
-
-        mWidth = width;
-        mHeight = height;
-        int nDeviceWidth = width;
-        int nDeviceHeight = height;
-        try
-        {
-            if (Build.VERSION.SDK_INT >= 17) {
-                DisplayMetrics realMetrics = new DisplayMetrics();
-                mDisplay.getRealMetrics( realMetrics );
-                nDeviceWidth = realMetrics.widthPixels;
-                nDeviceHeight = realMetrics.heightPixels;
-            }
-        } catch(Exception ignored) {
-        }
-
-        synchronized(SDLActivity.getContext()) {
-            // In case we're waiting on a size change after going fullscreen, send a notification.
-            SDLActivity.getContext().notifyAll();
-        }
-
-        Log.v("SDL", "Window size: " + width + "x" + height);
-        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
-        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, mDisplay.getRefreshRate());
-        SDLActivity.onNativeResize();
-
-        // Prevent a screen distortion glitch,
-        // for instance when the device is in Landscape and a Portrait App is resumed.
-        boolean skip = false;
-        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
-
-        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
-            if (mWidth > mHeight) {
-               skip = true;
-            }
-        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
-            if (mWidth < mHeight) {
-               skip = true;
-            }
-        }
-
-        // Special Patch for Square Resolution: Black Berry Passport
-        if (skip) {
-           double min = Math.min(mWidth, mHeight);
-           double max = Math.max(mWidth, mHeight);
-
-           if (max / min < 1.20) {
-              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
-              skip = false;
-           }
-        }
-
-        // Don't skip in MultiWindow.
-        if (skip) {
-            if (Build.VERSION.SDK_INT >= 24) {
-                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
-                    Log.v("SDL", "Don't skip in Multi-Window");
-                    skip = false;
-                }
-            }
-        }
-
-        if (skip) {
-           Log.v("SDL", "Skip .. Surface is not ready.");
-           mIsSurfaceReady = false;
-           return;
-        }
-
-        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
-        SDLActivity.onNativeSurfaceChanged();
-
-        /* Surface is ready */
-        mIsSurfaceReady = true;
-
-        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
-        SDLActivity.handleNativeState();
-    }
-
-    // Key events
-    @Override
-    public boolean onKey(View  v, int keyCode, KeyEvent event) {
-
-        int deviceId = event.getDeviceId();
-        int source = event.getSource();
-
-        if (source == InputDevice.SOURCE_UNKNOWN) {
-            InputDevice device = InputDevice.getDevice(deviceId);
-            if (device != null) {
-                source = device.getSources();
-            }
-        }
-
-//        if (event.getAction() == KeyEvent.ACTION_DOWN) {
-//            Log.v("SDL", "key down: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
-//        } else if (event.getAction() == KeyEvent.ACTION_UP) {
-//            Log.v("SDL", "key up: " + keyCode + ", deviceId = " + deviceId + ", source = " + source);
-//        }
-
-        // Dispatch the different events depending on where they come from
-        // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
-        // So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD
-        //
-        // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and
-        // SOURCE_JOYSTICK, while its key events arrive from the keyboard source
-        // So, retrieve the device itself and check all of its sources
-        if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
-            // Note that we process events with specific key codes here
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (SDLControllerManager.onNativePadDown(deviceId, keyCode) == 0) {
-                    return true;
-                }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (SDLControllerManager.onNativePadUp(deviceId, keyCode) == 0) {
-                    return true;
-                }
-            }
-        }
-
-        if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (SDLActivity.isTextInputEvent(event)) {
-                    SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                }
-                SDLActivity.onNativeKeyDown(keyCode);
-                return true;
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                SDLActivity.onNativeKeyUp(keyCode);
-                return true;
-            }
-        }
-
-        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
-            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
-            // they are ignored here because sending them as mouse input to SDL is messy
-            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
-                switch (event.getAction()) {
-                case KeyEvent.ACTION_DOWN:
-                case KeyEvent.ACTION_UP:
-                    // mark the event as handled or it will be handled by system
-                    // handling KEYCODE_BACK by system will call onBackPressed()
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    // Touch events
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        /* Ref: http://developer.android.com/training/gestures/multi.html */
-        int touchDevId = event.getDeviceId();
-        final int pointerCount = event.getPointerCount();
-        int action = event.getActionMasked();
-        int pointerFingerId;
-        int i = -1;
-        float x,y,p;
-
-        /*
-         * Prevent id to be -1, since it's used in SDL internal for synthetic events
-         * Appears when using Android emulator, eg:
-         *  adb shell input mouse tap 100 100
-         *  adb shell input touchscreen tap 100 100
-         */
-        if (touchDevId < 0) {
-            touchDevId -= 1;
-        }
-
-        // 12290 = Samsung DeX mode desktop mouse
-        // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
-        // 0x2   = SOURCE_CLASS_POINTER
-        if (event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == (InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN)) {
-            int mouseButton = 1;
-            try {
-                Object object = event.getClass().getMethod("getButtonState").invoke(event);
-                if (object != null) {
-                    mouseButton = (Integer) object;
-                }
-            } catch(Exception ignored) {
-            }
-
-            // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
-            // if we are.  We'll leverage our existing mouse motion listener
-            SDLGenericMotionListener_API12 motionListener = SDLActivity.getMotionListener();
-            x = motionListener.getEventX(event);
-            y = motionListener.getEventY(event);
-
-            SDLActivity.onNativeMouse(mouseButton, action, x, y, motionListener.inRelativeMode());
-        } else {
-            switch(action) {
-                case MotionEvent.ACTION_MOVE:
-                    for (i = 0; i < pointerCount; i++) {
-                        pointerFingerId = event.getPointerId(i);
-                        x = event.getX(i) / mWidth;
-                        y = event.getY(i) / mHeight;
-                        p = event.getPressure(i);
-                        if (p > 1.0f) {
-                            // may be larger than 1.0f on some devices
-                            // see the documentation of getPressure(i)
-                            p = 1.0f;
-                        }
-                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
-                    }
-                    break;
-
-                case MotionEvent.ACTION_UP:
-                case MotionEvent.ACTION_DOWN:
-                    // Primary pointer up/down, the index is always zero
-                    i = 0;
-                    /* fallthrough */
-                case MotionEvent.ACTION_POINTER_UP:
-                case MotionEvent.ACTION_POINTER_DOWN:
-                    // Non primary pointer up/down
-                    if (i == -1) {
-                        i = event.getActionIndex();
-                    }
-
-                    pointerFingerId = event.getPointerId(i);
-                    x = event.getX(i) / mWidth;
-                    y = event.getY(i) / mHeight;
-                    p = event.getPressure(i);
-                    if (p > 1.0f) {
-                        // may be larger than 1.0f on some devices
-                        // see the documentation of getPressure(i)
-                        p = 1.0f;
-                    }
-                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
-                    break;
-
-                case MotionEvent.ACTION_CANCEL:
-                    for (i = 0; i < pointerCount; i++) {
-                        pointerFingerId = event.getPointerId(i);
-                        x = event.getX(i) / mWidth;
-                        y = event.getY(i) / mHeight;
-                        p = event.getPressure(i);
-                        if (p > 1.0f) {
-                            // may be larger than 1.0f on some devices
-                            // see the documentation of getPressure(i)
-                            p = 1.0f;
-                        }
-                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return true;
-   }
-
-    // Sensor events
-    public void enableSensor(int sensortype, boolean enabled) {
-        // TODO: This uses getDefaultSensor - what if we have >1 accels?
-        if (enabled) {
-            mSensorManager.registerListener(this,
-                            mSensorManager.getDefaultSensor(sensortype),
-                            SensorManager.SENSOR_DELAY_GAME, null);
-        } else {
-            mSensorManager.unregisterListener(this,
-                            mSensorManager.getDefaultSensor(sensortype));
-        }
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        // TODO
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
-
-            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
-            // We thus should check here.
-            int newOrientation;
-
-            float x, y;
-            switch (mDisplay.getRotation()) {
-                case Surface.ROTATION_90:
-                    x = -event.values[1];
-                    y = event.values[0];
-                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE;
-                    break;
-                case Surface.ROTATION_270:
-                    x = event.values[1];
-                    y = -event.values[0];
-                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE_FLIPPED;
-                    break;
-                case Surface.ROTATION_180:
-                    x = -event.values[0];
-                    y = -event.values[1];
-                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT_FLIPPED;
-                    break;
-                case Surface.ROTATION_0:
-                default:
-                    x = event.values[0];
-                    y = event.values[1];
-                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT;
-                    break;
-            }
-
-            if (newOrientation != SDLActivity.mCurrentOrientation) {
-                SDLActivity.mCurrentOrientation = newOrientation;
-                SDLActivity.onNativeOrientationChanged(newOrientation);
-            }
-
-            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
-                                      y / SensorManager.GRAVITY_EARTH,
-                                      event.values[2] / SensorManager.GRAVITY_EARTH);
-
-
-        }
-    }
-
-    // Captured pointer events for API 26.
-    public boolean onCapturedPointerEvent(MotionEvent event)
-    {
-        int action = event.getActionMasked();
-
-        float x, y;
-        switch (action) {
-            case MotionEvent.ACTION_SCROLL:
-                x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
-                y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
-                SDLActivity.onNativeMouse(0, action, x, y, false);
-                return true;
-
-            case MotionEvent.ACTION_HOVER_MOVE:
-            case MotionEvent.ACTION_MOVE:
-                x = event.getX(0);
-                y = event.getY(0);
-                SDLActivity.onNativeMouse(0, action, x, y, true);
-                return true;
-
-            case MotionEvent.ACTION_BUTTON_PRESS:
-            case MotionEvent.ACTION_BUTTON_RELEASE:
-
-                // Change our action value to what SDL's code expects.
-                if (action == MotionEvent.ACTION_BUTTON_PRESS) {
-                    action = MotionEvent.ACTION_DOWN;
-                } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
-                    action = MotionEvent.ACTION_UP;
-                }
-
-                x = event.getX(0);
-                y = event.getY(0);
-                int button = event.getButtonState();
-
-                SDLActivity.onNativeMouse(button, action, x, y, true);
-                return true;
-        }
-
-        return false;
-    }
-
-}
-
 /* This is a fake invisible editor view that receives the input and defines the
  * pan&scan region
  */
@@ -2278,21 +1911,7 @@ class DummyEdit extends View implements View.OnKeyListener {
 
     @Override
     public boolean onKey(View v, int keyCode, KeyEvent event) {
-        /*
-         * This handles the hardware keyboard input
-         */
-        if (event.getAction() == KeyEvent.ACTION_DOWN) {
-            if (SDLActivity.isTextInputEvent(event)) {
-                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                return true;
-            }
-            SDLActivity.onNativeKeyDown(keyCode);
-            return true;
-        } else if (event.getAction() == KeyEvent.ACTION_UP) {
-            SDLActivity.onNativeKeyUp(keyCode);
-            return true;
-        }
-        return false;
+        return SDLActivity.handleKeyEvent(v, keyCode, event, ic);
     }
 
     //
@@ -2316,9 +1935,10 @@ class DummyEdit extends View implements View.OnKeyListener {
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         ic = new SDLInputConnection(this, true);
 
-        outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
-        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
-                | EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
+        outAttrs.inputType = InputType.TYPE_CLASS_TEXT |
+                             InputType.TYPE_TEXT_FLAG_MULTI_LINE;
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+                              EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
 
         return ic;
     }
@@ -2326,9 +1946,17 @@ class DummyEdit extends View implements View.OnKeyListener {
 
 class SDLInputConnection extends BaseInputConnection {
 
+    protected EditText mEditText;
+    protected String mCommittedText = "";
+
     public SDLInputConnection(View targetView, boolean fullEditor) {
         super(targetView, fullEditor);
+        mEditText = new EditText(SDL.getContext());
+    }
 
+    @Override
+    public Editable getEditable() {
+        return mEditText.getEditableText();
     }
 
     @Override
@@ -2351,79 +1979,84 @@ class SDLInputConnection extends BaseInputConnection {
             }
         }
 
-
         return super.sendKeyEvent(event);
     }
 
     @Override
     public boolean commitText(CharSequence text, int newCursorPosition) {
-
-        /* Generate backspaces for the text we're going to replace */
-        final Editable content = getEditable();
-        if (content != null) {
-            int a = getComposingSpanStart(content);
-            int b = getComposingSpanEnd(content);
-            if (a == -1 || b == -1) {
-                a = Selection.getSelectionStart(content);
-                b = Selection.getSelectionEnd(content);
-            }
-            if (a < 0) a = 0;
-            if (b < 0) b = 0;
-            if (b < a) {
-                int tmp = a;
-                a = b;
-                b = tmp;
-            }
-            int backspaces = (b - a);
-
-            for (int i = 0; i < backspaces; i++) {
-                nativeGenerateScancodeForUnichar('\b');
-            }
+        if (!super.commitText(text, newCursorPosition)) {
+            return false;
         }
-
-        for (int i = 0; i < text.length(); i++) {
-            char c = text.charAt(i);
-            if (c == '\n') {
-                if (SDLActivity.onNativeSoftReturnKey()) {
-                    return true;
-                }
-            }
-            nativeGenerateScancodeForUnichar(c);
-        }
-
-        SDLInputConnection.nativeCommitText(text.toString(), newCursorPosition);
-
-        return super.commitText(text, newCursorPosition);
+        updateText();
+        return true;
     }
 
     @Override
     public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        if (!super.setComposingText(text, newCursorPosition)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
 
-        nativeSetComposingText(text.toString(), newCursorPosition);
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        if (!super.deleteSurroundingText(beforeLength, afterLength)) {
+            return false;
+        }
+        updateText();
+        return true;
+    }
 
-        return super.setComposingText(text, newCursorPosition);
+    protected void updateText() {
+        final Editable content = getEditable();
+        if (content == null) {
+            return;
+        }
+
+        String text = content.toString();
+        int compareLength = Math.min(text.length(), mCommittedText.length());
+        int matchLength, offset;
+
+        /* Backspace over characters that are no longer in the string */
+        for (matchLength = 0; matchLength < compareLength; ) {
+            int codePoint = mCommittedText.codePointAt(matchLength);
+            if (codePoint != text.codePointAt(matchLength)) {
+                break;
+            }
+            matchLength += Character.charCount(codePoint);
+        }
+        /* FIXME: This doesn't handle graphemes, like '🌬️' */
+        for (offset = matchLength; offset < mCommittedText.length(); ) {
+            int codePoint = mCommittedText.codePointAt(offset);
+            nativeGenerateScancodeForUnichar('\b');
+            offset += Character.charCount(codePoint);
+        }
+
+        if (matchLength < text.length()) {
+            String pendingText = text.subSequence(matchLength, text.length()).toString();
+            for (offset = 0; offset < pendingText.length(); ) {
+                int codePoint = pendingText.codePointAt(offset);
+                if (codePoint == '\n') {
+                    if (SDLActivity.onNativeSoftReturnKey()) {
+                        return;
+                    }
+                }
+                /* Higher code points don't generate simulated scancodes */
+                if (codePoint < 128) {
+                    nativeGenerateScancodeForUnichar((char)codePoint);
+                }
+                offset += Character.charCount(codePoint);
+            }
+            SDLInputConnection.nativeCommitText(pendingText, 0);
+        }
+        mCommittedText = text;
     }
 
     public static native void nativeCommitText(String text, int newCursorPosition);
 
-    public native void nativeGenerateScancodeForUnichar(char c);
-
-    public native void nativeSetComposingText(String text, int newCursorPosition);
-
-    @Override
-    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
-        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
-        // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
-        if (beforeLength > 0 && afterLength == 0) {
-            // backspace(s)
-            while (beforeLength-- > 0) {
-                nativeGenerateScancodeForUnichar('\b');
-            }
-            return true;
-        }
-
-        return super.deleteSurroundingText(beforeLength, afterLength);
-    }
+    public static native void nativeGenerateScancodeForUnichar(char c);
 }
 
 class SDLClipboardHandler implements

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

@@ -0,0 +1,405 @@
+package org.libsdl.app;
+
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowManager;
+
+
+/**
+    SDLSurface. This is what we draw on, so we need to know when it's created
+    in order to do anything useful.
+
+    Because of this, that's where we set up the SDL thread
+*/
+public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
+
+    // Sensors
+    protected SensorManager mSensorManager;
+    protected Display mDisplay;
+
+    // Keep track of the surface size to normalize touch events
+    protected float mWidth, mHeight;
+
+    // Is SurfaceView ready for rendering
+    public boolean mIsSurfaceReady;
+
+    // Startup
+    public SDLSurface(Context context) {
+        super(context);
+        getHolder().addCallback(this);
+
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+
+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+        setOnGenericMotionListener(SDLActivity.getMotionListener());
+
+        // Some arbitrary defaults to avoid a potential division by zero
+        mWidth = 1.0f;
+        mHeight = 1.0f;
+
+        mIsSurfaceReady = false;
+    }
+
+    public void handlePause() {
+        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+    }
+
+    public void handleResume() {
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        setOnKeyListener(this);
+        setOnTouchListener(this);
+        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+    }
+
+    public Surface getNativeSurface() {
+        return getHolder().getSurface();
+    }
+
+    // Called when we have a valid drawing surface
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceCreated()");
+        SDLActivity.onNativeSurfaceCreated();
+    }
+
+    // Called when we lose the surface
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.v("SDL", "surfaceDestroyed()");
+
+        // Transition to pause, if needed
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.PAUSED;
+        SDLActivity.handleNativeState();
+
+        mIsSurfaceReady = false;
+        SDLActivity.onNativeSurfaceDestroyed();
+    }
+
+    // Called when the surface is resized
+    @Override
+    public void surfaceChanged(SurfaceHolder holder,
+                               int format, int width, int height) {
+        Log.v("SDL", "surfaceChanged()");
+
+        if (SDLActivity.mSingleton == null) {
+            return;
+        }
+
+        mWidth = width;
+        mHeight = height;
+        int nDeviceWidth = width;
+        int nDeviceHeight = height;
+        try
+        {
+            if (Build.VERSION.SDK_INT >= 17) {
+                DisplayMetrics realMetrics = new DisplayMetrics();
+                mDisplay.getRealMetrics( realMetrics );
+                nDeviceWidth = realMetrics.widthPixels;
+                nDeviceHeight = realMetrics.heightPixels;
+            }
+        } catch(Exception ignored) {
+        }
+
+        synchronized(SDLActivity.getContext()) {
+            // In case we're waiting on a size change after going fullscreen, send a notification.
+            SDLActivity.getContext().notifyAll();
+        }
+
+        Log.v("SDL", "Window size: " + width + "x" + height);
+        Log.v("SDL", "Device size: " + nDeviceWidth + "x" + nDeviceHeight);
+        SDLActivity.nativeSetScreenResolution(width, height, nDeviceWidth, nDeviceHeight, mDisplay.getRefreshRate());
+        SDLActivity.onNativeResize();
+
+        // Prevent a screen distortion glitch,
+        // for instance when the device is in Landscape and a Portrait App is resumed.
+        boolean skip = false;
+        int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
+            if (mWidth > mHeight) {
+               skip = true;
+            }
+        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
+            if (mWidth < mHeight) {
+               skip = true;
+            }
+        }
+
+        // Special Patch for Square Resolution: Black Berry Passport
+        if (skip) {
+           double min = Math.min(mWidth, mHeight);
+           double max = Math.max(mWidth, mHeight);
+
+           if (max / min < 1.20) {
+              Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+              skip = false;
+           }
+        }
+
+        // Don't skip in MultiWindow.
+        if (skip) {
+            if (Build.VERSION.SDK_INT >= 24) {
+                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
+                    Log.v("SDL", "Don't skip in Multi-Window");
+                    skip = false;
+                }
+            }
+        }
+
+        if (skip) {
+           Log.v("SDL", "Skip .. Surface is not ready.");
+           mIsSurfaceReady = false;
+           return;
+        }
+
+        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+        SDLActivity.onNativeSurfaceChanged();
+
+        /* Surface is ready */
+        mIsSurfaceReady = true;
+
+        SDLActivity.mNextNativeState = SDLActivity.NativeState.RESUMED;
+        SDLActivity.handleNativeState();
+    }
+
+    // Key events
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        return SDLActivity.handleKeyEvent(v, keyCode, event, null);
+    }
+
+    // Touch events
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        /* Ref: http://developer.android.com/training/gestures/multi.html */
+        int touchDevId = event.getDeviceId();
+        final int pointerCount = event.getPointerCount();
+        int action = event.getActionMasked();
+        int pointerFingerId;
+        int i = -1;
+        float x,y,p;
+
+        /*
+         * Prevent id to be -1, since it's used in SDL internal for synthetic events
+         * Appears when using Android emulator, eg:
+         *  adb shell input mouse tap 100 100
+         *  adb shell input touchscreen tap 100 100
+         */
+        if (touchDevId < 0) {
+            touchDevId -= 1;
+        }
+
+        // 12290 = Samsung DeX mode desktop mouse
+        // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
+        // 0x2   = SOURCE_CLASS_POINTER
+        if (event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == (InputDevice.SOURCE_MOUSE | InputDevice.SOURCE_TOUCHSCREEN)) {
+            int mouseButton = 1;
+            try {
+                Object object = event.getClass().getMethod("getButtonState").invoke(event);
+                if (object != null) {
+                    mouseButton = (Integer) object;
+                }
+            } catch(Exception ignored) {
+            }
+
+            // We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
+            // if we are.  We'll leverage our existing mouse motion listener
+            SDLGenericMotionListener_API12 motionListener = SDLActivity.getMotionListener();
+            x = motionListener.getEventX(event);
+            y = motionListener.getEventY(event);
+
+            SDLActivity.onNativeMouse(mouseButton, action, x, y, motionListener.inRelativeMode());
+        } else {
+            switch(action) {
+                case MotionEvent.ACTION_MOVE:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_DOWN:
+                    // Primary pointer up/down, the index is always zero
+                    i = 0;
+                    /* fallthrough */
+                case MotionEvent.ACTION_POINTER_UP:
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    // Non primary pointer up/down
+                    if (i == -1) {
+                        i = event.getActionIndex();
+                    }
+
+                    pointerFingerId = event.getPointerId(i);
+                    x = event.getX(i) / mWidth;
+                    y = event.getY(i) / mHeight;
+                    p = event.getPressure(i);
+                    if (p > 1.0f) {
+                        // may be larger than 1.0f on some devices
+                        // see the documentation of getPressure(i)
+                        p = 1.0f;
+                    }
+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    for (i = 0; i < pointerCount; i++) {
+                        pointerFingerId = event.getPointerId(i);
+                        x = event.getX(i) / mWidth;
+                        y = event.getY(i) / mHeight;
+                        p = event.getPressure(i);
+                        if (p > 1.0f) {
+                            // may be larger than 1.0f on some devices
+                            // see the documentation of getPressure(i)
+                            p = 1.0f;
+                        }
+                        SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return true;
+   }
+
+    // Sensor events
+    public void enableSensor(int sensortype, boolean enabled) {
+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
+        if (enabled) {
+            mSensorManager.registerListener(this,
+                            mSensorManager.getDefaultSensor(sensortype),
+                            SensorManager.SENSOR_DELAY_GAME, null);
+        } else {
+            mSensorManager.unregisterListener(this,
+                            mSensorManager.getDefaultSensor(sensortype));
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        // TODO
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+
+            // Since we may have an orientation set, we won't receive onConfigurationChanged events.
+            // We thus should check here.
+            int newOrientation;
+
+            float x, y;
+            switch (mDisplay.getRotation()) {
+                case Surface.ROTATION_90:
+                    x = -event.values[1];
+                    y = event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE;
+                    break;
+                case Surface.ROTATION_270:
+                    x = event.values[1];
+                    y = -event.values[0];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_LANDSCAPE_FLIPPED;
+                    break;
+                case Surface.ROTATION_180:
+                    x = -event.values[0];
+                    y = -event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT_FLIPPED;
+                    break;
+                case Surface.ROTATION_0:
+                default:
+                    x = event.values[0];
+                    y = event.values[1];
+                    newOrientation = SDLActivity.SDL_ORIENTATION_PORTRAIT;
+                    break;
+            }
+
+            if (newOrientation != SDLActivity.mCurrentOrientation) {
+                SDLActivity.mCurrentOrientation = newOrientation;
+                SDLActivity.onNativeOrientationChanged(newOrientation);
+            }
+
+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+                                      y / SensorManager.GRAVITY_EARTH,
+                                      event.values[2] / SensorManager.GRAVITY_EARTH);
+
+
+        }
+    }
+
+    // Captured pointer events for API 26.
+    public boolean onCapturedPointerEvent(MotionEvent event)
+    {
+        int action = event.getActionMasked();
+
+        float x, y;
+        switch (action) {
+            case MotionEvent.ACTION_SCROLL:
+                x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+                y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+                SDLActivity.onNativeMouse(0, action, x, y, false);
+                return true;
+
+            case MotionEvent.ACTION_HOVER_MOVE:
+            case MotionEvent.ACTION_MOVE:
+                x = event.getX(0);
+                y = event.getY(0);
+                SDLActivity.onNativeMouse(0, action, x, y, true);
+                return true;
+
+            case MotionEvent.ACTION_BUTTON_PRESS:
+            case MotionEvent.ACTION_BUTTON_RELEASE:
+
+                // Change our action value to what SDL's code expects.
+                if (action == MotionEvent.ACTION_BUTTON_PRESS) {
+                    action = MotionEvent.ACTION_DOWN;
+                } else { /* MotionEvent.ACTION_BUTTON_RELEASE */
+                    action = MotionEvent.ACTION_UP;
+                }
+
+                x = event.getX(0);
+                y = event.getY(0);
+                int button = event.getButtonState();
+
+                SDLActivity.onNativeMouse(button, action, x, y, true);
+                return true;
+        }
+
+        return false;
+    }
+}

os/android/gradlew.bat

@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

os/ios/Info.plist

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleDisplayName</key>
+    <string>${MACOSX_BUNDLE_DISPLAY_NAME}</string>
+    <key>CFBundleExecutable</key>
+    <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+    <key>CFBundleVersion</key>
+    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.role-playing-games</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>11.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
+    <key>UIApplicationSupportsIndirectInputEvents</key>
+    <true/>
+    <key>UIFileSharingEnabled</key>
+    <true/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UIRequiresFullScreen</key>
+    <true/>
+    <key>UIStatusBarHidden</key>
+    <true/>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+    </array>
+</dict>
+</plist>

os/ios/LaunchScreen.storyboard

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>

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);
@@ -21,4 +23,6 @@ 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

@@ -4,11 +4,13 @@
 #include "combat_defs.h"
 #include "obj_types.h"
 
+namespace fallout {
+
 typedef enum AnimationRequestOptions {
     ANIMATION_REQUEST_UNRESERVED = 0x01,
     ANIMATION_REQUEST_RESERVED = 0x02,
     ANIMATION_REQUEST_NO_STAND = 0x04,
-    ANIMATION_REQUEST_0x100 = 0x100,
+    ANIMATION_REQUEST_PING = 0x100,
     ANIMATION_REQUEST_INSIGNIFICANT = 0x200,
 } AnimationRequestOptions;
 
@@ -98,12 +100,12 @@ 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 {
+typedef struct StraightPathNode {
     int tile;
     int elevation;
     int x;
     int y;
-} STRUCT_530014_28;
+} StraightPathNode;
 
 typedef Object* PathBuilderCallback(Object* object, int tile, int elevation);
 
@@ -140,15 +142,15 @@ int animationRegisterSetLightDistance(Object* owner, int lightDistance, int dela
 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 animationRegisterPing(int flags, int delay);
 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);
-int _make_straight_path(Object* a1, int from, int to, STRUCT_530014_28* pathNodes, Object** a5, int a6);
-int _make_straight_path_func(Object* a1, int from, int to, STRUCT_530014_28* a4, Object** a5, int a6, Object* (*a7)(Object*, int, int));
+int _make_straight_path(Object* a1, int from, int to, StraightPathNode* straightPathNodeList, Object** obstaclePtr, int a6);
+int _make_straight_path_func(Object* a1, int from, int to, StraightPathNode* straightPathNodeList, Object** obstaclePtr, int a6, PathBuilderCallback* callback);
 void _object_animate();
-int _check_move(int* a1);
-int _dude_move(int a1);
-int _dude_run(int a1);
+int _check_move(int* actionPointsPtr);
+int _dude_move(int actionPoints);
+int _dude_run(int actionPoints);
 void _dude_fidget();
 void _dude_stand(Object* obj, int rotation, int fid);
 void _dude_standup(Object* a1);
@@ -156,4 +158,6 @@ void animationStop();
 
 int animationRegisterSetLightIntensity(Object* owner, int lightDistance, int lightIntensity, int delay);
 
+} // namespace fallout
+
 #endif /* ANIMATION_H */

src/art.cc

@@ -8,12 +8,14 @@
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
-#include "game_config.h"
 #include "memory.h"
 #include "object.h"
 #include "proto.h"
+#include "settings.h"
 #include "sfall_config.h"
 
+namespace fallout {
+
 typedef struct ArtListDescription {
     int flags;
     char name[16];
@@ -32,8 +34,10 @@ static int artReadList(const char* path, char** out_arr, int* out_count);
 static int artCacheGetFileSizeImpl(int a1, int* out_size);
 static int artCacheReadDataImpl(int a1, int* a2, unsigned char* data);
 static void artCacheFreeImpl(void* ptr);
-static int artReadFrameData(unsigned char* data, File* stream, int count);
+static int artReadFrameData(unsigned char* data, File* stream, int count, int* paddingPtr);
 static int artReadHeader(Art* art, File* stream);
+static int artGetDataSize(Art* art);
+static int paddingForSize(int size);
 
 // 0x5002D8
 static char gDefaultJumpsuitMaleFileName[] = "hmjmps";
@@ -130,18 +134,14 @@ int artInit()
     File* stream;
     char string[200];
 
-    int cacheSize;
-    if (!configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_ART_CACHE_SIZE_KEY, &cacheSize)) {
-        cacheSize = 8;
-    }
-
+    int cacheSize = settings.system.art_cache_size;
     if (!cacheInit(&gArtCache, artCacheGetFileSizeImpl, artCacheReadDataImpl, artCacheFreeImpl, cacheSize << 20)) {
         debugPrint("cache_init failed in art_init\n");
         return -1;
     }
 
-    char* language;
-    if (configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language) && compat_stricmp(language, ENGLISH) != 0) {
+    const char* language = settings.system.language.c_str();
+    if (compat_stricmp(language, ENGLISH) != 0) {
         strcpy(gArtLanguage, language);
         gArtLanguageInitialized = true;
     }
@@ -149,28 +149,13 @@ int artInit()
     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);
-
-        int oldDb;
-        if (objectType == OBJ_TYPE_CRITTER) {
-            oldDb = _db_current();
-            critterDbSelected = true;
-            _db_select(_critter_db_handle);
-        }
+        snprintf(path, sizeof(path), "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[objectType].name, gArtListDescriptions[objectType].name);
 
         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[OBJ_TYPE_CRITTER].fileNamesLength);
@@ -193,7 +178,7 @@ int artInit()
         gArtCritterFidShoudRunData[critterIndex] = 0;
     }
 
-    sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[OBJ_TYPE_CRITTER].name, gArtListDescriptions[OBJ_TYPE_CRITTER].name);
+    snprintf(path, sizeof(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) {
@@ -229,16 +214,16 @@ int artInit()
 
     char* critterFileNames = gArtListDescriptions[OBJ_TYPE_CRITTER].fileNames;
     for (int critterIndex = 0; critterIndex < gArtListDescriptions[OBJ_TYPE_CRITTER].fileNamesLength; critterIndex++) {
-        if (compat_stricmp(critterFileNames, "hmjmps") == 0) {
+        if (compat_stricmp(critterFileNames, jumpsuitMaleFileName) == 0) {
             _art_vault_person_nums[DUDE_NATIVE_LOOK_JUMPSUIT][GENDER_MALE] = critterIndex;
-        } else if (compat_stricmp(critterFileNames, "hfjmps") == 0) {
+        } else if (compat_stricmp(critterFileNames, jumpsuitFemaleFileName) == 0) {
             _art_vault_person_nums[DUDE_NATIVE_LOOK_JUMPSUIT][GENDER_FEMALE] = critterIndex;
         }
 
-        if (compat_stricmp(critterFileNames, "hmwarr") == 0) {
+        if (compat_stricmp(critterFileNames, tribalMaleFileName) == 0) {
             _art_vault_person_nums[DUDE_NATIVE_LOOK_TRIBAL][GENDER_MALE] = critterIndex;
             _art_vault_guy_num = critterIndex;
-        } else if (compat_stricmp(critterFileNames, "hfprim") == 0) {
+        } else if (compat_stricmp(critterFileNames, tribalFemaleFileName) == 0) {
             _art_vault_person_nums[DUDE_NATIVE_LOOK_TRIBAL][GENDER_FEMALE] = critterIndex;
         }
 
@@ -284,7 +269,7 @@ int artInit()
         return -1;
     }
 
-    sprintf(path, "%s%s%s\\%s.lst", _cd_path_base, "art\\", gArtListDescriptions[OBJ_TYPE_HEAD].name, gArtListDescriptions[OBJ_TYPE_HEAD].name);
+    snprintf(path, sizeof(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) {
@@ -655,19 +640,19 @@ char* artBuildFilePath(int fid)
             return NULL;
         }
         if (v10) {
-            sprintf(_art_name, "%s%s%s\\%s%c%c.fr%c", _cd_path_base, "art\\", gArtListDescriptions[1].name, gArtListDescriptions[1].fileNames + v8, v11, v12, v10 + 47);
+            snprintf(_art_name, sizeof(_art_name), "%s%s%s\\%s%c%c.fr%c", _cd_path_base, "art\\", gArtListDescriptions[1].name, gArtListDescriptions[1].fileNames + v8, v11, v12, v10 + 47);
         } else {
-            sprintf(_art_name, "%s%s%s\\%s%c%c.frm", _cd_path_base, "art\\", gArtListDescriptions[1].name, gArtListDescriptions[1].fileNames + v8, v11, v12);
+            snprintf(_art_name, sizeof(_art_name), "%s%s%s\\%s%c%c.frm", _cd_path_base, "art\\", gArtListDescriptions[1].name, gArtListDescriptions[1].fileNames + v8, v11, v12);
         }
     } else if (type == 8) {
         v9 = _head2[v4];
         if (v9 == 'f') {
-            sprintf(_art_name, "%s%s%s\\%s%c%c%d.frm", _cd_path_base, "art\\", gArtListDescriptions[8].name, gArtListDescriptions[8].fileNames + v8, _head1[v4], 102, v5);
+            snprintf(_art_name, sizeof(_art_name), "%s%s%s\\%s%c%c%d.frm", _cd_path_base, "art\\", gArtListDescriptions[8].name, gArtListDescriptions[8].fileNames + v8, _head1[v4], 102, v5);
         } else {
-            sprintf(_art_name, "%s%s%s\\%s%c%c.frm", _cd_path_base, "art\\", gArtListDescriptions[8].name, gArtListDescriptions[8].fileNames + v8, _head1[v4], v9);
+            snprintf(_art_name, sizeof(_art_name), "%s%s%s\\%s%c%c.frm", _cd_path_base, "art\\", gArtListDescriptions[8].name, gArtListDescriptions[8].fileNames + v8, _head1[v4], v9);
         }
     } else {
-        sprintf(_art_name, "%s%s%s\\%s", _cd_path_base, "art\\", gArtListDescriptions[type].name, gArtListDescriptions[type].fileNames + v8);
+        snprintf(_art_name, sizeof(_art_name), "%s%s%s\\%s", _cd_path_base, "art\\", gArtListDescriptions[type].name, gArtListDescriptions[type].fileNames + v8);
     }
 
     return _art_name;
@@ -850,9 +835,9 @@ ArtFrame* artGetFrame(Art* art, int frame, int rotation)
         return NULL;
     }
 
-    ArtFrame* frm = (ArtFrame*)((unsigned char*)art + sizeof(*art) + art->dataOffsets[rotation]);
+    ArtFrame* frm = (ArtFrame*)((unsigned char*)art + sizeof(*art) + art->dataOffsets[rotation] + art->padding[rotation]);
     for (int index = 0; index < frame; index++) {
-        frm = (ArtFrame*)((unsigned char*)frm + sizeof(*frm) + frm->size);
+        frm = (ArtFrame*)((unsigned char*)frm + sizeof(*frm) + frm->size + paddingForSize(frm->size));
     }
     return frm;
 }
@@ -861,12 +846,6 @@ ArtFrame* artGetFrame(Art* art, int frame, int rotation)
 bool artExists(int fid)
 {
     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) {
@@ -876,10 +855,6 @@ bool artExists(int fid)
         }
     }
 
-    if (oldDb != -1) {
-        _db_select(oldDb);
-    }
-
     return result;
 }
 
@@ -889,12 +864,6 @@ bool artExists(int fid)
 bool _art_fid_valid(int fid)
 {
     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) {
@@ -904,10 +873,6 @@ bool _art_fid_valid(int fid)
         }
     }
 
-    if (oldDb != -1) {
-        _db_select(oldDb);
-    }
-
     return result;
 }
 
@@ -954,18 +919,12 @@ int artAliasFid(int fid)
 // 0x419A78
 static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
 {
-    int oldDb = -1;
     int result = -1;
 
-    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
-        oldDb = _db_current();
-        _db_select(_critter_db_handle);
-    }
-
     char* artFilePath = artBuildFilePath(fid);
     if (artFilePath != NULL) {
-        int fileSize;
         bool loaded = false;
+        File* stream = NULL;
 
         if (gArtLanguageInitialized) {
             char* pch = strchr(artFilePath, '\\');
@@ -974,27 +933,23 @@ static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
             }
 
             char localizedPath[COMPAT_MAX_PATH];
-            sprintf(localizedPath, "art\\%s\\%s", gArtLanguage, pch);
+            snprintf(localizedPath, sizeof(localizedPath), "art\\%s\\%s", gArtLanguage, pch);
 
-            if (dbGetFileSize(localizedPath, &fileSize) == 0) {
-                loaded = true;
+            stream = fileOpen(localizedPath, "rb");
+        }
+
+        if (stream == NULL) {
+            stream = fileOpen(artFilePath, "rb");
+        }
+
+        if (stream != NULL) {
+            Art art;
+            if (artReadHeader(&art, stream) == 0) {
+                *sizePtr = artGetDataSize(&art);
+                result = 0;
             }
+            fileClose(stream);
         }
-
-        if (!loaded) {
-            if (dbGetFileSize(artFilePath, &fileSize) == 0) {
-                loaded = true;
-            }
-        }
-
-        if (loaded) {
-            *sizePtr = fileSize;
-            result = 0;
-        }
-    }
-
-    if (oldDb != -1) {
-        _db_select(oldDb);
     }
 
     return result;
@@ -1003,14 +958,8 @@ static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
 // 0x419B78
 static int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
 {
-    int oldDb = -1;
     int result = -1;
 
-    if (FID_TYPE(fid) == OBJ_TYPE_CRITTER) {
-        oldDb = _db_current();
-        _db_select(_critter_db_handle);
-    }
-
     char* artFileName = artBuildFilePath(fid);
     if (artFileName != NULL) {
         bool loaded = false;
@@ -1021,7 +970,7 @@ static int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
             }
 
             char localizedPath[COMPAT_MAX_PATH];
-            sprintf(localizedPath, "art\\%s\\%s", gArtLanguage, pch);
+            snprintf(localizedPath, sizeof(localizedPath), "art\\%s\\%s", gArtLanguage, pch);
 
             if (artRead(localizedPath, data) == 0) {
                 loaded = true;
@@ -1035,16 +984,11 @@ static int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
         }
 
         if (loaded) {
-            // TODO: Why it adds 74?
-            *sizePtr = ((Art*)data)->field_3A + 74;
+            *sizePtr = artGetDataSize((Art*)data);
             result = 0;
         }
     }
 
-    if (oldDb != -1) {
-        _db_select(oldDb);
-    }
-
     return result;
 }
 
@@ -1096,9 +1040,10 @@ out:
 }
 
 // 0x419D60
-static int artReadFrameData(unsigned char* data, File* stream, int count)
+static int artReadFrameData(unsigned char* data, File* stream, int count, int* paddingPtr)
 {
     unsigned char* ptr = data;
+    int padding = 0;
     for (int index = 0; index < count; index++) {
         ArtFrame* frame = (ArtFrame*)ptr;
 
@@ -1110,8 +1055,12 @@ static int artReadFrameData(unsigned char* data, File* stream, int count)
         if (fileRead(ptr + sizeof(ArtFrame), frame->size, 1, stream) != 1) return -1;
 
         ptr += sizeof(ArtFrame) + frame->size;
+        ptr += paddingForSize(frame->size);
+        padding += paddingForSize(frame->size);
     }
 
+    *paddingPtr = padding;
+
     return 0;
 }
 
@@ -1125,7 +1074,7 @@ static int artReadHeader(Art* art, File* stream)
     if (fileReadInt16List(stream, art->xOffsets, ROTATION_COUNT) == -1) return -1;
     if (fileReadInt16List(stream, art->yOffsets, ROTATION_COUNT) == -1) return -1;
     if (fileReadInt32List(stream, art->dataOffsets, ROTATION_COUNT) == -1) return -1;
-    if (fileReadInt32(stream, &(art->field_3A)) == -1) return -1;
+    if (fileReadInt32(stream, &(art->dataSize)) == -1) return -1;
 
     return 0;
 }
@@ -1144,9 +1093,16 @@ int artRead(const char* path, unsigned char* data)
         return -3;
     }
 
+    int currentPadding = paddingForSize(sizeof(Art));
+    int previousPadding = 0;
+
     for (int index = 0; index < ROTATION_COUNT; index++) {
+        art->padding[index] = currentPadding;
+
         if (index == 0 || art->dataOffsets[index - 1] != art->dataOffsets[index]) {
-            if (artReadFrameData(data + sizeof(Art) + art->dataOffsets[index], stream, art->frameCount) != 0) {
+            art->padding[index] += previousPadding;
+            currentPadding += previousPadding;
+            if (artReadFrameData(data + sizeof(Art) + art->dataOffsets[index] + art->padding[index], stream, art->frameCount, &previousPadding) != 0) {
                 fileClose(stream);
                 return -5;
             }
@@ -1174,6 +1130,7 @@ int artWriteFrameData(unsigned char* data, File* stream, int count)
         if (fileWrite(ptr + sizeof(ArtFrame), frame->size, 1, stream) != 1) return -1;
 
         ptr += sizeof(ArtFrame) + frame->size;
+        ptr += paddingForSize(frame->size);
     }
 
     return 0;
@@ -1191,7 +1148,7 @@ int artWriteHeader(Art* art, File* stream)
     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;
+    if (fileWriteInt32(stream, art->dataSize) == -1) return -1;
 
     return 0;
 }
@@ -1218,7 +1175,7 @@ int artWrite(const char* path, unsigned char* data)
 
     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) {
+            if (artWriteFrameData(data + sizeof(Art) + art->dataOffsets[index] + art->padding[index], stream, art->frameCount) != 0) {
                 fileClose(stream);
                 return -1;
             }
@@ -1228,3 +1185,63 @@ int artWrite(const char* path, unsigned char* data)
     fileClose(stream);
     return 0;
 }
+
+static int artGetDataSize(Art* art)
+{
+    int dataSize = sizeof(*art) + art->dataSize;
+
+    for (int index = 0; index < ROTATION_COUNT; index++) {
+        if (index == 0 || art->dataOffsets[index - 1] != art->dataOffsets[index]) {
+            // Assume worst case - every frame is unaligned and need
+            // max padding.
+            dataSize += (sizeof(int) - 1) * art->frameCount;
+        }
+    }
+
+    return dataSize;
+}
+
+static int paddingForSize(int size)
+{
+    return (sizeof(int) - size % sizeof(int)) % sizeof(int);
+}
+
+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,
@@ -65,7 +67,6 @@ typedef enum Background {
     BACKGROUND_COUNT,
 } Background;
 
-#pragma pack(2)
 typedef struct Art {
     int field_0;
     short framesPerSecond;
@@ -74,9 +75,9 @@ typedef struct Art {
     short xOffsets[6];
     short yOffsets[6];
     int dataOffsets[6];
-    int field_3A;
+    int padding[6];
+    int dataSize;
 } Art;
-#pragma pack()
 
 typedef struct ArtFrame {
     short width;
@@ -149,4 +150,26 @@ 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

@@ -9,34 +9,52 @@
 #include "memory_manager.h"
 #include "pointer_registry.h"
 #include "sound.h"
+#include "sound_decoder.h"
 
-static bool _defaultCompressionFunc(char* filePath);
+namespace fallout {
+
+typedef enum AudioFlags {
+    AUDIO_IN_USE = 0x01,
+    AUDIO_COMPRESSED = 0x02,
+} AudioFileFlags;
+
+typedef struct Audio {
+    int flags;
+    int stream;
+    SoundDecoder* soundDecoder;
+    int fileSize;
+    int sampleRate;
+    int channels;
+    int position;
+} Audio;
+
+static bool defaultCompressionFunc(char* filePath);
 static int audioSoundDecoderReadHandler(int fileHandle, void* buf, unsigned int size);
 
 // 0x5108BC
-static AudioFileIsCompressedProc* _queryCompressedFunc = _defaultCompressionFunc;
+static AudioQueryCompressedFunc* queryCompressedFunc = defaultCompressionFunc;
 
 // 0x56CB00
 static int gAudioListLength;
 
 // 0x56CB04
-static AudioFile* gAudioList;
+static Audio* gAudioList;
 
 // 0x41A2B0
-static bool _defaultCompressionFunc(char* filePath)
+static bool defaultCompressionFunc(char* filePath)
 {
     char* pch = strrchr(filePath, '.');
     if (pch != NULL) {
-        strcpy(pch + 1, "war");
+        strcpy(pch + 1, "raw");
     }
 
     return false;
 }
 
 // 0x41A2D0
-static int audioSoundDecoderReadHandler(int fileHandle, void* buffer, unsigned int size)
+static int audioSoundDecoderReadHandler(int handle, void* buffer, unsigned int size)
 {
-    return fileRead(buffer, 1, size, (File*)intToPtr(fileHandle));
+    return fileRead(buffer, 1, size, (File*)intToPtr(handle));
 }
 
 // AudioOpen
@@ -44,10 +62,10 @@ static int audioSoundDecoderReadHandler(int fileHandle, void* buffer, unsigned i
 int audioOpen(const char* fname, int flags, ...)
 {
     char path[80];
-    sprintf(path, "%s", fname);
+    snprintf(path, sizeof(path), "%s", fname);
 
     int compression;
-    if (_queryCompressedFunc(path)) {
+    if (queryCompressedFunc(path)) {
         compression = 2;
     } else {
         compression = 0;
@@ -82,27 +100,27 @@ int audioOpen(const char* fname, int flags, ...)
 
     int index;
     for (index = 0; index < gAudioListLength; index++) {
-        if ((gAudioList[index].flags & AUDIO_FILE_IN_USE) == 0) {
+        if ((gAudioList[index].flags & AUDIO_IN_USE) == 0) {
             break;
         }
     }
 
     if (index == gAudioListLength) {
         if (gAudioList != NULL) {
-            gAudioList = (AudioFile*)internal_realloc_safe(gAudioList, sizeof(*gAudioList) * (gAudioListLength + 1), __FILE__, __LINE__); // "..\int\audio.c", 216
+            gAudioList = (Audio*)internal_realloc_safe(gAudioList, sizeof(*gAudioList) * (gAudioListLength + 1), __FILE__, __LINE__); // "..\int\audio.c", 216
         } else {
-            gAudioList = (AudioFile*)internal_malloc_safe(sizeof(*gAudioList), __FILE__, __LINE__); // "..\int\audio.c", 218
+            gAudioList = (Audio*)internal_malloc_safe(sizeof(*gAudioList), __FILE__, __LINE__); // "..\int\audio.c", 218
         }
         gAudioListLength++;
     }
 
-    AudioFile* audioFile = &(gAudioList[index]);
-    audioFile->flags = AUDIO_FILE_IN_USE;
-    audioFile->fileHandle = ptrToInt(stream);
+    Audio* audioFile = &(gAudioList[index]);
+    audioFile->flags = AUDIO_IN_USE;
+    audioFile->stream = ptrToInt(stream);
 
     if (compression == 2) {
-        audioFile->flags |= AUDIO_FILE_COMPRESSED;
-        audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize));
+        audioFile->flags |= AUDIO_COMPRESSED;
+        audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->stream, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
         audioFile->fileSize *= 2;
     } else {
         audioFile->fileSize = fileGetSize(stream);
@@ -114,30 +132,30 @@ int audioOpen(const char* fname, int flags, ...)
 }
 
 // 0x41A50C
-int audioClose(int fileHandle)
+int audioClose(int handle)
 {
-    AudioFile* audioFile = &(gAudioList[fileHandle - 1]);
-    fileClose((File*)intToPtr(audioFile->fileHandle, true));
+    Audio* audioFile = &(gAudioList[handle - 1]);
+    fileClose((File*)intToPtr(audioFile->stream, true));
 
-    if ((audioFile->flags & AUDIO_FILE_COMPRESSED) != 0) {
+    if ((audioFile->flags & AUDIO_COMPRESSED) != 0) {
         soundDecoderFree(audioFile->soundDecoder);
     }
 
-    memset(audioFile, 0, sizeof(AudioFile));
+    memset(audioFile, 0, sizeof(Audio));
 
     return 0;
 }
 
 // 0x41A574
-int audioRead(int fileHandle, void* buffer, unsigned int size)
+int audioRead(int handle, void* buffer, unsigned int size)
 {
-    AudioFile* audioFile = &(gAudioList[fileHandle - 1]);
+    Audio* audioFile = &(gAudioList[handle - 1]);
 
     int bytesRead;
-    if ((audioFile->flags & AUDIO_FILE_COMPRESSED) != 0) {
+    if ((audioFile->flags & AUDIO_COMPRESSED) != 0) {
         bytesRead = soundDecoderDecode(audioFile->soundDecoder, buffer, size);
     } else {
-        bytesRead = fileRead(buffer, 1, size, (File*)intToPtr(audioFile->fileHandle));
+        bytesRead = fileRead(buffer, 1, size, (File*)intToPtr(audioFile->stream));
     }
 
     audioFile->position += bytesRead;
@@ -146,13 +164,13 @@ int audioRead(int fileHandle, void* buffer, unsigned int size)
 }
 
 // 0x41A5E0
-long audioSeek(int fileHandle, long offset, int origin)
+long audioSeek(int handle, long offset, int origin)
 {
     int pos;
     unsigned char* buf;
     int v10;
 
-    AudioFile* audioFile = &(gAudioList[fileHandle - 1]);
+    Audio* audioFile = &(gAudioList[handle - 1]);
 
     switch (origin) {
     case SEEK_SET:
@@ -168,11 +186,11 @@ long audioSeek(int fileHandle, long offset, int origin)
         assert(false && "Should be unreachable");
     }
 
-    if ((audioFile->flags & AUDIO_FILE_COMPRESSED) != 0) {
+    if ((audioFile->flags & AUDIO_COMPRESSED) != 0) {
         if (pos < audioFile->position) {
             soundDecoderFree(audioFile->soundDecoder);
-            fileSeek((File*)intToPtr(audioFile->fileHandle), 0, SEEK_SET);
-            audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize));
+            fileSeek((File*)intToPtr(audioFile->stream), 0, SEEK_SET);
+            audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->stream, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
             audioFile->position = 0;
             audioFile->fileSize *= 2;
 
@@ -180,11 +198,11 @@ long audioSeek(int fileHandle, long offset, int origin)
                 buf = (unsigned char*)internal_malloc_safe(4096, __FILE__, __LINE__); // "..\int\audio.c", 361
                 while (pos > 4096) {
                     pos -= 4096;
-                    audioRead(fileHandle, buf, 4096);
+                    audioRead(handle, buf, 4096);
                 }
 
                 if (pos != 0) {
-                    audioRead(fileHandle, buf, pos);
+                    audioRead(handle, buf, pos);
                 }
 
                 internal_free_safe(buf, __FILE__, __LINE__); // // "..\int\audio.c", 367
@@ -194,11 +212,11 @@ long audioSeek(int fileHandle, long offset, int origin)
             v10 = audioFile->position - pos;
             while (v10 > 1024) {
                 v10 -= 1024;
-                audioRead(fileHandle, buf, 1024);
+                audioRead(handle, buf, 1024);
             }
 
             if (v10 != 0) {
-                audioRead(fileHandle, buf, v10);
+                audioRead(handle, buf, v10);
             }
 
             // TODO: Probably leaks memory.
@@ -206,21 +224,21 @@ long audioSeek(int fileHandle, long offset, int origin)
 
         return audioFile->position;
     } else {
-        return fileSeek((File*)intToPtr(audioFile->fileHandle), offset, origin);
+        return fileSeek((File*)intToPtr(audioFile->stream), offset, origin);
     }
 }
 
 // 0x41A78C
-long audioGetSize(int fileHandle)
+long audioGetSize(int handle)
 {
-    AudioFile* audioFile = &(gAudioList[fileHandle - 1]);
+    Audio* audioFile = &(gAudioList[handle - 1]);
     return audioFile->fileSize;
 }
 
 // 0x41A7A8
-long audioTell(int fileHandle)
+long audioTell(int handle)
 {
-    AudioFile* audioFile = &(gAudioList[fileHandle - 1]);
+    Audio* audioFile = &(gAudioList[handle - 1]);
     return audioFile->position;
 }
 
@@ -233,9 +251,9 @@ int audioWrite(int handle, const void* buf, unsigned int size)
 }
 
 // 0x41A7D4
-int audioInit(AudioFileIsCompressedProc* isCompressedProc)
+int audioInit(AudioQueryCompressedFunc* func)
 {
-    _queryCompressedFunc = isCompressedProc;
+    queryCompressedFunc = func;
     gAudioList = NULL;
     gAudioListLength = 0;
 
@@ -252,3 +270,5 @@ void audioExit()
     gAudioListLength = 0;
     gAudioList = NULL;
 }
+
+} // namespace fallout

src/audio.h

@@ -1,16 +1,20 @@
 #ifndef AUDIO_H
 #define AUDIO_H
 
-#include "audio_file.h"
+namespace fallout {
+
+typedef bool(AudioQueryCompressedFunc)(char* filePath);
 
 int audioOpen(const char* fname, int mode, ...);
-int audioClose(int fileHandle);
-int audioRead(int fileHandle, void* buffer, unsigned int size);
-long audioSeek(int fileHandle, long offset, int origin);
-long audioGetSize(int fileHandle);
-long audioTell(int fileHandle);
+int audioClose(int handle);
+int audioRead(int handle, void* buffer, unsigned int size);
+long audioSeek(int handle, long offset, int origin);
+long audioGetSize(int handle);
+long audioTell(int handle);
 int audioWrite(int handle, const void* buf, unsigned int size);
-int audioInit(AudioFileIsCompressedProc* isCompressedProc);
+int audioInit(AudioQueryCompressedFunc* func);
 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 {
@@ -32,6 +34,11 @@ static SDL_AudioSpec gAudioEngineSpec;
 static SDL_AudioDeviceID gAudioEngineDeviceId = -1;
 static AudioEngineSoundBuffer gAudioEngineSoundBuffers[AUDIO_ENGINE_SOUND_BUFFERS];
 
+static bool audioEngineIsInitialized()
+{
+    return gAudioEngineDeviceId != -1;
+}
+
 static bool soundBufferIsValid(int soundBufferIndex)
 {
     return soundBufferIndex >= 0 && soundBufferIndex < AUDIO_ENGINE_SOUND_BUFFERS;
@@ -111,30 +118,36 @@ bool audioEngineInit()
 
 void audioEngineExit()
 {
-    if (gAudioEngineDeviceId != -1) {
+    if (audioEngineIsInitialized()) {
         SDL_CloseAudioDevice(gAudioEngineDeviceId);
         gAudioEngineDeviceId = -1;
     }
 
-    SDL_QuitSubSystem(SDL_INIT_AUDIO);
+    if (SDL_WasInit(SDL_INIT_AUDIO)) {
+        SDL_QuitSubSystem(SDL_INIT_AUDIO);
+    }
 }
 
 void audioEnginePause()
 {
-    if (gAudioEngineDeviceId != -1) {
+    if (audioEngineIsInitialized()) {
         SDL_PauseAudioDevice(gAudioEngineDeviceId, 1);
     }
 }
 
 void audioEngineResume()
 {
-    if (gAudioEngineDeviceId != -1) {
+    if (audioEngineIsInitialized()) {
         SDL_PauseAudioDevice(gAudioEngineDeviceId, 0);
     }
 }
 
 int audioEngineCreateSoundBuffer(unsigned int size, int bitsPerSample, int channels, int rate)
 {
+    if (!audioEngineIsInitialized()) {
+        return -1;
+    }
+
     for (int index = 0; index < AUDIO_ENGINE_SOUND_BUFFERS; index++) {
         AudioEngineSoundBuffer* soundBuffer = &(gAudioEngineSoundBuffers[index]);
         std::lock_guard<std::recursive_mutex> lock(soundBuffer->mutex);
@@ -160,6 +173,10 @@ int audioEngineCreateSoundBuffer(unsigned int size, int bitsPerSample, int chann
 
 bool audioEngineSoundBufferRelease(int soundBufferIndex)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -184,6 +201,10 @@ bool audioEngineSoundBufferRelease(int soundBufferIndex)
 
 bool audioEngineSoundBufferSetVolume(int soundBufferIndex, int volume)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -202,6 +223,10 @@ bool audioEngineSoundBufferSetVolume(int soundBufferIndex, int volume)
 
 bool audioEngineSoundBufferGetVolume(int soundBufferIndex, int* volumePtr)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -220,6 +245,10 @@ bool audioEngineSoundBufferGetVolume(int soundBufferIndex, int* volumePtr)
 
 bool audioEngineSoundBufferSetPan(int soundBufferIndex, int pan)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -239,6 +268,10 @@ bool audioEngineSoundBufferSetPan(int soundBufferIndex, int pan)
 
 bool audioEngineSoundBufferPlay(int soundBufferIndex, unsigned int flags)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -261,6 +294,10 @@ bool audioEngineSoundBufferPlay(int soundBufferIndex, unsigned int flags)
 
 bool audioEngineSoundBufferStop(int soundBufferIndex)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -279,6 +316,10 @@ bool audioEngineSoundBufferStop(int soundBufferIndex)
 
 bool audioEngineSoundBufferGetCurrentPosition(int soundBufferIndex, unsigned int* readPosPtr, unsigned int* writePosPtr)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -310,6 +351,10 @@ bool audioEngineSoundBufferGetCurrentPosition(int soundBufferIndex, unsigned int
 
 bool audioEngineSoundBufferSetCurrentPosition(int soundBufferIndex, unsigned int pos)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -328,6 +373,10 @@ bool audioEngineSoundBufferSetCurrentPosition(int soundBufferIndex, unsigned int
 
 bool audioEngineSoundBufferLock(int soundBufferIndex, unsigned int writePos, unsigned int writeBytes, void** audioPtr1, unsigned int* audioBytes1, void** audioPtr2, unsigned int* audioBytes2, unsigned int flags)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -385,6 +434,10 @@ bool audioEngineSoundBufferLock(int soundBufferIndex, unsigned int writePos, uns
 
 bool audioEngineSoundBufferUnlock(int soundBufferIndex, void* audioPtr1, unsigned int audioBytes1, void* audioPtr2, unsigned int audioBytes2)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -403,6 +456,10 @@ bool audioEngineSoundBufferUnlock(int soundBufferIndex, void* audioPtr1, unsigne
 
 bool audioEngineSoundBufferGetStatus(int soundBufferIndex, unsigned int* statusPtr)
 {
+    if (!audioEngineIsInitialized()) {
+        return false;
+    }
+
     if (!soundBufferIsValid(soundBufferIndex)) {
         return false;
     }
@@ -430,3 +487,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

@@ -9,12 +9,30 @@
 #include "platform_compat.h"
 #include "pointer_registry.h"
 #include "sound.h"
+#include "sound_decoder.h"
 
-static bool _defaultCompressionFunc__(char* filePath);
-static int audioFileSoundDecoderReadHandler(int fileHandle, void* buffer, unsigned int size);
+namespace fallout {
+
+typedef enum AudioFileFlags {
+    AUDIO_FILE_IN_USE = 0x01,
+    AUDIO_FILE_COMPRESSED = 0x02,
+} AudioFileFlags;
+
+typedef struct AudioFile {
+    int flags;
+    int stream;
+    SoundDecoder* soundDecoder;
+    int fileSize;
+    int sampleRate;
+    int channels;
+    int position;
+} AudioFile;
+
+static bool defaultCompressionFunc(char* filePath);
+static int audioFileSoundDecoderReadHandler(int handle, void* buffer, unsigned int size);
 
 // 0x5108C0
-static AudioFileIsCompressedProc* _queryCompressedFunc_2 = _defaultCompressionFunc__;
+static AudioFileQueryCompressedFunc* queryCompressedFunc = defaultCompressionFunc;
 
 // 0x56CB10
 static AudioFile* gAudioFileList;
@@ -23,20 +41,20 @@ static AudioFile* gAudioFileList;
 static int gAudioFileListLength;
 
 // 0x41A850
-static bool _defaultCompressionFunc__(char* filePath)
+static bool defaultCompressionFunc(char* filePath)
 {
     char* pch = strrchr(filePath, '.');
     if (pch != NULL) {
-        strcpy(pch + 1, "war");
+        strcpy(pch + 1, "raw");
     }
 
     return false;
 }
 
 // 0x41A870
-static int audioFileSoundDecoderReadHandler(int fileHandle, void* buffer, unsigned int size)
+static int audioFileSoundDecoderReadHandler(int handle, void* buffer, unsigned int size)
 {
-    return fread(buffer, 1, size, (FILE*)intToPtr(fileHandle));
+    return fread(buffer, 1, size, (FILE*)intToPtr(handle));
 }
 
 // 0x41A88C
@@ -46,7 +64,7 @@ int audioFileOpen(const char* fname, int flags, ...)
     strcpy(path, fname);
 
     int compression;
-    if (_queryCompressedFunc_2(path)) {
+    if (queryCompressedFunc(path)) {
         compression = 2;
     } else {
         compression = 0;
@@ -96,11 +114,11 @@ int audioFileOpen(const char* fname, int flags, ...)
 
     AudioFile* audioFile = &(gAudioFileList[index]);
     audioFile->flags = AUDIO_FILE_IN_USE;
-    audioFile->fileHandle = ptrToInt(stream);
+    audioFile->stream = ptrToInt(stream);
 
     if (compression == 2) {
         audioFile->flags |= AUDIO_FILE_COMPRESSED;
-        audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize));
+        audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->stream, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
         audioFile->fileSize *= 2;
     } else {
         audioFile->fileSize = getFileSize(stream);
@@ -112,10 +130,10 @@ int audioFileOpen(const char* fname, int flags, ...)
 }
 
 // 0x41AAA0
-int audioFileClose(int fileHandle)
+int audioFileClose(int handle)
 {
-    AudioFile* audioFile = &(gAudioFileList[fileHandle - 1]);
-    fclose((FILE*)intToPtr(audioFile->fileHandle, true));
+    AudioFile* audioFile = &(gAudioFileList[handle - 1]);
+    fclose((FILE*)intToPtr(audioFile->stream, true));
 
     if ((audioFile->flags & AUDIO_FILE_COMPRESSED) != 0) {
         soundDecoderFree(audioFile->soundDecoder);
@@ -128,16 +146,16 @@ int audioFileClose(int fileHandle)
 }
 
 // 0x41AB08
-int audioFileRead(int fileHandle, void* buffer, unsigned int size)
+int audioFileRead(int handle, void* buffer, unsigned int size)
 {
 
-    AudioFile* ptr = &(gAudioFileList[fileHandle - 1]);
+    AudioFile* ptr = &(gAudioFileList[handle - 1]);
 
     int bytesRead;
     if ((ptr->flags & AUDIO_FILE_COMPRESSED) != 0) {
         bytesRead = soundDecoderDecode(ptr->soundDecoder, buffer, size);
     } else {
-        bytesRead = fread(buffer, 1, size, (FILE*)intToPtr(ptr->fileHandle));
+        bytesRead = fread(buffer, 1, size, (FILE*)intToPtr(ptr->stream));
     }
 
     ptr->position += bytesRead;
@@ -146,13 +164,13 @@ int audioFileRead(int fileHandle, void* buffer, unsigned int size)
 }
 
 // 0x41AB74
-long audioFileSeek(int fileHandle, long offset, int origin)
+long audioFileSeek(int handle, long offset, int origin)
 {
     void* buf;
     int remaining;
     int a4;
 
-    AudioFile* audioFile = &(gAudioFileList[fileHandle - 1]);
+    AudioFile* audioFile = &(gAudioFileList[handle - 1]);
 
     switch (origin) {
     case SEEK_SET:
@@ -172,20 +190,20 @@ long audioFileSeek(int fileHandle, long offset, int origin)
         if (a4 <= audioFile->position) {
             soundDecoderFree(audioFile->soundDecoder);
 
-            fseek((FILE*)intToPtr(audioFile->fileHandle), 0, 0);
+            fseek((FILE*)intToPtr(audioFile->stream), 0, 0);
 
-            audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize));
+            audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->stream, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
             audioFile->fileSize *= 2;
             audioFile->position = 0;
 
             if (a4) {
                 buf = internal_malloc_safe(4096, __FILE__, __LINE__); // "..\int\audiof.c", 364
                 while (a4 > 4096) {
-                    audioFileRead(fileHandle, buf, 4096);
+                    audioFileRead(handle, buf, 4096);
                     a4 -= 4096;
                 }
                 if (a4 != 0) {
-                    audioFileRead(fileHandle, buf, a4);
+                    audioFileRead(handle, buf, a4);
                 }
                 internal_free_safe(buf, __FILE__, __LINE__); // "..\int\audiof.c", 370
             }
@@ -193,46 +211,46 @@ long audioFileSeek(int fileHandle, long offset, int origin)
             buf = internal_malloc_safe(0x400, __FILE__, __LINE__); // "..\int\audiof.c", 316
             remaining = audioFile->position - a4;
             while (remaining > 1024) {
-                audioFileRead(fileHandle, buf, 1024);
+                audioFileRead(handle, buf, 1024);
                 remaining -= 1024;
             }
             if (remaining != 0) {
-                audioFileRead(fileHandle, buf, remaining);
+                audioFileRead(handle, buf, remaining);
             }
             // TODO: Obiously leaks memory.
         }
         return audioFile->position;
     }
 
-    return fseek((FILE*)intToPtr(audioFile->fileHandle), offset, origin);
+    return fseek((FILE*)intToPtr(audioFile->stream), offset, origin);
 }
 
 // 0x41AD20
-long audioFileGetSize(int fileHandle)
+long audioFileGetSize(int handle)
 {
-    AudioFile* audioFile = &(gAudioFileList[fileHandle - 1]);
+    AudioFile* audioFile = &(gAudioFileList[handle - 1]);
     return audioFile->fileSize;
 }
 
 // 0x41AD3C
-long audioFileTell(int fileHandle)
+long audioFileTell(int handle)
 {
-    AudioFile* audioFile = &(gAudioFileList[fileHandle - 1]);
+    AudioFile* audioFile = &(gAudioFileList[handle - 1]);
     return audioFile->position;
 }
 
 // AudiofWrite
 // 0x41AD58
-int audioFileWrite(int fileHandle, const void* buffer, unsigned int size)
+int audioFileWrite(int handle, const void* buffer, unsigned int size)
 {
     debugPrint("AudiofWrite shouldn't be ever called\n");
     return 0;
 }
 
 // 0x41AD68
-int audioFileInit(AudioFileIsCompressedProc* isCompressedProc)
+int audioFileInit(AudioFileQueryCompressedFunc* func)
 {
-    _queryCompressedFunc_2 = isCompressedProc;
+    queryCompressedFunc = func;
     gAudioFileList = NULL;
     gAudioFileListLength = 0;
 
@@ -249,3 +267,5 @@ void audioFileExit()
     gAudioFileListLength = 0;
     gAudioFileList = NULL;
 }
+
+} // namespace fallout

src/audio_file.h

@@ -1,33 +1,20 @@
 #ifndef AUDIO_FILE_H
 #define AUDIO_FILE_H
 
-#include "sound_decoder.h"
+namespace fallout {
 
-typedef enum AudioFileFlags {
-    AUDIO_FILE_IN_USE = 0x01,
-    AUDIO_FILE_COMPRESSED = 0x02,
-} AudioFileFlags;
-
-typedef struct AudioFile {
-    int flags;
-    int fileHandle;
-    SoundDecoder* soundDecoder;
-    int fileSize;
-    int field_10;
-    int field_14;
-    int position;
-} AudioFile;
-
-typedef bool(AudioFileIsCompressedProc)(char* filePath);
+typedef bool(AudioFileQueryCompressedFunc)(char* filePath);
 
 int audioFileOpen(const char* fname, int flags, ...);
-int audioFileClose(int a1);
-int audioFileRead(int a1, void* buf, unsigned int size);
+int audioFileClose(int handle);
+int audioFileRead(int handle, void* buf, unsigned int size);
 long audioFileSeek(int handle, long offset, int origin);
-long audioFileGetSize(int a1);
-long audioFileTell(int a1);
+long audioFileGetSize(int handle);
+long audioFileTell(int handle);
 int audioFileWrite(int handle, const void* buf, unsigned int size);
-int audioFileInit(AudioFileIsCompressedProc* isCompressedProc);
+int audioFileInit(AudioFileQueryCompressedFunc* func);
 void audioFileExit();
 
+} // namespace fallout
+
 #endif /* AUDIO_FILE_H */

src/automap.cc

@@ -8,23 +8,27 @@
 #include "art.h"
 #include "color.h"
 #include "config.h"
-#include "core.h"
 #include "dbox.h"
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
-#include "game_config.h"
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "graph_lib.h"
+#include "input.h"
 #include "item.h"
+#include "kb.h"
 #include "map.h"
 #include "memory.h"
 #include "object.h"
 #include "platform_compat.h"
+#include "settings.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 
+namespace fallout {
+
 #define AUTOMAP_OFFSET_COUNT (AUTOMAP_MAP_COUNT * ELEVATION_COUNT)
 
 #define AUTOMAP_WINDOW_WIDTH (519)
@@ -267,12 +271,9 @@ int automapReset()
 // 0x41B81C
 void automapExit()
 {
-    char* masterPatchesPath;
-    if (configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_MASTER_PATCHES_KEY, &masterPatchesPath)) {
-        char path[COMPAT_MAX_PATH];
-        sprintf(path, "%s\\%s\\%s", masterPatchesPath, "MAPS", AUTOMAP_DB);
-        compat_remove(path);
-    }
+    char path[COMPAT_MAX_PATH];
+    snprintf(path, sizeof(path), "%s\\%s\\%s", settings.system.master_patches_path.c_str(), "MAPS", AUTOMAP_DB);
+    compat_remove(path);
 }
 
 // 0x41B87C
@@ -296,18 +297,15 @@ int _automapDisplayMap(int map)
 // 0x41B8BC
 void automapShow(bool isInGame, bool isUsingScanner)
 {
+    ScopedGameMode gm(GameMode::kAutomap);
+
     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(OBJ_TYPE_INTERFACE, frmIds[index], 0, 0, 0);
-        frmData[index] = artLockFrameData(fid, 0, 0, &(frmHandle[index]));
-        if (frmData[index] == NULL) {
-            while (--index >= 0) {
-                artUnlock(frmHandle[index]);
-            }
+        if (!frmImages[index].lock(fid)) {
             return;
         }
     }
@@ -325,19 +323,55 @@ void automapShow(bool isInGame, bool isUsingScanner)
 
     int automapWindowX = (screenGetWidth() - AUTOMAP_WINDOW_WIDTH) / 2;
     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 window = windowCreate(automapWindowX, automapWindowY, AUTOMAP_WINDOW_WIDTH, AUTOMAP_WINDOW_HEIGHT, color, WINDOW_MODAL | WINDOW_MOVE_ON_TOP);
 
-    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,18 +392,20 @@ 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);
 
     bool done = false;
     while (!done) {
+        sharedFpsLimiter.mark();
+
         bool needsRefresh = false;
 
         // FIXME: There is minor bug in the interface - pressing H/L to toggle
         // high/low details does not update switch state.
-        int keyCode = _get_input();
+        int keyCode = inputGetInput();
         switch (keyCode) {
         case KEY_TAB:
         case KEY_ESCAPE:
@@ -442,9 +478,12 @@ 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;
         }
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
     if (isoWasEnabled) {
@@ -453,10 +492,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.
@@ -674,7 +709,7 @@ int automapSaveCurrent()
 
     // NOTE: Not sure about the size.
     char path[256];
-    sprintf(path, "%s\\%s", "MAPS", AUTOMAP_DB);
+    snprintf(path, sizeof(path), "%s\\%s", "MAPS", AUTOMAP_DB);
 
     File* stream1 = fileOpen(path, "r+b");
     if (stream1 == NULL) {
@@ -705,7 +740,7 @@ int automapSaveCurrent()
     }
 
     if (entryOffset != 0) {
-        sprintf(path, "%s\\%s", "MAPS", AUTOMAP_TMP);
+        snprintf(path, sizeof(path), "%s\\%s", "MAPS", AUTOMAP_TMP);
 
         File* stream2 = fileOpen(path, "wb");
         if (stream2 == NULL) {
@@ -799,15 +834,9 @@ int automapSaveCurrent()
         internal_free(gAutomapEntry.data);
         internal_free(gAutomapEntry.compressedData);
 
-        char* masterPatchesPath;
-        if (!configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_MASTER_PATCHES_KEY, &masterPatchesPath)) {
-            debugPrint("\nAUTOMAP: Error reading config info!\n");
-            return -1;
-        }
-
         // NOTE: Not sure about the size.
         char automapDbPath[512];
-        sprintf(automapDbPath, "%s\\%s\\%s", masterPatchesPath, "MAPS", AUTOMAP_DB);
+        snprintf(automapDbPath, sizeof(automapDbPath), "%s\\%s\\%s", settings.system.master_patches_path.c_str(), "MAPS", AUTOMAP_DB);
         if (compat_remove(automapDbPath) != 0) {
             debugPrint("\nAUTOMAP: Error removing database!\n");
             return -1;
@@ -815,7 +844,7 @@ int automapSaveCurrent()
 
         // NOTE: Not sure about the size.
         char automapTmpPath[512];
-        sprintf(automapTmpPath, "%s\\%s\\%s", masterPatchesPath, "MAPS", AUTOMAP_TMP);
+        snprintf(automapTmpPath, sizeof(automapTmpPath), "%s\\%s\\%s", settings.system.master_patches_path.c_str(), "MAPS", AUTOMAP_TMP);
         if (compat_rename(automapTmpPath, automapDbPath) != 0) {
             debugPrint("\nAUTOMAP: Error renaming database!\n");
             return -1;
@@ -902,7 +931,7 @@ static int automapLoadEntry(int map, int elevation)
     gAutomapEntry.compressedData = NULL;
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s\\%s", "MAPS", AUTOMAP_DB);
+    snprintf(path, sizeof(path), "%s\\%s", "MAPS", AUTOMAP_DB);
 
     bool success = true;
 
@@ -1077,7 +1106,7 @@ static int automapCreate()
     memcpy(gAutomapHeader.offsets, _defam, sizeof(_defam));
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s\\%s", "MAPS", AUTOMAP_DB);
+    snprintf(path, sizeof(path), "%s\\%s", "MAPS", AUTOMAP_DB);
 
     File* stream = fileOpen(path, "wb");
     if (stream == NULL) {
@@ -1132,7 +1161,7 @@ static int _copy_file_data(File* stream1, File* stream2, int length)
 int automapGetHeader(AutomapHeader** automapHeaderPtr)
 {
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s\\%s", "MAPS", AUTOMAP_DB);
+    snprintf(path, sizeof(path), "%s\\%s", "MAPS", AUTOMAP_DB);
 
     File* stream = fileOpen(path, "rb");
     if (stream == NULL) {
@@ -1160,3 +1189,5 @@ void automapSetDisplayMap(int map, bool available)
         _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")
 
@@ -56,4 +58,6 @@ 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

@@ -9,6 +9,8 @@
 #include "memory.h"
 #include "sound.h"
 
+namespace fallout {
+
 // The initial number of cache entries in new cache.
 #define CACHE_ENTRIES_INITIAL_CAPACITY (100)
 
@@ -192,13 +194,13 @@ bool cacheFlush(Cache* cache)
 }
 
 // 0x42019C
-bool cachePrintStats(Cache* cache, char* dest)
+bool cachePrintStats(Cache* cache, char* dest, size_t size)
 {
     if (cache == NULL || dest == NULL) {
         return false;
     }
 
-    sprintf(dest, "Cache stats are disabled.%s", "\n");
+    snprintf(dest, size, "Cache stats are disabled.%s", "\n");
 
     return true;
 }
@@ -613,3 +615,5 @@ static int cacheEntriesCompareByMostRecentHit(const void* a1, const void* a2)
         return 0;
     }
 }
+
+} // namespace fallout

src/cache.h

@@ -1,8 +1,12 @@
 #ifndef CACHE_H
 #define CACHE_H
 
+#include <stddef.h>
+
 #include "heap.h"
 
+namespace fallout {
+
 #define INVALID_CACHE_ENTRY ((CacheEntry*)-1)
 
 typedef enum CacheEntryFlags {
@@ -64,6 +68,8 @@ bool cacheFree(Cache* cache);
 bool cacheLock(Cache* cache, int key, void** data, CacheEntry** cacheEntryPtr);
 bool cacheUnlock(Cache* cache, CacheEntry* cacheEntry);
 bool cacheFlush(Cache* cache);
-bool cachePrintStats(Cache* cache, char* dest);
+bool cachePrintStats(Cache* cache, char* dest, size_t size);
+
+} // 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

@@ -9,28 +9,33 @@
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
-#include "core.h"
 #include "critter.h"
 #include "db.h"
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
-#include "game_config.h"
 #include "game_sound.h"
+#include "input.h"
+#include "kb.h"
 #include "memory.h"
 #include "message.h"
+#include "mouse.h"
 #include "object.h"
 #include "options.h"
 #include "palette.h"
 #include "platform_compat.h"
 #include "proto.h"
+#include "settings.h"
 #include "sfall_config.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "trait.h"
 #include "window_manager.h"
 
+namespace fallout {
+
 #define CS_WINDOW_WIDTH (640)
 #define CS_WINDOW_HEIGHT (480)
 
@@ -81,6 +86,7 @@ static bool characterSelectorWindowRefresh();
 static bool characterSelectorWindowRenderFace();
 static bool characterSelectorWindowRenderStats();
 static bool characterSelectorWindowRenderBio();
+static bool characterSelectorWindowFatalError(bool result);
 
 static void premadeCharactersLocalizePath(char* path);
 
@@ -109,92 +115,33 @@ 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;
-
-// 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 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;
 
 static std::vector<PremadeCharacterDescription> gCustomPremadeCharacterDescriptions;
 
@@ -216,11 +163,13 @@ int characterSelectorOpen()
     int rc = 0;
     bool done = false;
     while (!done) {
+        sharedFpsLimiter.mark();
+
         if (_game_user_wants_to_quit != 0) {
             break;
         }
 
-        int keyCode = _get_input();
+        int keyCode = inputGetInput();
 
         switch (keyCode) {
         case KEY_MINUS:
@@ -290,6 +239,9 @@ int characterSelectorOpen()
             characterSelectorWindowRefresh();
             break;
         }
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
     paletteFadeTo(gPaletteBlack);
@@ -305,9 +257,6 @@ int characterSelectorOpen()
 // 0x4A7468
 static bool characterSelectorWindowInit()
 {
-    int backgroundFid;
-    unsigned char* backgroundFrmData;
-
     if (gCharacterSelectorWindow != -1) {
         return false;
     }
@@ -316,22 +265,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(OBJ_TYPE_INTERFACE, 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,
@@ -340,30 +288,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(OBJ_TYPE_INTERFACE, 122, 0, 0, 0);
-    gCharacterSelectorWindowPreviousButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowPreviousButtonUpFrmHandle);
-    if (gCharacterSelectorWindowPreviousButtonUpFrmData == NULL) {
-        goto err;
+    if (!_previousButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     fid = buildFid(OBJ_TYPE_INTERFACE, 123, 0, 0, 0);
-    gCharacterSelectorWindowPreviousButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowPreviousButtonDownFrmHandle);
-    if (gCharacterSelectorWindowPreviousButtonDownFrmData == NULL) {
-        goto err;
+    if (!_previousButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowPreviousButton = buttonCreate(gCharacterSelectorWindow,
@@ -375,27 +321,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(OBJ_TYPE_INTERFACE, 124, 0, 0, 0);
-    gCharacterSelectorWindowNextButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowNextButtonUpFrmHandle);
-    if (gCharacterSelectorWindowNextButtonUpFrmData == NULL) {
-        goto err;
+    if (!_nextButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     fid = buildFid(OBJ_TYPE_INTERFACE, 125, 0, 0, 0);
-    gCharacterSelectorWindowNextButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowNextButtonDownFrmHandle);
-    if (gCharacterSelectorWindowNextButtonDownFrmData == NULL) {
-        goto err;
+    if (!_nextButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowNextButton = buttonCreate(gCharacterSelectorWindow,
@@ -407,27 +351,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(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
-    gCharacterSelectorWindowTakeButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowTakeButtonUpFrmHandle);
-    if (gCharacterSelectorWindowTakeButtonUpFrmData == NULL) {
-        goto err;
+    if (!_takeButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
-    gCharacterSelectorWindowTakeButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowTakeButtonDownFrmHandle);
-    if (gCharacterSelectorWindowTakeButtonDownFrmData == NULL) {
-        goto err;
+    if (!_takeButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowTakeButton = buttonCreate(gCharacterSelectorWindow,
@@ -439,26 +381,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(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
-    gCharacterSelectorWindowModifyButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowModifyButtonUpFrmHandle);
-    if (gCharacterSelectorWindowModifyButtonUpFrmData == NULL)
-        goto err;
+    if (!_modifyButtonNormalFrmImage.lock(fid))
+        return characterSelectorWindowFatalError(false);
 
     fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
-    gCharacterSelectorWindowModifyButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowModifyButtonDownFrmHandle);
-    if (gCharacterSelectorWindowModifyButtonDownFrmData == NULL) {
-        goto err;
+    if (!_modifyButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowModifyButton = buttonCreate(gCharacterSelectorWindow,
@@ -470,27 +410,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(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
-    gCharacterSelectorWindowCreateButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowCreateButtonUpFrmHandle);
-    if (gCharacterSelectorWindowCreateButtonUpFrmData == NULL) {
-        goto err;
+    if (!_createButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
-    gCharacterSelectorWindowCreateButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowCreateButtonDownFrmHandle);
-    if (gCharacterSelectorWindowCreateButtonDownFrmData == NULL) {
-        goto err;
+    if (!_createButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowCreateButton = buttonCreate(gCharacterSelectorWindow,
@@ -502,27 +440,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(OBJ_TYPE_INTERFACE, 8, 0, 0, 0);
-    gCharacterSelectorWindowBackButtonUpFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowBackButtonUpFrmHandle);
-    if (gCharacterSelectorWindowBackButtonUpFrmData == NULL) {
-        goto err;
+    if (!_backButtonNormalFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     fid = buildFid(OBJ_TYPE_INTERFACE, 9, 0, 0, 0);
-    gCharacterSelectorWindowBackButtonDownFrmData = artLockFrameData(fid, 0, 0, &gCharacterSelectorWindowBackButtonDownFrmHandle);
-    if (gCharacterSelectorWindowBackButtonDownFrmData == NULL) {
-        goto err;
+    if (!_backButtonPressedFrmImage.lock(fid)) {
+        return characterSelectorWindowFatalError(false);
     }
 
     gCharacterSelectorWindowBackButton = buttonCreate(gCharacterSelectorWindow,
@@ -534,12 +470,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);
@@ -549,16 +485,10 @@ static bool characterSelectorWindowInit()
     windowRefresh(gCharacterSelectorWindow);
 
     if (!characterSelectorWindowRefresh()) {
-        goto err;
+        return characterSelectorWindowFatalError(false);
     }
 
     return true;
-
-err:
-
-    characterSelectorWindowFree();
-
-    return false;
 }
 
 // 0x4A7AD4
@@ -573,102 +503,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);
@@ -683,7 +559,7 @@ static void characterSelectorWindowFree()
 static bool characterSelectorWindowRefresh()
 {
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s.gcd", gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
+    snprintf(path, sizeof(path), "%s.gcd", gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
     premadeCharactersLocalizePath(path);
 
     if (_proto_dude_init(path) == -1) {
@@ -715,18 +591,17 @@ static bool characterSelectorWindowRenderFace()
 {
     bool success = false;
 
-    CacheEntry* faceFrmHandle;
+    FrmImage faceFrmImage;
     int faceFid = buildFid(OBJ_TYPE_INTERFACE, gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].face, 0, 0, 0);
-    Art* frm = artLock(faceFid, &faceFrmHandle);
-    if (frm != NULL) {
-        unsigned char* data = artGetFrameData(frm, 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;
@@ -762,13 +637,13 @@ static bool characterSelectorWindowRenderStats()
     value = critterGetStat(gDude, STAT_STRENGTH);
     str = statGetName(STAT_STRENGTH);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -779,13 +654,13 @@ static bool characterSelectorWindowRenderStats()
     value = critterGetStat(gDude, STAT_PERCEPTION);
     str = statGetName(STAT_PERCEPTION);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -794,15 +669,15 @@ static bool characterSelectorWindowRenderStats()
     y += vh;
 
     value = critterGetStat(gDude, STAT_ENDURANCE);
-    str = statGetName(STAT_PERCEPTION);
+    str = statGetName(STAT_ENDURANCE);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -813,13 +688,13 @@ static bool characterSelectorWindowRenderStats()
     value = critterGetStat(gDude, STAT_CHARISMA);
     str = statGetName(STAT_CHARISMA);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -830,13 +705,13 @@ static bool characterSelectorWindowRenderStats()
     value = critterGetStat(gDude, STAT_INTELLIGENCE);
     str = statGetName(STAT_INTELLIGENCE);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -847,13 +722,13 @@ static bool characterSelectorWindowRenderStats()
     value = critterGetStat(gDude, STAT_AGILITY);
     str = statGetName(STAT_AGILITY);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -864,13 +739,13 @@ static bool characterSelectorWindowRenderStats()
     value = critterGetStat(gDude, STAT_LUCK);
     str = statGetName(STAT_LUCK);
 
-    sprintf(text, "%s %02d", str, value);
+    snprintf(text, sizeof(text), "%s %02d", str, value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     str = statGetValueDescription(value);
-    sprintf(text, "  %s", str);
+    snprintf(text, sizeof(text), "  %s", str);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_PRIMARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -890,7 +765,7 @@ static bool characterSelectorWindowRenderStats()
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     value = critterGetStat(gDude, STAT_MAXIMUM_HIT_POINTS);
-    sprintf(text, " %d/%d", critterGetHitPoints(gDude), value);
+    snprintf(text, sizeof(text), " %d/%d", critterGetHitPoints(gDude), value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -905,7 +780,7 @@ static bool characterSelectorWindowRenderStats()
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     value = critterGetStat(gDude, STAT_ARMOR_CLASS);
-    sprintf(text, " %d", value);
+    snprintf(text, sizeof(text), " %d", value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -923,7 +798,7 @@ static bool characterSelectorWindowRenderStats()
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     value = critterGetStat(gDude, STAT_MAXIMUM_ACTION_POINTS);
-    sprintf(text, " %d", value);
+    snprintf(text, sizeof(text), " %d", value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -938,7 +813,7 @@ static bool characterSelectorWindowRenderStats()
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
     value = critterGetStat(gDude, STAT_ARMOR_CLASS);
-    sprintf(text, " %d", value);
+    snprintf(text, sizeof(text), " %d", value);
 
     length = fontGetStringWidth(text);
     fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -959,7 +834,7 @@ static bool characterSelectorWindowRenderStats()
         fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X - length, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
 
         value = skillGetValue(gDude, skills[index]);
-        sprintf(text, " %d%%", value);
+        snprintf(text, sizeof(text), " %d%%", value);
 
         length = fontGetStringWidth(text);
         fontDrawText(gCharacterSelectorWindowBuffer + CS_WINDOW_WIDTH * y + CS_WINDOW_SECONDARY_STAT_MID_X, text, length, CS_WINDOW_WIDTH, _colorTable[992]);
@@ -991,7 +866,7 @@ static bool characterSelectorWindowRenderBio()
     fontSetCurrent(101);
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s.bio", gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
+    snprintf(path, sizeof(path), "%s.bio", gCustomPremadeCharacterDescriptions[gCurrentPremadeCharacter].fileName);
     premadeCharactersLocalizePath(path);
 
     File* stream = fileOpen(path, "rt");
@@ -1013,6 +888,15 @@ static bool characterSelectorWindowRenderBio()
     return true;
 }
 
+// NOTE: Inlined.
+//
+// 0x4A8BD0
+static bool characterSelectorWindowFatalError(bool result)
+{
+    characterSelectorWindowFree();
+    return result;
+}
+
 void premadeCharactersInit()
 {
     char* fileNamesString;
@@ -1054,7 +938,7 @@ void premadeCharactersInit()
                 continue;
             }
 
-            sprintf(gCustomPremadeCharacterDescriptions[index].fileName, "premade\\%s", fileNamesString);
+            snprintf(gCustomPremadeCharacterDescriptions[index].fileName, sizeof(gCustomPremadeCharacterDescriptions[index].fileName), "premade\\%s", fileNamesString);
 
             if (pch != NULL) {
                 *pch = ',';
@@ -1103,11 +987,7 @@ static void premadeCharactersLocalizePath(char* path)
         return;
     }
 
-    char* language;
-    if (!configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language)) {
-        return;
-    }
-
+    const char* language = settings.system.language.c_str();
     if (compat_stricmp(language, ENGLISH) == 0) {
         return;
     }
@@ -1122,3 +1002,5 @@ static void premadeCharactersLocalizePath(char* path)
         strcpy(path, localizedPath);
     }
 }
+
+} // namespace fallout

src/character_selector.h

@@ -1,9 +1,13 @@
 #ifndef CHARACTER_SELECTOR_H
 #define CHARACTER_SELECTOR_H
 
+namespace fallout {
+
 int characterSelectorOpen();
 
 void premadeCharactersInit();
 void premadeCharactersExit();
 
+} // namespace fallout
+
 #endif /* CHARACTER_SELECTOR_H */

src/color.cc

@@ -5,7 +5,9 @@
 
 #include <algorithm>
 
-#include "core.h"
+#include "svga.h"
+
+namespace fallout {
 
 #define COLOR_PALETTE_STACK_CAPACITY 16
 
@@ -84,13 +86,13 @@ unsigned char* _blendTable[256];
 unsigned char _mappedColor[256];
 
 // 0x6738D0
-unsigned char _colorMixAddTable[65536];
+Color colorMixAddTable[256][256];
 
 // 0x6838D0
-unsigned char _intensityColorTable[65536];
+Color intensityColorTable[256][256];
 
 // 0x6938D0
-unsigned char _colorMixMulTable[65536];
+Color colorMixMulTable[256][256];
 
 // 0x6A38D0
 unsigned char _colorTable[32768];
@@ -170,22 +172,19 @@ static void colorPaletteFreeDefaultImpl(void* ptr)
 }
 
 // 0x4C72B4
-int _calculateColor(int a1, int a2)
+int _calculateColor(int intensity, Color color)
 {
-    int v1 = (a1 >> 9) + ((a2 & 0xFF) << 8);
-    return _intensityColorTable[v1];
+    return intensityColorTable[color][intensity / 512];
 }
 
 // 0x4C72E0
-int _Color2RGB_(int a1)
+int Color2RGB(Color c)
 {
-    int v1, v2, v3;
+    int r = _cmap[3 * c] >> 1;
+    int g = _cmap[3 * c + 1] >> 1;
+    int b = _cmap[3 * c + 2] >> 1;
 
-    v1 = _cmap[3 * a1] >> 1;
-    v2 = _cmap[3 * a1 + 1] >> 1;
-    v3 = _cmap[3 * a1 + 2] >> 1;
-
-    return (((v1 << 5) | v2) << 5) | v3;
+    return (r << 10) | (g << 5) | b;
 }
 
 // Performs animated palette transition.
@@ -194,6 +193,8 @@ int _Color2RGB_(int a1)
 void colorPaletteFadeBetween(unsigned char* oldPalette, unsigned char* newPalette, int steps)
 {
     for (int step = 0; step < steps; step++) {
+        sharedFpsLimiter.mark();
+
         unsigned char palette[768];
 
         for (int index = 0; index < 768; index++) {
@@ -207,9 +208,14 @@ void colorPaletteFadeBetween(unsigned char* oldPalette, unsigned char* newPalett
         }
 
         _setSystemPalette(palette);
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
+    sharedFpsLimiter.mark();
     _setSystemPalette(newPalette);
+    renderPresent();
+    sharedFpsLimiter.throttle();
 }
 
 // 0x4C73D4
@@ -257,29 +263,28 @@ void _setSystemPaletteEntries(unsigned char* palette, int start, int end)
 }
 
 // 0x4C7550
-static void _setIntensityTableColor(int a1)
+static void _setIntensityTableColor(int cc)
 {
-    int v1, v2, v3, v4, v5, v6, v7, v8, v9, v10;
-
-    v5 = 0;
-    v10 = a1 << 8;
+    int shift = 0;
 
     for (int index = 0; index < 128; index++) {
-        v1 = (_Color2RGB_(a1) & 0x7C00) >> 10;
-        v2 = (_Color2RGB_(a1) & 0x3E0) >> 5;
-        v3 = (_Color2RGB_(a1) & 0x1F);
+        int r = (Color2RGB(cc) & 0x7C00) >> 10;
+        int g = (Color2RGB(cc) & 0x3E0) >> 5;
+        int b = (Color2RGB(cc) & 0x1F);
 
-        v4 = (((v1 * v5) >> 16) << 10) | (((v2 * v5) >> 16) << 5) | ((v3 * v5) >> 16);
-        _intensityColorTable[index + v10] = _colorTable[v4];
+        int darkerR = ((r * shift) >> 16);
+        int darkerG = ((g * shift) >> 16);
+        int darkerB = ((b * shift) >> 16);
+        int darkerColor = (darkerR << 10) | (darkerG << 5) | darkerB;
+        intensityColorTable[cc][index] = _colorTable[darkerColor];
 
-        v6 = v1 + (((0x1F - v1) * v5) >> 16);
-        v7 = v2 + (((0x1F - v2) * v5) >> 16);
-        v8 = v3 + (((0x1F - v3) * v5) >> 16);
+        int lighterR = r + (((0x1F - r) * shift) >> 16);
+        int lighterG = g + (((0x1F - g) * shift) >> 16);
+        int lighterB = b + (((0x1F - b) * shift) >> 16);
+        int lighterColor = (lighterR << 10) | (lighterG << 5) | lighterB;
+        intensityColorTable[cc][128 + index] = _colorTable[lighterColor];
 
-        v9 = (v6 << 10) | (v7 << 5) | v8;
-        _intensityColorTable[0x7F + index + 1 + v10] = _colorTable[v9];
-
-        v5 += 0x200;
+        shift += 512;
     }
 }
 
@@ -290,7 +295,7 @@ static void _setIntensityTables()
         if (_mappedColor[index] != 0) {
             _setIntensityTableColor(index);
         } else {
-            memset(_intensityColorTable + index * 256, 0, 256);
+            memset(intensityColorTable[index], 0, 256);
         }
     }
 }
@@ -299,20 +304,18 @@ static void _setIntensityTables()
 static void _setMixTableColor(int a1)
 {
     int i;
-    int v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19;
+    int v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19;
     int v20, v21, v22, v23, v24, v25, v26, v27, v28, v29;
 
-    v1 = a1 << 8;
-
     for (i = 0; i < 256; i++) {
         if (_mappedColor[a1] && _mappedColor[i]) {
-            v2 = (_Color2RGB_(a1) & 0x7C00) >> 10;
-            v3 = (_Color2RGB_(a1) & 0x3E0) >> 5;
-            v4 = (_Color2RGB_(a1) & 0x1F);
+            v2 = (Color2RGB(a1) & 0x7C00) >> 10;
+            v3 = (Color2RGB(a1) & 0x3E0) >> 5;
+            v4 = (Color2RGB(a1) & 0x1F);
 
-            v5 = (_Color2RGB_(i) & 0x7C00) >> 10;
-            v6 = (_Color2RGB_(i) & 0x3E0) >> 5;
-            v7 = (_Color2RGB_(i) & 0x1F);
+            v5 = (Color2RGB(i) & 0x7C00) >> 10;
+            v6 = (Color2RGB(i) & 0x3E0) >> 5;
+            v7 = (Color2RGB(i) & 0x1F);
 
             v8 = v2 + v5;
             v9 = v3 + v6;
@@ -357,29 +360,29 @@ static void _setMixTableColor(int a1)
                 v12 = _calculateColor(v19, v18);
             }
 
-            _colorMixAddTable[v1 + i] = v12;
+            colorMixAddTable[a1][i] = v12;
 
-            v20 = (_Color2RGB_(a1) & 0x7C00) >> 10;
-            v21 = (_Color2RGB_(a1) & 0x3E0) >> 5;
-            v22 = (_Color2RGB_(a1) & 0x1F);
+            v20 = (Color2RGB(a1) & 0x7C00) >> 10;
+            v21 = (Color2RGB(a1) & 0x3E0) >> 5;
+            v22 = (Color2RGB(a1) & 0x1F);
 
-            v23 = (_Color2RGB_(i) & 0x7C00) >> 10;
-            v24 = (_Color2RGB_(i) & 0x3E0) >> 5;
-            v25 = (_Color2RGB_(i) & 0x1F);
+            v23 = (Color2RGB(i) & 0x7C00) >> 10;
+            v24 = (Color2RGB(i) & 0x3E0) >> 5;
+            v25 = (Color2RGB(i) & 0x1F);
 
             v26 = (v20 * v23) >> 5;
             v27 = (v21 * v24) >> 5;
             v28 = (v22 * v25) >> 5;
 
             v29 = (v26 << 10) | (v27 << 5) | v28;
-            _colorMixMulTable[v1 + i] = _colorTable[v29];
+            colorMixMulTable[a1][i] = _colorTable[v29];
         } else {
             if (_mappedColor[i]) {
-                _colorMixAddTable[v1 + i] = i;
-                _colorMixMulTable[v1 + i] = i;
+                colorMixAddTable[a1][i] = i;
+                colorMixMulTable[a1][i] = i;
             } else {
-                _colorMixAddTable[v1 + i] = a1;
-                _colorMixMulTable[v1 + i] = a1;
+                colorMixAddTable[a1][i] = a1;
+                colorMixMulTable[a1][i] = a1;
             }
         }
     }
@@ -436,15 +439,15 @@ bool colorPaletteLoad(const char* path)
 
     // NOTE: The value is "NEWC". Original code uses cmp opcode, not stricmp,
     // or comparing characters one-by-one.
-    if (type == 0x4E455743) {
+    if (type == 'NEWC') {
         // NOTE: Uninline.
-        colorPaletteFileRead(fd, _intensityColorTable, 0x10000);
+        colorPaletteFileRead(fd, intensityColorTable, sizeof(intensityColorTable));
 
         // NOTE: Uninline.
-        colorPaletteFileRead(fd, _colorMixAddTable, 0x10000);
+        colorPaletteFileRead(fd, colorMixAddTable, sizeof(colorMixAddTable));
 
         // NOTE: Uninline.
-        colorPaletteFileRead(fd, _colorMixMulTable, 0x10000);
+        colorPaletteFileRead(fd, colorMixMulTable, sizeof(colorMixMulTable));
     } else {
         _setIntensityTables();
 
@@ -477,9 +480,9 @@ static void _buildBlendTable(unsigned char* ptr, unsigned char ch)
 
     beg = ptr;
 
-    r = (_Color2RGB_(ch) & 0x7C00) >> 10;
-    g = (_Color2RGB_(ch) & 0x3E0) >> 5;
-    b = (_Color2RGB_(ch) & 0x1F);
+    r = (Color2RGB(ch) & 0x7C00) >> 10;
+    g = (Color2RGB(ch) & 0x3E0) >> 5;
+    b = (Color2RGB(ch) & 0x1F);
 
     for (i = 0; i < 256; i++) {
         ptr[i] = i;
@@ -498,9 +501,9 @@ static void _buildBlendTable(unsigned char* ptr, unsigned char ch)
 
     for (j = 0; j < 7; j++) {
         for (i = 0; i < 256; i++) {
-            v12 = (_Color2RGB_(i) & 0x7C00) >> 10;
-            v14 = (_Color2RGB_(i) & 0x3E0) >> 5;
-            v16 = (_Color2RGB_(i) & 0x1F);
+            v12 = (Color2RGB(i) & 0x7C00) >> 10;
+            v14 = (Color2RGB(i) & 0x3E0) >> 5;
+            v16 = (Color2RGB(i) & 0x1F);
             int index = 0;
             index |= (r_2 + v12 * v31) / 7 << 10;
             index |= (g_2 + v14 * v31) / 7 << 5;
@@ -679,3 +682,5 @@ void _colorsClose()
 
     gColorPaletteStackSize = 0;
 }
+
+} // namespace fallout

src/color.h

@@ -3,6 +3,9 @@
 
 #include "memory_defs.h"
 
+namespace fallout {
+
+typedef unsigned char Color;
 typedef const char*(ColorFileNameManger)(const char*);
 typedef void(ColorTransitionCallback)();
 
@@ -16,14 +19,14 @@ extern unsigned char _systemCmap[256 * 3];
 extern unsigned char _currentGammaTable[64];
 extern unsigned char* _blendTable[256];
 extern unsigned char _mappedColor[256];
-extern unsigned char _colorMixAddTable[65536];
-extern unsigned char _intensityColorTable[65536];
-extern unsigned char _colorMixMulTable[65536];
+extern Color colorMixAddTable[256][256];
+extern Color intensityColorTable[256][256];
+extern Color colorMixMulTable[256][256];
 extern unsigned char _colorTable[32768];
 
 void colorPaletteSetFileIO(ColorPaletteFileOpenProc* openProc, ColorPaletteFileReadProc* readProc, ColorPaletteCloseProc* closeProc);
-int _calculateColor(int a1, int a2);
-int _Color2RGB_(int a1);
+int _calculateColor(int intensity, Color color);
+int Color2RGB(Color c);
 void colorPaletteFadeBetween(unsigned char* oldPalette, unsigned char* newPalette, int steps);
 void colorPaletteSetTransitionCallback(ColorTransitionCallback* callback);
 void _setSystemPalette(unsigned char* palette);
@@ -40,4 +43,6 @@ bool colorPopColorPalette();
 bool _initColors();
 void _colorsClose();
 
+} // namespace fallout
+
 #endif /* COLOR_H */

src/combat.h

@@ -6,6 +6,8 @@
 #include "obj_types.h"
 #include "proto_types.h"
 
+namespace fallout {
+
 extern int _combatNumTurns;
 extern unsigned int gCombatState;
 
@@ -17,8 +19,8 @@ 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* aiInfoGetFriendlyDead(Object* obj);
@@ -56,6 +58,7 @@ int _combat_explode_scenery(Object* a1, Object* a2);
 void _combat_delete_critter(Object* obj);
 void _combatKillCritterOutsideCombat(Object* critter_obj, char* msg);
 
+int combatGetTargetHighlight();
 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);
@@ -81,4 +84,6 @@ static inline bool isUnarmedHitMode(int hitMode)
         || (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,
@@ -42,10 +44,10 @@ int aiSetAttackWho(Object* critter, int attackWho);
 int aiSetChemUse(Object* critter, int chemUse);
 int aiGetDisposition(Object* obj);
 int aiSetDisposition(Object* obj, int a2);
-int _caiSetupTeamCombat(Object* a1, Object* a2);
-int _caiTeamCombatInit(Object** a1, int a2);
+int _caiSetupTeamCombat(Object* attackerTeam, Object* defenderTeam);
+int _caiTeamCombatInit(Object** crittersList, int crittersListLength);
 void _caiTeamCombatExit();
-Object* _ai_search_inven_weap(Object* critter, int a2, Object* a3);
+Object* _ai_search_inven_weap(Object* critter, bool checkRequiredActionPoints, Object* defender);
 Object* _ai_search_inven_armor(Object* critter);
 int _cAIPrepWeaponItem(Object* critter, Object* item);
 void aiAttemptWeaponReload(Object* critter, int animate);
@@ -57,13 +59,15 @@ bool _combatai_want_to_join(Object* a1);
 bool _combatai_want_to_stop(Object* a1);
 int critterSetTeam(Object* obj, int team);
 int critterSetAiPacket(Object* object, int aiPacket);
-int _combatai_msg(Object* a1, Attack* attack, int a3, int a4);
+int _combatai_msg(Object* critter, Attack* attack, int type, int delay);
 Object* _combat_ai_random_target(Attack* attack);
-int _combatai_check_retaliation(Object* a1, Object* a2);
-bool objectCanHearObject(Object* a1, Object* a2);
+void _combatai_check_retaliation(Object* a1, Object* a2);
+bool isWithinPerception(Object* a1, Object* a2);
 void aiMessageListReloadIfNeeded();
 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,
@@ -169,4 +171,6 @@ typedef enum CombatBadShot {
     COMBAT_BAD_SHOT_BOTH_ARMS_CRIPPLED = 7,
 } CombatBadShot;
 
+} // namespace fallout
+
 #endif /* COMBAT_DEFS_H */

src/config.cc

@@ -11,6 +11,8 @@
 #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.
@@ -246,12 +248,14 @@ bool configGetIntList(Config* config, const char* sectionKey, const char* key, i
         string = pch + 1;
     }
 
-    if (count <= 1) {
+    // SFALL: Fix getting last item in a list if the list has less than the
+    // requested number of values (for `chem_primary_desire`).
+    if (count > 0) {
         *arr = atoi(string);
-        return true;
+        count--;
     }
 
-    return false;
+    return count == 0;
 }
 
 // 0x42C160
@@ -377,10 +381,25 @@ static bool configParseLine(Config* config, char* string)
         *pch = '\0';
     }
 
-    // Find opening bracket.
-    pch = strchr(string, '[');
-    if (pch != NULL) {
-        char* sectionKey = pch + 1;
+    // CE: Original implementation treats any line with brackets as section key.
+    // The problem can be seen when loading Olympus settings (ddraw.ini), which
+    // contains the following line:
+    //
+    //  ```ini
+    //  VersionString=Olympus 2207 [Complete].
+    //  ```
+    //
+    // It thinks that [Complete] is a start of new section, and puts remaining
+    // keys there.
+
+    // Skip leading whitespace.
+    while (isspace(*string)) {
+        string++;
+    }
+
+    // Check if it's a section key.
+    if (*string == '[') {
+        char* sectionKey = string + 1;
 
         // Find closing bracket.
         pch = strchr(sectionKey, ']');
@@ -469,7 +488,7 @@ static bool configTrimString(char* string)
         return false;
     }
 
-    int length = strlen(string);
+    size_t length = strlen(string);
     if (length == 0) {
         return true;
     }
@@ -520,7 +539,7 @@ bool configGetDouble(Config* config, const char* sectionKey, const char* key, do
 bool configSetDouble(Config* config, const char* sectionKey, const char* key, double value)
 {
     char stringValue[32];
-    sprintf(stringValue, "%.6f", value);
+    snprintf(stringValue, sizeof(stringValue), "%.6f", value);
 
     return configSetString(config, sectionKey, key, stringValue);
 }
@@ -547,3 +566,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.h

@@ -1,699 +0,0 @@
-#ifndef CORE_H
-#define CORE_H
-
-#include <SDL.h>
-
-#include "db.h"
-#include "dinput.h"
-#include "geometry.h"
-#include "window.h"
-
-#define MOUSE_DEFAULT_CURSOR_WIDTH 8
-#define MOUSE_DEFAULT_CURSOR_HEIGHT 8
-#define MOUSE_DEFAULT_CURSOR_SIZE (MOUSE_DEFAULT_CURSOR_WIDTH * MOUSE_DEFAULT_CURSOR_HEIGHT)
-
-#define MOUSE_STATE_LEFT_BUTTON_DOWN 0x01
-#define MOUSE_STATE_RIGHT_BUTTON_DOWN 0x02
-
-#define MOUSE_EVENT_LEFT_BUTTON_DOWN 0x01
-#define MOUSE_EVENT_RIGHT_BUTTON_DOWN 0x02
-#define MOUSE_EVENT_LEFT_BUTTON_REPEAT 0x04
-#define MOUSE_EVENT_RIGHT_BUTTON_REPEAT 0x08
-#define MOUSE_EVENT_LEFT_BUTTON_UP 0x10
-#define MOUSE_EVENT_RIGHT_BUTTON_UP 0x20
-#define MOUSE_EVENT_ANY_BUTTON_DOWN (MOUSE_EVENT_LEFT_BUTTON_DOWN | MOUSE_EVENT_RIGHT_BUTTON_DOWN)
-#define MOUSE_EVENT_ANY_BUTTON_REPEAT (MOUSE_EVENT_LEFT_BUTTON_REPEAT | MOUSE_EVENT_RIGHT_BUTTON_REPEAT)
-#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
-
-#define KEY_STATE_UP 0
-#define KEY_STATE_DOWN 1
-#define KEY_STATE_REPEAT 2
-
-#define MODIFIER_KEY_STATE_NUM_LOCK 0x01
-#define MODIFIER_KEY_STATE_CAPS_LOCK 0x02
-#define MODIFIER_KEY_STATE_SCROLL_LOCK 0x04
-
-#define KEYBOARD_EVENT_MODIFIER_CAPS_LOCK 0x0001
-#define KEYBOARD_EVENT_MODIFIER_NUM_LOCK 0x0002
-#define KEYBOARD_EVENT_MODIFIER_SCROLL_LOCK 0x0004
-#define KEYBOARD_EVENT_MODIFIER_LEFT_SHIFT 0x0008
-#define KEYBOARD_EVENT_MODIFIER_RIGHT_SHIFT 0x0010
-#define KEYBOARD_EVENT_MODIFIER_LEFT_ALT 0x0020
-#define KEYBOARD_EVENT_MODIFIER_RIGHT_ALT 0x0040
-#define KEYBOARD_EVENT_MODIFIER_LEFT_CONTROL 0x0080
-#define KEYBOARD_EVENT_MODIFIER_RIGHT_CONTROL 0x0100
-#define KEYBOARD_EVENT_MODIFIER_ANY_SHIFT (KEYBOARD_EVENT_MODIFIER_LEFT_SHIFT | KEYBOARD_EVENT_MODIFIER_RIGHT_SHIFT)
-#define KEYBOARD_EVENT_MODIFIER_ANY_ALT (KEYBOARD_EVENT_MODIFIER_LEFT_ALT | KEYBOARD_EVENT_MODIFIER_RIGHT_ALT)
-#define KEYBOARD_EVENT_MODIFIER_ANY_CONTROL (KEYBOARD_EVENT_MODIFIER_LEFT_CONTROL | KEYBOARD_EVENT_MODIFIER_RIGHT_CONTROL)
-
-#define KEY_QUEUE_SIZE 64
-
-typedef enum Key {
-    KEY_ESCAPE = '\x1b',
-    KEY_TAB = '\x09',
-    KEY_BACKSPACE = '\x08',
-    KEY_RETURN = '\r',
-
-    KEY_SPACE = ' ',
-    KEY_EXCLAMATION = '!',
-    KEY_QUOTE = '"',
-    KEY_NUMBER_SIGN = '#',
-    KEY_DOLLAR = '$',
-    KEY_PERCENT = '%',
-    KEY_AMPERSAND = '&',
-    KEY_SINGLE_QUOTE = '\'',
-    KEY_PAREN_LEFT = '(',
-    KEY_PAREN_RIGHT = ')',
-    KEY_ASTERISK = '*',
-    KEY_PLUS = '+',
-    KEY_COMMA = ',',
-    KEY_MINUS = '-',
-    KEY_DOT = '.',
-    KEY_SLASH = '/',
-    KEY_0 = '0',
-    KEY_1 = '1',
-    KEY_2 = '2',
-    KEY_3 = '3',
-    KEY_4 = '4',
-    KEY_5 = '5',
-    KEY_6 = '6',
-    KEY_7 = '7',
-    KEY_8 = '8',
-    KEY_9 = '9',
-    KEY_COLON = ':',
-    KEY_SEMICOLON = ';',
-    KEY_LESS = '<',
-    KEY_EQUAL = '=',
-    KEY_GREATER = '>',
-    KEY_QUESTION = '?',
-    KEY_AT = '@',
-    KEY_UPPERCASE_A = 'A',
-    KEY_UPPERCASE_B = 'B',
-    KEY_UPPERCASE_C = 'C',
-    KEY_UPPERCASE_D = 'D',
-    KEY_UPPERCASE_E = 'E',
-    KEY_UPPERCASE_F = 'F',
-    KEY_UPPERCASE_G = 'G',
-    KEY_UPPERCASE_H = 'H',
-    KEY_UPPERCASE_I = 'I',
-    KEY_UPPERCASE_J = 'J',
-    KEY_UPPERCASE_K = 'K',
-    KEY_UPPERCASE_L = 'L',
-    KEY_UPPERCASE_M = 'M',
-    KEY_UPPERCASE_N = 'N',
-    KEY_UPPERCASE_O = 'O',
-    KEY_UPPERCASE_P = 'P',
-    KEY_UPPERCASE_Q = 'Q',
-    KEY_UPPERCASE_R = 'R',
-    KEY_UPPERCASE_S = 'S',
-    KEY_UPPERCASE_T = 'T',
-    KEY_UPPERCASE_U = 'U',
-    KEY_UPPERCASE_V = 'V',
-    KEY_UPPERCASE_W = 'W',
-    KEY_UPPERCASE_X = 'X',
-    KEY_UPPERCASE_Y = 'Y',
-    KEY_UPPERCASE_Z = 'Z',
-
-    KEY_BRACKET_LEFT = '[',
-    KEY_BACKSLASH = '\\',
-    KEY_BRACKET_RIGHT = ']',
-    KEY_CARET = '^',
-    KEY_UNDERSCORE = '_',
-
-    KEY_GRAVE = '`',
-    KEY_LOWERCASE_A = 'a',
-    KEY_LOWERCASE_B = 'b',
-    KEY_LOWERCASE_C = 'c',
-    KEY_LOWERCASE_D = 'd',
-    KEY_LOWERCASE_E = 'e',
-    KEY_LOWERCASE_F = 'f',
-    KEY_LOWERCASE_G = 'g',
-    KEY_LOWERCASE_H = 'h',
-    KEY_LOWERCASE_I = 'i',
-    KEY_LOWERCASE_J = 'j',
-    KEY_LOWERCASE_K = 'k',
-    KEY_LOWERCASE_L = 'l',
-    KEY_LOWERCASE_M = 'm',
-    KEY_LOWERCASE_N = 'n',
-    KEY_LOWERCASE_O = 'o',
-    KEY_LOWERCASE_P = 'p',
-    KEY_LOWERCASE_Q = 'q',
-    KEY_LOWERCASE_R = 'r',
-    KEY_LOWERCASE_S = 's',
-    KEY_LOWERCASE_T = 't',
-    KEY_LOWERCASE_U = 'u',
-    KEY_LOWERCASE_V = 'v',
-    KEY_LOWERCASE_W = 'w',
-    KEY_LOWERCASE_X = 'x',
-    KEY_LOWERCASE_Y = 'y',
-    KEY_LOWERCASE_Z = 'z',
-    KEY_BRACE_LEFT = '{',
-    KEY_BAR = '|',
-    KEY_BRACE_RIGHT = '}',
-    KEY_TILDE = '~',
-    KEY_DEL = 127,
-
-    KEY_136 = 136,
-    KEY_146 = 146,
-    KEY_149 = 149,
-    KEY_150 = 150,
-    KEY_151 = 151,
-    KEY_152 = 152,
-    KEY_161 = 161,
-    KEY_163 = 163,
-    KEY_164 = 164,
-    KEY_166 = 166,
-    KEY_168 = 168,
-    KEY_167 = 167,
-    KEY_170 = 170,
-    KEY_172 = 172,
-    KEY_176 = 176,
-    KEY_178 = 178,
-    KEY_179 = 179,
-    KEY_180 = 180,
-    KEY_181 = 181,
-    KEY_186 = 186,
-    KEY_191 = 191,
-    KEY_196 = 196,
-    KEY_199 = 199,
-    KEY_209 = 209,
-    KEY_214 = 214,
-    KEY_215 = 215,
-    KEY_220 = 220,
-    KEY_223 = 223,
-    KEY_224 = 224,
-    KEY_228 = 228,
-    KEY_231 = 231,
-    KEY_232 = 232,
-    KEY_233 = 233,
-    KEY_241 = 241,
-    KEY_246 = 246,
-    KEY_247 = 247,
-    KEY_249 = 249,
-    KEY_252 = 252,
-
-    KEY_ALT_Q = 272,
-    KEY_ALT_W = 273,
-    KEY_ALT_E = 274,
-    KEY_ALT_R = 275,
-    KEY_ALT_T = 276,
-    KEY_ALT_Y = 277,
-    KEY_ALT_U = 278,
-    KEY_ALT_I = 279,
-    KEY_ALT_O = 280,
-    KEY_ALT_P = 281,
-    KEY_ALT_A = 286,
-    KEY_ALT_S = 287,
-    KEY_ALT_D = 288,
-    KEY_ALT_F = 289,
-    KEY_ALT_G = 290,
-    KEY_ALT_H = 291,
-    KEY_ALT_J = 292,
-    KEY_ALT_K = 293,
-    KEY_ALT_L = 294,
-    KEY_ALT_Z = 300,
-    KEY_ALT_X = 301,
-    KEY_ALT_C = 302,
-    KEY_ALT_V = 303,
-    KEY_ALT_B = 304,
-    KEY_ALT_N = 305,
-    KEY_ALT_M = 306,
-
-    KEY_CTRL_Q = 17,
-    KEY_CTRL_W = 23,
-    KEY_CTRL_E = 5,
-    KEY_CTRL_R = 18,
-    KEY_CTRL_T = 20,
-    KEY_CTRL_Y = 25,
-    KEY_CTRL_U = 21,
-    KEY_CTRL_I = 9,
-    KEY_CTRL_O = 15,
-    KEY_CTRL_P = 16,
-    KEY_CTRL_A = 1,
-    KEY_CTRL_S = 19,
-    KEY_CTRL_D = 4,
-    KEY_CTRL_F = 6,
-    KEY_CTRL_G = 7,
-    KEY_CTRL_H = 8,
-    KEY_CTRL_J = 10,
-    KEY_CTRL_K = 11,
-    KEY_CTRL_L = 12,
-    KEY_CTRL_Z = 26,
-    KEY_CTRL_X = 24,
-    KEY_CTRL_C = 3,
-    KEY_CTRL_V = 22,
-    KEY_CTRL_B = 2,
-    KEY_CTRL_N = 14,
-    KEY_CTRL_M = 13,
-
-    KEY_F1 = 315,
-    KEY_F2 = 316,
-    KEY_F3 = 317,
-    KEY_F4 = 318,
-    KEY_F5 = 319,
-    KEY_F6 = 320,
-    KEY_F7 = 321,
-    KEY_F8 = 322,
-    KEY_F9 = 323,
-    KEY_F10 = 324,
-    KEY_F11 = 389,
-    KEY_F12 = 390,
-
-    KEY_SHIFT_F1 = 340,
-    KEY_SHIFT_F2 = 341,
-    KEY_SHIFT_F3 = 342,
-    KEY_SHIFT_F4 = 343,
-    KEY_SHIFT_F5 = 344,
-    KEY_SHIFT_F6 = 345,
-    KEY_SHIFT_F7 = 346,
-    KEY_SHIFT_F8 = 347,
-    KEY_SHIFT_F9 = 348,
-    KEY_SHIFT_F10 = 349,
-    KEY_SHIFT_F11 = 391,
-    KEY_SHIFT_F12 = 392,
-
-    KEY_CTRL_F1 = 350,
-    KEY_CTRL_F2 = 351,
-    KEY_CTRL_F3 = 352,
-    KEY_CTRL_F4 = 353,
-    KEY_CTRL_F5 = 354,
-    KEY_CTRL_F6 = 355,
-    KEY_CTRL_F7 = 356,
-    KEY_CTRL_F8 = 357,
-    KEY_CTRL_F9 = 358,
-    KEY_CTRL_F10 = 359,
-    KEY_CTRL_F11 = 393,
-    KEY_CTRL_F12 = 394,
-
-    KEY_ALT_F1 = 360,
-    KEY_ALT_F2 = 361,
-    KEY_ALT_F3 = 362,
-    KEY_ALT_F4 = 363,
-    KEY_ALT_F5 = 364,
-    KEY_ALT_F6 = 365,
-    KEY_ALT_F7 = 366,
-    KEY_ALT_F8 = 367,
-    KEY_ALT_F9 = 368,
-    KEY_ALT_F10 = 369,
-    KEY_ALT_F11 = 395,
-    KEY_ALT_F12 = 396,
-
-    KEY_HOME = 327,
-    KEY_CTRL_HOME = 375,
-    KEY_ALT_HOME = 407,
-
-    KEY_PAGE_UP = 329,
-    KEY_CTRL_PAGE_UP = 388,
-    KEY_ALT_PAGE_UP = 409,
-
-    KEY_INSERT = 338,
-    KEY_CTRL_INSERT = 402,
-    KEY_ALT_INSERT = 418,
-
-    KEY_DELETE = 339,
-    KEY_CTRL_DELETE = 403,
-    KEY_ALT_DELETE = 419,
-
-    KEY_END = 335,
-    KEY_CTRL_END = 373,
-    KEY_ALT_END = 415,
-
-    KEY_PAGE_DOWN = 337,
-    KEY_ALT_PAGE_DOWN = 417,
-    KEY_CTRL_PAGE_DOWN = 374,
-
-    KEY_ARROW_UP = 328,
-    KEY_CTRL_ARROW_UP = 397,
-    KEY_ALT_ARROW_UP = 408,
-
-    KEY_ARROW_DOWN = 336,
-    KEY_CTRL_ARROW_DOWN = 401,
-    KEY_ALT_ARROW_DOWN = 416,
-
-    KEY_ARROW_LEFT = 331,
-    KEY_CTRL_ARROW_LEFT = 371,
-    KEY_ALT_ARROW_LEFT = 411,
-
-    KEY_ARROW_RIGHT = 333,
-    KEY_CTRL_ARROW_RIGHT = 372,
-    KEY_ALT_ARROW_RIGHT = 413,
-
-    KEY_CTRL_BACKSLASH = 192,
-
-    KEY_NUMBERPAD_5 = 332,
-    KEY_CTRL_NUMBERPAD_5 = 399,
-    KEY_ALT_NUMBERPAD_5 = 9999,
-
-    KEY_FIRST_INPUT_CHARACTER = KEY_SPACE,
-    KEY_LAST_INPUT_CHARACTER = KEY_LOWERCASE_Z,
-} Key;
-
-typedef enum KeyboardLayout {
-    KEYBOARD_LAYOUT_QWERTY,
-    KEYBOARD_LAYOUT_FRENCH,
-    KEYBOARD_LAYOUT_GERMAN,
-    KEYBOARD_LAYOUT_ITALIAN,
-    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;
-    int repeatCount;
-} STRUCT_6ABF50;
-
-typedef struct InputEvent {
-    // This is either logical key or input event id, which can be either
-    // character code pressed or some other numbers used throughout the
-    // game interface.
-    int logicalKey;
-    int mouseX;
-    int mouseY;
-} InputEvent;
-
-typedef void(IdleFunc)();
-typedef void(FocusFunc)(bool focus);
-typedef void(TickerProc)();
-
-typedef struct TickerListNode {
-    int flags;
-    TickerProc* proc;
-    struct TickerListNode* next;
-} TickerListNode;
-
-typedef struct VcrEntry {
-    unsigned int type;
-    unsigned int time;
-    unsigned int counter;
-    union {
-        struct {
-            int mouseX;
-            int mouseY;
-            int keyboardLayout;
-        } initial;
-        struct {
-            short key;
-        } keyboardEvent;
-        struct {
-            int dx;
-            int dy;
-            int buttons;
-        } mouseEvent;
-    };
-} VcrEntry;
-
-typedef struct LogicalKeyEntry {
-    short field_0;
-    short unmodified;
-    short shift;
-    short lmenu;
-    short rmenu;
-    short ctrl;
-} LogicalKeyEntry;
-
-typedef struct KeyboardEvent {
-    int scanCode;
-    unsigned short modifiers;
-} KeyboardEvent;
-
-typedef int(PauseHandler)();
-typedef int(ScreenshotHandler)(int width, int height, unsigned char* buffer, unsigned char* palette);
-typedef void(VcrPlaybackCompletionCallback)(int reason);
-
-extern IdleFunc* _idle_func;
-extern FocusFunc* _focus_func;
-extern int gKeyboardKeyRepeatRate;
-extern int gKeyboardKeyRepeatDelay;
-extern bool _keyboard_hooked;
-extern unsigned char gMouseDefaultCursor[MOUSE_DEFAULT_CURSOR_SIZE];
-extern int _mouse_idling;
-extern unsigned char* gMouseCursorData;
-extern unsigned char* _mouse_shape;
-extern unsigned char* _mouse_fptr;
-extern double gMouseSensitivity;
-extern unsigned int _ticker_;
-extern int gMouseButtonsState;
-
-extern void (*_update_palette_func)();
-extern bool gMmxEnabled;
-extern bool gMmxProbed;
-
-extern unsigned char _kb_installed;
-extern bool gKeyboardDisabled;
-extern bool gKeyboardNumpadDisabled;
-extern bool gKeyboardNumlockDisabled;
-extern int gKeyboardEventQueueWriteIndex;
-extern int gKeyboardEventQueueReadIndex;
-extern short word_51E2E8;
-extern int gModifierKeysState;
-extern int (*_kb_scan_to_ascii)();
-extern VcrEntry* _vcr_buffer;
-extern int _vcr_buffer_index;
-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* 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];
-extern STRUCT_6ABF50 _GNW95_key_time_stamps[SDL_NUM_SCANCODES];
-extern int _input_mx;
-extern int _input_my;
-extern bool gPaused;
-extern int gScreenshotKeyCode;
-extern int _using_msec_timer;
-extern int gPauseKeyCode;
-extern ScreenshotHandler* gScreenshotHandler;
-extern int gInputEventQueueReadIndex;
-extern unsigned char* gScreenshotBuffer;
-extern PauseHandler* gPauseHandler;
-extern int gInputEventQueueWriteIndex;
-extern bool gRunLoopDisabled;
-extern TickerListNode* gTickerListHead;
-extern unsigned int gTickerLastTimestamp;
-extern bool gCursorIsHidden;
-extern int _raw_x;
-extern int gMouseCursorHeight;
-extern int _raw_y;
-extern int _raw_buttons;
-extern int gMouseCursorY;
-extern int gMouseCursorX;
-extern int _mouse_disabled;
-extern int gMouseEvent;
-extern unsigned int _mouse_speed;
-extern int _mouse_curr_frame;
-extern bool gMouseInitialized;
-extern int gMouseCursorPitch;
-extern int gMouseCursorWidth;
-extern int _mouse_num_frames;
-extern int _mouse_hoty;
-extern int _mouse_hotx;
-extern unsigned int _mouse_idle_start_time;
-extern WindowDrawingProc2* _mouse_blit_trans;
-extern WINDOWDRAWINGPROC _mouse_blit;
-extern unsigned char _mouse_trans;
-extern int gMouseRightButtonDownTimestamp;
-extern int gMouseLeftButtonDownTimestamp;
-extern int gMousePreviousEvent;
-extern unsigned short gSixteenBppPalette[256];
-extern Rect _scr_size;
-extern int gRedMask;
-extern int gGreenMask;
-extern int gBlueMask;
-extern int gBlueShift;
-extern int gRedShift;
-extern int gGreenShift;
-extern void (*_scr_blit)(unsigned char* src, int src_pitch, int a3, int src_x, int src_y, int src_width, int src_height, int dest_x, int dest_y);
-extern void (*_zero_mem)();
-extern bool gMmxSupported;
-extern unsigned char gLastVideoModePalette[268];
-extern KeyboardEvent gKeyboardEventsQueue[KEY_QUEUE_SIZE];
-extern LogicalKeyEntry gLogicalKeyEntries[SDL_NUM_SCANCODES];
-extern unsigned char gPressedPhysicalKeys[SDL_NUM_SCANCODES];
-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;
-extern SDL_Renderer* gSdlRenderer;
-extern SDL_Texture* gSdlTexture;
-extern SDL_Surface* gSdlTextureSurface;
-
-int coreInit(int a1);
-void coreExit();
-int _get_input();
-void _process_bk();
-void enqueueInputEvent(int a1);
-int dequeueInputEvent();
-void inputEventQueueReset();
-void tickersExecute();
-void tickersAdd(TickerProc* fn);
-void tickersRemove(TickerProc* fn);
-void tickersEnable();
-void tickersDisable();
-void pauseGame();
-int pauseHandlerDefaultImpl();
-void pauseHandlerConfigure(int keyCode, PauseHandler* fn);
-void takeScreenshot();
-void screenshotBlitter(unsigned char* src, int src_pitch, int a3, int x, int y, int width, int height, int dest_x, int dest_y);
-int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, unsigned char* palette);
-void screenshotHandlerConfigure(int keyCode, ScreenshotHandler* handler);
-unsigned int _get_time();
-void coreDelayProcessingEvents(unsigned int ms);
-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();
-void _GNW95_clear_time_stamps();
-void _GNW95_process_key(KeyboardData* data);
-void _GNW95_lost_focus();
-int mouseInit();
-void mouseFree();
-void mousePrepareDefaultCursor();
-int mouseSetFrame(unsigned char* a1, int width, int height, int pitch, int a5, int a6, int a7);
-void _mouse_anim();
-void mouseShowCursor();
-void mouseHideCursor();
-void _mouse_info();
-void _mouse_simulate_input(int delta_x, int delta_y, int buttons);
-bool _mouse_in(int left, int top, int right, int bottom);
-bool _mouse_click_in(int left, int top, int right, int bottom);
-void mouseGetRect(Rect* rect);
-void mouseGetPosition(int* out_x, int* out_y);
-void _mouse_set_position(int a1, int a2);
-void _mouse_clip();
-int mouseGetEvent();
-bool cursorIsHidden();
-void _mouse_get_raw_state(int* out_x, int* out_y, int* out_buttons);
-void mouseSetSensitivity(double value);
-void mmxSetEnabled(bool a1);
-int _init_mode_320_200();
-int _init_mode_320_400();
-int _init_mode_640_480_16();
-int _init_mode_640_480();
-int _init_mode_640_400();
-int _init_mode_800_600();
-int _init_mode_1024_768();
-int _init_mode_1280_1024();
-void _get_start_mode_();
-void _zero_vid_mem();
-int _GNW95_init_mode_ex(int width, int height, int bpp);
-int _init_vesa_mode(int width, int height);
-int _GNW95_init_window(int width, int height, bool fullscreen);
-int getShiftForBitMask(int mask);
-int directDrawInit(int width, int height, int bpp);
-void directDrawFree();
-void directDrawSetPaletteInRange(unsigned char* a1, int a2, int a3);
-void directDrawSetPalette(unsigned char* palette);
-unsigned char* directDrawGetPalette();
-void _GNW95_ShowRect(unsigned char* src, int src_pitch, int a3, int src_x, int src_y, int src_width, int src_height, int dest_x, int dest_y);
-void _GNW95_MouseShowRect16(unsigned char* src, int srcPitch, int a3, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY);
-void _GNW95_ShowRect16(unsigned char* src, int srcPitch, int a3, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY);
-void _GNW95_MouseShowTransRect16(unsigned char* src, int srcPitch, int a3, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, unsigned char keyColor);
-void _GNW95_zero_vid_mem();
-int keyboardInit();
-void keyboardFree();
-void keyboardReset();
-int _kb_getch();
-void keyboardDisable();
-void keyboardEnable();
-int keyboardIsDisabled();
-void keyboardSetLayout(int new_language);
-int keyboardGetLayout();
-void _kb_simulate_key(KeyboardData* data);
-int _kb_next_ascii_English_US();
-int keyboardDequeueLogicalKeyCode();
-void keyboardBuildQwertyConfiguration();
-void keyboardBuildFrenchConfiguration();
-void keyboardBuildGermanConfiguration();
-void keyboardBuildItalianConfiguration();
-void keyboardBuildSpanishConfiguration();
-void _kb_init_lock_status();
-int keyboardPeekEvent(int index, KeyboardEvent** keyboardEventPtr);
-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);
-
-#endif /* CORE_H */

src/credits.cc

@@ -2,24 +2,28 @@
 
 #include <string.h>
 
+#include <algorithm>
+
 #include "art.h"
 #include "color.h"
-#include "core.h"
 #include "cycle.h"
 #include "db.h"
 #include "debug.h"
 #include "draw.h"
 #include "game_mouse.h"
+#include "input.h"
 #include "memory.h"
 #include "message.h"
+#include "mouse.h"
 #include "palette.h"
 #include "platform_compat.h"
 #include "sound.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 
-#define CREDITS_WINDOW_WIDTH (640)
-#define CREDITS_WINDOW_HEIGHT (480)
+namespace fallout {
+
 #define CREDITS_WINDOW_SCROLLING_DELAY (38)
 
 static bool creditsFileParseNextLine(char* dest, int* font, int* color);
@@ -61,7 +65,7 @@ void creditsOpen(const char* filePath, int backgroundFid, bool useReversedStyle)
     soundContinueAll();
 
     char localizedPath[COMPAT_MAX_PATH];
-    if (_message_make_path(localizedPath, filePath)) {
+    if (_message_make_path(localizedPath, sizeof(localizedPath), filePath)) {
         gCreditsFile = fileOpen(localizedPath, "rt");
         if (gCreditsFile != NULL) {
             soundContinueAll();
@@ -74,39 +78,35 @@ void creditsOpen(const char* filePath, int backgroundFid, bool useReversedStyle)
                 mouseShowCursor();
             }
 
-            int creditsWindowX = (screenGetWidth() - CREDITS_WINDOW_WIDTH) / 2;
-            int creditsWindowY = (screenGetHeight() - CREDITS_WINDOW_HEIGHT) / 2;
-            int window = windowCreate(creditsWindowX, creditsWindowY, CREDITS_WINDOW_WIDTH, CREDITS_WINDOW_HEIGHT, _colorTable[0], 20);
+            int windowWidth = screenGetWidth();
+            int windowHeight = screenGetHeight();
+            int window = windowCreate(0, 0, windowWidth, windowHeight, _colorTable[0], 20);
             soundContinueAll();
             if (window != -1) {
                 unsigned char* windowBuffer = windowGetBuffer(window);
                 if (windowBuffer != NULL) {
-                    unsigned char* backgroundBuffer = (unsigned char*)internal_malloc(CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT);
+                    unsigned char* backgroundBuffer = (unsigned char*)internal_malloc(windowWidth * windowHeight);
                     if (backgroundBuffer) {
                         soundContinueAll();
 
-                        memset(backgroundBuffer, _colorTable[0], CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT);
+                        memset(backgroundBuffer, _colorTable[0], windowWidth * windowHeight);
 
                         if (backgroundFid != -1) {
-                            CacheEntry* backgroundFrmHandle;
-                            Art* frm = artLock(backgroundFid, &backgroundFrmHandle);
-                            if (frm != NULL) {
-                                int width = artGetWidth(frm, 0, 0);
-                                int height = artGetHeight(frm, 0, 0);
-                                unsigned char* backgroundFrmData = artGetFrameData(frm, 0, 0);
-                                blitBufferToBuffer(backgroundFrmData,
-                                    width,
-                                    height,
-                                    width,
-                                    backgroundBuffer + CREDITS_WINDOW_WIDTH * ((CREDITS_WINDOW_HEIGHT - height) / 2) + (CREDITS_WINDOW_WIDTH - width) / 2,
-                                    CREDITS_WINDOW_WIDTH);
-                                artUnlock(backgroundFrmHandle);
+                            FrmImage backgroundFrmImage;
+                            if (backgroundFrmImage.lock(backgroundFid)) {
+                                blitBufferToBuffer(backgroundFrmImage.getData(),
+                                    backgroundFrmImage.getWidth(),
+                                    backgroundFrmImage.getHeight(),
+                                    backgroundFrmImage.getWidth(),
+                                    backgroundBuffer + windowWidth * ((windowHeight - backgroundFrmImage.getHeight()) / 2) + (windowWidth - backgroundFrmImage.getWidth()) / 2,
+                                    windowWidth);
+                                backgroundFrmImage.unlock();
                             }
                         }
 
-                        unsigned char* intermediateBuffer = (unsigned char*)internal_malloc(CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT);
+                        unsigned char* intermediateBuffer = (unsigned char*)internal_malloc(windowWidth * windowHeight);
                         if (intermediateBuffer != NULL) {
-                            memset(intermediateBuffer, 0, CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT);
+                            memset(intermediateBuffer, 0, windowWidth * windowHeight);
 
                             fontSetCurrent(gCreditsWindowTitleFont);
                             int titleFontLineHeight = fontGetLineHeight();
@@ -114,22 +114,21 @@ void creditsOpen(const char* filePath, int backgroundFid, bool useReversedStyle)
                             fontSetCurrent(gCreditsWindowNameFont);
                             int nameFontLineHeight = fontGetLineHeight();
 
-                            int lineHeight = nameFontLineHeight + (titleFontLineHeight >= nameFontLineHeight ? titleFontLineHeight - nameFontLineHeight : 0);
-                            int stringBufferSize = CREDITS_WINDOW_WIDTH * lineHeight;
+                            int lineHeight = std::max(titleFontLineHeight, nameFontLineHeight);
+                            int stringBufferSize = windowWidth * lineHeight;
                             unsigned char* stringBuffer = (unsigned char*)internal_malloc(stringBufferSize);
                             if (stringBuffer != NULL) {
                                 blitBufferToBuffer(backgroundBuffer,
-                                    CREDITS_WINDOW_WIDTH,
-                                    CREDITS_WINDOW_HEIGHT,
-                                    CREDITS_WINDOW_WIDTH,
+                                    windowWidth,
+                                    windowHeight,
+                                    windowWidth,
                                     windowBuffer,
-                                    CREDITS_WINDOW_WIDTH);
+                                    windowWidth);
 
                                 windowRefresh(window);
 
                                 paletteFadeTo(_cmap);
 
-                                unsigned char* v40 = intermediateBuffer + CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT - CREDITS_WINDOW_WIDTH;
                                 char str[260];
                                 int font;
                                 int color;
@@ -138,47 +137,52 @@ void creditsOpen(const char* filePath, int backgroundFid, bool useReversedStyle)
                                 while (creditsFileParseNextLine(str, &font, &color)) {
                                     fontSetCurrent(font);
 
-                                    int v19 = fontGetStringWidth(str);
-                                    if (v19 >= CREDITS_WINDOW_WIDTH) {
+                                    int stringWidth = fontGetStringWidth(str);
+                                    if (stringWidth >= windowWidth) {
                                         continue;
                                     }
 
                                     memset(stringBuffer, 0, stringBufferSize);
-                                    fontDrawText(stringBuffer, str, CREDITS_WINDOW_WIDTH, CREDITS_WINDOW_WIDTH, color);
+                                    fontDrawText(stringBuffer, str, windowWidth, windowWidth, color);
 
-                                    unsigned char* dest = intermediateBuffer + CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT - CREDITS_WINDOW_WIDTH + (CREDITS_WINDOW_WIDTH - v19) / 2;
+                                    unsigned char* dest = intermediateBuffer + windowWidth * windowHeight - windowWidth + (windowWidth - stringWidth) / 2;
                                     unsigned char* src = stringBuffer;
                                     for (int index = 0; index < lineHeight; index++) {
-                                        if (_get_input() != -1) {
+                                        sharedFpsLimiter.mark();
+
+                                        if (inputGetInput() != -1) {
                                             stop = true;
                                             break;
                                         }
 
-                                        memmove(intermediateBuffer, intermediateBuffer + CREDITS_WINDOW_WIDTH, CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT - CREDITS_WINDOW_WIDTH);
-                                        memcpy(dest, src, v19);
+                                        memmove(intermediateBuffer, intermediateBuffer + windowWidth, windowWidth * windowHeight - windowWidth);
+                                        memcpy(dest, src, stringWidth);
 
                                         blitBufferToBuffer(backgroundBuffer,
-                                            CREDITS_WINDOW_WIDTH,
-                                            CREDITS_WINDOW_HEIGHT,
-                                            CREDITS_WINDOW_WIDTH,
+                                            windowWidth,
+                                            windowHeight,
+                                            windowWidth,
                                             windowBuffer,
-                                            CREDITS_WINDOW_WIDTH);
+                                            windowWidth);
 
                                         blitBufferToBufferTrans(intermediateBuffer,
-                                            CREDITS_WINDOW_WIDTH,
-                                            CREDITS_WINDOW_HEIGHT,
-                                            CREDITS_WINDOW_WIDTH,
+                                            windowWidth,
+                                            windowHeight,
+                                            windowWidth,
                                             windowBuffer,
-                                            CREDITS_WINDOW_WIDTH);
+                                            windowWidth);
 
                                         while (getTicksSince(tick) < CREDITS_WINDOW_SCROLLING_DELAY) {
                                         }
 
-                                        tick = _get_time();
+                                        tick = getTicks();
 
                                         windowRefresh(window);
 
-                                        src += CREDITS_WINDOW_WIDTH;
+                                        src += windowWidth;
+
+                                        sharedFpsLimiter.throttle();
+                                        renderPresent();
                                     }
 
                                     if (stop) {
@@ -187,34 +191,39 @@ void creditsOpen(const char* filePath, int backgroundFid, bool useReversedStyle)
                                 }
 
                                 if (!stop) {
-                                    for (int index = 0; index < CREDITS_WINDOW_HEIGHT; index++) {
-                                        if (_get_input() != -1) {
+                                    for (int index = 0; index < windowHeight; index++) {
+                                        sharedFpsLimiter.mark();
+
+                                        if (inputGetInput() != -1) {
                                             break;
                                         }
 
-                                        memmove(intermediateBuffer, intermediateBuffer + CREDITS_WINDOW_WIDTH, CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT - CREDITS_WINDOW_WIDTH);
-                                        memset(intermediateBuffer + CREDITS_WINDOW_WIDTH * CREDITS_WINDOW_HEIGHT - CREDITS_WINDOW_WIDTH, 0, CREDITS_WINDOW_WIDTH);
+                                        memmove(intermediateBuffer, intermediateBuffer + windowWidth, windowWidth * windowHeight - windowWidth);
+                                        memset(intermediateBuffer + windowWidth * windowHeight - windowWidth, 0, windowWidth);
 
                                         blitBufferToBuffer(backgroundBuffer,
-                                            CREDITS_WINDOW_WIDTH,
-                                            CREDITS_WINDOW_HEIGHT,
-                                            CREDITS_WINDOW_WIDTH,
+                                            windowWidth,
+                                            windowHeight,
+                                            windowWidth,
                                             windowBuffer,
-                                            CREDITS_WINDOW_WIDTH);
+                                            windowWidth);
 
                                         blitBufferToBufferTrans(intermediateBuffer,
-                                            CREDITS_WINDOW_WIDTH,
-                                            CREDITS_WINDOW_HEIGHT,
-                                            CREDITS_WINDOW_WIDTH,
+                                            windowWidth,
+                                            windowHeight,
+                                            windowWidth,
                                             windowBuffer,
-                                            CREDITS_WINDOW_WIDTH);
+                                            windowWidth);
 
                                         while (getTicksSince(tick) < CREDITS_WINDOW_SCROLLING_DELAY) {
                                         }
 
-                                        tick = _get_time();
+                                        tick = getTicks();
 
                                         windowRefresh(window);
+
+                                        sharedFpsLimiter.throttle();
+                                        renderPresent();
                                     }
                                 }
 
@@ -274,3 +283,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

@@ -31,6 +31,8 @@
 #include "trait.h"
 #include "worldmap.h"
 
+namespace fallout {
+
 // Maximum length of dude's name length.
 #define DUDE_NAME_MAX_LENGTH (32)
 
@@ -169,13 +171,15 @@ int critterInit()
     }
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%sscrname.msg", asc_5186C8);
+    snprintf(path, sizeof(path), "%sscrname.msg", asc_5186C8);
 
     if (!messageListLoad(&gCritterMessageList, path)) {
         debugPrint("\nError: Loading critter name message file!");
         return -1;
     }
 
+    messageListRepositorySetStandardMessageList(STANDARD_MESSAGE_LIST_SCRNAME, &gCritterMessageList);
+
     return 0;
 }
 
@@ -191,6 +195,7 @@ void critterReset()
 // 0x42D004
 void critterExit()
 {
+    messageListRepositorySetStandardMessageList(STANDARD_MESSAGE_LIST_SCRNAME, nullptr);
     messageListFree(&gCritterMessageList);
 }
 
@@ -420,7 +425,7 @@ int critterAdjustRadiation(Object* obj, int amount)
     }
 
     if (amount > 0) {
-        proto->critter.data.flags |= CRITTER_FLAG_0x2;
+        proto->critter.data.flags |= CRITTER_RADIATED;
     }
 
     if (amount > 0) {
@@ -487,7 +492,7 @@ int _critter_check_rads(Object* obj)
 
     Proto* proto;
     protoGetProto(obj->pid, &proto);
-    if ((proto->critter.data.flags & CRITTER_FLAG_0x2) == 0) {
+    if ((proto->critter.data.flags & CRITTER_RADIATED) == 0) {
         return 0;
     }
 
@@ -528,7 +533,7 @@ int _critter_check_rads(Object* obj)
         queueAddEvent(GAME_TIME_TICKS_PER_HOUR * randomBetween(4, 18), obj, radiationEvent, EVENT_TYPE_RADIATION);
     }
 
-    proto->critter.data.flags &= ~(CRITTER_FLAG_0x2);
+    proto->critter.data.flags &= ~CRITTER_RADIATED;
 
     return 0;
 }
@@ -874,7 +879,7 @@ void critterKill(Object* critter, int anim, bool a3)
         rectUnion(&updatedRect, &tempRect, &updatedRect);
     }
 
-    if (!_critter_flag_check(critter->pid, CRITTER_FLAG_0x800)) {
+    if (!_critter_flag_check(critter->pid, CRITTER_FLAT)) {
         critter->flags |= OBJECT_NO_BLOCK;
         _obj_toggle_flat(critter, &tempRect);
     }
@@ -1249,7 +1254,7 @@ int knockoutEventProcess(Object* obj, void* data)
     obj->data.critter.combat.results |= DAM_KNOCKED_DOWN;
 
     if (isInCombat()) {
-        obj->data.critter.combat.maneuver |= CRITTER_MANEUVER_0x01;
+        obj->data.critter.combat.maneuver |= CRITTER_MANEUVER_ENGAGING;
     } else {
         _dude_standup(obj);
     }
@@ -1390,3 +1395,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,
@@ -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

@@ -1,14 +1,17 @@
 #include "cycle.h"
 
 #include "color.h"
-#include "core.h"
-#include "game_config.h"
+#include "input.h"
 #include "palette.h"
+#include "settings.h"
+#include "svga.h"
 
-#define COLOR_CYCLE_PERIOD_1 (200U)
-#define COLOR_CYCLE_PERIOD_2 (142U)
-#define COLOR_CYCLE_PERIOD_3 (100U)
-#define COLOR_CYCLE_PERIOD_4 (33U)
+namespace fallout {
+
+static constexpr unsigned int kSlowCyclePeriod = 1000 / 5;
+static constexpr unsigned int kMediumCyclePeriod = 1000 / 7;
+static constexpr unsigned int kFastCyclePeriod = 1000 / 10;
+static constexpr unsigned int kVeryFastCyclePeriod = 1000 / 30;
 
 // 0x51843C
 static int gColorCycleSpeedFactor = 1;
@@ -19,7 +22,7 @@ static int gColorCycleSpeedFactor = 1;
 // Green.
 //
 // 0x518440
-static unsigned char _slime[12] = {
+static unsigned char slime[12] = {
     0, 108, 0,
     11, 115, 7,
     27, 123, 15,
@@ -29,7 +32,7 @@ static unsigned char _slime[12] = {
 // Light gray?
 //
 // 0x51844C
-static unsigned char _shoreline[18] = {
+static unsigned char shoreline[18] = {
     83, 63, 43,
     75, 59, 43,
     67, 55, 39,
@@ -41,7 +44,7 @@ static unsigned char _shoreline[18] = {
 // Orange.
 //
 // 0x51845E
-static unsigned char _fire_slow[15] = {
+static unsigned char fire_slow[15] = {
     255, 0, 0,
     215, 0, 0,
     147, 43, 11,
@@ -52,7 +55,7 @@ static unsigned char _fire_slow[15] = {
 // Red.
 //
 // 0x51846D
-static unsigned char _fire_fast[15] = {
+static unsigned char fire_fast[15] = {
     71, 0, 0,
     123, 0, 0,
     179, 0, 0,
@@ -63,7 +66,7 @@ static unsigned char _fire_fast[15] = {
 // Light blue.
 //
 // 0x51847C
-static unsigned char _monitors[15] = {
+static unsigned char monitors[15] = {
     107, 107, 111,
     99, 103, 127,
     87, 107, 143,
@@ -79,38 +82,17 @@ static bool gColorCycleInitialized = false;
 // 0x518490
 static bool gColorCycleEnabled = false;
 
-// 0x518494
-static int _slime_start = 0;
-
-// 0x518498
-static int _shoreline_start = 0;
-
-// 0x51849C
-static int _fire_slow_start = 0;
-
-// 0x5184A0
-static int _fire_fast_start = 0;
-
-// 0x5184A4
-static int _monitors_start = 0;
-
-// 0x5184A8
-static unsigned char _bobber_red = 0;
-
-// 0x5184A9
-static signed char _bobber_diff = -4;
-
 // 0x56D7D0
-static unsigned int gColorCycleTimestamp3;
+static unsigned int last_cycle_fast;
 
 // 0x56D7D4
-static unsigned int gColorCycleTimestamp1;
+static unsigned int last_cycle_slow;
 
 // 0x56D7D8
-static unsigned int gColorCycleTimestamp2;
+static unsigned int last_cycle_medium;
 
 // 0x56D7DC
-static unsigned int gColorCycleTimestamp4;
+static unsigned int last_cycle_very_fast;
 
 // 0x42E780
 void colorCycleInit()
@@ -119,33 +101,28 @@ void colorCycleInit()
         return;
     }
 
-    bool colorCycling;
-    if (!configGetBool(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_COLOR_CYCLING_KEY, &colorCycling)) {
-        colorCycling = true;
-    }
-
-    if (!colorCycling) {
+    if (!settings.system.color_cycling) {
         return;
     }
 
     for (int index = 0; index < 12; index++) {
-        _slime[index] >>= 2;
+        slime[index] >>= 2;
     }
 
     for (int index = 0; index < 18; index++) {
-        _shoreline[index] >>= 2;
+        shoreline[index] >>= 2;
     }
 
     for (int index = 0; index < 15; index++) {
-        _fire_slow[index] >>= 2;
+        fire_slow[index] >>= 2;
     }
 
     for (int index = 0; index < 15; index++) {
-        _fire_fast[index] >>= 2;
+        fire_fast[index] >>= 2;
     }
 
     for (int index = 0; index < 15; index++) {
-        _monitors[index] >>= 2;
+        monitors[index] >>= 2;
     }
 
     tickersAdd(colorCycleTicker);
@@ -153,22 +130,17 @@ void colorCycleInit()
     gColorCycleInitialized = true;
     gColorCycleEnabled = true;
 
-    int cycleSpeedFactor;
-    if (!configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CYCLE_SPEED_FACTOR_KEY, &cycleSpeedFactor)) {
-        cycleSpeedFactor = 1;
-    }
-
-    cycleSetSpeedFactor(cycleSpeedFactor);
+    cycleSetSpeedFactor(settings.system.cycle_speed_factor);
 }
 
 // 0x42E8CC
 void colorCycleReset()
 {
     if (gColorCycleInitialized) {
-        gColorCycleTimestamp1 = 0;
-        gColorCycleTimestamp2 = 0;
-        gColorCycleTimestamp3 = 0;
-        gColorCycleTimestamp4 = 0;
+        last_cycle_slow = 0;
+        last_cycle_medium = 0;
+        last_cycle_fast = 0;
+        last_cycle_very_fast = 0;
         tickersAdd(colorCycleTicker);
         gColorCycleEnabled = true;
     }
@@ -206,12 +178,33 @@ bool colorCycleEnabled()
 void cycleSetSpeedFactor(int value)
 {
     gColorCycleSpeedFactor = value;
-    configSetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CYCLE_SPEED_FACTOR_KEY, value);
+    settings.system.cycle_speed_factor = value;
 }
 
 // 0x42E97C
 void colorCycleTicker()
 {
+    // 0x518494
+    static int slime_start = 0;
+
+    // 0x518498
+    static int shoreline_start = 0;
+
+    // 0x51849C
+    static int fire_slow_start = 0;
+
+    // 0x5184A0
+    static int fire_fast_start = 0;
+
+    // 0x5184A4
+    static int monitors_start = 0;
+
+    // 0x5184A8
+    static unsigned char bobber_red = 0;
+
+    // 0x5184A9
+    static signed char bobber_diff = -4;
+
     if (!gColorCycleEnabled) {
         return;
     }
@@ -219,111 +212,111 @@ void colorCycleTicker()
     bool changed = false;
 
     unsigned char* palette = _getSystemPalette();
-    unsigned int time = _get_time();
+    unsigned int time = getTicks();
 
-    if (getTicksBetween(time, gColorCycleTimestamp1) >= COLOR_CYCLE_PERIOD_1 * gColorCycleSpeedFactor) {
+    if (getTicksBetween(time, last_cycle_slow) >= kSlowCyclePeriod * gColorCycleSpeedFactor) {
         changed = true;
-        gColorCycleTimestamp1 = time;
+        last_cycle_slow = time;
 
         int paletteIndex = 229 * 3;
 
-        for (int index = _slime_start; index < 12; index++) {
-            palette[paletteIndex++] = _slime[index];
+        for (int index = slime_start; index < 12; index++) {
+            palette[paletteIndex++] = slime[index];
         }
 
-        for (int index = 0; index < _slime_start; index++) {
-            palette[paletteIndex++] = _slime[index];
+        for (int index = 0; index < slime_start; index++) {
+            palette[paletteIndex++] = slime[index];
         }
 
-        _slime_start -= 3;
-        if (_slime_start < 0) {
-            _slime_start = 9;
+        slime_start -= 3;
+        if (slime_start < 0) {
+            slime_start = 9;
         }
 
         paletteIndex = 248 * 3;
 
-        for (int index = _shoreline_start; index < 18; index++) {
-            palette[paletteIndex++] = _shoreline[index];
+        for (int index = shoreline_start; index < 18; index++) {
+            palette[paletteIndex++] = shoreline[index];
         }
 
-        for (int index = 0; index < _shoreline_start; index++) {
-            palette[paletteIndex++] = _shoreline[index];
+        for (int index = 0; index < shoreline_start; index++) {
+            palette[paletteIndex++] = shoreline[index];
         }
 
-        _shoreline_start -= 3;
-        if (_shoreline_start < 0) {
-            _shoreline_start = 15;
+        shoreline_start -= 3;
+        if (shoreline_start < 0) {
+            shoreline_start = 15;
         }
 
         paletteIndex = 238 * 3;
 
-        for (int index = _fire_slow_start; index < 15; index++) {
-            palette[paletteIndex++] = _fire_slow[index];
+        for (int index = fire_slow_start; index < 15; index++) {
+            palette[paletteIndex++] = fire_slow[index];
         }
 
-        for (int index = 0; index < _fire_slow_start; index++) {
-            palette[paletteIndex++] = _fire_slow[index];
+        for (int index = 0; index < fire_slow_start; index++) {
+            palette[paletteIndex++] = fire_slow[index];
         }
 
-        _fire_slow_start -= 3;
-        if (_fire_slow_start < 0) {
-            _fire_slow_start = 12;
+        fire_slow_start -= 3;
+        if (fire_slow_start < 0) {
+            fire_slow_start = 12;
         }
     }
 
-    if (getTicksBetween(time, gColorCycleTimestamp2) >= COLOR_CYCLE_PERIOD_2 * gColorCycleSpeedFactor) {
+    if (getTicksBetween(time, last_cycle_medium) >= kMediumCyclePeriod * gColorCycleSpeedFactor) {
         changed = true;
-        gColorCycleTimestamp2 = time;
+        last_cycle_medium = time;
 
         int paletteIndex = 243 * 3;
 
-        for (int index = _fire_fast_start; index < 15; index++) {
-            palette[paletteIndex++] = _fire_fast[index];
+        for (int index = fire_fast_start; index < 15; index++) {
+            palette[paletteIndex++] = fire_fast[index];
         }
 
-        for (int index = 0; index < _fire_fast_start; index++) {
-            palette[paletteIndex++] = _fire_fast[index];
+        for (int index = 0; index < fire_fast_start; index++) {
+            palette[paletteIndex++] = fire_fast[index];
         }
 
-        _fire_fast_start -= 3;
-        if (_fire_fast_start < 0) {
-            _fire_fast_start = 12;
+        fire_fast_start -= 3;
+        if (fire_fast_start < 0) {
+            fire_fast_start = 12;
         }
     }
 
-    if (getTicksBetween(time, gColorCycleTimestamp3) >= COLOR_CYCLE_PERIOD_3 * gColorCycleSpeedFactor) {
+    if (getTicksBetween(time, last_cycle_fast) >= kFastCyclePeriod * gColorCycleSpeedFactor) {
         changed = true;
-        gColorCycleTimestamp3 = time;
+        last_cycle_fast = time;
 
         int paletteIndex = 233 * 3;
 
-        for (int index = _monitors_start; index < 15; index++) {
-            palette[paletteIndex++] = _monitors[index];
+        for (int index = monitors_start; index < 15; index++) {
+            palette[paletteIndex++] = monitors[index];
         }
 
-        for (int index = 0; index < _monitors_start; index++) {
-            palette[paletteIndex++] = _monitors[index];
+        for (int index = 0; index < monitors_start; index++) {
+            palette[paletteIndex++] = monitors[index];
         }
 
-        _monitors_start -= 3;
+        monitors_start -= 3;
 
-        if (_monitors_start < 0) {
-            _monitors_start = 12;
+        if (monitors_start < 0) {
+            monitors_start = 12;
         }
     }
 
-    if (getTicksBetween(time, gColorCycleTimestamp4) >= COLOR_CYCLE_PERIOD_4 * gColorCycleSpeedFactor) {
+    if (getTicksBetween(time, last_cycle_very_fast) >= kVeryFastCyclePeriod * gColorCycleSpeedFactor) {
         changed = true;
-        gColorCycleTimestamp4 = time;
+        last_cycle_very_fast = time;
 
-        if (_bobber_red == 0 || _bobber_red == 60) {
-            _bobber_diff = -_bobber_diff;
+        if (bobber_red == 0 || bobber_red == 60) {
+            bobber_diff = -bobber_diff;
         }
 
-        _bobber_red += _bobber_diff;
+        bobber_red += bobber_diff;
 
         int paletteIndex = 254 * 3;
-        palette[paletteIndex++] = _bobber_red;
+        palette[paletteIndex++] = bobber_red;
         palette[paletteIndex++] = 0;
         palette[paletteIndex++] = 0;
     }
@@ -332,3 +325,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

@@ -8,6 +8,8 @@
 #include "pcx.h"
 #include "platform_compat.h"
 
+namespace fallout {
+
 // 0x5184AC
 DatafileLoader* gDatafileLoader = NULL;
 
@@ -193,3 +195,5 @@ unsigned char* datafileLoad(char* path, int* sizePtr)
     *sizePtr = size;
     return data;
 }
+
+} // namespace fallout

src/datafile.h

@@ -1,6 +1,8 @@
 #ifndef DATAFILE_H
 #define DATAFILE_H
 
+namespace fallout {
+
 typedef unsigned char*(DatafileLoader)(char* path, unsigned char* palette, int* widthPtr, int* heightPtr);
 typedef char*(DatafileNameMangler)(char* path);
 
@@ -21,4 +23,6 @@ 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

@@ -7,6 +7,8 @@
 #include "platform_compat.h"
 #include "xfile.h"
 
+namespace fallout {
+
 typedef struct FileList {
     XList xlist;
     struct FileList* next;
@@ -61,18 +63,6 @@ int dbOpen(const char* filePath1, int a2, const char* filePath2, int a4)
     return 0;
 }
 
-// 0x4C5D54
-int _db_select(int dbHandle)
-{
-    return 0;
-}
-
-// NOTE: Uncollapsed 0x4C5D54.
-int _db_current()
-{
-    return 0;
-}
-
 // 0x4C5D58
 int _db_total()
 {
@@ -336,7 +326,7 @@ int fileReadInt32(File* stream, int* valuePtr)
         return -1;
     }
 
-    *valuePtr = ((value >> 24) & 0xFF) | ((value >> 8) & 0xFF00) | ((value << 8) & 0xFF0000) | ((value << 24) & 0xFF000000);
+    *valuePtr = ((value & 0xFF000000) >> 24) | ((value & 0xFF0000) >> 8) | ((value & 0xFF00) << 8) | ((value & 0xFF) << 24);
 
     return 0;
 }
@@ -509,7 +499,7 @@ int fileReadInt32List(File* stream, int* arr, int count)
 
     for (int index = 0; index < count; index++) {
         int value = arr[index];
-        arr[index] = ((value >> 24) & 0xFF) | ((value >> 8) & 0xFF00) | ((value << 8) & 0xFF0000) | ((value << 24) & 0xFF000000);
+        arr[index] = ((value & 0xFF000000) >> 24) | ((value & 0xFF0000) >> 8) | ((value & 0xFF00) << 8) | ((value & 0xFF) << 24);
     }
 
     return 0;
@@ -643,17 +633,18 @@ int fileNameListInit(const char* pattern, char*** fileNameListPtr, int a3, int a
         bool isWildcard = *pattern == '*';
 
         for (int index = 0; index < fileNamesLength; index += 1) {
-            const char* name = xlist->fileNames[index];
+            char* name = xlist->fileNames[index];
             char dir[COMPAT_MAX_DIR];
             char fileName[COMPAT_MAX_FNAME];
             char extension[COMPAT_MAX_EXT];
+            compat_windows_path_to_native(name);
             compat_splitpath(name, NULL, dir, fileName, extension);
 
-            if (!isWildcard || *dir == '\0' || strchr(dir, '\\') == NULL) {
+            if (!isWildcard || *dir == '\0' || (strchr(dir, '\\') == NULL && 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);
+                snprintf(path, sizeof(path), "%s%s", fileName, extension);
                 free(xlist->fileNames[length]);
                 xlist->fileNames[length] = compat_strdup(path);
                 length++;
@@ -697,14 +688,6 @@ void fileNameListFree(char*** fileNameListPtr, int a2)
     free(currentFileList);
 }
 
-// NOTE: This function does nothing. It was probably used to set memory procs
-// for building file name list.
-//
-// 0x4C68B8
-void _db_register_mem(MallocProc* mallocProc, StrdupProc* strdupProc, FreeProc* freeProc)
-{
-}
-
 // TODO: Return type should be long.
 //
 // 0x4C68BC
@@ -725,16 +708,10 @@ void fileSetReadProgressHandler(FileReadProgressHandler* handler, int size)
     }
 }
 
-// NOTE: This function is called when fallout2.cfg has "hashing" enabled, but
-// it does nothing. It's impossible to guess it's name.
-//
-// 0x4C68E4
-void _db_enable_hash_table_()
-{
-}
-
 // 0x4C68E8
 int _db_list_compare(const void* p1, const void* p2)
 {
     return compat_stricmp(*(const char**)p1, *(const char**)p2);
 }
+
+} // namespace fallout

src/db.h

@@ -3,16 +3,15 @@
 
 #include <stddef.h>
 
-#include "memory_defs.h"
 #include "xfile.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_select(int dbHandle);
-int _db_current();
 int _db_total();
 void dbExit();
 int dbGetFileSize(const char* filePath, int* sizePtr);
@@ -61,9 +60,9 @@ int _db_fwriteLongCount(File* stream, int* arr, int count);
 int fileWriteUInt32List(File* stream, unsigned int* arr, int count);
 int fileNameListInit(const char* pattern, char*** fileNames, int a3, int a4);
 void fileNameListFree(char*** fileNames, int a2);
-void _db_register_mem(MallocProc* mallocProc, StrdupProc* strdupProc, FreeProc* freeProc);
 int fileGetSize(File* stream);
 void fileSetReadProgressHandler(FileReadProgressHandler* handler, int size);
-void _db_enable_hash_table_();
+
+} // namespace fallout
 
 #endif /* DB_H */

src/dbox.cc

@@ -8,17 +8,22 @@
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
-#include "core.h"
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
 #include "game_sound.h"
+#include "input.h"
+#include "kb.h"
 #include "message.h"
+#include "mouse.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 #include "word_wrap.h"
 
+namespace fallout {
+
 #define FILE_DIALOG_LINE_COUNT 12
 
 #define FILE_DIALOG_DOUBLE_CLICK_DELAY 32
@@ -173,7 +178,7 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 
     int linesCount = 0;
     for (int index = 0; index < bodyLength; index++) {
-        // NOTE: Calls [fontGetStringWidth] twice because of [max] macro.
+        // NOTE: Originally there is no `max` macro.
         maximumLineWidth = std::max(fontGetStringWidth(body[index]), maximumLineWidth);
         linesCount++;
     }
@@ -193,94 +198,76 @@ 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(OBJ_TYPE_INTERFACE, 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_MODAL | WINDOW_MOVE_ON_TOP);
     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(OBJ_TYPE_INTERFACE, 209, 0, 0, 0);
-        doneBox = artLockFrameDataReturningSize(doneBoxFid, &doneBoxHandle, &doneBoxWidth, &doneBoxHeight);
-        if (doneBox == NULL) {
-            artUnlock(backgroundHandle);
+        if (!doneBoxFrmImage.lock(doneBoxFid)) {
             fontSetCurrent(savedFont);
             windowDestroy(win);
             return -1;
         }
 
-        int downButtonFid = buildFid(OBJ_TYPE_INTERFACE, 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(OBJ_TYPE_INTERFACE, 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;
         }
 
         char path[COMPAT_MAX_PATH];
-        sprintf(path, "%s%s", asc_5186C8, "DBOX.MSG");
+        snprintf(path, sizeof(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 +279,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,102 +314,95 @@ 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(OBJ_TYPE_INTERFACE, 209, 0, 0, 0);
-            unsigned char* doneBox = artLockFrameDataReturningSize(doneBoxFid, &doneBoxHandle, &doneBoxWidth, &doneBoxHeight);
-            if (doneBox == NULL) {
-                artUnlock(backgroundHandle);
+            if (!doneBoxFrmImage.lock(doneBoxFid)) {
                 fontSetCurrent(savedFont);
                 windowDestroy(win);
                 return -1;
             }
 
-            int downButtonFid = buildFid(OBJ_TYPE_INTERFACE, 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(OBJ_TYPE_INTERFACE, 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;
             }
 
             char path[COMPAT_MAX_PATH];
-            sprintf(path, "%s%s", asc_5186C8, "DBOX.MSG");
+            snprintf(path, sizeof(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) {
@@ -419,57 +415,107 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 
     fontSetCurrent(101);
 
-    int v23 = _ytable[dialogType];
+    int nextY = _ytable[dialogType];
+    int maxY = _ytable[dialogType] + _dblines[dialogType] * fontGetLineHeight();
 
     if ((flags & DIALOG_BOX_NO_VERTICAL_CENTERING) == 0) {
-        int v41 = _dblines[dialogType] * fontGetLineHeight() / 2 + v23;
-        v23 = v41 - ((bodyLength + 1) * fontGetLineHeight() / 2);
+        int numberOfLines = 0;
+
+        if (hasTitle) {
+            numberOfLines++;
+        }
+
+        for (int index = 0; index < bodyLength; index++) {
+            short beginnings[WORD_WRAP_MAX_COUNT];
+            short subLineCount;
+            int maxWidth = backgroundFrmImage.getWidth() - _xtable[dialogType] * 2;
+            if (wordWrap(body[index], maxWidth, beginnings, &subLineCount) == 0) {
+                numberOfLines += subLineCount - 1;
+            }
+        }
+
+        if (numberOfLines > _dblines[dialogType]) {
+            numberOfLines = _dblines[dialogType];
+        }
+
+        nextY += (_dblines[dialogType] - numberOfLines) * fontGetLineHeight() / 2;
     }
 
     if (hasTitle) {
         if ((flags & DIALOG_BOX_NO_HORIZONTAL_CENTERING) != 0) {
-            fontDrawText(windowBuf + backgroundWidth * v23 + _xtable[dialogType], title, backgroundWidth, backgroundWidth, titleColor);
+            fontDrawText(windowBuf + backgroundFrmImage.getWidth() * nextY + _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() * nextY + (backgroundFrmImage.getWidth() - length) / 2,
+                title,
+                backgroundFrmImage.getWidth(),
+                backgroundFrmImage.getWidth(),
+                titleColor);
         }
-        v23 += fontGetLineHeight();
+        nextY += fontGetLineHeight();
     }
 
-    for (int v94 = 0; v94 < bodyLength; v94++) {
-        int len = fontGetStringWidth(body[v94]);
-        if (len <= backgroundWidth - 26) {
+    for (int index = 0; index < bodyLength && nextY < maxY; index++) {
+        int width = fontGetStringWidth(body[index]);
+        int maxWidth = backgroundFrmImage.getWidth() - _xtable[dialogType] * 2;
+        if (width <= maxWidth) {
             if ((flags & DIALOG_BOX_NO_HORIZONTAL_CENTERING) != 0) {
-                fontDrawText(windowBuf + backgroundWidth * v23 + _xtable[dialogType], body[v94], backgroundWidth, backgroundWidth, bodyColor);
+                fontDrawText(windowBuf + backgroundFrmImage.getWidth() * nextY + _xtable[dialogType],
+                    body[index],
+                    backgroundFrmImage.getWidth(),
+                    backgroundFrmImage.getWidth(),
+                    bodyColor);
             } else {
-                int length = fontGetStringWidth(body[v94]);
-                fontDrawText(windowBuf + backgroundWidth * v23 + (backgroundWidth - length) / 2, body[v94], backgroundWidth, backgroundWidth, bodyColor);
+                int length = fontGetStringWidth(body[index]);
+                fontDrawText(windowBuf + backgroundFrmImage.getWidth() * nextY + (backgroundFrmImage.getWidth() - length) / 2,
+                    body[index],
+                    backgroundFrmImage.getWidth(),
+                    backgroundFrmImage.getWidth(),
+                    bodyColor);
             }
-            v23 += fontGetLineHeight();
+            nextY += fontGetLineHeight();
         } else {
             short beginnings[WORD_WRAP_MAX_COUNT];
             short count;
-            if (wordWrap(body[v94], backgroundWidth - 26, beginnings, &count) != 0) {
+            if (wordWrap(body[index], maxWidth, beginnings, &count) != 0) {
                 debugPrint("\nError: dialog_out");
             }
 
-            for (int v48 = 1; v48 < count; v48++) {
-                int v51 = beginnings[v48] - beginnings[v48 - 1];
-                if (v51 >= 260) {
-                    v51 = 259;
+            for (int beginningIndex = 1; beginningIndex < count && nextY < maxY; beginningIndex++) {
+                int subLineLength = beginnings[beginningIndex] - beginnings[beginningIndex - 1];
+                if (subLineLength >= 260) {
+                    subLineLength = 259;
                 }
 
                 char string[260];
-                strncpy(string, body[v94] + beginnings[v48 - 1], v51);
-                string[v51] = '\0';
+                strncpy(string, body[index] + beginnings[beginningIndex - 1], subLineLength);
+                string[subLineLength] = '\0';
+
+                // Remove trailing space as it affects width calculation.
+                if (subLineLength > 0 && string[subLineLength - 1] == ' ') {
+                    string[subLineLength - 1] = '\0';
+                    subLineLength -= 1;
+                }
 
                 if ((flags & DIALOG_BOX_NO_HORIZONTAL_CENTERING) != 0) {
-                    fontDrawText(windowBuf + backgroundWidth * v23 + _xtable[dialogType], string, backgroundWidth, backgroundWidth, bodyColor);
+                    fontDrawText(windowBuf + backgroundFrmImage.getWidth() * nextY + _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() * nextY + (backgroundFrmImage.getWidth() - length) / 2,
+                        string,
+                        backgroundFrmImage.getWidth(),
+                        backgroundFrmImage.getWidth(),
+                        bodyColor);
                 }
-                v23 += fontGetLineHeight();
+                nextY += fontGetLineHeight();
             }
         }
     }
@@ -478,7 +524,9 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
 
     int rc = -1;
     while (rc == -1) {
-        int keyCode = _get_input();
+        sharedFpsLimiter.mark();
+
+        int keyCode = inputGetInput();
 
         if (keyCode == 500) {
             rc = 1;
@@ -500,16 +548,15 @@ int showDialogBox(const char* title, const char** body, int bodyLength, int x, i
         if (_game_user_wants_to_quit != 0) {
             rc = 1;
         }
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
     windowDestroy(win);
-    artUnlock(backgroundHandle);
     fontSetCurrent(savedFont);
 
     if (v86) {
-        artUnlock(doneBoxHandle);
-        artUnlock(downButtonHandle);
-        artUnlock(upButtonHandle);
         messageListFree(&messageList);
     }
 
@@ -536,61 +583,42 @@ 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(OBJ_TYPE_INTERFACE, 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]);
-            }
+        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);
+    int win = windowCreate(x, y, backgroundWidth, backgroundHeight, 256, WINDOW_MODAL | WINDOW_MOVE_ON_TOP);
     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;
     }
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s%s", asc_5186C8, "DBOX.MSG");
+    snprintf(path, sizeof(path), "%s%s", asc_5186C8, "DBOX.MSG");
 
     if (!messageListLoad(&messageList, path)) {
         windowDestroy(win);
-
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
-
         return -1;
     }
 
@@ -607,14 +635,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) {
@@ -624,14 +652,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) {
@@ -641,14 +669,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) {
@@ -657,15 +685,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) {
@@ -701,8 +729,10 @@ int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLen
 
     int rc = -1;
     while (rc == -1) {
-        unsigned int tick = _get_time();
-        int keyCode = _get_input();
+        sharedFpsLimiter.mark();
+
+        unsigned int tick = getTicks();
+        int keyCode = inputGetInput();
         int scrollDirection = FILE_DIALOG_SCROLL_DIRECTION_NONE;
         int scrollCounter = 0;
         bool isScrolling = false;
@@ -811,7 +841,7 @@ int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLen
             unsigned int scrollDelay = 4;
             doubleClickSelectedFileIndex = -2;
             while (1) {
-                unsigned int scrollTick = _get_time();
+                unsigned int scrollTick = getTicks();
                 scrollCounter += 1;
                 if ((!isScrolling && scrollCounter == 1) || (isScrolling && scrollCounter > 14.4)) {
                     isScrolling = true;
@@ -863,10 +893,12 @@ int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLen
                     break;
                 }
 
-                int keyCode = _get_input();
+                int keyCode = inputGetInput();
                 if (keyCode == 505 || keyCode == 503) {
                     break;
                 }
+
+                renderPresent();
             }
         } else {
             windowRefresh(win);
@@ -884,14 +916,13 @@ int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLen
         if (_game_user_wants_to_quit) {
             rc = 1;
         }
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
     windowDestroy(win);
 
-    for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-        artUnlock(frmHandles[index]);
-    }
-
     messageListFree(&messageList);
     fontSetCurrent(oldFont);
 
@@ -918,61 +949,42 @@ 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(OBJ_TYPE_INTERFACE, 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]);
-            }
+        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);
+    int win = windowCreate(x, y, backgroundWidth, backgroundHeight, 256, WINDOW_MODAL | WINDOW_MOVE_ON_TOP);
     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;
     }
 
     char path[COMPAT_MAX_PATH];
-    sprintf(path, "%s%s", asc_5186C8, "DBOX.MSG");
+    snprintf(path, sizeof(path), "%s%s", asc_5186C8, "DBOX.MSG");
 
     if (!messageListLoad(&messageList, path)) {
         windowDestroy(win);
-
-        for (int index = 0; index < FILE_DIALOG_FRM_COUNT; index++) {
-            artUnlock(frmHandles[index]);
-        }
-
         return -1;
     }
 
@@ -989,14 +1001,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) {
@@ -1006,14 +1018,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) {
@@ -1023,14 +1035,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) {
@@ -1039,15 +1051,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) {
@@ -1092,7 +1104,7 @@ 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] = ' ';
 
@@ -1103,6 +1115,8 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
 
     windowRefresh(win);
 
+    beginTextInput();
+
     int blinkingCounter = 3;
     bool blink = false;
 
@@ -1111,8 +1125,10 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
 
     int rc = -1;
     while (rc == -1) {
-        unsigned int tick = _get_time();
-        int keyCode = _get_input();
+        sharedFpsLimiter.mark();
+
+        unsigned int tick = getTicks();
+        int keyCode = inputGetInput();
         int scrollDirection = FILE_DIALOG_SCROLL_DIRECTION_NONE;
         int scrollCounter = 0;
         bool isScrolling = false;
@@ -1258,7 +1274,7 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
             unsigned int scrollDelay = 4;
             doubleClickSelectedFileIndex = -2;
             while (1) {
-                unsigned int scrollTick = _get_time();
+                unsigned int scrollTick = getTicks();
                 scrollCounter += 1;
                 if ((!isScrolling && scrollCounter == 1) || (isScrolling && scrollCounter > 14.4)) {
                     isScrolling = true;
@@ -1327,10 +1343,12 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
                     break;
                 }
 
-                int key = _get_input();
+                int key = inputGetInput();
                 if (key == 505 || key == 503) {
                     break;
                 }
+
+                renderPresent();
             }
         } else {
             blinkingCounter -= 1;
@@ -1358,8 +1376,13 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen
         if (_game_user_wants_to_quit != 0) {
             rc = 1;
         }
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
+    endTextInput();
+
     if (rc == 0) {
         if (fileNameCopyLength != 0) {
             fileNameCopy[fileNameCopyLength] = '\0';
@@ -1374,11 +1397,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);
 
@@ -1398,8 +1416,10 @@ static void fileDialogRenderFileList(unsigned char* buffer, char** fileList, int
 
         for (int index = 0; index < fileListLength; index++) {
             int color = index == selectedIndex ? _colorTable[32747] : _colorTable[992];
-            fontDrawText(buffer + pitch * y + FILE_DIALOG_FILE_LIST_X, fileList[pageOffset + index], pitch, pitch, color);
+            fontDrawText(buffer + pitch * y + FILE_DIALOG_FILE_LIST_X, fileList[pageOffset + index], FILE_DIALOG_FILE_LIST_WIDTH, pitch, color);
             y += lineHeight;
         }
     }
 }
+
+} // 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

@@ -5,15 +5,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
+#include <SDL.h>
 
 #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);
@@ -141,18 +140,12 @@ int debugPrint(const char* format, ...)
 
     if (gDebugPrintProc != NULL) {
         char string[260];
-        vsprintf(string, format, args);
+        vsnprintf(string, sizeof(string), format, args);
 
         rc = gDebugPrintProc(string);
     } else {
 #ifdef _DEBUG
-        char string[260];
-        vsprintf(string, format, args);
-#ifdef _WIN32
-        OutputDebugStringA(string);
-#else
-        printf("%s", string);
-#endif
+        SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, format, args);
 #endif
         rc = -1;
     }
@@ -317,3 +310,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

@@ -5,10 +5,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <algorithm>
+
 #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)
 
@@ -816,10 +820,7 @@ static bool dfileReadCompressed(DFile* stream, void* ptr, size_t size)
 
         if (stream->decompressionStream->avail_in == 0) {
             // No more unprocessed data, request next chunk.
-            size_t bytesToRead = stream->entry->dataSize - stream->compressedBytesRead;
-            if (bytesToRead > DFILE_DECOMPRESSION_BUFFER_SIZE) {
-                bytesToRead = DFILE_DECOMPRESSION_BUFFER_SIZE;
-            }
+            size_t bytesToRead = std::min(DFILE_DECOMPRESSION_BUFFER_SIZE, stream->entry->dataSize - stream->compressedBytesRead);
 
             if (fread(stream->decompressionBuffer, bytesToRead, 1, stream->stream) != 1) {
                 break;
@@ -852,3 +853,5 @@ static void dfileUngetCompressed(DFile* stream, int ch)
     stream->flags |= DFILE_HAS_COMPRESSED_UNGETC;
     stream->position--;
 }
+
+} // namespace fallout

src/dfile.h

@@ -7,6 +7,8 @@
 
 #include "platform_compat.h"
 
+namespace fallout {
+
 typedef struct DBase DBase;
 typedef struct DBaseEntry DBaseEntry;
 typedef struct DFile DFile;
@@ -128,4 +130,6 @@ long dfileTell(DFile* stream);
 void dfileRewind(DFile* stream);
 int dfileEof(DFile* stream);
 
+} // namespace fallout
+
 #endif /* DFILE_H */

src/dialog.cc

@@ -2,13 +2,16 @@
 
 #include <string.h>
 
-#include "core.h"
 #include "memory_manager.h"
+#include "mouse.h"
 #include "movie.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 
+namespace fallout {
+
 // 0x501623
 const float flt_501623 = 31.0;
 
@@ -750,3 +753,5 @@ int _dialogGetMediaFlag()
 {
     return _mediaFlag;
 }
+
+} // namespace fallout

src/dialog.h

@@ -3,6 +3,8 @@
 
 #include "interpreter.h"
 
+namespace fallout {
+
 typedef void DialogFunc1(int win);
 typedef void DialogFunc2(int win);
 
@@ -131,4 +133,6 @@ void _dialogRegisterWinDrawCallbacks(DialogFunc1* a1, DialogFunc2* a2);
 int _dialogToggleMediaFlag(int a1);
 int _dialogGetMediaFlag();
 
+} // namespace fallout
+
 #endif /* DIALOG_H */

src/dictionary.cc

@@ -6,6 +6,8 @@
 
 #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.
@@ -445,7 +447,7 @@ int dictionaryLoad(FILE* stream, Dictionary* dictionary, int a3)
             return -1;
         }
 
-        if (fgets(entry->key, keyLength, stream) == NULL) {
+        if (fgets(entry->key, keyLength + 1, stream) == NULL) {
             return -1;
         }
 
@@ -552,3 +554,5 @@ void dictionarySetMemoryProcs(MallocProc* mallocProc, ReallocProc* reallocProc,
         gDictionaryFreeProc = dictionaryFreeDefaultImpl;
     }
 }
+
+} // namespace fallout

src/dictionary.h

@@ -5,6 +5,8 @@
 
 #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);
 
@@ -63,4 +65,6 @@ 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,5 +1,7 @@
 #include "dinput.h"
 
+namespace fallout {
+
 enum InputType {
     INPUT_TYPE_MOUSE,
     INPUT_TYPE_TOUCH,
@@ -237,3 +239,5 @@ void handleTouchEvent(SDL_Event* event)
         gLastInputType = INPUT_TYPE_TOUCH;
     }
 }
+
+} // namespace fallout

src/dinput.h

@@ -3,6 +3,8 @@
 
 #include <SDL.h>
 
+namespace fallout {
+
 typedef struct MouseData {
     int x;
     int y;
@@ -33,4 +35,6 @@ void keyboardDeviceFree();
 void handleMouseEvent(SDL_Event* event);
 void handleTouchEvent(SDL_Event* event);
 
+} // namespace fallout
+
 #endif /* DINPUT_H */

src/display_monitor.cc

@@ -7,17 +7,20 @@
 #include "art.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "draw.h"
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "memory.h"
 #include "sfall_config.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 
+namespace fallout {
+
 // The maximum number of lines display monitor can hold. Once this value
 // is reached earlier messages are thrown away.
 #define DISPLAY_MONITOR_LINES_CAPACITY (100)
@@ -27,7 +30,7 @@
 
 #define DISPLAY_MONITOR_X (23)
 #define DISPLAY_MONITOR_Y (24)
-#define DISPLAY_MONITOR_WIDTH (167)
+#define DISPLAY_MONITOR_WIDTH (167 + gInterfaceBarContentOffset)
 #define DISPLAY_MONITOR_HEIGHT (60)
 
 #define DISPLAY_MONITOR_HALF_HEIGHT (DISPLAY_MONITOR_HEIGHT / 2)
@@ -56,12 +59,7 @@ static bool gDisplayMonitorInitialized = false;
 // The rectangle that display monitor occupies in the main interface window.
 //
 // 0x518510
-static const Rect gDisplayMonitorRect = {
-    DISPLAY_MONITOR_X,
-    DISPLAY_MONITOR_Y,
-    DISPLAY_MONITOR_X + DISPLAY_MONITOR_WIDTH - 1,
-    DISPLAY_MONITOR_Y + DISPLAY_MONITOR_HEIGHT - 1,
-};
+static Rect gDisplayMonitorRect;
 
 // 0x518520
 static int gDisplayMonitorScrollDownButton = -1;
@@ -103,6 +101,13 @@ static int gConsoleFilePrintCount = 0;
 int displayMonitorInit()
 {
     if (!gDisplayMonitorInitialized) {
+        gDisplayMonitorRect = {
+            DISPLAY_MONITOR_X,
+            DISPLAY_MONITOR_Y,
+            DISPLAY_MONITOR_X + DISPLAY_MONITOR_WIDTH - 1,
+            DISPLAY_MONITOR_Y + DISPLAY_MONITOR_HEIGHT - 1,
+        };
+
         int oldFont = fontGetCurrent();
         fontSetCurrent(DISPLAY_MONITOR_FONT);
 
@@ -117,25 +122,33 @@ int displayMonitorInit()
             return -1;
         }
 
-        CacheEntry* backgroundFrmHandle;
-        int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, 16, 0, 0, 0);
-        Art* backgroundFrm = artLock(backgroundFid, &backgroundFrmHandle);
-        if (backgroundFrm == NULL) {
-            internal_free(gDisplayMonitorBackgroundFrmData);
-            return -1;
+        if (gInterfaceBarIsCustom) {
+            _intface_full_width = gInterfaceBarWidth;
+            blitBufferToBuffer(customInterfaceBarGetBackgroundImageData() + gInterfaceBarWidth * DISPLAY_MONITOR_Y + DISPLAY_MONITOR_X,
+                DISPLAY_MONITOR_WIDTH,
+                DISPLAY_MONITOR_HEIGHT,
+                gInterfaceBarWidth,
+                gDisplayMonitorBackgroundFrmData,
+                DISPLAY_MONITOR_WIDTH);
+        } else {
+            FrmImage backgroundFrmImage;
+            int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, 16, 0, 0, 0);
+            if (!backgroundFrmImage.lock(backgroundFid)) {
+                internal_free(gDisplayMonitorBackgroundFrmData);
+                return -1;
+            }
+
+            unsigned char* backgroundFrmData = backgroundFrmImage.getData();
+            _intface_full_width = backgroundFrmImage.getWidth();
+
+            blitBufferToBuffer(backgroundFrmData + _intface_full_width * DISPLAY_MONITOR_Y + DISPLAY_MONITOR_X,
+                DISPLAY_MONITOR_WIDTH,
+                DISPLAY_MONITOR_HEIGHT,
+                _intface_full_width,
+                gDisplayMonitorBackgroundFrmData,
+                DISPLAY_MONITOR_WIDTH);
         }
 
-        unsigned char* backgroundFrmData = artGetFrameData(backgroundFrm, 0, 0);
-        _intface_full_width = artGetWidth(backgroundFrm, 0, 0);
-        blitBufferToBuffer(backgroundFrmData + _intface_full_width * DISPLAY_MONITOR_Y + DISPLAY_MONITOR_X,
-            DISPLAY_MONITOR_WIDTH,
-            DISPLAY_MONITOR_HEIGHT,
-            _intface_full_width,
-            gDisplayMonitorBackgroundFrmData,
-            DISPLAY_MONITOR_WIDTH);
-
-        artUnlock(backgroundFrmHandle);
-
         gDisplayMonitorScrollUpButton = buttonCreate(gInterfaceBarWindow,
             DISPLAY_MONITOR_X,
             DISPLAY_MONITOR_Y,
@@ -468,3 +481,5 @@ static void consoleFileFlush()
         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

@@ -3,8 +3,10 @@
 #include <string.h>
 
 #include "color.h"
-#include "core.h"
 #include "mmx.h"
+#include "svga.h"
+
+namespace fallout {
 
 // 0x4D2FC0
 void bufferDrawLine(unsigned char* buf, int pitch, int x1, int y1, int x2, int y2, int color)
@@ -150,74 +152,56 @@ void bufferDrawRectShadowed(unsigned char* buf, int pitch, int left, int top, in
 // 0x4D33F0
 void blitBufferToBufferStretch(unsigned char* src, int srcWidth, int srcHeight, int srcPitch, unsigned char* dest, int destWidth, int destHeight, int destPitch)
 {
-    int heightRatio = (destHeight << 16) / srcHeight;
-    int widthRatio = (destWidth << 16) / srcWidth;
+    int stepX = (destWidth << 16) / srcWidth;
+    int stepY = (destHeight << 16) / srcHeight;
 
-    int v1 = 0;
-    int v2 = heightRatio;
     for (int srcY = 0; srcY < srcHeight; srcY += 1) {
-        int v3 = widthRatio;
-        int v4 = (heightRatio * srcY) >> 16;
-        int v5 = v2 >> 16;
-        int v6 = 0;
+        int startDestY = (srcY * stepY) >> 16;
+        int endDestY = ((srcY + 1) * stepY) >> 16;
 
-        unsigned char* c = src + v1;
+        unsigned char* currSrc = src + srcPitch * srcY;
         for (int srcX = 0; srcX < srcWidth; srcX += 1) {
-            int v7 = v3 >> 16;
-            int v8 = v6 >> 16;
+            int startDestX = (srcX * stepX) >> 16;
+            int endDestX = ((srcX + 1) * stepX) >> 16;
 
-            unsigned char* v9 = dest + destPitch * v4 + v8;
-            for (int destY = v4; destY < v5; destY += 1) {
-                for (int destX = v8; destX < v7; destX += 1) {
-                    *v9++ = *c;
+            for (int destY = startDestY; destY < endDestY; destY += 1) {
+                unsigned char* currDest = dest + destPitch * destY + startDestX;
+                for (int destX = startDestX; destX < endDestX; destX += 1) {
+                    *currDest++ = *currSrc;
                 }
-                v9 += destPitch;
             }
 
-            v3 += widthRatio;
-            c++;
-            v6 += widthRatio;
+            currSrc++;
         }
-        v1 += srcPitch;
-        v2 += heightRatio;
     }
 }
 
 // 0x4D3560
 void blitBufferToBufferStretchTrans(unsigned char* src, int srcWidth, int srcHeight, int srcPitch, unsigned char* dest, int destWidth, int destHeight, int destPitch)
 {
-    int heightRatio = (destHeight << 16) / srcHeight;
-    int widthRatio = (destWidth << 16) / srcWidth;
+    int stepX = (destWidth << 16) / srcWidth;
+    int stepY = (destHeight << 16) / srcHeight;
 
-    int v1 = 0;
-    int v2 = heightRatio;
     for (int srcY = 0; srcY < srcHeight; srcY += 1) {
-        int v3 = widthRatio;
-        int v4 = (heightRatio * srcY) >> 16;
-        int v5 = v2 >> 16;
-        int v6 = 0;
+        int startDestY = (srcY * stepY) >> 16;
+        int endDestY = ((srcY + 1) * stepY) >> 16;
 
-        unsigned char* c = src + v1;
+        unsigned char* currSrc = src + srcPitch * srcY;
         for (int srcX = 0; srcX < srcWidth; srcX += 1) {
-            int v7 = v3 >> 16;
-            int v8 = v6 >> 16;
+            int startDestX = (srcX * stepX) >> 16;
+            int endDestX = ((srcX + 1) * stepX) >> 16;
 
-            if (*c != 0) {
-                unsigned char* v9 = dest + destPitch * v4 + v8;
-                for (int destY = v4; destY < v5; destY += 1) {
-                    for (int destX = v8; destX < v7; destX += 1) {
-                        *v9++ = *c;
+            if (*currSrc != 0) {
+                for (int destY = startDestY; destY < endDestY; destY += 1) {
+                    unsigned char* currDest = dest + destPitch * destY + startDestX;
+                    for (int destX = startDestX; destX < endDestX; destX += 1) {
+                        *currDest++ = *currSrc;
                     }
-                    v9 += destPitch;
                 }
             }
 
-            v3 += widthRatio;
-            c++;
-            v6 += widthRatio;
+            currSrc++;
         }
-        v1 += srcPitch;
-        v2 += heightRatio;
     }
 }
 
@@ -257,8 +241,8 @@ void _lighten_buf(unsigned char* buf, int width, int height, int pitch)
 
     for (int y = 0; y < height; y++) {
         for (int x = 0; x < width; x++) {
-            unsigned char p = *buf;
-            *buf++ = _intensityColorTable[(p << 8) + 147];
+            unsigned char color = *buf;
+            *buf++ = intensityColorTable[color][147];
         }
         buf += skip;
     }
@@ -326,3 +310,5 @@ void bufferOutline(unsigned char* buf, int width, int height, int pitch, int col
         }
     }
 }
+
+} // namespace fallout

src/draw.h

@@ -1,6 +1,8 @@
 #ifndef DRAW_H
 #define DRAW_H
 
+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);
@@ -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,47 +0,0 @@
-#include "electronic_registration.h"
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-#include "game_config.h"
-#include "platform_compat.h"
-
-// 0x440DD0
-void runElectronicRegistration()
-{
-    int timesRun = 0;
-    configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_TIMES_RUN_KEY, &timesRun);
-    if (timesRun > 0 && timesRun < 5) {
-#ifdef _WIN32
-        char path[COMPAT_MAX_PATH];
-        if (GetModuleFileNameA(NULL, path, sizeof(path)) != 0) {
-            char* pch = strrchr(path, '\\');
-            if (pch == NULL) {
-                pch = path;
-            }
-
-            strcpy(pch, "\\ereg");
-
-            STARTUPINFOA startupInfo;
-            memset(&startupInfo, 0, sizeof(startupInfo));
-            startupInfo.cb = sizeof(startupInfo);
-
-            PROCESS_INFORMATION processInfo;
-
-            // FIXME: Leaking processInfo.hProcess and processInfo.hThread:
-            // https://docs.microsoft.com/en-us/cpp/code-quality/c6335.
-            if (CreateProcessA("ereg\\reg32a.exe", NULL, NULL, NULL, FALSE, 0, NULL, path, &startupInfo, &processInfo)) {
-                WaitForSingleObject(processInfo.hProcess, INFINITE);
-            }
-        }
-#endif
-
-        configSetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_TIMES_RUN_KEY, timesRun + 1);
-    } else {
-        if (timesRun == 0) {
-            configSetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_TIMES_RUN_KEY, 1);
-        }
-    }
-}

src/electronic_registration.h

@@ -1,6 +0,0 @@
-#ifndef ELECTRONIC_REGISTRATION_H
-#define ELECTRONIC_REGISTRATION_H
-
-void runElectronicRegistration();
-
-#endif /* ELECTRONIC_REGISTRATION_H */

src/elevator.cc

@@ -6,29 +6,27 @@
 #include <algorithm>
 
 #include "art.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "draw.h"
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
+#include "kb.h"
 #include "map.h"
 #include "pipboy.h"
 #include "scripts.h"
 #include "sfall_config.h"
+#include "svga.h"
 #include "window_manager.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
@@ -320,47 +318,18 @@ 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.
 //
@@ -411,21 +380,23 @@ 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;
     int keyCode;
     while (!done) {
-        keyCode = _get_input();
+        sharedFpsLimiter.mark();
+
+        keyCode = inputGetInput();
         if (keyCode == KEY_ESCAPE) {
             done = true;
         }
@@ -441,6 +412,9 @@ int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tileP
                 done = true;
             }
         }
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 
     if (keyCode != KEY_ESCAPE) {
@@ -465,23 +439,28 @@ int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tileP
             float v41 = (float)keyCode * v42;
             float v44 = (float)(*elevationPtr) * v42;
             do {
-                unsigned int tick = _get_time();
+                sharedFpsLimiter.mark();
+
+                unsigned int tick = getTicks();
                 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);
 
                 while (getTicksSince(tick) < delay) {
                 }
+
+                renderPresent();
+                sharedFpsLimiter.throttle();
             } while ((v43 <= 0.0 || v44 < v41) && (v43 > 0.0 || v44 > v41));
 
-            coreDelayProcessingEvents(200);
+            inputPauseForTocks(200);
         }
     }
 
@@ -512,15 +491,14 @@ static int elevatorWindowInit(int elevator)
     int index;
     for (index = 0; index < ELEVATOR_FRM_COUNT; index++) {
         int fid = buildFid(OBJ_TYPE_INTERFACE, gElevatorFrmIds[index], 0, 0, 0);
-        gElevatorFrmData[index] = artLockFrameDataReturningSize(fid, &(gElevatorFrmHandles[index]), &(gElevatorFrmSizes[index].width), &(gElevatorFrmSizes[index].height));
-        if (gElevatorFrmData[index] == NULL) {
+        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) {
@@ -532,39 +510,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(OBJ_TYPE_INTERFACE, elevatorBackground->backgroundFrmId, 0, 0, 0);
-    gElevatorBackgroundFrmData = artLockFrameDataReturningSize(backgroundFid, &gElevatorBackgroundFrmHandle, &gElevatorBackgroundFrmWidth, &gElevatorBackgroundFrmHeight);
-    if (gElevatorBackgroundFrmData != NULL) {
+    if (_elevatorBackgroundFrmImage.lock(backgroundFid)) {
         if (elevatorBackground->panelFrmId != -1) {
             int panelFid = buildFid(OBJ_TYPE_INTERFACE, elevatorBackground->panelFrmId, 0, 0, 0);
-            gElevatorPanelFrmData = artLockFrameDataReturningSize(panelFid, &gElevatorPanelFrmHandle, &gElevatorPanelFrmWidth, &gElevatorPanelFrmHeight);
-            if (gElevatorPanelFrmData == NULL) {
-                gElevatorPanelFrmData = ELEVATOR_BACKGROUND_NULL;
+            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) {
@@ -576,26 +542,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);
+        WINDOW_MODAL | WINDOW_DONT_MOVE_TOP);
     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) {
@@ -608,15 +569,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;
@@ -624,14 +585,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) {
@@ -648,16 +609,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();
@@ -705,7 +661,7 @@ void elevatorsInit()
                 char sectionKey[4];
                 char key[32];
                 for (int index = 0; index < ELEVATORS_MAX; index++) {
-                    sprintf(sectionKey, "%d", index);
+                    snprintf(sectionKey, sizeof(sectionKey), "%d", index);
 
                     if (index >= ELEVATOR_COUNT) {
                         int levels = 0;
@@ -717,13 +673,13 @@ void elevatorsInit()
                     configGetInt(&elevatorsConfig, sectionKey, "ButtonsFrm", &(gElevatorBackgrounds[index].panelFrmId));
 
                     for (int level = 0; level < ELEVATOR_LEVEL_MAX; level++) {
-                        sprintf(key, "ID%d", level + 1);
+                        snprintf(key, sizeof(key), "ID%d", level + 1);
                         configGetInt(&elevatorsConfig, sectionKey, key, &(gElevatorDescriptions[index][level].map));
 
-                        sprintf(key, "Elevation%d", level + 1);
+                        snprintf(key, sizeof(key), "Elevation%d", level + 1);
                         configGetInt(&elevatorsConfig, sectionKey, key, &(gElevatorDescriptions[index][level].elevation));
 
-                        sprintf(key, "Tile%d", level + 1);
+                        snprintf(key, sizeof(key), "Tile%d", level + 1);
                         configGetInt(&elevatorsConfig, sectionKey, key, &(gElevatorDescriptions[index][level].tile));
                     }
                 }
@@ -733,7 +689,7 @@ void elevatorsInit()
                 // 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);
+                    snprintf(sectionKey, sizeof(sectionKey), "%d", index);
 
                     int type;
                     if (configGetInt(&elevatorsConfig, sectionKey, "Image", &type)) {
@@ -751,3 +707,5 @@ void elevatorsInit()
         }
     }
 }
+
+} // namespace fallout

src/elevator.h

@@ -1,6 +1,8 @@
 #ifndef ELEVATOR_H
 #define ELEVATOR_H
 
+namespace fallout {
+
 typedef enum Elevator {
     ELEVATOR_BROTHERHOOD_OF_STEEL_MAIN,
     ELEVATOR_BROTHERHOOD_OF_STEEL_SURFACE,
@@ -15,11 +17,24 @@ typedef enum Elevator {
     ELEVATOR_SIERRA_1,
     ELEVATOR_SIERRA_2,
     ELEVATOR_SIERRA_SERVICE,
-    ELEVATOR_COUNT = 24,
+    ELEVATOR_KLAMATH_TOXIC_CAVES,
+    ELEVATOR_14,
+    ELEVATOR_VAULT_CITY,
+    ELEVATOR_VAULT_15_MAIN,
+    ELEVATOR_VAULT_15_SURFACE,
+    ELEVATOR_NAVARRO_NORTHERN,
+    ELEVATOR_NAVARRO_CENTER,
+    ELEVATOR_NAVARRO_LAB,
+    ELEVATOR_NAVARRO_CANTEEN,
+    ELEVATOR_SAN_FRANCISCO_SHI_TEMPLE,
+    ELEVATOR_REDDING_WANAMINGO_MINE,
+    ELEVATOR_COUNT,
 } Elevator;
 
 int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tilePtr);
 
 void elevatorsInit();
 
+} // namespace fallout
+
 #endif /* ELEVATOR_H */

src/endgame.cc

@@ -8,7 +8,6 @@
 
 #include "art.h"
 #include "color.h"
-#include "core.h"
 #include "credits.h"
 #include "cycle.h"
 #include "db.h"
@@ -16,23 +15,28 @@
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
-#include "game_config.h"
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "map.h"
 #include "memory.h"
+#include "mouse.h"
 #include "object.h"
 #include "palette.h"
 #include "pipboy.h"
 #include "platform_compat.h"
 #include "random.h"
+#include "settings.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 #include "word_wrap.h"
 #include "worldmap.h"
 
+namespace fallout {
+
 // The maximum number of subtitle lines per slide.
 #define ENDGAME_ENDING_MAX_SUBTITLES (50)
 
@@ -79,9 +83,7 @@ static void _endgame_movie_bk_process();
 static int endgameEndingInit();
 static void endgameEndingFree();
 static int endgameDeathEndingValidate(int* percentage);
-
-// 0x50B00C
-char _aEnglish_2[] = ENGLISH;
+static void endgameEndingUpdateOverlay();
 
 // The number of lines in current subtitles file.
 //
@@ -203,6 +205,8 @@ static unsigned char* gEndgameEndingSlideshowWindowBuffer;
 // 0x570BF4
 static int gEndgameEndingSlideshowWindow;
 
+static int gEndgameEndingOverlay;
+
 // 0x43F788
 void endgamePlaySlideshow()
 {
@@ -236,7 +240,7 @@ void endgamePlayMovie()
     tickersAdd(_endgame_movie_bk_process);
     backgroundSoundSetEndCallback(_endgame_movie_callback);
     backgroundSoundLoad("akiss", 12, 14, 15);
-    coreDelayProcessingEvents(3000);
+    inputPauseForTocks(3000);
 
     // NOTE: Result is ignored. I guess there was some kind of switch for male
     // vs. female ending, but it was not implemented.
@@ -320,6 +324,9 @@ static void endgameEndingRenderPanningScene(int direction, const char* narratorF
         bufferFill(gEndgameEndingSlideshowWindowBuffer, ENDGAME_ENDING_WINDOW_WIDTH, ENDGAME_ENDING_WINDOW_HEIGHT, ENDGAME_ENDING_WINDOW_WIDTH, _colorTable[0]);
         endgameEndingLoadPalette(6, 327);
 
+        // CE: Update overlay.
+        endgameEndingUpdateOverlay();
+
         unsigned char palette[768];
         memcpy(palette, _cmap, 768);
 
@@ -355,6 +362,8 @@ static void endgameEndingRenderPanningScene(int direction, const char* narratorF
 
         unsigned int since = 0;
         while (start != end) {
+            sharedFpsLimiter.mark();
+
             int v12 = 640 - v32;
 
             // TODO: Complex math, setup scene in debugger.
@@ -367,7 +376,7 @@ static void endgameEndingRenderPanningScene(int direction, const char* narratorF
 
                 windowRefresh(gEndgameEndingSlideshowWindow);
 
-                since = _get_time();
+                since = getTicks();
 
                 bool v14;
                 double v31;
@@ -407,11 +416,14 @@ static void endgameEndingRenderPanningScene(int direction, const char* narratorF
 
             soundContinueAll();
 
-            if (_get_input() != -1) {
+            if (inputGetInput() != -1) {
                 // NOTE: Uninline.
                 endgameEndingVoiceOverFree();
                 break;
             }
+
+            renderPresent();
+            sharedFpsLimiter.throttle();
         }
 
         tickersEnable();
@@ -423,7 +435,12 @@ static void endgameEndingRenderPanningScene(int direction, const char* narratorF
     }
 
     while (mouseGetEvent() != 0) {
-        _get_input();
+        sharedFpsLimiter.mark();
+
+        inputGetInput();
+
+        renderPresent();
+        sharedFpsLimiter.throttle();
     }
 }
 
@@ -443,6 +460,9 @@ static void endgameEndingRenderStaticScene(int fid, const char* narratorFileName
 
         endgameEndingLoadPalette(FID_TYPE(fid), fid & 0xFFF);
 
+        // CE: Update overlay.
+        endgameEndingUpdateOverlay();
+
         endgameEndingVoiceOverInit(narratorFileName);
 
         unsigned int delay;
@@ -454,17 +474,19 @@ static void endgameEndingRenderStaticScene(int fid, const char* narratorFileName
 
         paletteFadeTo(_cmap);
 
-        coreDelayProcessingEvents(500);
+        inputPauseForTocks(500);
 
         // NOTE: Uninline.
         endgameEndingVoiceOverReset();
 
-        unsigned int referenceTime = _get_time();
+        unsigned int referenceTime = getTicks();
         tickersDisable();
 
         int keyCode;
         while (true) {
-            keyCode = _get_input();
+            sharedFpsLimiter.mark();
+
+            keyCode = inputGetInput();
             if (keyCode != -1) {
                 break;
             }
@@ -485,6 +507,9 @@ static void endgameEndingRenderStaticScene(int fid, const char* narratorFileName
             endgameEndingRefreshSubtitles();
             windowRefresh(gEndgameEndingSlideshowWindow);
             soundContinueAll();
+
+            renderPresent();
+            sharedFpsLimiter.throttle();
         }
 
         tickersEnable();
@@ -495,13 +520,18 @@ static void endgameEndingRenderStaticScene(int fid, const char* narratorFileName
         gEndgameEndingVoiceOverSubtitlesLoaded = false;
 
         if (keyCode == -1) {
-            coreDelayProcessingEvents(500);
+            inputPauseForTocks(500);
         }
 
         paletteFadeTo(gPaletteBlack);
 
         while (mouseGetEvent() != 0) {
-            _get_input();
+            sharedFpsLimiter.mark();
+
+            inputGetInput();
+
+            renderPresent();
+            sharedFpsLimiter.throttle();
         }
     }
 
@@ -534,6 +564,13 @@ static int endgameEndingSlideshowWindowInit()
 
     paletteFadeTo(gPaletteBlack);
 
+    // CE: Every slide has a separate color palette which is incompatible with
+    // main color palette. Setup overlay to hide everything.
+    gEndgameEndingOverlay = windowCreate(0, 0, screenGetWidth(), screenGetHeight(), _colorTable[0], WINDOW_MOVE_ON_TOP);
+    if (gEndgameEndingOverlay == -1) {
+        return -1;
+    }
+
     int windowEndgameEndingX = (screenGetWidth() - ENDGAME_ENDING_WINDOW_WIDTH) / 2;
     int windowEndgameEndingY = (screenGetHeight() - ENDGAME_ENDING_WINDOW_HEIGHT) / 2;
     gEndgameEndingSlideshowWindow = windowCreate(windowEndgameEndingX,
@@ -541,7 +578,7 @@ static int endgameEndingSlideshowWindowInit()
         ENDGAME_ENDING_WINDOW_WIDTH,
         ENDGAME_ENDING_WINDOW_HEIGHT,
         _colorTable[0],
-        WINDOW_FLAG_0x04);
+        WINDOW_MOVE_ON_TOP);
     if (gEndgameEndingSlideshowWindow == -1) {
         return -1;
     }
@@ -555,19 +592,12 @@ static int endgameEndingSlideshowWindowInit()
 
     speechSetEndCallback(_endgame_voiceover_callback);
 
-    gEndgameEndingSubtitlesEnabled = false;
-    configGetBool(&gGameConfig, GAME_CONFIG_PREFERENCES_KEY, GAME_CONFIG_SUBTITLES_KEY, &gEndgameEndingSubtitlesEnabled);
+    gEndgameEndingSubtitlesEnabled = settings.preferences.subtitles;
     if (!gEndgameEndingSubtitlesEnabled) {
         return 0;
     }
 
-    char* language;
-    if (!configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language)) {
-        gEndgameEndingSubtitlesEnabled = false;
-        return 0;
-    }
-
-    sprintf(gEndgameEndingSubtitlesLocalizedPath, "text\\%s\\cuts\\", language);
+    snprintf(gEndgameEndingSubtitlesLocalizedPath, sizeof(gEndgameEndingSubtitlesLocalizedPath), "text\\%s\\cuts\\", settings.system.language.c_str());
 
     gEndgameEndingSubtitles = (char**)internal_malloc(sizeof(*gEndgameEndingSubtitles) * ENDGAME_ENDING_MAX_SUBTITLES);
     if (gEndgameEndingSubtitles == NULL) {
@@ -609,6 +639,7 @@ static void endgameEndingSlideshowWindowFree()
 
     speechSetEndCallback(NULL);
     windowDestroy(gEndgameEndingSlideshowWindow);
+    windowDestroy(gEndgameEndingOverlay);
 
     if (!_endgame_mouse_state) {
         mouseHideCursor();
@@ -638,7 +669,7 @@ static void endgameEndingVoiceOverInit(const char* fileBaseName)
     gEndgameEndingVoiceOverSubtitlesLoaded = false;
 
     // Build speech file path.
-    sprintf(path, "%s%s", "narrator\\", fileBaseName);
+    snprintf(path, sizeof(path), "%s%s", "narrator\\", fileBaseName);
 
     if (speechLoad(path, 10, 14, 15) != -1) {
         gEndgameEndingVoiceOverSpeechLoaded = true;
@@ -646,7 +677,7 @@ static void endgameEndingVoiceOverInit(const char* fileBaseName)
 
     if (gEndgameEndingSubtitlesEnabled) {
         // Build subtitles file path.
-        sprintf(path, "%s%s.txt", gEndgameEndingSubtitlesLocalizedPath, fileBaseName);
+        snprintf(path, sizeof(path), "%s%s.txt", gEndgameEndingSubtitlesLocalizedPath, fileBaseName);
 
         if (endgameEndingSubtitlesLoad(path) != 0) {
             return;
@@ -685,7 +716,7 @@ static void endgameEndingVoiceOverReset()
     }
 
     if (gEndgameEndingVoiceOverSubtitlesLoaded) {
-        gEndgameEndingSubtitlesReferenceTime = _get_time();
+        gEndgameEndingSubtitlesReferenceTime = getTicks();
     }
 }
 
@@ -716,7 +747,7 @@ static void endgameEndingLoadPalette(int type, int id)
 
     if (strlen(fileName) <= 8) {
         char path[COMPAT_MAX_PATH];
-        sprintf(path, "%s\\%s.pal", "art\\intrface", fileName);
+        snprintf(path, sizeof(path), "%s\\%s.pal", "art\\intrface", fileName);
         colorPaletteLoad(path);
     }
 }
@@ -1197,3 +1228,15 @@ char* endgameDeathEndingGetFileName()
 
     return gEndgameDeathEndingFileName;
 }
+
+void endgameEndingUpdateOverlay()
+{
+    bufferFill(windowGetBuffer(gEndgameEndingOverlay),
+        windowGetWidth(gEndgameEndingOverlay),
+        windowGetHeight(gEndgameEndingOverlay),
+        windowGetWidth(gEndgameEndingOverlay),
+        intensityColorTable[_colorTable[0]][0]);
+    windowRefresh(gEndgameEndingOverlay);
+}
+
+} // namespace fallout

src/endgame.h

@@ -1,6 +1,8 @@
 #ifndef ENDGAME_H
 #define ENDGAME_H
 
+namespace fallout {
+
 typedef enum EndgameDeathEndingReason {
     // Dude died.
     ENDGAME_DEATH_ENDING_REASON_DEATH = 0,
@@ -18,4 +20,6 @@ int endgameDeathEndingExit();
 void endgameSetupDeathEnding(int reason);
 char* endgameDeathEndingGetFileName();
 
+} // namespace fallout
+
 #endif /* ENDGAME_H */

src/export.cc

@@ -7,6 +7,8 @@
 #include "memory_manager.h"
 #include "platform_compat.h"
 
+namespace fallout {
+
 typedef struct ExternalVariable {
     char name[32];
     char* programName;
@@ -343,3 +345,5 @@ void _exportClearAllVariables()
         }
     }
 }
+
+} // namespace fallout

src/export.h

@@ -3,6 +3,8 @@
 
 #include "interpreter.h"
 
+namespace fallout {
+
 int externalVariableSetValue(Program* program, const char* identifier, ProgramValue& value);
 int externalVariableGetValue(Program* program, const char* name, ProgramValue& value);
 int externalVariableCreate(Program* program, const char* identifier);
@@ -12,4 +14,6 @@ Program* externalProcedureGetProgram(const char* identifier, int* addressPtr, in
 int externalProcedureCreate(Program* program, const char* identifier, int address, int argumentCount);
 void _exportClearAllVariables();
 
+} // namespace fallout
+
 #endif /* EXPORT_H */

src/file_find.cc

@@ -5,6 +5,8 @@
 
 #include <fpattern.h>
 
+namespace fallout {
+
 // 0x4E6380
 bool fileFindFirst(const char* path, DirectoryFileFindData* findData)
 {
@@ -95,3 +97,5 @@ bool findFindClose(DirectoryFileFindData* findData)
 
     return true;
 }
+
+} // namespace fallout

src/file_find.h

@@ -11,6 +11,8 @@
 
 #include "platform_compat.h"
 
+namespace fallout {
+
 // NOTE: This structure is significantly different from what was in the
 // original code. Watcom provides opendir/readdir/closedir implementations,
 // that use Win32 FindFirstFile/FindNextFile under the hood, which in turn
@@ -65,4 +67,6 @@ static inline char* fileFindGetName(DirectoryFileFindData* findData)
 #endif
 }
 
+} // namespace fallout
+
 #endif /* FILE_FIND_H */

src/file_utils.cc

@@ -11,6 +11,8 @@
 
 #include "platform_compat.h"
 
+namespace fallout {
+
 static void fileCopy(const char* existingFilePath, const char* newFilePath);
 
 // 0x452740
@@ -185,3 +187,5 @@ static void fileCopy(const char* existingFilePath, const char* newFilePath)
         fclose(out);
     }
 }
+
+} // namespace fallout

src/file_utils.h

@@ -1,8 +1,12 @@
 #ifndef FILE_UTILS_H
 #define FILE_UTILS_H
 
+namespace fallout {
+
 int fileCopyDecompressed(const char* existingFilePath, const char* newFilePath);
 int fileCopyCompressed(const char* existingFilePath, const char* newFilePath);
 int _gzdecompress_file(const char* existingFilePath, const char* newFilePath);
 
+} // namespace fallout
+
 #endif /* FILE_UTILS_H */

src/font_manager.cc

@@ -10,6 +10,8 @@
 // The maximum number of interface fonts.
 #define INTERFACE_FONT_MAX (16)
 
+namespace fallout {
+
 typedef struct InterfaceFontGlyph {
     short width;
     short height;
@@ -117,64 +119,89 @@ static int interfaceFontLoad(int font_index)
     InterfaceFontDescriptor* fontDescriptor = &(gInterfaceFontDescriptors[font_index]);
 
     char path[56];
-    sprintf(path, "font%d.aaf", font_index);
+    snprintf(path, sizeof(path), "font%d.aaf", font_index);
 
     File* stream = fileOpen(path, "rb");
     if (stream == NULL) {
-        return false;
+        return -1;
     }
 
     int fileSize = fileGetSize(stream);
 
     int sig;
-    if (fileRead(&sig, 4, 1, stream) != 1) goto err;
+    if (fileRead(&sig, 4, 1, stream) != 1) {
+        fileClose(stream);
+        return -1;
+    }
 
     interfaceFontByteSwapInt32(&sig);
-    if (sig != 0x41414646) goto err;
+    if (sig != 0x41414646) {
+        fileClose(stream);
+        return -1;
+    }
 
-    if (fileRead(&(fontDescriptor->maxHeight), 2, 1, stream) != 1) goto err;
+    if (fileRead(&(fontDescriptor->maxHeight), 2, 1, stream) != 1) {
+        fileClose(stream);
+        return -1;
+    }
     interfaceFontByteSwapInt16(&(fontDescriptor->maxHeight));
 
-    if (fileRead(&(fontDescriptor->letterSpacing), 2, 1, stream) != 1) goto err;
+    if (fileRead(&(fontDescriptor->letterSpacing), 2, 1, stream) != 1) {
+        fileClose(stream);
+        return -1;
+    }
     interfaceFontByteSwapInt16(&(fontDescriptor->letterSpacing));
 
-    if (fileRead(&(fontDescriptor->wordSpacing), 2, 1, stream) != 1) goto err;
+    if (fileRead(&(fontDescriptor->wordSpacing), 2, 1, stream) != 1) {
+        fileClose(stream);
+        return -1;
+    }
     interfaceFontByteSwapInt16(&(fontDescriptor->wordSpacing));
 
-    if (fileRead(&(fontDescriptor->lineSpacing), 2, 1, stream) != 1) goto err;
+    if (fileRead(&(fontDescriptor->lineSpacing), 2, 1, stream) != 1) {
+        fileClose(stream);
+        return -1;
+    }
     interfaceFontByteSwapInt16(&(fontDescriptor->lineSpacing));
 
     for (int index = 0; index < 256; index++) {
         InterfaceFontGlyph* glyph = &(fontDescriptor->glyphs[index]);
 
-        if (fileRead(&(glyph->width), 2, 1, stream) != 1) goto err;
+        if (fileRead(&(glyph->width), 2, 1, stream) != 1) {
+            fileClose(stream);
+            return -1;
+        }
         interfaceFontByteSwapInt16(&(glyph->width));
 
-        if (fileRead(&(glyph->height), 2, 1, stream) != 1) goto err;
+        if (fileRead(&(glyph->height), 2, 1, stream) != 1) {
+            fileClose(stream);
+            return -1;
+        }
         interfaceFontByteSwapInt16(&(glyph->height));
 
-        if (fileRead(&(glyph->offset), 4, 1, stream) != 1) goto err;
+        if (fileRead(&(glyph->offset), 4, 1, stream) != 1) {
+            fileClose(stream);
+            return -1;
+        }
         interfaceFontByteSwapInt32(&(glyph->offset));
     }
 
-    fileSize -= sizeof(InterfaceFontDescriptor);
+    int glyphDataSize = fileSize - 2060;
 
-    fontDescriptor->data = (unsigned char*)internal_malloc_safe(fileSize, __FILE__, __LINE__); // FONTMGR.C, 259
-    if (fontDescriptor->data == NULL) goto err;
+    fontDescriptor->data = (unsigned char*)internal_malloc_safe(glyphDataSize, __FILE__, __LINE__); // FONTMGR.C, 259
+    if (fontDescriptor->data == NULL) {
+        fileClose(stream);
+        return -1;
+    }
 
-    if (fileRead(fontDescriptor->data, fileSize, 1, stream) != 1) {
+    if (fileRead(fontDescriptor->data, glyphDataSize, 1, stream) != 1) {
         internal_free_safe(fontDescriptor->data, __FILE__, __LINE__); // FONTMGR.C, 268
-        goto err;
+        fileClose(stream);
+        return -1;
     }
 
     fileClose(stream);
-
     return 0;
-
-err:
-    fileClose(stream);
-
-    return -1;
 }
 
 // 0x442120
@@ -209,26 +236,22 @@ static int interfaceFontGetStringWidthImpl(const char* string)
         return 0;
     }
 
-    const char* pch = string;
-    int width = 0;
+    int stringWidth = 0;
 
-    while (*pch != '\0') {
-        int v3;
-        int v4;
+    while (*string != '\0') {
+        unsigned char ch = static_cast<unsigned char>(*string++);
 
-        if (*pch == ' ') {
-            v3 = gCurrentInterfaceFontDescriptor->letterSpacing;
-            v4 = gCurrentInterfaceFontDescriptor->wordSpacing;
+        int characterWidth;
+        if (ch == ' ') {
+            characterWidth = gCurrentInterfaceFontDescriptor->wordSpacing;
         } else {
-            v3 = gCurrentInterfaceFontDescriptor->glyphs[*pch & 0xFF].width;
-            v4 = gCurrentInterfaceFontDescriptor->letterSpacing;
+            characterWidth = gCurrentInterfaceFontDescriptor->glyphs[ch].width;
         }
-        width += v3 + v4;
 
-        pch++;
+        stringWidth += characterWidth + gCurrentInterfaceFontDescriptor->letterSpacing;
     }
 
-    return width;
+    return stringWidth;
 }
 
 // 0x4421DC
@@ -320,13 +343,13 @@ static void interfaceFontDrawImpl(unsigned char* buf, const char* string, int le
 
     unsigned char* ptr = buf;
     while (*string != '\0') {
-        char ch = *string++;
+        unsigned char ch = static_cast<unsigned char>(*string++);
 
         int characterWidth;
         if (ch == ' ') {
             characterWidth = gCurrentInterfaceFontDescriptor->wordSpacing;
         } else {
-            characterWidth = gCurrentInterfaceFontDescriptor->glyphs[ch & 0xFF].width;
+            characterWidth = gCurrentInterfaceFontDescriptor->glyphs[ch].width;
         }
 
         unsigned char* end;
@@ -341,7 +364,7 @@ static void interfaceFontDrawImpl(unsigned char* buf, const char* string, int le
             break;
         }
 
-        InterfaceFontGlyph* glyph = &(gCurrentInterfaceFontDescriptor->glyphs[ch & 0xFF]);
+        InterfaceFontGlyph* glyph = &(gCurrentInterfaceFontDescriptor->glyphs[ch]);
         unsigned char* glyphDataPtr = gCurrentInterfaceFontDescriptor->data + glyph->offset;
 
         // Skip blank pixels (difference between font's line height and glyph height).
@@ -405,3 +428,5 @@ static void interfaceFontByteSwapInt16(short* value)
 {
     interfaceFontByteSwapUInt16((unsigned short*)value);
 }
+
+} // namespace fallout

src/font_manager.h

@@ -3,9 +3,13 @@
 
 #include "text_font.h"
 
+namespace fallout {
+
 extern FontManager gModernFontManager;
 
 int interfaceFontsInit();
 void interfaceFontsExit();
 
+} // namespace fallout
+
 #endif /* FONT_MANAGER_H */

src/fps_limiter.cc

@@ -2,7 +2,9 @@
 
 #include <SDL.h>
 
-FpsLimiter::FpsLimiter(std::size_t fps)
+namespace fallout {
+
+FpsLimiter::FpsLimiter(unsigned int fps)
     : _fps(fps)
     , _ticks(0)
 {
@@ -19,3 +21,5 @@ void FpsLimiter::throttle() const
         SDL_Delay(1000 / _fps - (SDL_GetTicks() - _ticks));
     }
 }
+
+} // namespace fallout

src/fps_limiter.h

@@ -1,17 +1,19 @@
 #ifndef FPS_LIMITER_H
 #define FPS_LIMITER_H
 
-#include <cstddef>
+namespace fallout {
 
 class FpsLimiter {
 public:
-    FpsLimiter(std::size_t fps = 60);
+    FpsLimiter(unsigned int fps = 60);
     void mark();
     void throttle() const;
 
 private:
-    const std::size_t _fps;
-    std::size_t _ticks;
+    const unsigned int _fps;
+    unsigned int _ticks;
 };
 
+} // namespace fallout
+
 #endif /* FPS_LIMITER_H */

src/game.cc

@@ -18,7 +18,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "db.h"
@@ -26,21 +25,22 @@
 #include "debug.h"
 #include "display_monitor.h"
 #include "draw.h"
-#include "electronic_registration.h"
 #include "endgame.h"
 #include "font_manager.h"
-#include "game_config.h"
 #include "game_dialog.h"
 #include "game_memory.h"
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "inventory.h"
 #include "item.h"
+#include "kb.h"
 #include "loadsave.h"
 #include "map.h"
 #include "memory.h"
+#include "mouse.h"
 #include "movie.h"
 #include "movie_effect.h"
 #include "object.h"
@@ -54,18 +54,23 @@
 #include "queue.h"
 #include "random.h"
 #include "scripts.h"
+#include "settings.h"
 #include "sfall_config.h"
+#include "sfall_global_vars.h"
+#include "sfall_lists.h"
 #include "skill.h"
 #include "skilldex.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "trait.h"
-#include "trap.h"
 #include "version.h"
 #include "window_manager.h"
 #include "worldmap.h"
 
+namespace fallout {
+
 #define HELP_SCREEN_WIDTH (640)
 #define HELP_SCREEN_HEIGHT (480)
 
@@ -90,7 +95,7 @@ static char _aDec11199816543[] = VERSION_BUILD_TIME;
 static bool gGameUiDisabled = false;
 
 // 0x5186B8
-static int _game_state_cur = GAME_STATE_0;
+static int gGameState = GAME_STATE_0;
 
 // 0x5186BC
 static bool gIsMapper = false;
@@ -112,16 +117,6 @@ int _game_user_wants_to_quit = 0;
 // 0x58E940
 MessageList gMiscMessageList;
 
-// master.dat loading result
-//
-// 0x58E948
-int _master_db_handle;
-
-// critter.dat loading result
-//
-// 0x58E94C
-int _critter_db_handle;
-
 // 0x442580
 int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4, int argc, char** argv)
 {
@@ -135,32 +130,33 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
     // override it's file name.
     sfallConfigInit(argc, argv);
 
-    gameConfigInit(isMapper, argc, argv);
+    settingsInit(isMapper, argc, argv);
 
     gIsMapper = isMapper;
 
     if (gameDbInit() == -1) {
-        gameConfigExit(false);
+        settingsExit(false);
         sfallConfigExit();
         return -1;
     }
 
-    runElectronicRegistration();
+    // Message list repository is considered a specialized file manager, so
+    // it should be initialized early in the process.
+    messageListRepositoryInit();
+
     programWindowSetTitle(windowTitle);
     _initWindow(1, a4);
     paletteInit();
 
-    char* language;
-    if (configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language)) {
-        if (compat_stricmp(language, FRENCH) == 0) {
-            keyboardSetLayout(KEYBOARD_LAYOUT_FRENCH);
-        } else if (compat_stricmp(language, GERMAN) == 0) {
-            keyboardSetLayout(KEYBOARD_LAYOUT_GERMAN);
-        } else if (compat_stricmp(language, ITALIAN) == 0) {
-            keyboardSetLayout(KEYBOARD_LAYOUT_ITALIAN);
-        } else if (compat_stricmp(language, SPANISH) == 0) {
-            keyboardSetLayout(KEYBOARD_LAYOUT_SPANISH);
-        }
+    const char* language = settings.system.language.c_str();
+    if (compat_stricmp(language, FRENCH) == 0) {
+        keyboardSetLayout(KEYBOARD_LAYOUT_FRENCH);
+    } else if (compat_stricmp(language, GERMAN) == 0) {
+        keyboardSetLayout(KEYBOARD_LAYOUT_GERMAN);
+    } else if (compat_stricmp(language, ITALIAN) == 0) {
+        keyboardSetLayout(KEYBOARD_LAYOUT_ITALIAN);
+    } else if (compat_stricmp(language, SPANISH) == 0) {
+        keyboardSetLayout(KEYBOARD_LAYOUT_SPANISH);
     }
 
     // SFALL: Allow to skip splash screen
@@ -171,8 +167,6 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
         showSplash();
     }
 
-    _trap_init();
-
     interfaceFontsInit();
     fontManagerAdd(&gModernFontManager);
     fontSetCurrent(font);
@@ -313,7 +307,7 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
 
     debugPrint(">message_init\t");
 
-    sprintf(path, "%s%s", asc_5186C8, "misc.msg");
+    snprintf(path, sizeof(path), "%s%s", asc_5186C8, "misc.msg");
 
     if (!messageListLoad(&gMiscMessageList, path)) {
         debugPrint("Failed on message_load\n");
@@ -346,6 +340,18 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
     // SFALL
     premadeCharactersInit();
 
+    if (!sfallGlobalVarsInit()) {
+        debugPrint("Failed on sfallGlobalVarsInit");
+        return -1;
+    }
+
+    if (!sfallListsInit()) {
+        debugPrint("Failed on sfallListsInit");
+        return -1;
+    }
+
+    messageListRepositorySetStandardMessageList(STANDARD_MESSAGE_LIST_MISC, &gMiscMessageList);
+
     return 0;
 }
 
@@ -386,6 +392,11 @@ void gameReset()
     _game_user_wants_to_quit = 0;
     automapReset();
     _init_options_menu();
+
+    // SFALL
+    sfallGlobalVarsReset();
+    sfallListsReset();
+    messageListRepositoryReset();
 }
 
 // 0x442C34
@@ -394,9 +405,12 @@ void gameExit()
     debugPrint("\nGame Exit\n");
 
     // SFALL
+    sfallListsExit();
+    sfallGlobalVarsExit();
     premadeCharactersExit();
 
     tileDisable();
+    messageListRepositorySetStandardMessageList(STANDARD_MESSAGE_LIST_MISC, nullptr);
     messageListFree(&gMiscMessageList);
     combatExit();
     gameDialogExit();
@@ -429,10 +443,10 @@ void gameExit()
     partyMembersExit();
     endgameDeathEndingExit();
     interfaceFontsExit();
-    _trap_init();
     _windowClose();
+    messageListRepositoryExit();
     dbExit();
-    gameConfigExit(true);
+    settingsExit(true);
     sfallConfigExit();
 }
 
@@ -440,7 +454,7 @@ void gameExit()
 int gameHandleKey(int eventCode, bool isInCombatMode)
 {
     // NOTE: Uninline.
-    if (_game_state() == GAME_STATE_5) {
+    if (gameGetState() == GAME_STATE_5) {
         _gdialogSystemEnter();
     }
 
@@ -694,7 +708,7 @@ int gameHandleKey(int eventCode, bool isInCombatMode)
         }
 
         if (gIsMapper) {
-            tileSetCenter(gDude->tile, TILE_SET_CENTER_FLAG_0x01);
+            tileSetCenter(gDude->tile, TILE_SET_CENTER_REFRESH_WINDOW);
         } else {
             _tile_scroll_to(gDude->tile, 2);
         }
@@ -799,7 +813,7 @@ int gameHandleKey(int eventCode, bool isInCombatMode)
             MessageList messageList;
             if (messageListInit(&messageList)) {
                 char path[COMPAT_MAX_PATH];
-                sprintf(path, "%s%s", asc_5186C8, "editor.msg");
+                snprintf(path, sizeof(path), "%s%s", asc_5186C8, "editor.msg");
 
                 if (messageListLoad(&messageList, path)) {
                     MessageListItem messageListItem;
@@ -808,7 +822,7 @@ int gameHandleKey(int eventCode, bool isInCombatMode)
                         char* time = gameTimeGetTimeString();
 
                         char date[128];
-                        sprintf(date, "%s: %d/%d %s", messageListItem.text, day, year, time);
+                        snprintf(date, sizeof(date), "%s: %d/%d %s", messageListItem.text, day, year, time);
 
                         displayMonitorAddMessage(date);
                     }
@@ -877,7 +891,7 @@ int gameHandleKey(int eventCode, bool isInCombatMode)
             soundPlayFile("ib1p1xx1");
 
             char version[VERSION_MAX];
-            versionGetVersion(version);
+            versionGetVersion(version, sizeof(version));
             displayMonitorAddMessage(version);
             displayMonitorAddMessage(_aDec11199816543);
         }
@@ -961,9 +975,9 @@ int gameSetGlobalVar(int var, int value)
             if (diff != 0) {
                 char formattedMessage[80];
                 if (diff > 0) {
-                    sprintf(formattedMessage, "You gained %d karma.", diff);
+                    snprintf(formattedMessage, sizeof(formattedMessage), "You gained %d karma.", diff);
                 } else {
-                    sprintf(formattedMessage, "You lost %d karma.", -diff);
+                    snprintf(formattedMessage, sizeof(formattedMessage), "You lost %d karma.", -diff);
                 }
                 displayMonitorAddMessage(formattedMessage);
             }
@@ -1042,48 +1056,48 @@ int globalVarsRead(const char* path, const char* section, int* variablesListLeng
 }
 
 // 0x443E2C
-int _game_state()
+int gameGetState()
 {
-    return _game_state_cur;
+    return gGameState;
 }
 
 // 0x443E34
-int _game_state_request(int a1)
+int gameRequestState(int newGameState)
 {
-    if (a1 == GAME_STATE_0) {
-        a1 = GAME_STATE_1;
-    } else if (a1 == GAME_STATE_2) {
-        a1 = GAME_STATE_3;
-    } else if (a1 == GAME_STATE_4) {
-        a1 = GAME_STATE_5;
+    switch (newGameState) {
+    case GAME_STATE_0:
+        newGameState = GAME_STATE_1;
+        break;
+    case GAME_STATE_2:
+        newGameState = GAME_STATE_3;
+        break;
+    case GAME_STATE_4:
+        newGameState = GAME_STATE_5;
+        break;
     }
 
-    if (_game_state_cur != GAME_STATE_4 || a1 != GAME_STATE_5) {
-        _game_state_cur = a1;
-        return 0;
+    if (gGameState == GAME_STATE_4 && newGameState == GAME_STATE_5) {
+        return -1;
     }
 
-    return -1;
+    gGameState = newGameState;
+    return 0;
 }
 
 // 0x443E90
-void _game_state_update()
+void gameUpdateState()
 {
-    int v0;
-
-    v0 = _game_state_cur;
-    switch (_game_state_cur) {
+    switch (gGameState) {
     case GAME_STATE_1:
-        v0 = GAME_STATE_0;
+        gGameState = GAME_STATE_0;
         break;
     case GAME_STATE_3:
-        v0 = GAME_STATE_2;
+        gGameState = GAME_STATE_2;
         break;
     case GAME_STATE_5:
-        v0 = GAME_STATE_4;
+        gGameState = GAME_STATE_4;
+        break;
     }
-
-    _game_state_cur = v0;
 }
 
 // 0x443EF0
@@ -1125,6 +1139,8 @@ static void gameFreeGlobalVars()
 // 0x443F74
 static void showHelp()
 {
+    ScopedGameMode gm(GameMode::kHelp);
+
     bool isoWasEnabled = isoDisable();
     gameMouseObjectsHide();
 
@@ -1133,34 +1149,56 @@ static void showHelp()
     bool colorCycleWasEnabled = colorCycleEnabled();
     colorCycleDisable();
 
+    // CE: Help screen uses separate color palette which is incompatible with
+    // colors in other windows. Setup overlay to hide everything.
+    int overlay = windowCreate(0, 0, screenGetWidth(), screenGetHeight(), 0, WINDOW_HIDDEN | WINDOW_MOVE_ON_TOP);
+
     int helpWindowX = (screenGetWidth() - HELP_SCREEN_WIDTH) / 2;
     int helpWindowY = (screenGetHeight() - HELP_SCREEN_HEIGHT) / 2;
-    int win = windowCreate(helpWindowX, helpWindowY, HELP_SCREEN_WIDTH, HELP_SCREEN_HEIGHT, 0, WINDOW_HIDDEN | WINDOW_FLAG_0x04);
+    int win = windowCreate(helpWindowX, helpWindowY, HELP_SCREEN_WIDTH, HELP_SCREEN_HEIGHT, 0, WINDOW_HIDDEN | WINDOW_MOVE_ON_TOP);
     if (win != -1) {
         unsigned char* windowBuffer = windowGetBuffer(win);
         if (windowBuffer != NULL) {
+            FrmImage backgroundFrmImage;
             int backgroundFid = buildFid(OBJ_TYPE_INTERFACE, 297, 0, 0, 0);
-            CacheEntry* backgroundHandle;
-            unsigned char* backgroundData = artLockFrameData(backgroundFid, 0, 0, &backgroundHandle);
-            if (backgroundData != NULL) {
+            if (backgroundFrmImage.lock(backgroundFid)) {
                 paletteSetEntries(gPaletteBlack);
-                blitBufferToBuffer(backgroundData, HELP_SCREEN_WIDTH, HELP_SCREEN_HEIGHT, HELP_SCREEN_WIDTH, windowBuffer, HELP_SCREEN_WIDTH);
-                artUnlock(backgroundHandle);
-                windowUnhide(win);
+                blitBufferToBuffer(backgroundFrmImage.getData(), HELP_SCREEN_WIDTH, HELP_SCREEN_HEIGHT, HELP_SCREEN_WIDTH, windowBuffer, HELP_SCREEN_WIDTH);
+
                 colorPaletteLoad("art\\intrface\\helpscrn.pal");
                 paletteSetEntries(_cmap);
 
-                while (_get_input() == -1 && _game_user_wants_to_quit == 0) {
+                // CE: Fill overlay with darkest color in the palette. It might
+                // not be completely black, but at least it's uniform.
+                bufferFill(windowGetBuffer(overlay),
+                    screenGetWidth(),
+                    screenGetHeight(),
+                    screenGetWidth(),
+                    intensityColorTable[_colorTable[0]][0]);
+
+                windowShow(overlay);
+                windowShow(win);
+
+                while (inputGetInput() == -1 && _game_user_wants_to_quit == 0) {
+                    sharedFpsLimiter.mark();
+                    renderPresent();
+                    sharedFpsLimiter.throttle();
                 }
 
                 while (mouseGetEvent() != 0) {
-                    _get_input();
+                    sharedFpsLimiter.mark();
+
+                    inputGetInput();
+
+                    renderPresent();
+                    sharedFpsLimiter.throttle();
                 }
 
                 paletteSetEntries(gPaletteBlack);
             }
         }
 
+        windowDestroy(overlay);
         windowDestroy(win);
         colorPaletteLoad("color.pal");
         paletteSetEntries(_cmap);
@@ -1235,84 +1273,74 @@ int showQuitConfirmationDialog()
 // 0x44418C
 static int gameDbInit()
 {
-    int hashing;
-    char* main_file_name;
-    char* patch_file_name;
+    const char* main_file_name;
+    const char* patch_file_name;
     int patch_index;
     char filename[COMPAT_MAX_PATH];
 
-    hashing = 0;
     main_file_name = NULL;
     patch_file_name = NULL;
 
-    if (configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_HASHING_KEY, &hashing)) {
-        _db_enable_hash_table_();
-    }
-
-    configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_MASTER_DAT_KEY, &main_file_name);
+    main_file_name = settings.system.master_dat_path.c_str();
     if (*main_file_name == '\0') {
         main_file_name = NULL;
     }
 
-    configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_MASTER_PATCHES_KEY, &patch_file_name);
+    patch_file_name = settings.system.master_patches_path.c_str();
     if (*patch_file_name == '\0') {
         patch_file_name = NULL;
     }
 
-    _master_db_handle = dbOpen(main_file_name, 0, patch_file_name, 1);
-    if (_master_db_handle == -1) {
+    int master_db_handle = dbOpen(main_file_name, 0, patch_file_name, 1);
+    if (master_db_handle == -1) {
         showMesageBox("Could not find the master datafile. Please make sure the FALLOUT CD is in the drive and that you are running FALLOUT from the directory you installed it to.");
         return -1;
     }
 
-    configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CRITTER_DAT_KEY, &main_file_name);
+    main_file_name = settings.system.critter_dat_path.c_str();
     if (*main_file_name == '\0') {
         main_file_name = NULL;
     }
 
-    configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CRITTER_PATCHES_KEY, &patch_file_name);
+    patch_file_name = settings.system.critter_patches_path.c_str();
     if (*patch_file_name == '\0') {
         patch_file_name = NULL;
     }
 
-    _critter_db_handle = dbOpen(main_file_name, 0, patch_file_name, 1);
-    if (_critter_db_handle == -1) {
-        _db_select(_master_db_handle);
+    int critter_db_handle = dbOpen(main_file_name, 0, patch_file_name, 1);
+    if (critter_db_handle == -1) {
         showMesageBox("Could not find the critter datafile. Please make sure the FALLOUT CD is in the drive and that you are running FALLOUT from the directory you installed it to.");
         return -1;
     }
 
     for (patch_index = 0; patch_index < 1000; patch_index++) {
-        sprintf(filename, "patch%03d.dat", patch_index);
+        snprintf(filename, sizeof(filename), "patch%03d.dat", patch_index);
 
         if (access(filename, 0) == 0) {
             dbOpen(filename, 0, NULL, 1);
         }
     }
 
-    _db_select(_master_db_handle);
-
     return 0;
 }
 
 // 0x444384
 static void showSplash()
 {
-    int splash;
-    configGetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_SPLASH_KEY, &splash);
+    int splash = settings.system.splash;
 
     char path[64];
-    char* language;
-    if (configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language) && compat_stricmp(language, ENGLISH) != 0) {
-        sprintf(path, "art\\%s\\splash\\", language);
+    const char* language = settings.system.language.c_str();
+    if (compat_stricmp(language, ENGLISH) != 0) {
+        snprintf(path, sizeof(path), "art\\%s\\splash\\", language);
     } else {
-        sprintf(path, "art\\splash\\");
+        snprintf(path, sizeof(path), "art\\splash\\");
     }
 
     File* stream;
     for (int index = 0; index < SPLASH_COUNT; index++) {
         char filePath[64];
-        sprintf(filePath, "%ssplash%d.rix", path, splash);
+        snprintf(filePath, sizeof(filePath), "%ssplash%d.rix", path, splash);
         stream = fileOpen(filePath, "rb");
         if (stream != NULL) {
             break;
@@ -1329,13 +1357,26 @@ static void showSplash()
         return;
     }
 
-    unsigned char* palette = (unsigned char*)internal_malloc(768);
+    unsigned char* palette = reinterpret_cast<unsigned char*>(internal_malloc(768));
     if (palette == NULL) {
         fileClose(stream);
         return;
     }
 
-    unsigned char* data = (unsigned char*)internal_malloc(SPLASH_WIDTH * SPLASH_HEIGHT);
+    int version;
+    fileReadInt32(stream, &version);
+    if (version != 'RIX3') {
+        fileClose(stream);
+        return;
+    }
+
+    short width;
+    fileRead(&width, sizeof(width), 1, stream);
+
+    short height;
+    fileRead(&height, sizeof(height), 1, stream);
+
+    unsigned char* data = reinterpret_cast<unsigned char*>(internal_malloc(width * height));
     if (data == NULL) {
         internal_free(palette);
         fileClose(stream);
@@ -1345,18 +1386,63 @@ static void showSplash()
     paletteSetEntries(gPaletteBlack);
     fileSeek(stream, 10, SEEK_SET);
     fileRead(palette, 1, 768, stream);
-    fileRead(data, 1, SPLASH_WIDTH * SPLASH_HEIGHT, stream);
+    fileRead(data, 1, width * height, stream);
     fileClose(stream);
 
-    int splashWindowX = (screenGetWidth() - SPLASH_WIDTH) / 2;
-    int splashWindowY = (screenGetHeight() - SPLASH_HEIGHT) / 2;
-    _scr_blit(data, SPLASH_WIDTH, SPLASH_HEIGHT, 0, 0, SPLASH_WIDTH, SPLASH_HEIGHT, splashWindowX, splashWindowY);
-    paletteFadeTo(palette);
+    int size = 0;
+
+    // TODO: Move to settings.
+    Config config;
+    if (configInit(&config)) {
+        if (configRead(&config, "f2_res.ini", false)) {
+            configGetInt(&config, "STATIC_SCREENS", "SPLASH_SCRN_SIZE", &size);
+        }
+
+        configFree(&config);
+    }
+
+    int screenWidth = screenGetWidth();
+    int screenHeight = screenGetHeight();
+
+    if (size != 0 || screenWidth < width || screenHeight < height) {
+        int scaledWidth;
+        int scaledHeight;
+
+        if (size == 2) {
+            scaledWidth = screenWidth;
+            scaledHeight = screenHeight;
+        } else {
+            if (screenHeight * width >= screenWidth * height) {
+                scaledWidth = screenWidth;
+                scaledHeight = screenWidth * height / width;
+            } else {
+                scaledWidth = screenHeight * width / height;
+                scaledHeight = screenHeight;
+            }
+        }
+
+        unsigned char* scaled = reinterpret_cast<unsigned char*>(internal_malloc(scaledWidth * scaledHeight));
+        if (scaled != NULL) {
+            blitBufferToBufferStretch(data, width, height, width, scaled, scaledWidth, scaledHeight, scaledWidth);
+
+            int x = screenWidth > scaledWidth ? (screenWidth - scaledWidth) / 2 : 0;
+            int y = screenHeight > scaledHeight ? (screenHeight - scaledHeight) / 2 : 0;
+            _scr_blit(scaled, scaledWidth, scaledHeight, 0, 0, scaledWidth, scaledHeight, x, y);
+            paletteFadeTo(palette);
+
+            internal_free(scaled);
+        }
+    } else {
+        int x = (screenWidth - width) / 2;
+        int y = (screenHeight - height) / 2;
+        _scr_blit(data, width, height, 0, 0, width, height, x, y);
+        paletteFadeTo(palette);
+    }
 
     internal_free(data);
     internal_free(palette);
 
-    configSetInt(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_SPLASH_KEY, splash + 1);
+    settings.system.splash = splash + 1;
 }
 
 int gameShowDeathDialog(const char* message)
@@ -1405,3 +1491,33 @@ int gameShowDeathDialog(const char* message)
 
     return rc;
 }
+
+int GameMode::currentGameMode = 0;
+
+void GameMode::enterGameMode(int gameMode)
+{
+    currentGameMode |= gameMode;
+}
+
+void GameMode::exitGameMode(int gameMode)
+{
+    currentGameMode &= ~gameMode;
+}
+
+bool GameMode::isInGameMode(int gameMode)
+{
+    return (currentGameMode & gameMode) != 0;
+}
+
+ScopedGameMode::ScopedGameMode(int gameMode)
+{
+    this->gameMode = gameMode;
+    GameMode::enterGameMode(gameMode);
+}
+
+ScopedGameMode::~ScopedGameMode()
+{
+    GameMode::exitGameMode(gameMode);
+}
+
+} // namespace fallout

src/game.h

@@ -4,6 +4,8 @@
 #include "game_vars.h"
 #include "message.h"
 
+namespace fallout {
+
 typedef enum GameState {
     GAME_STATE_0,
     GAME_STATE_1,
@@ -19,8 +21,6 @@ extern const char* asc_5186C8;
 extern int _game_user_wants_to_quit;
 
 extern MessageList gMiscMessageList;
-extern int _master_db_handle;
-extern int _critter_db_handle;
 
 int gameInitWithOptions(const char* windowTitle, bool isMapper, int a3, int a4, int argc, char** argv);
 void gameReset();
@@ -32,11 +32,57 @@ bool gameUiIsDisabled();
 int gameGetGlobalVar(int var);
 int gameSetGlobalVar(int var, int value);
 int globalVarsRead(const char* path, const char* section, int* variablesListLengthPtr, int** variablesListPtr);
-int _game_state();
-int _game_state_request(int a1);
-void _game_state_update();
+int gameGetState();
+int gameRequestState(int newGameState);
+void gameUpdateState();
 int showQuitConfirmationDialog();
 
 int gameShowDeathDialog(const char* message);
 
+class GameMode {
+public:
+    enum Flags {
+        kWorldmap = 0x1,
+        kDialog = 0x4,
+        kOptions = 0x8,
+        kSaveGame = 0x10,
+        kLoadGame = 0x20,
+        kCombat = 0x40,
+        kPreferences = 0x80,
+        kHelp = 0x100,
+        kEditor = 0x200,
+        kPipboy = 0x400,
+        kPlayerTurn = 0x800,
+        kInventory = 0x1000,
+        kAutomap = 0x2000,
+        kSkilldex = 0x4000,
+        kUseOn = 0x8000,
+        kLoot = 0x10000,
+        kBarter = 0x20000,
+        kHero = 0x40000,
+        kDialogReview = 0x80000,
+        kCounter = 0x100000,
+        kSpecial = 0x80000000,
+    };
+
+    static void enterGameMode(int gameMode);
+    static void exitGameMode(int gameMode);
+    static bool isInGameMode(int gameMode);
+    static int getCurrentGameMode() { return currentGameMode; }
+
+private:
+    static int currentGameMode;
+};
+
+class ScopedGameMode {
+public:
+    ScopedGameMode(int gameMode);
+    ~ScopedGameMode();
+
+private:
+    int gameMode;
+};
+
+} // namespace fallout
+
 #endif /* GAME_H */

src/game_config.cc

@@ -6,6 +6,8 @@
 #include "main.h"
 #include "platform_compat.h"
 
+namespace fallout {
+
 // A flag indicating if [gGameConfig] was initialized.
 //
 // 0x5186D0
@@ -123,7 +125,7 @@ bool gameConfigInit(bool isMapper, int argc, char** argv)
     char* ch = strrchr(executable, '\\');
     if (ch != NULL) {
         *ch = '\0';
-        sprintf(gGameConfigFilePath, "%s\\%s", executable, GAME_CONFIG_FILE_NAME);
+        snprintf(gGameConfigFilePath, sizeof(gGameConfigFilePath), "%s\\%s", executable, GAME_CONFIG_FILE_NAME);
         *ch = '\\';
     } else {
         strcpy(gGameConfigFilePath, GAME_CONFIG_FILE_NAME);
@@ -181,3 +183,5 @@ bool gameConfigExit(bool shouldSave)
 
     return result;
 }
+
+} // namespace fallout

src/game_config.h

@@ -3,6 +3,8 @@
 
 #include "config.h"
 
+namespace fallout {
+
 // The file name of the main config file.
 #define GAME_CONFIG_FILE_NAME "fallout2.cfg"
 
@@ -120,4 +122,6 @@ bool gameConfigInit(bool isMapper, int argc, char** argv);
 bool gameConfigSave();
 bool gameConfigExit(bool shouldSave);
 
+} // namespace fallout
+
 #endif /* GAME_CONFIG_H */

src/game_dialog.h

@@ -4,6 +4,8 @@
 #include "interpreter.h"
 #include "obj_types.h"
 
+namespace fallout {
+
 extern Object* gGameDialogSpeaker;
 extern bool gGameDialogSpeakerIsPartyMember;
 extern int gGameDialogHeadFid;
@@ -13,7 +15,7 @@ int gameDialogInit();
 int gameDialogReset();
 int gameDialogExit();
 bool _gdialogActive();
-void gameDialogEnter(Object* a1, int a2);
+void gameDialogEnter(Object* speaker, int a2);
 void _gdialogSystemEnter();
 void gameDialogStartLips(const char* a1);
 int gameDialogEnable();
@@ -37,4 +39,6 @@ void gameDialogSetBarterModifier(int modifier);
 int gameDialogBarter(int modifier);
 void _barter_end_to_talk_to();
 
+} // namespace fallout
+
 #endif /* GAME_DIALOG_H */

src/game_memory.cc

@@ -6,6 +6,8 @@
 #include "memory_defs.h"
 #include "memory_manager.h"
 
+namespace fallout {
+
 static void* gameMemoryMalloc(size_t size);
 static void* gameMemoryRealloc(void* ptr, size_t newSize);
 static void gameMemoryFree(void* ptr);
@@ -14,7 +16,6 @@ static void gameMemoryFree(void* ptr);
 int gameMemoryInit()
 {
     dictionarySetMemoryProcs(internal_malloc, internal_realloc, internal_free);
-    _db_register_mem(internal_malloc, internal_strdup, internal_free);
     memoryManagerSetProcs(gameMemoryMalloc, gameMemoryRealloc, gameMemoryFree);
 
     return 0;
@@ -37,3 +38,5 @@ static void gameMemoryFree(void* ptr)
 {
     internal_free(ptr);
 }
+
+} // namespace fallout

src/game_memory.h

@@ -1,6 +1,10 @@
 #ifndef GAME_MEMORY_H
 #define GAME_MEMORY_H
 
+namespace fallout {
+
 int gameMemoryInit();
 
+} // namespace fallout
+
 #endif /* GAME_MEMORY_H */

src/game_mouse.cc

@@ -4,29 +4,36 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <algorithm>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "draw.h"
 #include "game.h"
-#include "game_config.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
+#include "kb.h"
+#include "mouse.h"
 #include "object.h"
 #include "proto.h"
 #include "proto_instance.h"
+#include "settings.h"
 #include "sfall_config.h"
 #include "skill.h"
 #include "skilldex.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "window_manager.h"
 
+namespace fallout {
+
 typedef enum ScrollableDirections {
     SCROLLABLE_W = 0x01,
     SCROLLABLE_E = 0x02,
@@ -687,7 +694,7 @@ void gameMouseRefresh()
                                     primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_TALK;
                                 }
                             } else {
-                                if (_critter_flag_check(pointedObject->pid, CRITTER_FLAG_0x20)) {
+                                if (_critter_flag_check(pointedObject->pid, CRITTER_NO_STEAL)) {
                                     primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_LOOK;
                                 } else {
                                     primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_USE;
@@ -735,9 +742,7 @@ void gameMouseRefresh()
                 if (pointedObject != NULL) {
                     bool pointedObjectIsCritter = FID_TYPE(pointedObject->fid) == OBJ_TYPE_CRITTER;
 
-                    int combatLooks = 0;
-                    configGetInt(&gGameConfig, GAME_CONFIG_PREFERENCES_KEY, GAME_CONFIG_COMBAT_LOOKS_KEY, &combatLooks);
-                    if (combatLooks != 0) {
+                    if (settings.preferences.combat_looks) {
                         if (_obj_examine(gDude, pointedObject) == -1) {
                             _obj_look_at(gDude, pointedObject);
                         }
@@ -747,7 +752,7 @@ void gameMouseRefresh()
                     int accuracy;
                     char formattedAccuracy[8];
                     if (_combat_to_hit(pointedObject, &accuracy)) {
-                        sprintf(formattedAccuracy, "%d%%", accuracy);
+                        snprintf(formattedAccuracy, sizeof(formattedAccuracy), "%d%%", accuracy);
 
                         if (pointedObjectIsCritter) {
                             if (pointedObject->data.critter.combat.team != 0) {
@@ -759,7 +764,7 @@ void gameMouseRefresh()
                             color = _colorTable[17969];
                         }
                     } else {
-                        sprintf(formattedAccuracy, " %c ", 'X');
+                        snprintf(formattedAccuracy, sizeof(formattedAccuracy), " %c ", 'X');
 
                         if (pointedObjectIsCritter) {
                             if (pointedObject->data.critter.combat.team != 0) {
@@ -799,30 +804,25 @@ void gameMouseRefresh()
 
         char formattedActionPoints[8];
         int color;
-        int v6 = _make_path(gDude, gDude->tile, gGameMouseHexCursor->tile, NULL, 1);
-        if (v6) {
+        int distance = _make_path(gDude, gDude->tile, gGameMouseHexCursor->tile, NULL, 1);
+        if (distance != 0) {
             if (!isInCombat()) {
                 formattedActionPoints[0] = '\0';
                 color = _colorTable[31744];
             } else {
-                int v7 = critterGetMovementPointCostAdjustedForCrippledLegs(gDude, v6);
-                int v8;
-                if (v7 - _combat_free_move >= 0) {
-                    v8 = v7 - _combat_free_move;
-                } else {
-                    v8 = 0;
-                }
+                int actionPointsMax = critterGetMovementPointCostAdjustedForCrippledLegs(gDude, distance);
+                int actionPointsRequired = std::max(0, actionPointsMax - _combat_free_move);
 
-                if (v8 <= gDude->data.critter.combat.ap) {
-                    sprintf(formattedActionPoints, "%d", v8);
+                if (actionPointsRequired <= gDude->data.critter.combat.ap) {
+                    snprintf(formattedActionPoints, sizeof(formattedActionPoints), "%d", actionPointsRequired);
                     color = _colorTable[32767];
                 } else {
-                    sprintf(formattedActionPoints, "%c", 'X');
+                    snprintf(formattedActionPoints, sizeof(formattedActionPoints), "%c", 'X');
                     color = _colorTable[31744];
                 }
             }
         } else {
-            sprintf(formattedActionPoints, "%c", 'X');
+            snprintf(formattedActionPoints, sizeof(formattedActionPoints), "%c", 'X');
             color = _colorTable[31744];
         }
 
@@ -933,16 +933,13 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                 actionPoints = -1;
             }
 
-            bool running;
-            configGetBool(&gGameConfig, GAME_CONFIG_PREFERENCES_KEY, GAME_CONFIG_RUNNING_KEY, &running);
-
             if (gPressedPhysicalKeys[SDL_SCANCODE_LSHIFT] || gPressedPhysicalKeys[SDL_SCANCODE_RSHIFT]) {
-                if (running) {
+                if (settings.preferences.running) {
                     _dude_move(actionPoints);
                     return;
                 }
             } else {
-                if (!running) {
+                if (!settings.preferences.running) {
                     _dude_move(actionPoints);
                     return;
                 }
@@ -1014,7 +1011,7 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                 _gmouse_3d_hover_test = true;
                 gGameMouseLastY = mouseY;
                 gGameMouseLastX = mouseX;
-                _gmouse_3d_last_move_time = _get_time() - 250;
+                _gmouse_3d_last_move_time = getTicks() - 250;
             }
             return;
         }
@@ -1091,7 +1088,7 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                             actionMenuItems[actionMenuItemsCount++] = GAME_MOUSE_ACTION_MENU_ITEM_TALK;
                         }
                     } else {
-                        if (!_critter_flag_check(v16->pid, CRITTER_FLAG_0x20)) {
+                        if (!_critter_flag_check(v16->pid, CRITTER_NO_STEAL)) {
                             actionMenuItems[actionMenuItemsCount++] = GAME_MOUSE_ACTION_MENU_ITEM_USE;
                         }
                     }
@@ -1136,7 +1133,9 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                     int v33 = mouseY;
                     int actionIndex = 0;
                     while ((mouseGetEvent() & MOUSE_EVENT_LEFT_BUTTON_UP) == 0) {
-                        _get_input();
+                        sharedFpsLimiter.mark();
+
+                        inputGetInput();
 
                         if (_game_user_wants_to_quit != 0) {
                             actionMenuItems[actionIndex] = 0;
@@ -1158,6 +1157,9 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                             }
                             v33 = v47;
                         }
+
+                        renderPresent();
+                        sharedFpsLimiter.throttle();
                     }
 
                     isoEnable();
@@ -1165,7 +1167,7 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                     _gmouse_3d_hover_test = false;
                     gGameMouseLastX = mouseX;
                     gGameMouseLastY = mouseY;
-                    _gmouse_3d_last_move_time = _get_time();
+                    _gmouse_3d_last_move_time = getTicks();
 
                     _mouse_set_position(mouseX, v33);
 
@@ -1271,7 +1273,7 @@ int gameMouseSetCursor(int cursor)
     bool shouldUpdate = true;
     int frame = 0;
     if (cursor >= FIRST_GAME_MOUSE_ANIMATED_CURSOR) {
-        unsigned int tick = _get_time();
+        unsigned int tick = getTicks();
 
         if ((gGameMouseHexCursor->flags & OBJECT_HIDDEN) == 0) {
             gameMouseObjectsHide();
@@ -1390,7 +1392,7 @@ void gameMouseSetMode(int mode)
 
     gGameMouseMode = mode;
     _gmouse_3d_hover_test = false;
-    _gmouse_3d_last_move_time = _get_time();
+    _gmouse_3d_last_move_time = getTicks();
 
     tileWindowRefreshRect(&rect, gElevation);
 
@@ -1558,7 +1560,7 @@ void gameMouseObjectsShow()
     }
 
     _gmouse_3d_hover_test = false;
-    _gmouse_3d_last_move_time = _get_time() - 250;
+    _gmouse_3d_last_move_time = getTicks() - 250;
 }
 
 // 0x44CE34
@@ -1940,10 +1942,7 @@ int gameMouseRenderActionPoints(const char* string, int color)
 // 0x44D954
 void gameMouseLoadItemHighlight()
 {
-    bool itemHighlight;
-    if (configGetBool(&gGameConfig, GAME_CONFIG_PREFERENCES_KEY, GAME_CONFIG_ITEM_HIGHLIGHT_KEY, &itemHighlight)) {
-        gGameMouseItemHighlightEnabled = itemHighlight;
-    }
+    gGameMouseItemHighlightEnabled = settings.preferences.item_highlight;
 }
 
 // 0x44D984
@@ -1974,13 +1973,13 @@ int gameMouseObjectsInit()
     }
 
     gGameMouseBouncingCursor->flags |= OBJECT_LIGHT_THRU;
-    gGameMouseBouncingCursor->flags |= OBJECT_TEMPORARY;
-    gGameMouseBouncingCursor->flags |= OBJECT_FLAG_0x400;
+    gGameMouseBouncingCursor->flags |= OBJECT_NO_SAVE;
+    gGameMouseBouncingCursor->flags |= OBJECT_NO_REMOVE;
     gGameMouseBouncingCursor->flags |= OBJECT_SHOOT_THRU;
     gGameMouseBouncingCursor->flags |= OBJECT_NO_BLOCK;
 
-    gGameMouseHexCursor->flags |= OBJECT_FLAG_0x400;
-    gGameMouseHexCursor->flags |= OBJECT_TEMPORARY;
+    gGameMouseHexCursor->flags |= OBJECT_NO_REMOVE;
+    gGameMouseHexCursor->flags |= OBJECT_NO_SAVE;
     gGameMouseHexCursor->flags |= OBJECT_LIGHT_THRU;
     gGameMouseHexCursor->flags |= OBJECT_SHOOT_THRU;
     gGameMouseHexCursor->flags |= OBJECT_NO_BLOCK;
@@ -2022,7 +2021,7 @@ int gameMouseObjectsReset()
     gGameMouseLastX = -1;
     gGameMouseLastY = -1;
     _gmouse_3d_hover_test = false;
-    _gmouse_3d_last_move_time = _get_time();
+    _gmouse_3d_last_move_time = getTicks();
     gameMouseLoadItemHighlight();
 
     return 0;
@@ -2036,8 +2035,8 @@ void gameMouseObjectsFree()
     if (gGameMouseObjectsInitialized) {
         gameMouseActionMenuFree();
 
-        gGameMouseBouncingCursor->flags &= ~OBJECT_TEMPORARY;
-        gGameMouseHexCursor->flags &= ~OBJECT_TEMPORARY;
+        gGameMouseBouncingCursor->flags &= ~OBJECT_NO_SAVE;
+        gGameMouseHexCursor->flags &= ~OBJECT_NO_SAVE;
 
         objectDestroy(gGameMouseBouncingCursor, NULL);
         objectDestroy(gGameMouseHexCursor, NULL);
@@ -2251,9 +2250,7 @@ int _gmouse_3d_move_to(int x, int y, int elevation, Rect* a4)
             x1 = -8;
             y1 = 13;
 
-            char* executable;
-            configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_EXECUTABLE_KEY, &executable);
-            if (compat_stricmp(executable, "mapper") == 0) {
+            if (compat_stricmp(settings.system.executable.c_str(), "mapper") == 0) {
                 if (tileRoofIsVisible()) {
                     if ((gDude->flags & OBJECT_HIDDEN) == 0) {
                         y1 = -83;
@@ -2454,3 +2451,11 @@ static void customMouseModeFrmsInit()
     configGetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_USE_SCIENCE_FRM_KEY, &(gGameMouseModeFrmIds[GAME_MOUSE_MODE_USE_SCIENCE]));
     configGetInt(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_USE_REPAIR_FRM_KEY, &(gGameMouseModeFrmIds[GAME_MOUSE_MODE_USE_REPAIR]));
 }
+
+void gameMouseRefreshImmediately()
+{
+    gameMouseRefresh();
+    renderPresent();
+}
+
+} // namespace fallout

src/game_mouse.h

@@ -3,6 +3,8 @@
 
 #include "obj_types.h"
 
+namespace fallout {
+
 typedef enum GameMouseMode {
     GAME_MOUSE_MODE_MOVE,
     GAME_MOUSE_MODE_ARROW,
@@ -99,4 +101,8 @@ int gameMouseHighlightActionMenuItemAtIndex(int menuItemIndex);
 void gameMouseLoadItemHighlight();
 void _gmouse_remove_item_outline(Object* object);
 
+void gameMouseRefreshImmediately();
+
+} // namespace fallout
+
 #endif /* GAME_MOUSE_H */

src/game_movie.cc

@@ -4,20 +4,24 @@
 #include <string.h>
 
 #include "color.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "game.h"
-#include "game_config.h"
 #include "game_mouse.h"
 #include "game_sound.h"
+#include "input.h"
+#include "mouse.h"
 #include "movie.h"
 #include "movie_effect.h"
 #include "palette.h"
 #include "platform_compat.h"
+#include "settings.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 
+namespace fallout {
+
 #define GAME_MOVIE_WINDOW_WIDTH 640
 #define GAME_MOVIE_WINDOW_HEIGHT 480
 
@@ -139,24 +143,18 @@ int gameMoviePlay(int movie, int flags)
     const char* movieFileName = gMovieFileNames[movie];
     debugPrint("\nPlaying movie: %s\n", movieFileName);
 
-    char* language;
-    if (!configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language)) {
-        debugPrint("\ngmovie_play() - Error: Unable to determine language!\n");
-        gGameMovieIsPlaying = false;
-        return -1;
-    }
-
+    const char* language = settings.system.language.c_str();
     char movieFilePath[COMPAT_MAX_PATH];
     int movieFileSize;
     bool movieFound = false;
 
     if (compat_stricmp(language, ENGLISH) != 0) {
-        sprintf(movieFilePath, "art\\%s\\cuts\\%s", language, gMovieFileNames[movie]);
+        snprintf(movieFilePath, sizeof(movieFilePath), "art\\%s\\cuts\\%s", language, gMovieFileNames[movie]);
         movieFound = dbGetFileSize(movieFilePath, &movieFileSize) == 0;
     }
 
     if (!movieFound) {
-        sprintf(movieFilePath, "art\\cuts\\%s", gMovieFileNames[movie]);
+        snprintf(movieFilePath, sizeof(movieFilePath), "art\\cuts\\%s", gMovieFileNames[movie]);
         movieFound = dbGetFileSize(movieFilePath, &movieFileSize) == 0;
     }
 
@@ -178,7 +176,7 @@ int gameMoviePlay(int movie, int flags)
         GAME_MOVIE_WINDOW_WIDTH,
         GAME_MOVIE_WINDOW_HEIGHT,
         0,
-        WINDOW_FLAG_0x10);
+        WINDOW_MODAL);
     if (win == -1) {
         gGameMovieIsPlaying = false;
         return -1;
@@ -192,9 +190,8 @@ int gameMoviePlay(int movie, int flags)
 
     windowRefresh(win);
 
-    bool subtitlesEnabled = false;
+    bool subtitlesEnabled = settings.preferences.subtitles;
     int v1 = 4;
-    configGetBool(&gGameConfig, GAME_CONFIG_PREFERENCES_KEY, GAME_CONFIG_SUBTITLES_KEY, &subtitlesEnabled);
     if (subtitlesEnabled) {
         char* subtitlesFilePath = gameMovieBuildSubtitlesFilePath(movieFilePath);
 
@@ -248,7 +245,7 @@ int gameMoviePlay(int movie, int flags)
     int v11 = 0;
     int buttons;
     do {
-        if (!_moviePlaying() || _game_user_wants_to_quit || _get_input() != -1) {
+        if (!_moviePlaying() || _game_user_wants_to_quit || inputGetInput() != -1) {
             break;
         }
 
@@ -279,14 +276,18 @@ int gameMoviePlay(int movie, int flags)
 
         windowSetFont(oldFont);
 
-        float r = (float)((_Color2RGB_(oldTextColor) & 0x7C00) >> 10) * flt_50352A;
-        float g = (float)((_Color2RGB_(oldTextColor) & 0x3E0) >> 5) * flt_50352A;
-        float b = (float)(_Color2RGB_(oldTextColor) & 0x1F) * flt_50352A;
+        float r = (float)((Color2RGB(oldTextColor) & 0x7C00) >> 10) * flt_50352A;
+        float g = (float)((Color2RGB(oldTextColor) & 0x3E0) >> 5) * flt_50352A;
+        float b = (float)(Color2RGB(oldTextColor) & 0x1F) * flt_50352A;
         windowSetTextColor(r, g, b);
     }
 
     windowDestroy(win);
 
+    // CE: Destroying a window redraws only content it was covering (centered
+    // 640x480). This leads to everything outside this rect to remain black.
+    windowRefreshAll(&_scr_size);
+
     if ((flags & GAME_MOVIE_PAUSE_MUSIC) != 0) {
         backgroundSoundResume();
     }
@@ -328,9 +329,6 @@ bool gameMovieIsPlaying()
 // 0x44EB1C
 static char* gameMovieBuildSubtitlesFilePath(char* movieFilePath)
 {
-    char* language;
-    configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language);
-
     char* path = movieFilePath;
 
     char* separator = strrchr(path, '\\');
@@ -338,7 +336,7 @@ static char* gameMovieBuildSubtitlesFilePath(char* movieFilePath)
         path = separator + 1;
     }
 
-    sprintf(gGameMovieSubtitlesFilePath, "text\\%s\\cuts\\%s", language, path);
+    snprintf(gGameMovieSubtitlesFilePath, sizeof(gGameMovieSubtitlesFilePath), "text\\%s\\cuts\\%s", settings.system.language.c_str(), path);
 
     char* pch = strrchr(gGameMovieSubtitlesFilePath, '.');
     if (*pch != '\0') {
@@ -349,3 +347,5 @@ static char* gameMovieBuildSubtitlesFilePath(char* movieFilePath)
 
     return gGameMovieSubtitlesFilePath;
 }
+
+} // namespace fallout

src/game_movie.h

@@ -3,6 +3,8 @@
 
 #include "db.h"
 
+namespace fallout {
+
 typedef enum GameMovieFlags {
     GAME_MOVIE_FADE_IN = 0x01,
     GAME_MOVIE_FADE_OUT = 0x02,
@@ -40,4 +42,6 @@ void gameMovieFadeOut();
 bool gameMovieIsSeen(int movie);
 bool gameMovieIsPlaying();
 
+} // namespace fallout
+
 #endif /* GAME_MOVIE_H */

src/game_palette.cc

@@ -1,25 +0,0 @@
-#include "game_palette.h"
-
-#include "color.h"
-
-// 0x44EBC0
-int _HighRGB_(int a1)
-{
-    // TODO: Some strange bit arithmetic.
-    int v1 = _Color2RGB_(a1);
-    int r = (v1 & 0x7C00) >> 10;
-    int g = (v1 & 0x3E0) >> 5;
-    int b = (v1 & 0x1F);
-
-    int result = g;
-    if (r > result) {
-        result = r;
-    }
-
-    result = result & 0xFF;
-    if (result <= b) {
-        result = b;
-    }
-
-    return result;
-}

src/game_palette.h

@@ -1,6 +0,0 @@
-#ifndef GAME_PALETTE_H
-#define GAME_PALETTE_H
-
-int _HighRGB_(int a1);
-
-#endif /* GAME_PALETTE_H */