mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-09 07:40:21 +00:00
Code Issues Releases Wiki Activity

Android save compat: Support "ch" (current health) value, and make maxHealth float.

Browse source
This commit is contained in:
fgenesis 2013-06-23 04:43:24 +02:00
parent 318811f92d
commit 7faee73f14
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Aquaria/Continuity.cpp
View file

@ -2518,7 +2518,7 @@ void Continuity::saveFile(int slot, Vector position, unsigned char *scrShotData,
startData.SetAttribute("scene", dsq->game->sceneName); startData.SetAttribute("scene", dsq->game->sceneName);
startData.SetAttribute("exp", dsq->continuity.exp); startData.SetAttribute("exp", dsq->continuity.exp);
startData.SetAttribute("h", dsq->continuity.maxHealth); startData.SetAttribute("h", dsq->continuity.maxHealth);
// ANDROID TODO: "ch" field startData.SetAttribute("ch", dsq->continuity.health);
startData.SetAttribute("naijaModel", dsq->continuity.naijaModel); startData.SetAttribute("naijaModel", dsq->continuity.naijaModel);
startData.SetAttribute("costume", dsq->continuity.costume); startData.SetAttribute("costume", dsq->continuity.costume);
startData.SetAttribute("form", dsq->continuity.form); startData.SetAttribute("form", dsq->continuity.form);
@ -3054,11 +3054,9 @@ void Continuity::loadFile(int slot)
} }
} }
// TODO ANDROID: "ch" field
if (startData->Attribute("h")) if (startData->Attribute("h"))
{ {
int read = atoi(startData->Attribute("h")); float read = strtof(startData->Attribute("h"), NULL);
maxHealth = read; maxHealth = read;
health = read; health = read;
std::ostringstream os; std::ostringstream os;
@ -3071,6 +3069,21 @@ void Continuity::loadFile(int slot)
dsq->game->avatar->health = maxHealth; dsq->game->avatar->health = maxHealth;
} }
} }
if (startData->Attribute("ch"))
{
float h = strtof(startData->Attribute("ch"), NULL);
health = h;
std::ostringstream os;
os << "CurHealth read as: " << health;
debugLog(os.str());
if (dsq->game->avatar)
{
dsq->game->avatar->health = h;
}
}
if (startData->Attribute("seconds")) if (startData->Attribute("seconds"))
{ {
std::istringstream is(startData->Attribute("seconds")); std::istringstream is(startData->Attribute("seconds"));

2
Aquaria/DSQ.h
View file

@ -951,7 +951,7 @@ public:
std::string getSaveFileName(int slot, const std::string &pfix); std::string getSaveFileName(int slot, const std::string &pfix);
int maxHealth; float maxHealth;
float health; float health;
bool hudVisible; bool hudVisible;
unsigned int exp; unsigned int exp;