From 6d1c7be74068a06ba8a64dbe3d94a8a25fa7b09e Mon Sep 17 00:00:00 2001 From: jacob1 Date: Mon, 15 Oct 2012 21:30:47 -0400 Subject: [PATCH] initialize all stickmen variables, not just legs --- src/simulation/Simulation.cpp | 2 +- src/simulation/elements/STKM.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index b98b3bddd..09b0da947 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -103,9 +103,9 @@ int Simulation::Load(int fullX, int fullY, GameSave * save) fighcount++; //currentPart.tmp = fcount; parts[i].tmp = fcount; + Element_STKM::STKM_init_legs(this, &(fighters[fcount]), i); fighters[fcount].spwn = 1; fighters[fcount].elem = PT_DUST; - Element_STKM::STKM_init_legs(this, &(fighters[fcount]), i); break; } } diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp index 9024e08fd..081720e1e 100644 --- a/src/simulation/elements/STKM.cpp +++ b/src/simulation/elements/STKM.cpp @@ -79,7 +79,7 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) { playerp->elem = parts[i].ctype; playerp->frames++; - //Tempirature handling + //Temperature handling if (parts[i].temp<243) parts[i].life -= 1; if ((parts[i].temp<309.6f) && (parts[i].temp>=243)) @@ -545,6 +545,12 @@ void Element_STKM::STKM_init_legs(Simulation * sim, playerst* playerp, int i) playerp->legs[13] = y+12; playerp->legs[14] = x+3; playerp->legs[15] = y+12; + + for (int i = 0; i < 8; i++) + playerp->accs[i] = 0; + playerp->comm = 0; + playerp->pcomm = 0; + playerp->frames = 0; }