diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-28 22:47:00 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-28 23:14:46 (GMT) |
| commit | fe033ce859b1d5db91fa840e0353403ab19b0d3a (patch) | |
| tree | 6b1252a35d656f5653052fdacbc6b5b5822725e9 /includes | |
| parent | a5ff51f5a508b35980502ebce46c4a3822ecb4b4 (diff) | |
| download | powder-fe033ce859b1d5db91fa840e0353403ab19b0d3a.zip powder-fe033ce859b1d5db91fa840e0353403ab19b0d3a.tar.gz | |
INWR should cool after being sparked; and correct function parameters
Also correct grule size and replicate existing freezing point behaviour for lava
with strange ctypes.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/powder.h b/includes/powder.h index e033e02..f402b65 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -687,9 +687,9 @@ static part_transition ptransitions[PT_NUM] = #undef ST -static int grule[NGOL][9] = +static int grule[NGOL][10] = { -// 0,1,2,3,4,5,6,7,8,STATES live=1 spawn=2 spawn&live=3 States are kind of how long until it dies, normal ones use two states(living,dead) for others the intermediate states live but do nothing +// 0,1,2,3,4,5,6,7,8,STATES live=1 spawn=2 spawn&live=3 States are kind of how long until it dies, normal ones use two states(living,dead) for others the intermediate states live but do nothing {0,0,0,0,0,0,0,0,0,2},//blank {0,0,1,3,0,0,0,0,0,2},//GOL {0,0,1,3,0,0,2,0,0,2},//HLIF @@ -804,7 +804,7 @@ static void create_gain_photon(int pp); void kill_part(int i); #if defined(WIN32) && !defined(__GNUC__) -extern _inline void part_change_type(int n, int x, int y, int t); +extern _inline void part_change_type(int i, int x, int y, int t); #else extern inline void part_change_type(int i, int x, int y, int t); #endif |