diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-12-30 02:06:53 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-12-30 02:06:53 (GMT) |
| commit | 5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f (patch) | |
| tree | 3000d7b1d85f6a031181454377f2c0920d319868 /src/elements | |
| parent | 86369670aaa11b8cd2ddcbd46413fb9482e4e58f (diff) | |
| parent | f04577598b48c9e294b102395afc94023df8c92c (diff) | |
| download | powder-5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f.zip powder-5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/bang.c | 6 | ||||
| -rw-r--r-- | src/elements/ignt.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/elements/bang.c b/src/elements/bang.c index 2c5c904..9a374c2 100644 --- a/src/elements/bang.c +++ b/src/elements/bang.c @@ -45,12 +45,12 @@ int update_BANG(UPDATE_FUNC_ARGS) { if(!(rand()%2)) { create_part(i, x, y, PT_FIRE); - parts[i].temp = (MAX_TEMP/4)+otemp; + parts[i].temp = restrict_flt((MAX_TEMP/4)+otemp, MIN_TEMP, MAX_TEMP); } else { create_part(i, x, y, PT_SMKE); - parts[i].temp = (MAX_TEMP/4)+otemp; + parts[i].temp = restrict_flt((MAX_TEMP/4)+otemp, MIN_TEMP, MAX_TEMP); } } else @@ -60,7 +60,7 @@ int update_BANG(UPDATE_FUNC_ARGS) { create_part(i, x, y, PT_BOMB); parts[i].tmp = 1; parts[i].life = 50; - parts[i].temp = (MAX_TEMP/3)+otemp; + parts[i].temp = restrict_flt((MAX_TEMP/3)+otemp, MIN_TEMP, MAX_TEMP); parts[i].vx = rand()%20-10; parts[i].vy = rand()%20-10; } diff --git a/src/elements/ignt.c b/src/elements/ignt.c index c11fccf..f002e2d 100644 --- a/src/elements/ignt.c +++ b/src/elements/ignt.c @@ -31,7 +31,7 @@ int update_IGNT(UPDATE_FUNC_ARGS) { parts[nb].life = 30; parts[nb].vx = rand()%20-10; parts[nb].vy = rand()%20-10; - parts[nb].temp = 400.0f+parts[i].temp-273.15; + parts[nb].temp = restrict_flt(400.0f+parts[i].temp-273.15, MIN_TEMP, MAX_TEMP); } } else |