summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ai/ai.c4
-rw-r--r--ai/ai.h2
-rw-r--r--settings.c4
-rw-r--r--settings_gui.c4
4 files changed, 0 insertions, 14 deletions
diff --git a/ai/ai.c b/ai/ai.c
index e3fe2d307..50a4a39ca 100644
--- a/ai/ai.c
+++ b/ai/ai.c
@@ -244,9 +244,7 @@ void AI_PlayerDied(PlayerID player)
void AI_Initialize(void)
{
bool tmp_ai_network_client = _ai.network_client;
-#ifdef GPMI
bool tmp_ai_gpmi = _ai.gpmi;
-#endif /* GPMI */
memset(&_ai, 0, sizeof(_ai));
memset(&_ai_player, 0, sizeof(_ai_player));
@@ -254,9 +252,7 @@ void AI_Initialize(void)
_ai.network_client = tmp_ai_network_client;
_ai.network_playas = OWNER_SPECTATOR;
_ai.enabled = true;
-#ifdef GPMI
_ai.gpmi = tmp_ai_gpmi;
-#endif /* GPMI */
}
/**
diff --git a/ai/ai.h b/ai/ai.h
index 97747aa7b..cb18882ca 100644
--- a/ai/ai.h
+++ b/ai/ai.h
@@ -39,9 +39,7 @@ typedef struct AIStruct {
bool network_client; //! Are we a network_client?
uint8 network_playas; //! The current network player we are connected as
-#ifdef GPMI
bool gpmi; //! True if we want GPMI AIs
-#endif /* GPMI */
} AIStruct;
VARDEF AIStruct _ai;
diff --git a/settings.c b/settings.c
index d18b44564..38a84c3a7 100644
--- a/settings.c
+++ b/settings.c
@@ -11,9 +11,7 @@
#include "variables.h"
#include "network.h"
#include "settings.h"
-#ifdef GPMI
#include "ai/ai.h"
-#endif /* GPMI */
typedef struct IniFile IniFile;
typedef struct IniItem IniItem;
@@ -946,9 +944,7 @@ const SettingDesc patch_settings[] = {
{"ainew_active", SDT_BOOL, (void*)false, &_patches.ainew_active, NULL},
{"ai_in_multiplayer", SDT_BOOL, (void*)false, &_patches.ai_in_multiplayer, NULL},
-#ifdef GPMI
{"ai_gpmi", SDT_BOOL, (void*)true, &_ai.gpmi, NULL},
-#endif /* GPMI */
{"map_x", SDT_UINT32, (void*)8, &_patches.map_x, NULL},
{"map_y", SDT_UINT32, (void*)8, &_patches.map_y, NULL},
diff --git a/settings_gui.c b/settings_gui.c
index 9e8365b75..95341c944 100644
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -19,9 +19,7 @@
#include "console.h"
#include "town.h"
#include "variables.h"
-#ifdef GPMI
#include "ai/ai.h"
-#endif /* GPMI */
static uint32 _difficulty_click_a;
static uint32 _difficulty_click_b;
@@ -763,9 +761,7 @@ static const PatchEntry _patches_economy[] = {
static const PatchEntry _patches_ai[] = {
{PE_BOOL, 0, STR_CONFIG_PATCHES_AINEW_ACTIVE, "ainew_active", &_patches.ainew_active, 0, 1, 1, &AiNew_PatchActive_Warning},
{PE_BOOL, 0, STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER, "ai_in_multiplayer", &_patches.ai_in_multiplayer, 0, 1, 1, &Ai_In_Multiplayer_Warning},
-#ifdef GPMI
{PE_BOOL, 0, STR_CONFIG_PATCHES_AI_GPMI, "ai_gpmi", &_ai.gpmi, 0, 1, 1, NULL},
-#endif /* GPMI */
{PE_BOOL, 0, STR_CONFIG_PATCHES_AI_BUILDS_TRAINS, "ai_disable_veh_train", &_patches.ai_disable_veh_train, 0, 0, 0, NULL},
{PE_BOOL, 0, STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH,"ai_disable_veh_roadveh",&_patches.ai_disable_veh_roadveh, 0, 0, 0, NULL},