mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 03:09:53 +02:00
Code Issues Projects Releases Wiki Activity

Signed integers can be negative, so prop>x does not always correctly indicate whether higher bytes are used

Browse Source
This commit is contained in:
jacksonmj
2013-06-11 00:24:55 +01:00
parent b699bb176f
commit 4e4bd9a11b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/GameSave.cpp
View File

@@ -1820,7 +1820,7 @@ char * GameSave::serialiseOPS(int & dataLength)
{ {
fieldDesc |= 1 << 1; fieldDesc |= 1 << 1;
partsData[partsDataLen++] = particles[i].life; partsData[partsDataLen++] = particles[i].life;
if(particles[i].life > 255) if(particles[i].life & 0xFF00)
{ {
fieldDesc |= 1 << 2; fieldDesc |= 1 << 2;
partsData[partsDataLen++] = particles[i].life >> 8; partsData[partsDataLen++] = particles[i].life >> 8;
@@ -1832,11 +1832,11 @@ char * GameSave::serialiseOPS(int & dataLength)
{ {
fieldDesc |= 1 << 3; fieldDesc |= 1 << 3;
partsData[partsDataLen++] = particles[i].tmp; partsData[partsDataLen++] = particles[i].tmp;
if(particles[i].tmp > 255) if(particles[i].tmp & 0xFFFFFF00)
{ {
fieldDesc |= 1 << 4; fieldDesc |= 1 << 4;
partsData[partsDataLen++] = particles[i].tmp >> 8; partsData[partsDataLen++] = particles[i].tmp >> 8;
if(particles[i].tmp > 65535) if(particles[i].tmp & 0xFFFF0000)
{ {
fieldDesc |= 1 << 12; fieldDesc |= 1 << 12;
partsData[partsDataLen++] = (particles[i].tmp&0xFF000000)>>24; partsData[partsDataLen++] = (particles[i].tmp&0xFF000000)>>24;
@@ -1850,7 +1850,7 @@ char * GameSave::serialiseOPS(int & dataLength)
{ {
fieldDesc |= 1 << 5; fieldDesc |= 1 << 5;
partsData[partsDataLen++] = particles[i].ctype; partsData[partsDataLen++] = particles[i].ctype;
if(particles[i].ctype > 255) if(particles[i].ctype & 0xFFFFFF00)
{ {
fieldDesc |= 1 << 9; fieldDesc |= 1 << 9;
partsData[partsDataLen++] = (particles[i].ctype&0xFF000000)>>24; partsData[partsDataLen++] = (particles[i].ctype&0xFF000000)>>24;
@@ -1894,7 +1894,7 @@ char * GameSave::serialiseOPS(int & dataLength)
{ {
fieldDesc |= 1 << 10; fieldDesc |= 1 << 10;
partsData[partsDataLen++] = particles[i].tmp2; partsData[partsDataLen++] = particles[i].tmp2;
if(particles[i].tmp2 > 255) if(particles[i].tmp2 & 0xFF00)
{ {
fieldDesc |= 1 << 11; fieldDesc |= 1 << 11;
partsData[partsDataLen++] = particles[i].tmp2 >> 8; partsData[partsDataLen++] = particles[i].tmp2 >> 8;