… | |
… | |
50 | #define MAGIC_MAP_SIZE 50 |
50 | #define MAGIC_MAP_SIZE 50 |
51 | #define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 |
51 | #define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 |
52 | |
52 | |
53 | #define MAP_LAYERS 3 |
53 | #define MAP_LAYERS 3 |
54 | |
54 | |
55 | // tile map index |
55 | // tile map index - toggling the lowest bit reverses direction |
56 | enum { |
56 | enum |
|
|
57 | { |
57 | TILE_NORTH, |
58 | TILE_NORTH, |
58 | TILE_EAST, |
|
|
59 | TILE_SOUTH, |
59 | TILE_SOUTH, |
|
|
60 | TILE_EAST , |
60 | TILE_WEST, |
61 | TILE_WEST, |
61 | TILE_UP, |
62 | TILE_UP, |
62 | TILE_DOWN, |
63 | TILE_DOWN, |
63 | TILE_NUM, |
64 | TILE_NUM |
64 | }; |
65 | }; |
|
|
66 | |
|
|
67 | #define REVERSE_TILE_DIR(dir) ((dir) ^ 1) |
65 | |
68 | |
66 | /* Values for state below */ |
69 | /* Values for state below */ |
67 | enum { |
70 | enum |
|
|
71 | { |
68 | MAP_SWAPPED, // header loaded, nothing else |
72 | MAP_SWAPPED, // header loaded, nothing else |
69 | MAP_INACTIVE, // in memory, linkable, but not active |
73 | MAP_INACTIVE, // in memory, linkable, but not active |
70 | MAP_ACTIVE, // running! |
74 | MAP_ACTIVE, // running! |
71 | }; |
75 | }; |
72 | |
76 | |
… | |
… | |
89 | * should almost always be using out_of_map instead, which takes into account |
93 | * should almost always be using out_of_map instead, which takes into account |
90 | * map tiling. |
94 | * map tiling. |
91 | */ |
95 | */ |
92 | #define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) |
96 | #define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) |
93 | |
97 | |
94 | /* These are used in the MapLook flags element. They are not used in |
98 | /* These are used in the mapspace flags element. They are not used in |
95 | * in the object flags structure. |
99 | * in the object flags structure. |
96 | */ |
100 | */ |
97 | #define P_BLOCKSVIEW 0x01 |
101 | #define P_BLOCKSVIEW 0x01 |
98 | #define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ |
102 | #define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ |
99 | #define P_NO_CLERIC 0x04 /* no clerical spells cast here */ |
103 | #define P_NO_CLERIC 0x04 /* no clerical spells cast here */ |
… | |
… | |
113 | * function that does more of the work can hopefully be used to replace |
117 | * function that does more of the work can hopefully be used to replace |
114 | * lots of duplicate checks currently in the code. |
118 | * lots of duplicate checks currently in the code. |
115 | */ |
119 | */ |
116 | #define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ |
120 | #define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ |
117 | #define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ |
121 | #define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ |
|
|
122 | |
|
|
123 | // persistent flags (pflags) in mapspace |
|
|
124 | enum |
|
|
125 | { |
|
|
126 | PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace |
|
|
127 | }; |
118 | |
128 | |
119 | /* Instead of having numerous arrays that have information on a |
129 | /* Instead of having numerous arrays that have information on a |
120 | * particular space (was map, floor, floor2, map_ob), |
130 | * particular space (was map, floor, floor2, map_ob), |
121 | * have this structure take care of that information. |
131 | * have this structure take care of that information. |
122 | * This puts it all in one place, and should also make it easier |
132 | * This puts it all in one place, and should also make it easier |
… | |
… | |
137 | uint16_t ACC (RW, items_); // saturates at 64k |
147 | uint16_t ACC (RW, items_); // saturates at 64k |
138 | uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) |
148 | uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) |
139 | uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 |
149 | uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 |
140 | static uint32_t ACC (RW, smellcount); // global smell counter |
150 | static uint32_t ACC (RW, smellcount); // global smell counter |
141 | |
151 | |
|
|
152 | uint8_t pflags; // additional, persistent flags |
142 | uint32_t pad1_; // pad to 64 bytes on 64 bit systems |
153 | uint8_t pad [3]; // pad to 64 bytes on LP64 systems |
143 | |
154 | |
144 | //-GPL |
155 | //-GPL |
145 | |
156 | |
146 | void update_ (); |
157 | void update_ (); |
147 | MTH void update () |
158 | MTH void update () |
… | |
… | |
163 | { |
174 | { |
164 | update (); |
175 | update (); |
165 | return flags_; |
176 | return flags_; |
166 | } |
177 | } |
167 | |
178 | |
|
|
179 | MTH void update_up (); |
|
|
180 | |
168 | MTH void invalidate () |
181 | MTH void invalidate () |
169 | { |
182 | { |
170 | flags_ = 0; |
183 | flags_ = 0; |
171 | } |
184 | |
|
|
185 | if (pflags) |
|
|
186 | update_up (); |
172 | |
187 | } |
|
|
188 | |
173 | MTH object *player () |
189 | MTH object *player () |
174 | { |
190 | { |
175 | object *op; |
191 | object *op; |
176 | |
192 | |
177 | if (flags () & P_PLAYER) |
193 | if (flags () & P_PLAYER) |