matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update Simulation.cpp to use new macros

Browse Source
This commit is contained in:
jacob1 2017-12-29 17:34:19 -05:00
parent da45e0e469
commit 20e1abd840
2 changed files with 242 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/Elements.h
View File

@ -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) // 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 PMAPBITS 8
#define PMAPMASK ((2<<(PMAPBITS-1))-1) #define PMAPMASK ((1<<PMAPBITS)-1)
#define ID(r) ((r)>>PMAPBITS) #define ID(r) ((r)>>PMAPBITS)
#define TYP(r) ((r)&PMAPMASK) #define TYP(r) ((r)&PMAPMASK)
#define PMAP(id, typ) ((id)<<PMAPBITS | ((typ)&PMAPMASK)) #define PMAP(id, typ) ((id)<<PMAPBITS | ((typ)&PMAPMASK))
#define PMAPID(id) ((id)<<PMAPBITS) #define PMAPID(id) ((id)<<PMAPBITS)
#define PT_NUM 256 #define PT_NUM (1<<PMAPBITS)
struct playerst; struct playerst;

477
src/simulation/Simulation.cpp
View File

File diff suppressed because it is too large Load Diff