update Simulation.cpp to use new macros

The-Powder-Toy · Dec 29, 2017 · 20e1abd · 20e1abd
1 parent da45e0e
commit 20e1abd
Show file tree

Hide file tree

Showing 2 changed files with 242 additions and 239 deletions.
diff --git a/src/simulation/Elements.h b/src/simulation/Elements.h
@@ -52,13 +52,13 @@
 
 // Change this to change the amount of bits used to store type in pmap (and a few elements such as PIPE and CRAY)
 #define PMAPBITS 8
-#define PMAPMASK ((2<<(PMAPBITS-1))-1)
+#define PMAPMASK ((1<<PMAPBITS)-1)
 #define ID(r) ((r)>>PMAPBITS)
 #define TYP(r) ((r)&PMAPMASK)
 #define PMAP(id, typ) ((id)<<PMAPBITS | ((typ)&PMAPMASK))
 #define PMAPID(id) ((id)<<PMAPBITS)
 
-#define PT_NUM	256
+#define PT_NUM	(1<<PMAPBITS)
 
 struct playerst;