mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-21 23:45:20 +02:00
Code Issues Projects Releases Wiki Activity

Gravity state now saved

Browse Source
This commit is contained in:
Simon Robertshaw
2011-05-28 18:54:12 +01:00
parent 232595c209
commit 577ad4eb47
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/defines.h
View File

@@ -7,8 +7,8 @@
#define PATH_SEP "/" #define PATH_SEP "/"
#endif #endif
#define SAVE_VERSION 48 #define SAVE_VERSION 49
#define MINOR_VERSION 2 #define MINOR_VERSION 0
#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.
#define BETA #define BETA

18
src/main.c
View File

@@ -466,7 +466,7 @@ void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRE
c[0] = 0x50; //0x66; c[0] = 0x50; //0x66;
c[1] = 0x53; //0x75; c[1] = 0x53; //0x75;
c[2] = 0x76; //0x43; c[2] = 0x76; //0x43;
c[3] = legacy_enable|((sys_pause<<1)&0x02)|((gravityMode<<2)&0x0C)|((airMode<<4)&0x70); c[3] = legacy_enable|((sys_pause<<1)&0x02)|((gravityMode<<2)&0x0C)|((airMode<<4)&0x70)|((ngrav_enable<<7)&0x80);
c[4] = SAVE_VERSION; c[4] = SAVE_VERSION;
c[5] = CELL; c[5] = CELL;
c[6] = bw; c[6] = bw;
@@ -495,7 +495,7 @@ void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRE
int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr, unsigned pmap[YRES][XRES], pixel *decorations) int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr, unsigned pmap[YRES][XRES], pixel *decorations)
{ {
unsigned char *d=NULL,*c=save; unsigned char *d=NULL,*c=save;
int q,i,j,k,x,y,p=0,*m=NULL, ver, pty, ty, legacy_beta=0; int q,i,j,k,x,y,p=0,*m=NULL, ver, pty, ty, legacy_beta=0, tempGrav = 0;
int bx0=x0/CELL, by0=y0/CELL, bw, bh, w, h; int bx0=x0/CELL, by0=y0/CELL, bw, bh, w, h;
int fp[NPART], nf=0, new_format = 0, ttv = 0; int fp[NPART], nf=0, new_format = 0, ttv = 0;
particle *parts = partsptr; particle *parts = partsptr;
@@ -529,6 +529,9 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
gravityMode = ((c[3]>>2)&0x03);// | ((c[3]>>2)&0x01); gravityMode = ((c[3]>>2)&0x03);// | ((c[3]>>2)&0x01);
airMode = ((c[3]>>4)&0x07);// | ((c[3]>>4)&0x02) | ((c[3]>>4)&0x01); airMode = ((c[3]>>4)&0x07);// | ((c[3]>>4)&0x02) | ((c[3]>>4)&0x01);
} }
if (ver>=49 && replace) {
tempGrav = ((c[3]>>7)&0x01);
}
} else { } else {
if (c[3]==1||c[3]==0) { if (c[3]==1||c[3]==0) {
legacy_enable = c[3]; legacy_enable = c[3];
@@ -883,12 +886,21 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
// Replace invisible particles with something sensible and add decoration to hide it // Replace invisible particles with something sensible and add decoration to hide it
x = (int)(parts[i-1].x+0.5f); x = (int)(parts[i-1].x+0.5f);
y = (int)(parts[i-1].y+0.5f); y = (int)(parts[i-1].y+0.5f);
decorations[y*(XRES+BARSIZE)+x] = PIXPACK(0x010101); parts[i-1].dcolour = 0x010101;
parts[i-1].type = PT_DMND; parts[i-1].type = PT_DMND;
} }
} }
} }
//Change the gravity state
if(ngrav_enable != tempGrav && replace)
{
if(tempGrav)
start_grav_async();
else
stop_grav_async();
}
if (p >= size) if (p >= size)
goto version1; goto version1;
j = d[p++]; j = d[p++];