mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 17:53:47 +00:00
Code Issues Releases Wiki Activity

Removing more build options

Browse source 
This times, it is `AQ_TEST_QUADTRAIL`, `AQUARIA_BUILD_MAPVIS`
  and `DISABLE_SUBS` that have disappeared.
This commit is contained in:
Nicolas Braud-Santoni 2016-05-05 20:00:37 +02:00
parent eb128e65a4
commit b29e57d15b
No known key found for this signature in database
GPG key ID: 06EA317DE11BD278
3 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Aquaria/Avatar.cpp
View file

@ -32,11 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//#define AQ_TEST_QUADTRAIL //#define AQ_TEST_QUADTRAIL
#ifdef AQ_TEST_QUADTRAIL
#include "QuadTrail.h"
QuadTrail *quadTrail = 0;
#endif
Path *lastWaterBubble = 0; Path *lastWaterBubble = 0;
bool lastJumpOutFromWaterBubble = false; bool lastJumpOutFromWaterBubble = false;
@ -3787,12 +3782,6 @@ Avatar::Avatar() : Entity(), ActionMapper()
urchinDelay = 0; urchinDelay = 0;
jellyDelay = 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; curWebPoint = 0;
@ -5588,9 +5577,6 @@ void Avatar::onUpdate(float dt)
looking = 0; looking = 0;
#ifdef AQ_TEST_QUADTRAIL
quadTrail->addPoint(position);
#endif
if (lightFormGlow) if (lightFormGlow)
{ {

4
Aquaria/Continuity.cpp
View file

@ -2430,7 +2430,6 @@ void Continuity::saveFile(int slot, Vector position, unsigned char *scrShotData,
} }
worldMap->SetAttribute("b", os.str().c_str()); worldMap->SetAttribute("b", os.str().c_str());
#ifdef AQUARIA_BUILD_MAPVIS
if (dsq->game->worldMapRender) if (dsq->game->worldMapRender)
{ {
std::ostringstream os; std::ostringstream os;
@ -2443,7 +2442,6 @@ void Continuity::saveFile(int slot, Vector position, unsigned char *scrShotData,
} }
worldMap->SetAttribute("va", os.str().c_str()); worldMap->SetAttribute("va", os.str().c_str());
} }
#endif
} }
doc.InsertEndChild(worldMap); doc.InsertEndChild(worldMap);
@ -2961,7 +2959,6 @@ void Continuity::loadFile(int slot)
} }
#ifdef AQUARIA_BUILD_MAPVIS
if (worldMap->Attribute("va") && dsq->continuity.worldMap.getNumWorldMapTiles()) if (worldMap->Attribute("va") && dsq->continuity.worldMap.getNumWorldMapTiles())
{ {
std::istringstream is(worldMap->Attribute("va")); std::istringstream is(worldMap->Attribute("va"));
@ -2987,7 +2984,6 @@ void Continuity::loadFile(int slot)
tile->stringToData(is); tile->stringToData(is);
} }
} }
#endif
} }

8
Aquaria/WorldMapRender.cpp
View file

@ -452,7 +452,6 @@ void WorldMapRender::setProperTileColor(WorldMapTile *tile)
} }
} }
#ifdef AQUARIA_BUILD_MAPVIS
static void tileDataToVis(WorldMapTile *tile, Vector **vis) 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); tile->q->texture->write(0, 0, tile->q->texture->width, tile->q->texture->height, savedTexData);
} }
#endif // AQUARIA_BUILD_MAPVIS
void WorldMapRender::setVis(WorldMapTile *tile) void WorldMapRender::setVis(WorldMapTile *tile)
{ {
if (!tile) return; if (!tile) return;
#ifdef AQUARIA_BUILD_MAPVIS
tile->q->color = Vector(1,1,1); tile->q->color = Vector(1,1,1);
@ -589,13 +586,11 @@ void WorldMapRender::setVis(WorldMapTile *tile)
lastVisQuad = tile->q; lastVisQuad = tile->q;
lastVisTile = tile; lastVisTile = tile;
#endif
} }
void WorldMapRender::clearVis(WorldMapTile *tile) void WorldMapRender::clearVis(WorldMapTile *tile)
{ {
if (!tile) return; if (!tile) return;
#ifdef AQUARIA_BUILD_MAPVIS
if (visMethod == VIS_VERTEX) if (visMethod == VIS_VERTEX)
{ {
if (tile->q) if (tile->q)
@ -610,7 +605,6 @@ void WorldMapRender::clearVis(WorldMapTile *tile)
savedTexData = 0; savedTexData = 0;
} }
} }
#endif
} }
@ -1151,7 +1145,6 @@ void WorldMapRender::onUpdate(float dt)
} }
else else
{ {
#ifdef AQUARIA_BUILD_MAPVIS
if (!dsq->isInCutscene() && dsq->game->avatar && activeTile if (!dsq->isInCutscene() && dsq->game->avatar && activeTile
#ifdef AQUARIA_BUILD_SCENEEDITOR #ifdef AQUARIA_BUILD_SCENEEDITOR
&& !dsq->game->sceneEditor.isOn() && !dsq->game->sceneEditor.isOn()
@ -1193,7 +1186,6 @@ void WorldMapRender::onUpdate(float dt)
} }
} }
} }
#endif
} }
lastMousePosition = core->mouse.position; lastMousePosition = core->mouse.position;