From 0c59428b304be77ff60180ea92a2296c525f4469 Mon Sep 17 00:00:00 2001
From: Ali El Gariani <alinkmaze@gmail.com>
Date: Thu, 29 Jul 2010 20:21:37 +0000
Subject: [PATCH] Disable terrain-graphics when NO_TERRAIN_GFX is defined.

Activated by TITLE_SCREEN (auto defined when starting title screen)
and now also by NO_GUI.
---
 data/_main.cfg      | 13 ++++++++++++-
 data/core/_main.cfg |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/data/_main.cfg b/data/_main.cfg
index cbb4fbb62e2..4f4531905d7 100644
--- a/data/_main.cfg
+++ b/data/_main.cfg
@@ -55,9 +55,20 @@
     name="wesnoth-anl"
 [/textdomain]
 
+# title screen and no_gui mode doens't need terrain_graphics
+#ifdef TITLE_SCREEN
+#define NO_TERRAIN_GFX
+#enddef
+#endif
+
+#ifdef NO_GUI
+#define NO_TERRAIN_GFX
+#enddef
+#endif
+
+#ifndef NO_TERRAIN_GFX
 # Include the terrain-graphics definitions after the campaigns so campaign specific
 # terrains work properly.
-#ifndef TITLE_SCREEN
 {core/terrain-graphics.cfg}
 #endif
 
diff --git a/data/core/_main.cfg b/data/core/_main.cfg
index 44691c40b32..3fcede471f8 100644
--- a/data/core/_main.cfg
+++ b/data/core/_main.cfg
@@ -3,7 +3,7 @@
 
 # wmlscope: set export=yes
 
-#ifndef TITLE_SCREEN
+#ifndef NO_TERRAIN_GFX
 {core/terrain-graphics/}
 #endif