matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue allowing drawing unlimited LIGH with 1x1 cursor

Browse Source 
Also fix warnings from a previous commit
This commit is contained in:
jacob1 2021-05-10 21:04:08 -04:00
parent fca0c62cd7
commit 829c0bced5
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/Simulation.cpp
View File

@ -49,8 +49,6 @@ int Simulation::Load(GameSave * save, bool includePressure)
int Simulation::Load(GameSave * save, bool includePressure, int fullX, int fullY) int Simulation::Load(GameSave * save, bool includePressure, int fullX, int fullY)
{ {
int x, y;
if (!save) if (!save)
return 1; return 1;
try try
@ -98,7 +96,7 @@ int Simulation::Load(GameSave * save, bool includePressure, int fullX, int fullY
int r; int r;
bool doFullScan = false; bool doFullScan = false;
for (unsigned int n = 0; n < NPART && n < save->particlesCount; n++) 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;
@ -184,9 +182,6 @@ int Simulation::Load(GameSave * save, bool includePressure, int fullX, int fullY
for (int n = 0; n < NPART && n < save->particlesCount; n++) for (int n = 0; n < NPART && n < save->particlesCount; n++)
{ {
Particle tempPart = save->particles[n]; Particle tempPart = save->particles[n];
x = int(tempPart.x + 0.5f);
y = int(tempPart.y + 0.5f);
if (tempPart.type > 0 && tempPart.type < PT_NUM) if (tempPart.type > 0 && tempPart.type < PT_NUM)
tempPart.type = partMap[tempPart.type]; tempPart.type = partMap[tempPart.type];
else else
@ -1698,7 +1693,7 @@ int Simulation::CreateParts(int positionX, int positionY, int c, Brush * cBrush,
if (newlife > 55) if (newlife > 55)
newlife = 55; newlife = 55;
c = PMAP(newlife, c); c = PMAP(newlife, c);
lightningRecreate = currentTick+newlife/4; lightningRecreate = currentTick + std::max(newlife / 4, 1);
return CreatePartFlags(positionX, positionY, c, flags); return CreatePartFlags(positionX, positionY, c, flags);
} }
else if (c == PT_TESC) else if (c == PT_TESC)
@ -1739,7 +1734,7 @@ int Simulation::CreateParts(int x, int y, int rx, int ry, int c, int flags)
if (newlife > 55) if (newlife > 55)
newlife = 55; newlife = 55;
c = PMAP(newlife, c); c = PMAP(newlife, c);
lightningRecreate = currentTick+newlife/4; lightningRecreate = currentTick + std::max(newlife / 4, 1);
rx = ry = 0; rx = ry = 0;
} }
else if (c == PT_TESC) else if (c == PT_TESC)