mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-19 14:41:29 +02:00
Code Issues Projects Releases Wiki Activity

fix SOAP links not saving/loading properly

Browse Source
This commit is contained in:
jacob1
2017-11-23 21:53:21 -05:00
parent 6ddab5a96e
commit 78fb27b354
1 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/simulation/Simulation.cpp
View File

@@ -80,7 +80,9 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
} }
int i; int i;
for(int n = 0; n < NPART && n < save->particlesCount; n++) // Map of soap particles loaded into this save, old ID -> new ID
std::map<unsigned int, unsigned int> soapList;
for (int n = 0; n < NPART && n < save->particlesCount; n++)
{ {
Particle tempPart = save->particles[n]; Particle tempPart = save->particles[n];
tempPart.x += (float)fullX; tempPart.x += (float)fullX;
@@ -183,10 +185,44 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
} }
} }
} }
else if (parts[i].type == PT_SOAP)
{
soapList.insert(std::pair<unsigned int, unsigned int>(n, i));
}
} }
parts_lastActiveIndex = NPART-1; parts_lastActiveIndex = NPART-1;
force_stacking_check = true; force_stacking_check = true;
Element_PPIP::ppip_changed = 1; Element_PPIP::ppip_changed = 1;
// fix SOAP links using soapList, a map of old particle ID -> new particle ID
// loop through every old particle (loaded from save), and convert .tmp / .tmp2
for (std::map<unsigned int, unsigned int>::iterator iter = soapList.begin(), end = soapList.end(); iter != end; ++iter)
{
int i = (*iter).second;
if ((parts[i].ctype & 0x2) == 2)
{
std::map<unsigned int, unsigned int>::iterator n = soapList.find(parts[i].tmp);
if (n != end)
parts[i].tmp = n->second;
else
{
parts[i].tmp = 0;
parts[i].ctype ^= 2;
}
}
if ((parts[i].ctype & 0x4) == 4)
{
std::map<unsigned int, unsigned int>::iterator n = soapList.find(parts[i].tmp2);
if (n != end)
parts[i].tmp2 = n->second;
else
{
parts[i].tmp2 = 0;
parts[i].ctype ^= 4;
}
}
}
for (size_t i = 0; i < save->signs.size() && signs.size() < MAXSIGNS; i++) for (size_t i = 0; i < save->signs.size() && signs.size() < MAXSIGNS; i++)
{ {
if (save->signs[i].text[0]) if (save->signs[i].text[0])
@@ -262,18 +298,22 @@ GameSave * Simulation::Save(int fullX, int fullY, int fullX2, int fullY2, bool i
int storedParts = 0; int storedParts = 0;
int elementCount[PT_NUM]; int elementCount[PT_NUM];
std::fill(elementCount, elementCount+PT_NUM, 0); std::fill(elementCount, elementCount+PT_NUM, 0);
for(int i = 0; i < NPART; i++) // Map of soap particles loaded into this save, new ID -> old ID
std::map<unsigned int, unsigned int> soapList;
for (int i = 0; i < NPART; i++)
{ {
int x, y; int x, y;
x = int(parts[i].x + 0.5f); x = int(parts[i].x + 0.5f);
y = int(parts[i].y + 0.5f); y = int(parts[i].y + 0.5f);
if(parts[i].type && x >= fullX && y >= fullY && x <= fullX2 && y <= fullY2) if (parts[i].type && x >= fullX && y >= fullY && x <= fullX2 && y <= fullY2)
{ {
Particle tempPart = parts[i]; Particle tempPart = parts[i];
tempPart.x -= blockX*CELL; tempPart.x -= blockX*CELL;
tempPart.y -= blockY*CELL; tempPart.y -= blockY*CELL;
if(elements[tempPart.type].Enabled) if (elements[tempPart.type].Enabled)
{ {
if (tempPart.type == PT_SOAP)
soapList.insert(std::pair<unsigned int, unsigned int>(i, storedParts));
*newSave << tempPart; *newSave << tempPart;
storedParts++; storedParts++;
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
@@ -281,15 +321,43 @@ GameSave * Simulation::Save(int fullX, int fullY, int fullX2, int fullY2, bool i
} }
} }
if(storedParts) if (storedParts)
{ {
for(int i = 0; i < PT_NUM; i++) for (int i = 0; i < PT_NUM; i++)
{ {
if(elements[i].Enabled && elementCount[i]) if (elements[i].Enabled && elementCount[i])
{ {
newSave->palette.push_back(GameSave::PaletteItem(elements[i].Identifier, i)); newSave->palette.push_back(GameSave::PaletteItem(elements[i].Identifier, i));
} }
} }
// fix SOAP links using soapList, a map of new particle ID -> old particle ID
// loop through every old particle (loaded from save), and convert .tmp / .tmp2
for (std::map<unsigned int, unsigned int>::iterator iter = soapList.begin(), end = soapList.end(); iter != end; ++iter)
{
int i = (*iter).second;
if ((newSave->particles[i].ctype & 0x2) == 2)
{
std::map<unsigned int, unsigned int>::iterator n = soapList.find(newSave->particles[i].tmp);
if (n != end)
newSave->particles[i].tmp = n->second;
else
{
newSave->particles[i].tmp = 0;
newSave->particles[i].ctype ^= 2;
}
}
if ((newSave->particles[i].ctype & 0x4) == 4)
{
std::map<unsigned int, unsigned int>::iterator n = soapList.find(newSave->particles[i].tmp2);
if (n != end)
newSave->particles[i].tmp2 = n->second;
else
{
newSave->particles[i].tmp2 = 0;
newSave->particles[i].ctype ^= 4;
}
}
}
} }
for (size_t i = 0; i < MAXSIGNS && i < signs.size(); i++) for (size_t i = 0; i < MAXSIGNS && i < signs.size(); i++)