From 81bdf49af28ff33c94b4ba85dc0eee11777b9c64 Mon Sep 17 00:00:00 2001
From: icex2 <djh.icex2@gmail.com>
Date: Fri, 19 Mar 2021 16:28:03 +0100
Subject: [PATCH] hook/x2: Remove non working window mode option

---
 dist/conf/x2hook.conf      |  3 ---
 src/main/hook/x2/main.c    |  4 ----
 src/main/hook/x2/options.c | 10 ----------
 src/main/hook/x2/options.h |  4 ----
 4 files changed, 21 deletions(-)

diff --git a/dist/conf/x2hook.conf b/dist/conf/x2hook.conf
index 65e6777..86b072b 100644
--- a/dist/conf/x2hook.conf
+++ b/dist/conf/x2hook.conf
@@ -4,9 +4,6 @@ game.force_unlock=0
 # [str]: Path to game settings (SETTINGS) folder
 game.settings=./save
 
-# [bool (0/1)]: Force game into window mode
-patch.gfx.windowed=0
-
 # [bool (0/1)]: Enable file call monitoring
 patch.hook_mon.file=0
 
diff --git a/src/main/hook/x2/main.c b/src/main/hook/x2/main.c
index 1b96d0e..eec4e5b 100644
--- a/src/main/hook/x2/main.c
+++ b/src/main/hook/x2/main.c
@@ -141,10 +141,6 @@ static void x2hook_patch_gfx_init(struct x2hook_options *options)
   log_assert(options);
 
   patch_gfx_init();
-
-  if (options->patch.gfx.windowed) {
-    patch_gfx_force_window_mode();
-  }
 }
 
 static void x2hook_patch_game_init(struct x2hook_options *options)
diff --git a/src/main/hook/x2/options.c b/src/main/hook/x2/options.c
index 9953189..75404b5 100644
--- a/src/main/hook/x2/options.c
+++ b/src/main/hook/x2/options.c
@@ -4,7 +4,6 @@
 
 #define X2HOOK_OPTIONS_STR_GAME_FORCE_UNLOCK "game.force_unlock"
 #define X2HOOK_OPTIONS_STR_GAME_SETTINGS "game.settings"
-#define X2HOOK_OPTIONS_STR_PATCH_GFX_WINDOWED "patch.gfx.windowed"
 #define X2HOOK_OPTIONS_STR_PATCH_HOOK_MON_FILE "patch.hook_mon.file"
 #define X2HOOK_OPTIONS_STR_PATCH_HOOK_MON_FS "patch.hook_mon.fs"
 #define X2HOOK_OPTIONS_STR_PATCH_HOOK_MON_IO "patch.hook_mon.io"
@@ -39,13 +38,6 @@ static const struct util_options_def x2hook_options_def[] = {
         .type = UTIL_OPTIONS_TYPE_STR,
         .default_value.str = "./save",
     },
-    {
-        .name = X2HOOK_OPTIONS_STR_PATCH_GFX_WINDOWED,
-        .description = "Force game into window mode",
-        .param = 'w',
-        .type = UTIL_OPTIONS_TYPE_BOOL,
-        .default_value.b = false,
-    },
     {
         .name = X2HOOK_OPTIONS_STR_PATCH_HOOK_MON_FILE,
         .description = "Enable file call monitoring",
@@ -169,8 +161,6 @@ bool x2hook_options_init(int argc, char **argv, struct x2hook_options *options)
       util_options_get_bool(options_opt, X2HOOK_OPTIONS_STR_GAME_FORCE_UNLOCK);
   options->game.settings =
       util_options_get_str(options_opt, X2HOOK_OPTIONS_STR_GAME_SETTINGS);
-  options->patch.gfx.windowed =
-      util_options_get_bool(options_opt, X2HOOK_OPTIONS_STR_PATCH_GFX_WINDOWED);
   options->patch.hook_mon.file = util_options_get_bool(
       options_opt, X2HOOK_OPTIONS_STR_PATCH_HOOK_MON_FILE);
   options->patch.hook_mon.fs =
diff --git a/src/main/hook/x2/options.h b/src/main/hook/x2/options.h
index d75d8cd..cfe0a18 100644
--- a/src/main/hook/x2/options.h
+++ b/src/main/hook/x2/options.h
@@ -13,10 +13,6 @@ struct x2hook_options {
   } game;
 
   struct patch {
-    struct gfx {
-      bool windowed;
-    } gfx;
-
     struct hook_mon {
       bool file;
       bool fs;