summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-12-29 21:15:40 (GMT)
committer Simon <simon@hardwired.org.uk>2010-12-29 21:15:40 (GMT)
commit3715925dd95c7433c4bfd3078089bcf05a16f813 (patch)
tree6e7c1ac2757738343f748fd51d4ab3ad5dcca3a9 /includes
parent713034ed619378aa0abc6b38b69604e1aba8821c (diff)
parent5766f9aa7ee0f78adea5799322dce67506d9247d (diff)
downloadpowder-3715925dd95c7433c4bfd3078089bcf05a16f813.zip
powder-3715925dd95c7433c4bfd3078089bcf05a16f813.tar.gz
Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy
Diffstat (limited to 'includes')
-rw-r--r--includes/powder.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/includes/powder.h b/includes/powder.h
index 02805c4..65eca3a 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -5,8 +5,9 @@
#include "defines.h"
#include "interface.h"
-#define CM_COUNT 10
-#define CM_CRACK 9
+#define CM_COUNT 11
+#define CM_CRACK 10
+#define CM_LIFE 9
#define CM_GRAD 8
#define CM_NOTHING 7
#define CM_FANCY 6
@@ -582,8 +583,8 @@ static int lolzrule[9][9] =
{0,1,0,0,0,0,0,1,0},
{0,1,0,0,0,0,0,1,0},
};
-int portal[MAX_TEMP/100][8][8];
-float portaltemp[MAX_TEMP/100][8][8];
+int portal[MAX_TEMP/100][8][80];
+float portaltemp[MAX_TEMP/100][8][80];
int wireless[MAX_TEMP/100][2];
extern int isplayer;