mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 22:25:46 +00:00
Code Issues Releases Wiki Activity

Make world map reveal method configurable via user settings,

Browse source 
and add the possibility for mods to override this setting.
This commit is contained in:
fgenesis 2012-10-14 03:46:47 +02:00
parent 8cad58f0c4
commit 416c47b4e9
6 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Aquaria/DSQ.h
View file

@ -177,6 +177,14 @@ enum MenuPage
MENUPAGE_PETS = 3
};
enum WorldMapRevealMethod
{
REVEAL_UNSPECIFIED = -1,
REVEAL_DEFAULT = 0,
REVEAL_PARTIAL = 1 // Not visited areas have zero alpha (invisible)
};
/*
class Title;
class GameOver;
@ -274,6 +282,8 @@ public:
static bool loadModXML(TiXmlDocument *d, std::string modName);
static ModType getTypeFromXML(TiXmlElement *xml);
WorldMapRevealMethod mapRevealMethod;
protected:
bool shuttingDown;
bool active;

5
Aquaria/Game.cpp
View file

@ -6742,6 +6742,11 @@ void Game::applyState()
worldMapRender = 0;
if(dsq->mod.isActive() && dsq->mod.mapRevealMethod != REVEAL_UNSPECIFIED)
WorldMapRender::setRevealMethod(dsq->mod.mapRevealMethod);
else
WorldMapRender::setRevealMethod((WorldMapRevealMethod)dsq->user.video.worldMapRevealMethod);
worldMapRender = new WorldMapRender;
addRenderObject(worldMapRender, LR_WORLDMAP);
// to hide minimap

6
Aquaria/GridRender.h
View file

@ -67,12 +67,6 @@ protected:
InterpolatedVector lerp;
};
enum WorldMapRevealMethod
{
REVEAL_DEFAULT = 0,
REVEAL_PARTIAL = 1 // Not visited areas have zero alpha (invisible)
};
class WorldMapRender : public RenderObject, public ActionMapper
{
public:

7
Aquaria/Mod.cpp
View file

@ -60,6 +60,7 @@ void Mod::clear()
debugMenu = false;
hasMap = false;
blockEditor = false;
mapRevealMethod = REVEAL_UNSPECIFIED;
}
bool Mod::isDebugMenu()
@ -137,6 +138,11 @@ void Mod::load(const std::string &p)
props->Attribute("blockEditor", &t);
blockEditor = t;
}
if (props->Attribute("worldMapRevealMethod")) {
int t;
props->Attribute("worldMapRevealMethod", &t);
mapRevealMethod = (WorldMapRevealMethod)t;
}
}
}
@ -248,6 +254,7 @@ void Mod::setActive(bool a)
{
if (!active)
{
mapRevealMethod = REVEAL_UNSPECIFIED;
setLocalisationModPath("");
name = path = "";
dsq->secondaryTexturePath = "";

8
Aquaria/UserSettings.cpp
View file

@ -144,6 +144,12 @@ void UserSettings::save()
xml_saveSlotScreens.SetAttribute("on", video.saveSlotScreens);
}
xml_video.InsertEndChild(xml_saveSlotScreens);
TiXmlElement xml_worldMap("WorldMap");
{
xml_worldMap.SetAttribute("revealMethod", video.worldMapRevealMethod);
}
xml_video.InsertEndChild(xml_worldMap);
}
doc.InsertEndChild(xml_video);
@ -445,6 +451,8 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
}
readInt(xml_video, "SaveSlotScreens", "on", &video.saveSlotScreens);
readInt(xml_video, "WorldMap", "revealMethod", &video.worldMapRevealMethod);
}
TiXmlElement *xml_control = doc.FirstChildElement("Control");

2
Aquaria/UserSettings.h
View file

@ -113,6 +113,7 @@ public:
vsync = 1;
darkbuffersize = 256;
displaylists = 0;
worldMapRevealMethod = 0;
}
int shader;
int blur;
@ -123,6 +124,7 @@ public:
int parallaxOn0, parallaxOn1, parallaxOn2;
int numParticles;
int displaylists;
int worldMapRevealMethod;
} video;
struct Control