summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-01-08 21:05:52 (GMT)
committer Simon <simon@hardwired.org.uk>2011-01-08 21:05:52 (GMT)
commit75e898e45ba03f4c80b50a91d1fc338bff2eccb7 (patch)
tree362a3414bc225f3cf24a6a8c883e0e5b476dbfd6 /includes
parent764e3966bb1294fcb2d42812ad0f8d49747aebca (diff)
parent0958a6e6da7ffd8c93779bfeb4552e18f593a090 (diff)
downloadpowder-75e898e45ba03f4c80b50a91d1fc338bff2eccb7.zip
powder-75e898e45ba03f4c80b50a91d1fc338bff2eccb7.tar.gz
Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy
Diffstat (limited to 'includes')
-rw-r--r--includes/powder.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/powder.h b/includes/powder.h
index 3e4d388..7b4a0ee 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -649,6 +649,7 @@ static int lolzrule[9][9] =
};
int portal[MAX_TEMP/100][8][80];
float portaltemp[MAX_TEMP/100][8][80];
+int portalctype[MAX_TEMP/100][8][80];
int wireless[MAX_TEMP/100][2];
extern int isplayer;