summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-09-22 15:01:49 (GMT)
committer Simon <simon@hardwired.org.uk>2010-09-22 15:01:49 (GMT)
commitd43b5a4fd848fe6f3fca12ee5a6be7d2e9dd9294 (patch)
tree6fbeea593aabecebc2054cb8584299eeb76b05b8 /main.c
parentc12cdce5b650220334bdc1de03303118954fb12d (diff)
downloadpowder-d43b5a4fd848fe6f3fca12ee5a6be7d2e9dd9294.zip
powder-d43b5a4fd848fe6f3fca12ee5a6be7d2e9dd9294.tar.gz
Fix Thermite and Stickman reload glitch
Diffstat (limited to 'main.c')
-rwxr-xr-x[-rw-r--r--]main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index 51fe3b0..e0c5d62 100644..100755
--- a/main.c
+++ b/main.c
@@ -506,7 +506,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
j=d[p++];
if(j >= PT_NUM)
goto corrupt;
- if(j && !(isplayer == 1 && j==PT_STKM))
+ if(j)// && !(isplayer == 1 && j==PT_STKM))
{
if(pmap[y][x])
{
@@ -1764,7 +1764,7 @@ int main(int argc, char *argv[])
memset(fire_g, 0, sizeof(fire_g));
memset(fire_b, 0, sizeof(fire_b));
}
- if(x>=19 && x<=35 && svf_last && svf_open)
+ if(x>=19 && x<=35 && svf_last && svf_open && !bq)
parse_save(svf_last, svf_lsize, 1, 0, 0);
if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq)
{