matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix creating particles in autorun.lua

Browse Source
This commit is contained in:
jacksonmj 2011-12-13 17:16:17 +08:00 committed by Simon Robertshaw
parent 46068833d1
commit 33271ce3e2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -545,7 +545,6 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
int nf=0, new_format = 0, ttv = 0; int nf=0, new_format = 0, ttv = 0;
particle *parts = partsptr; particle *parts = partsptr;
int *fp = malloc(NPART*sizeof(int)); int *fp = malloc(NPART*sizeof(int));
parts_lastActiveIndex = NPART-1;
//New file header uses PSv, replacing fuC. This is to detect if the client uses a new save format for temperatures //New file header uses PSv, replacing fuC. This is to detect if the client uses a new save format for temperatures
//This creates a problem for old clients, that display and "corrupt" error instead of a "newer version" error //This creates a problem for old clients, that display and "corrupt" error instead of a "newer version" error
@ -630,6 +629,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
} }
clear_sim(); clear_sim();
} }
parts_lastActiveIndex = NPART-1;
m = calloc(XRES*YRES, sizeof(int)); m = calloc(XRES*YRES, sizeof(int));
// make a catalog of free parts // make a catalog of free parts
@ -1124,13 +1124,16 @@ corrupt:
void clear_sim(void) void clear_sim(void)
{ {
int x, y; int i, x, y;
memset(bmap, 0, sizeof(bmap)); memset(bmap, 0, sizeof(bmap));
memset(emap, 0, sizeof(emap)); memset(emap, 0, sizeof(emap));
memset(signs, 0, sizeof(signs)); memset(signs, 0, sizeof(signs));
memset(parts, 0, sizeof(particle)*NPART); memset(parts, 0, sizeof(particle)*NPART);
pfree = -1; for (i=0; i<NPART-1; i++)
parts_lastActiveIndex = NPART-1; parts[i].life = i+1;
parts[NPART-1].life = -1;
pfree = 0;
parts_lastActiveIndex = 0;
memset(pmap, 0, sizeof(pmap)); memset(pmap, 0, sizeof(pmap));
memset(pv, 0, sizeof(pv)); memset(pv, 0, sizeof(pv));
memset(vx, 0, sizeof(vx)); memset(vx, 0, sizeof(vx));