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

missed movement code fixes from my mod? b7ef4c8f2b95

Browse Source
This commit is contained in:
jacob1
2016-10-01 00:16:50 -04:00
parent e8b4f99644
commit 85e2516a42
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/simulation/Simulation.cpp
View File

@@ -4097,8 +4097,8 @@ killed:
fin_y = (int)(fin_yf+0.5f); fin_y = (int)(fin_yf+0.5f);
if (edgeMode == 2) if (edgeMode == 2)
{ {
bool x_ok = (fin_x >= CELL && fin_x < XRES-CELL); bool x_ok = (fin_xf >= CELL-.5f && fin_xf < XRES-CELL-.5f);
bool y_ok = (fin_y >= CELL && fin_y < YRES-CELL); bool y_ok = (fin_yf >= CELL-.5f && fin_yf < YRES-CELL-.5f);
if (!x_ok) if (!x_ok)
fin_xf = remainder_p(fin_xf-CELL+.5f, XRES-CELL*2.0f)+CELL-.5f; fin_xf = remainder_p(fin_xf-CELL+.5f, XRES-CELL*2.0f)+CELL-.5f;
if (!y_ok) if (!y_ok)
@@ -4186,8 +4186,8 @@ killed:
if (stickman) if (stickman)
for (int i = 0; i < 16; i+=2) for (int i = 0; i < 16; i+=2)
{ {
stickman->legs[i] += (nx-oldnx)+.5f; stickman->legs[i] += (nx-oldnx);
stickman->legs[i+1] += (ny-oldny)+.5f; stickman->legs[i+1] += (ny-oldny);
stickman->accs[i/2] *= .95f; stickman->accs[i/2] *= .95f;
} }
parts[i].vy *= .95f; parts[i].vy *= .95f;