mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-01 20:12:50 +02:00
Code Issues Projects Releases Wiki Activity

Also fix bugs with energy particles that pass directly from PIPE to portal

Browse Source
This commit is contained in:
jacksonmj
2012-09-05 09:07:49 +01:00
parent 8233d60906
commit 8c09bf5787
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/elements/prto.c
View File

@@ -87,7 +87,19 @@ int update_PRTO(UPDATE_FUNC_ARGS) {
fighters[(unsigned char)parts[np].tmp].spwn = 0;
fighters[(unsigned char)portalp[parts[i].tmp][randomness][nnx].tmp].spwn = 1;
}
parts[np] = portalp[parts[i].tmp][randomness][nnx];
if (portalp[parts[i].tmp][randomness][nnx].vx == 0.0f && portalp[parts[i].tmp][randomness][nnx].vy == 0.0f)
{
// particles that have passed from PIPE into PRTI have lost their velocity, so use the velocity of the newly created particle if the particle in the portal has no velocity
float tmp_vx = parts[np].vx;
float tmp_vy = parts[np].vy;
parts[np] = portalp[parts[i].tmp][randomness][nnx];
parts[np].vx = tmp_vx;
parts[np].vy = tmp_vy;
}
else
{
parts[np] = portalp[parts[i].tmp][randomness][nnx];
}
parts[np].x = x+rx;
parts[np].y = y+ry;
portalp[parts[i].tmp][randomness][nnx] = emptyparticle;