mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 19:04:05 +02:00
Code Issues Projects Releases Wiki Activity

fixed indention

Browse Source
This commit is contained in:
Felix Wallin
2010-10-02 19:45:55 +02:00
parent ad3fa82329
commit b7f8fd4ba6
2 changed files with 323 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/powder.c
View File

@@ -70,8 +70,13 @@ int try_move(int i, int x, int y, int nx, int ny)
return 1; return 1;
e = eval_move(parts[i].type, nx, ny, &r); e = eval_move(parts[i].type, nx, ny, &r);
if(!e) if(!e) {
if(!legacy_enable) {
if((r >> 8) < PT_NUM)
| parts[r>>8].temp = restrict_flt(parts[r>>8].temp+parts[i].temp/2, MIN_TEMP, MAX_TEMP);;
}
return 0; return 0;
}
if(e == 2) if(e == 2)
return 1; return 1;
@@ -278,7 +283,7 @@ void kill_part(int i)
#ifdef WIN32 #ifdef WIN32
_inline int create_part(int p, int x, int y, int t) _inline int create_part(int p, int x, int y, int t)
#else #else
inline int create_part(int p, int x, int y, int t) inline int create_part(int p, int x, int y, int t)
#endif #endif
{ {
int i; int i;
@@ -494,7 +499,7 @@ _inline int create_part(int p, int x, int y, int t)
#ifdef WIN32 #ifdef WIN32
_inline void delete_part(int x, int y) _inline void delete_part(int x, int y)
#else #else
inline void delete_part(int x, int y) inline void delete_part(int x, int y)
#endif #endif
{ {
unsigned i; unsigned i;
@@ -512,7 +517,7 @@ _inline void delete_part(int x, int y)
#ifdef WIN32 #ifdef WIN32
_inline int is_wire(int x, int y) _inline int is_wire(int x, int y)
#else #else
inline int is_wire(int x, int y) inline int is_wire(int x, int y)
#endif #endif
{ {
return bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12; return bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12;
@@ -521,7 +526,7 @@ _inline int is_wire(int x, int y)
#ifdef WIN32 #ifdef WIN32
_inline int is_wire_off(int x, int y) _inline int is_wire_off(int x, int y)
#else #else
inline int is_wire_off(int x, int y) inline int is_wire_off(int x, int y)
#endif #endif
{ {
return (bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12) && emap[y][x]<8; return (bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12) && emap[y][x]<8;
@@ -587,7 +592,7 @@ void set_emap(int x, int y)
#ifdef WIN32 #ifdef WIN32
_inline int parts_avg(int ci, int ni) _inline int parts_avg(int ci, int ni)
#else #else
inline int parts_avg(int ci, int ni) inline int parts_avg(int ci, int ni)
#endif #endif
{ {
int pmr = pmap[(int)((parts[ci].y + parts[ni].y)/2)][(int)((parts[ci].x + parts[ni].x)/2)]; int pmr = pmap[(int)((parts[ci].y + parts[ni].y)/2)][(int)((parts[ci].x + parts[ni].x)/2)];
@@ -1964,7 +1969,7 @@ void update_particles_i(pixel *vid, int start, int inc)
} }
} }
} }
killed: killed:
if(parts[i].type == PT_NONE) if(parts[i].type == PT_NONE)
continue; continue;
} }