From a23138fbbec43f31e265a908c935b700558e1467 Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Thu, 13 Jan 2011 20:17:05 +0000 Subject: [PATCH] Fix permanent stickman death. --- src/elements/stkm.c | 1 + src/elements/stkm2.c | 1 + src/main.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 66f9b2e87..de0caa339 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -1,6 +1,7 @@ #include int update_SPAWN(UPDATE_FUNC_ARGS) { + ISSPAWN1 = 1; if (death) { playerspawn = create_part(-1,x,y,PT_STKM); diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c index 7c0204357..5d5da8a8c 100644 --- a/src/elements/stkm2.c +++ b/src/elements/stkm2.c @@ -1,6 +1,7 @@ #include int update_SPAWN2(UPDATE_FUNC_ARGS) { + ISSPAWN2 = 1; if (death2) { player2spawn = create_part(-1,x,y,PT_STKM2); diff --git a/src/main.c b/src/main.c index 55739afc5..575721f2d 100644 --- a/src/main.c +++ b/src/main.c @@ -487,6 +487,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0) memset(vx, 0, sizeof(vx)); memset(vy, 0, sizeof(vy)); memset(pv, 0, sizeof(pv)); + death = death2 = ISSPAWN1 = ISSPAWN2 = 0; } // make a catalog of free parts @@ -2032,6 +2033,7 @@ int main(int argc, char *argv[]) svf_tags[0] = 0; svf_description[0] = 0; gravityMode = 1; + death = death2 = 0; isplayer2 = 0; isplayer = 0; ISSPAWN1 = 0;