diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-16 21:01:33 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-16 21:01:33 (GMT) |
| commit | 6f8e2c03456552bdd54355606b8b8389f884c06d (patch) | |
| tree | dc51900a69809f0230239dcee562d2758d6e550f /src/client | |
| parent | 751da54183acb5f7dae94e815aec1e0daf7bbd36 (diff) | |
| download | powder-6f8e2c03456552bdd54355606b8b8389f884c06d.zip powder-6f8e2c03456552bdd54355606b8b8389f884c06d.tar.gz | |
remove unneeded / duplicate constants, fix SPC_AIR/other tools so it won't conflict with lua elements (the 11th one won't work right now)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/GameSave.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index 06441c8..265ff27 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -947,6 +947,11 @@ void GameSave::readOPS(char * data, int dataLength) case PT_PSTN: if (savedVersion < 87 && particles[newIndex].ctype) particles[newIndex].life = 1; + case PT_STKM: + case PT_STKM2: + case PT_FIGH: + if (savedVersion < 88 && particles[newIndex].ctype == OLD_SPC_AIR) + particles[newIndex].ctype = SPC_AIR; } newIndex++; } @@ -1566,6 +1571,9 @@ void GameSave::readPSv(char * data, int dataLength) particles[i-1].ctype = (((unsigned char)(firw_data[caddress]))<<16) | (((unsigned char)(firw_data[caddress+1]))<<8) | ((unsigned char)(firw_data[caddress+2])); } } + if (ver < 88) //fix air blowing stickmen + if ((particles[i-1].type == PT_STKM || particles[i-1].type == PT_STKM2 || particles[i-1].type == PT_FIGH) && particles[i-1].ctype == OLD_SPC_AIR) + particles[i-1].ctype == SPC_AIR; } } |