From b29e57d15bef567552a8f0722f7827b693f1d710 Mon Sep 17 00:00:00 2001
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Thu, 5 May 2016 20:00:37 +0200
Subject: [PATCH] Removing more build options

This times, it is `AQ_TEST_QUADTRAIL`, `AQUARIA_BUILD_MAPVIS`
  and `DISABLE_SUBS` that have disappeared.
---
 Aquaria/Avatar.cpp         | 14 --------------
 Aquaria/Continuity.cpp     |  4 ----
 Aquaria/WorldMapRender.cpp |  8 --------
 3 files changed, 26 deletions(-)

diff --git a/Aquaria/Avatar.cpp b/Aquaria/Avatar.cpp
index 27d85a2..d1d1519 100644
--- a/Aquaria/Avatar.cpp
+++ b/Aquaria/Avatar.cpp
@@ -32,11 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //#define AQ_TEST_QUADTRAIL
 
-#ifdef AQ_TEST_QUADTRAIL
-	#include "QuadTrail.h"
-
-	QuadTrail *quadTrail = 0;
-#endif
 
 Path *lastWaterBubble = 0;
 bool lastJumpOutFromWaterBubble = false;
@@ -3787,12 +3782,6 @@ Avatar::Avatar() : Entity(), ActionMapper()
 
 	urchinDelay = 0;
 	jellyDelay = 0;
-#ifdef AQ_TEST_QUADTRAIL
-	quadTrail = new QuadTrail(100, 32);
-	quadTrail->setTexture("Particles/QuadTrail");
-	quadTrail->setBlendType(BLEND_ADD);
-	dsq->game->addRenderObject(quadTrail, LR_PARTICLES);
-#endif
 
 	curWebPoint = 0;
 
@@ -5588,9 +5577,6 @@ void Avatar::onUpdate(float dt)
 
 	looking = 0;
 
-#ifdef AQ_TEST_QUADTRAIL
-	quadTrail->addPoint(position);
-#endif
 
 	if (lightFormGlow)
 	{
diff --git a/Aquaria/Continuity.cpp b/Aquaria/Continuity.cpp
index 9c3d917..0cebb8b 100644
--- a/Aquaria/Continuity.cpp
+++ b/Aquaria/Continuity.cpp
@@ -2430,7 +2430,6 @@ void Continuity::saveFile(int slot, Vector position, unsigned char *scrShotData,
 		}
 		worldMap->SetAttribute("b", os.str().c_str());
 
-#ifdef AQUARIA_BUILD_MAPVIS
 		if (dsq->game->worldMapRender)
 		{
 			std::ostringstream os;
@@ -2443,7 +2442,6 @@ void Continuity::saveFile(int slot, Vector position, unsigned char *scrShotData,
 			}
 			worldMap->SetAttribute("va", os.str().c_str());
 		}
-#endif
 	}
 	doc.InsertEndChild(worldMap);
 
@@ -2961,7 +2959,6 @@ void Continuity::loadFile(int slot)
 		}
 
 
-#ifdef AQUARIA_BUILD_MAPVIS
 		if (worldMap->Attribute("va") && dsq->continuity.worldMap.getNumWorldMapTiles())
 		{
 			std::istringstream is(worldMap->Attribute("va"));
@@ -2987,7 +2984,6 @@ void Continuity::loadFile(int slot)
 				tile->stringToData(is);
 			}
 		}
-#endif
 	}
 
 
diff --git a/Aquaria/WorldMapRender.cpp b/Aquaria/WorldMapRender.cpp
index 0e490c5..2c1a9f1 100644
--- a/Aquaria/WorldMapRender.cpp
+++ b/Aquaria/WorldMapRender.cpp
@@ -452,7 +452,6 @@ void WorldMapRender::setProperTileColor(WorldMapTile *tile)
 	}
 }
 
-#ifdef AQUARIA_BUILD_MAPVIS
 
 static void tileDataToVis(WorldMapTile *tile, Vector **vis)
 {
@@ -565,13 +564,11 @@ static void resetTileAlpha(WorldMapTile *tile, const unsigned char *savedTexData
 	tile->q->texture->write(0, 0, tile->q->texture->width, tile->q->texture->height, savedTexData);
 }
 
-#endif  // AQUARIA_BUILD_MAPVIS
 
 
 void WorldMapRender::setVis(WorldMapTile *tile)
 {
 	if (!tile) return;
-#ifdef AQUARIA_BUILD_MAPVIS
 
 
 	tile->q->color = Vector(1,1,1);
@@ -589,13 +586,11 @@ void WorldMapRender::setVis(WorldMapTile *tile)
 
 	lastVisQuad = tile->q;
 	lastVisTile = tile;
-#endif
 }
 
 void WorldMapRender::clearVis(WorldMapTile *tile)
 {
 	if (!tile) return;
-#ifdef AQUARIA_BUILD_MAPVIS
 	if (visMethod == VIS_VERTEX)
 	{
 		if (tile->q)
@@ -610,7 +605,6 @@ void WorldMapRender::clearVis(WorldMapTile *tile)
 			savedTexData = 0;
 		}
 	}
-#endif
 }
 
 
@@ -1151,7 +1145,6 @@ void WorldMapRender::onUpdate(float dt)
 	}
 	else
 	{
-#ifdef AQUARIA_BUILD_MAPVIS
 		if (!dsq->isInCutscene() && dsq->game->avatar && activeTile
 	#ifdef AQUARIA_BUILD_SCENEEDITOR
 			&& !dsq->game->sceneEditor.isOn()
@@ -1193,7 +1186,6 @@ void WorldMapRender::onUpdate(float dt)
 				}
 			}
 		}
-#endif
 	}
 
 	lastMousePosition = core->mouse.position;