diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-14 17:32:10 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-14 17:32:10 (GMT) |
| commit | dcd3af94404b1d1bb296566a84177cc37e0b83d5 (patch) | |
| tree | 77385a265e760cd8bd86ac9077e2c0f58c6204e8 /src/main.c | |
| parent | d3153aae85f2e3cd1ba8ff0520e5ebe51e08d7d5 (diff) | |
| parent | ca66525bea67de164603163752aee0212d59df34 (diff) | |
| download | powder-dcd3af94404b1d1bb296566a84177cc37e0b83d5.zip powder-dcd3af94404b1d1bb296566a84177cc37e0b83d5.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
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) { |