update Simulation.cpp to use new macros

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

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)
#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;

File diff suppressed because it is too large Load Diff