diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-12 16:08:12 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-12 16:08:12 (GMT) |
| commit | 345c183ee344c227c386221e49a094c62cf9799b (patch) | |
| tree | 0bf826e83ddec66c52c69a2f5a1ad159a726fec0 /src/main.c | |
| parent | 8824bcc6095704a2295423775e5dd6213cd4284d (diff) | |
| parent | f1908bab0c5e63e051382a54a2868124d267721c (diff) | |
| download | powder-345c183ee344c227c386221e49a094c62cf9799b.zip powder-345c183ee344c227c386221e49a094c62cf9799b.tar.gz | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -714,7 +714,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char j = PT_DUST;//goto corrupt; } gol[x][y]=0; - if (j)// && !(player[27] == 1 && j==PT_STKM)) + if (j && !(player[27] == 1 && j==PT_STKM) && !(player2[27] == 1 && j==PT_STKM2)) //Don't comment this, it's needed { if (pmap[y][x] && (pmap[y][x]>>8)<NPART) { |