summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-08-11 19:40:24 (GMT)
committer Simon <simon@hardwired.org.uk>2010-08-11 19:40:24 (GMT)
commit1319e922519b3e5c9d7029b0e7e5cb25198148bc (patch)
treebd7d71071bf3b1269971a287b4c63fa5c996f022
parent51c8a487bb6a69f157997a621d521ff2f59a9625 (diff)
downloadpowder-1319e922519b3e5c9d7029b0e7e5cb25198148bc.zip
powder-1319e922519b3e5c9d7029b0e7e5cb25198148bc.tar.gz
Fixes stickman wall bug and version number
-rwxr-xr-xpowder.c4
-rwxr-xr-xversion.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/powder.c b/powder.c
index 5ac8e33..deb0239 100755
--- a/powder.c
+++ b/powder.c
@@ -2151,7 +2151,7 @@ void update_particles_i(pixel *vid, int start, int inc){
r = pmap[(int)(player[8]-ny)][(int)(player[7]+0.5)]; //This is to make coding more pleasant :-)
//For left leg
- if (r && (r>>8)<NPART && (r&0xFF)!=PT_STKM)
+ if (r && (r&0xFF)!=PT_STKM)
{
if(pstates[r&0xFF].state == ST_LIQUID || pstates[r&0xFF].state == ST_GAS) //Liquid checks
{
@@ -2173,7 +2173,7 @@ void update_particles_i(pixel *vid, int start, int inc){
r = pmap[(int)(player[16]-ny)][(int)(player[15]+0.5)];
//For right leg
- if (r && (r>>8)<NPART && (r&0xFF)!=PT_STKM)
+ if (r && (r&0xFF)!=PT_STKM)
{
if(pstates[r&0xFF].state == ST_LIQUID || pstates[r&0xFF].state == ST_GAS)
{
diff --git a/version.h b/version.h
index f1fff2b..872531a 100755
--- a/version.h
+++ b/version.h
@@ -21,7 +21,7 @@
#define VERSION_H
#define SAVE_VERSION 40
-#define MINOR_VERSION 0
+#define MINOR_VERSION 2
#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.
#define MENUV3