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

resetting sparks resets any sparks in WIFI too

Browse Source
This commit is contained in:
jacob1 2015-09-01 01:27:03 -04:00
parent 476c2cce06
commit fbbc755283
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/game/GameController.cpp
View File

@ -821,6 +821,7 @@ void GameController::ResetSpark()
else else
sim->kill_part(i); sim->kill_part(i);
} }
memset(sim->wireless, 0, sizeof(sim->wireless));
} }
void GameController::SwitchGravity() void GameController::SwitchGravity()

9
src/lua/TPTScriptInterface.cpp
View File

@ -560,14 +560,7 @@ AnyType TPTScriptInterface::tptS_reset(std::deque<std::string> * words)
} }
else if (resetStr == "sparks") else if (resetStr == "sparks")
{ {
for (int i = 0; i < NPART; i++) c->ResetSpark();
{
if (sim->parts[i].type == PT_SPRK)
{
sim->parts[i].type = sim->parts[i].ctype;
sim->parts[i].life = 4;
}
}
} }
else if (resetStr == "temp") else if (resetStr == "temp")
{ {