ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.20 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.64 by root, Mon Jan 1 12:28:45 2007 UTC

1/*
2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.20 2006/09/03 00:18:40 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 22*/
28
29 23
30#include <global.h> 24#include <global.h>
31#include <funcpoint.h> 25#include <funcpoint.h>
32 26
33#include <loader.h> 27#include <loader.h>
34#ifndef WIN32 /* ---win32 exclude header */
35#include <unistd.h> 28#include <unistd.h>
36#endif /* win32 */
37 29
38#include "path.h" 30#include "path.h"
39
40
41extern int nrofallocobjects,nroffreeobjects;
42
43/*
44 * Returns the mapstruct which has a name matching the given argument.
45 * return NULL if no match is found.
46 */
47
48mapstruct *has_been_loaded (const char *name) {
49 mapstruct *map;
50
51 if (!name || !*name)
52 return 0;
53 for (map = first_map; map; map = map->next)
54 if (!strcmp (name, map->path))
55 break;
56 return (map);
57}
58 31
59/* 32/*
60 * This makes a path absolute outside the world of Crossfire. 33 * This makes a path absolute outside the world of Crossfire.
61 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 34 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
62 * and returns the pointer to a static array containing the result. 35 * and returns the pointer to a static array containing the result.
63 * it really should be called create_mapname 36 * it really should be called create_mapname
64 */ 37 */
65 38const char *
66const char *create_pathname (const char *name) { 39create_pathname (const char *name)
40{
67 static char buf[MAX_BUF]; 41 static char buf[8192];
68
69 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
70 * someplace else in the code? msw 2-17-97
71 */
72 if (*name == '/')
73 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
74 else
75 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 42 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
76 return (buf); 43 return buf;
77} 44}
78
79/*
80 * same as create_pathname, but for the overlay maps.
81 */
82
83const char *create_overlay_pathname (const char *name) {
84 static char buf[MAX_BUF];
85
86 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
87 * someplace else in the code? msw 2-17-97
88 */
89 if (*name == '/')
90 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
91 else
92 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
93 return (buf);
94}
95
96/*
97 * same as create_pathname, but for the template maps.
98 */
99
100const char *create_template_pathname (const char *name) {
101 static char buf[MAX_BUF];
102
103 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
104 * someplace else in the code? msw 2-17-97
105 */
106 if (*name == '/')
107 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
108 else
109 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
110 return (buf);
111}
112
113/*
114 * This makes absolute path to the itemfile where unique objects
115 * will be saved. Converts '/' to '@'. I think it's essier maintain
116 * files than full directory structure, but if this is problem it can
117 * be changed.
118 */
119static const char *create_items_path (const char *s) {
120 static char buf[MAX_BUF];
121 char *t;
122
123 if (*s == '/')
124 s++;
125
126 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
127
128 for (t=buf+strlen(buf); *s; s++,t++)
129 if (*s == '/')
130 *t = '@';
131 else
132 *t = *s;
133 *t = 0;
134 return (buf);
135}
136
137 45
138/* 46/*
139 * This function checks if a file with the given path exists. 47 * This function checks if a file with the given path exists.
140 * -1 is returned if it fails, otherwise the mode of the file 48 * -1 is returned if it fails, otherwise the mode of the file
141 * is returned. 49 * is returned.
… …
148 * the rest of the code only cares that the file is readable. 56 * the rest of the code only cares that the file is readable.
149 * when the editor goes away, the call to stat should probably be 57 * when the editor goes away, the call to stat should probably be
150 * replaced by an access instead (similar to the windows one, but 58 * replaced by an access instead (similar to the windows one, but
151 * that seems to be missing the prepend_dir processing 59 * that seems to be missing the prepend_dir processing
152 */ 60 */
153 61int
154int check_path (const char *name, int prepend_dir) 62check_path (const char *name, int prepend_dir)
155{ 63{
156 char buf[MAX_BUF]; 64 char buf[MAX_BUF];
157#ifndef WIN32 65
158 char *endbuf; 66 char *endbuf;
159 struct stat statbuf; 67 struct stat statbuf;
160 int mode = 0, i; 68 int mode = 0;
161#endif
162 69
163 if (prepend_dir) 70 if (prepend_dir)
164 strcpy (buf, create_pathname(name)); 71 strcpy (buf, create_pathname (name));
165 else 72 else
166 strcpy(buf, name); 73 strcpy (buf, name);
167#ifdef WIN32 /* ***win32: check this sucker in windows style. */
168 return(_access(buf,0));
169#else
170 74
171 /* old method (strchr(buf, '\0')) seemd very odd to me - 75 /* old method (strchr(buf, '\0')) seemd very odd to me -
172 * this method should be equivalant and is clearer. 76 * this method should be equivalant and is clearer.
173 * Can not use strcat because we need to cycle through 77 * Can not use strcat because we need to cycle through
174 * all the names. 78 * all the names.
175 */ 79 */
176 endbuf = buf + strlen(buf); 80 endbuf = buf + strlen (buf);
177 81
178 if (stat (buf, &statbuf)) 82 if (stat (buf, &statbuf))
179 return -1; 83 return -1;
180 if (!S_ISREG (statbuf.st_mode)) 84 if (!S_ISREG (statbuf.st_mode))
181 return (-1); 85 return (-1);
182 86
183 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) || 87 if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) ||
184 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) || 88 ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH))
185 (statbuf.st_mode & S_IROTH))
186 mode |= 4; 89 mode |= 4;
187 90
188 if ((statbuf.st_mode & S_IWGRP && getegid() == statbuf.st_gid) || 91 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
189 (statbuf.st_mode & S_IWUSR && geteuid() == statbuf.st_uid) || 92 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
190 (statbuf.st_mode & S_IWOTH))
191 mode |= 2; 93 mode |= 2;
192 94
193 return (mode); 95 return (mode);
194#endif
195}
196
197/*
198 * Prints out debug-information about a map.
199 * Dumping these at llevError doesn't seem right, but is
200 * necessary to make sure the information is in fact logged.
201 */
202
203void dump_map(const mapstruct *m) {
204 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory);
205 LOG(llevError,"Size: %dx%d Start: %d,%d\n",
206 MAP_WIDTH(m), MAP_HEIGHT(m),
207 MAP_ENTER_X(m), MAP_ENTER_Y(m));
208
209 if(m->msg!=NULL)
210 LOG(llevError,"Message:\n%s",m->msg);
211
212 if(m->maplore!=NULL)
213 LOG(llevError,"Lore:\n%s",m->maplore);
214
215 if(m->tmpname!=NULL)
216 LOG(llevError,"Tmpname: %s\n",m->tmpname);
217
218 LOG(llevError,"Difficulty: %d\n",m->difficulty);
219 LOG(llevError,"Darkness: %d\n",m->darkness);
220}
221
222/*
223 * Prints out debug-information about all maps.
224 * This basically just goes through all the maps and calls
225 * dump_map on each one.
226 */
227
228void dump_all_maps(void) {
229 mapstruct *m;
230 for(m=first_map;m!=NULL;m=m->next) {
231 dump_map(m);
232 }
233} 96}
234 97
235/* This rolls up wall, blocks_magic, blocks_view, etc, all into 98/* This rolls up wall, blocks_magic, blocks_view, etc, all into
236 * one function that just returns a P_.. value (see map.h) 99 * one function that just returns a P_.. value (see map.h)
237 * it will also do map translation for tiled maps, returning 100 * it will also do map translation for tiled maps, returning
… …
240 * by a P_NEW_MAP value, another call to get_map_from_coord 103 * by a P_NEW_MAP value, another call to get_map_from_coord
241 * is needed. The case of not passing values is if we're just 104 * is needed. The case of not passing values is if we're just
242 * checking for the existence of something on those spaces, but 105 * checking for the existence of something on those spaces, but
243 * don't expect to insert/remove anything from those spaces. 106 * don't expect to insert/remove anything from those spaces.
244 */ 107 */
108int
245int get_map_flags(mapstruct *oldmap, mapstruct **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) 109get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
246{ 110{
247 sint16 newx, newy;
248 int retval=0;
249 mapstruct *mp;
250
251 if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP;
252 newx = x; 111 sint16 newx = x;
253 newy = y; 112 sint16 newy = y;
113
254 mp = get_map_from_coord(oldmap, &newx, &newy); 114 maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
255 if (mp != oldmap) 115
256 retval |= P_NEW_MAP; 116 if (!mp)
117 return P_OUT_OF_MAP;
118
257 if (newmap) *newmap = mp; 119 if (newmap) *newmap = mp;
258 if (nx) *nx = newx; 120 if (nx) *nx = newx;
259 if (ny) *ny = newy; 121 if (ny) *ny = newy;
260 retval |= mp->spaces[newx + mp->width * newy].flags;
261 122
262 if (retval & P_SAFE) 123 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
263 retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these
264
265 return retval;
266} 124}
267
268 125
269/* 126/*
270 * Returns true if the given coordinate is blocked except by the 127 * Returns true if the given coordinate is blocked except by the
271 * object passed is not blocking. This is used with 128 * object passed is not blocking. This is used with
272 * multipart monsters - if we want to see if a 2x2 monster 129 * multipart monsters - if we want to see if a 2x2 monster
… …
276 * monster. 133 * monster.
277 * m, x, y are the target map/coordinates - needed for map tiling. 134 * m, x, y are the target map/coordinates - needed for map tiling.
278 * the coordinates & map passed in should have been updated for tiling 135 * the coordinates & map passed in should have been updated for tiling
279 * by the caller. 136 * by the caller.
280 */ 137 */
281 138int
282int blocked_link(object *ob, mapstruct *m, int sx, int sy) { 139blocked_link (object *ob, maptile *m, int sx, int sy)
140{
283 object *tmp; 141 object *tmp;
284 int mflags, blocked; 142 int mflags, blocked;
285 143
286 /* Make sure the coordinates are valid - they should be, as caller should 144 /* Make sure the coordinates are valid - they should be, as caller should
287 * have already checked this. 145 * have already checked this.
288 */ 146 */
289 if (OUT_OF_REAL_MAP(m, sx, sy)) { 147 if (OUT_OF_REAL_MAP (m, sx, sy))
148 {
290 LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n"); 149 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
291 return 1; 150 return 1;
292 } 151 }
293 152
294 /* Save some cycles - instead of calling get_map_flags(), just get the value 153 /* Save some cycles - instead of calling get_map_flags(), just get the value
295 * directly. 154 * directly.
296 */ 155 */
297 mflags = m->spaces[sx + m->width * sy].flags; 156 mflags = m->at (sx, sy).flags ();
298 157
299 blocked = GET_MAP_MOVE_BLOCK(m, sx, sy); 158 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
300 159
301 /* If space is currently not blocked by anything, no need to 160 /* If space is currently not blocked by anything, no need to
302 * go further. Not true for players - all sorts of special 161 * go further. Not true for players - all sorts of special
303 * things we need to do for players. 162 * things we need to do for players.
304 */ 163 */
305 if (ob->type != PLAYER && ! (mflags & P_IS_ALIVE) && (blocked==0)) return 0; 164 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
165 return 0;
306 166
307 /* if there isn't anytyhing alive on this space, and this space isn't 167 /* if there isn't anytyhing alive on this space, and this space isn't
308 * otherwise blocked, we can return now. Only if there is a living 168 * otherwise blocked, we can return now. Only if there is a living
309 * creature do we need to investigate if it is part of this creature 169 * creature do we need to investigate if it is part of this creature
310 * or another. Likewise, only if something is blocking us do we 170 * or another. Likewise, only if something is blocking us do we
311 * need to investigate if there is a special circumstance that would 171 * need to investigate if there is a special circumstance that would
312 * let the player through (inventory checkers for example) 172 * let the player through (inventory checkers for example)
313 */ 173 */
314 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0; 174 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
175 return 0;
315 176
316 if(ob->head != NULL) 177 if (ob->head != NULL)
317 ob=ob->head; 178 ob = ob->head;
318 179
319 /* We basically go through the stack of objects, and if there is 180 /* We basically go through the stack of objects, and if there is
320 * some other object that has NO_PASS or FLAG_ALIVE set, return 181 * some other object that has NO_PASS or FLAG_ALIVE set, return
321 * true. If we get through the entire stack, that must mean 182 * true. If we get through the entire stack, that must mean
322 * ob is blocking it, so return 0. 183 * ob is blocking it, so return 0.
323 */ 184 */
324 for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) { 185 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
186 {
325 187
326 /* This must be before the checks below. Code for inventory checkers. */ 188 /* This must be before the checks below. Code for inventory checkers. */
327 if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) { 189 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
190 {
328 /* If last_sp is set, the player/monster needs an object, 191 /* If last_sp is set, the player/monster needs an object,
329 * so we check for it. If they don't have it, they can't 192 * so we check for it. If they don't have it, they can't
330 * pass through this space. 193 * pass through this space.
331 */ 194 */
332 if (tmp->last_sp) { 195 if (tmp->last_sp)
196 {
333 if (check_inv_recursive(ob,tmp)==NULL) 197 if (check_inv_recursive (ob, tmp) == NULL)
334 return 1; 198 return 1;
335 else 199 else
336 continue; 200 continue;
337 } else {
338 /* In this case, the player must not have the object -
339 * if they do, they can't pass through.
340 */
341 if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */
342 return 1;
343 else
344 continue;
345 } 201 }
346 } /* if check_inv */
347 else { 202 else
203 {
204 /* In this case, the player must not have the object -
205 * if they do, they can't pass through.
206 */
207 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
208 return 1;
209 else
210 continue;
211 }
212 } /* if check_inv */
213 else
214 {
348 /* Broke apart a big nasty if into several here to make 215 /* Broke apart a big nasty if into several here to make
349 * this more readable. first check - if the space blocks 216 * this more readable. first check - if the space blocks
350 * movement, can't move here. 217 * movement, can't move here.
351 * second - if a monster, can't move there, unles it is a 218 * second - if a monster, can't move there, unles it is a
352 * hidden dm 219 * hidden dm
353 */ 220 */
354 if (OB_MOVE_BLOCK(ob, tmp)) return 1; 221 if (OB_MOVE_BLOCK (ob, tmp))
222 return 1;
355 if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob && 223 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
356 tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden)) 224 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
357 return 1; 225 return 1;
358 } 226 }
359 227
360 } 228 }
361 return 0; 229 return 0;
362} 230}
363 231
364 232
365/* 233/*
366 * Returns true if the given object can't fit in the given spot. 234 * Returns true if the given object can't fit in the given spot.
… …
386 * 254 *
387 * Note this used to be arch_blocked, but with new movement 255 * Note this used to be arch_blocked, but with new movement
388 * code, we need to have actual object to check its move_type 256 * code, we need to have actual object to check its move_type
389 * against the move_block values. 257 * against the move_block values.
390 */ 258 */
391 259int
392int ob_blocked(const object *ob,mapstruct *m,sint16 x,sint16 y) { 260ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
261{
393 archetype *tmp; 262 archetype *tmp;
394 int flag; 263 int flag;
395 mapstruct *m1; 264 maptile *m1;
396 sint16 sx, sy; 265 sint16 sx, sy;
397 266
398 if(ob==NULL) { 267 if (!ob)
268 {
399 flag= get_map_flags(m,&m1, x,y, &sx, &sy); 269 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
400 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 270 if (flag & P_OUT_OF_MAP)
271 return P_OUT_OF_MAP;
401 272
402 /* don't have object, so don't know what types would block */ 273 /* don't have object, so don't know what types would block */
403 return(GET_MAP_MOVE_BLOCK(m1, sx, sy)); 274 return m1->at (sx, sy).move_block;
404 } 275 }
405 276
406 for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) { 277 for (tmp = ob->arch; tmp; tmp = tmp->more)
278 {
407 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy); 279 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
408 280
409 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 281 if (flag & P_OUT_OF_MAP)
410 if (flag & P_IS_ALIVE) return P_IS_ALIVE; 282 return P_OUT_OF_MAP;
283 if (flag & P_IS_ALIVE)
284 return P_IS_ALIVE;
411 285
286 mapspace &ms = m1->at (sx, sy);
287
412 /* find_first_free_spot() calls this function. However, often 288 /* find_first_free_spot() calls this function. However, often
413 * ob doesn't have any move type (when used to place exits) 289 * ob doesn't have any move type (when used to place exits)
414 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 290 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
415 */ 291 */
416 292
417 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue; 293 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
294 continue;
418 295
419 /* Note it is intentional that we check ob - the movement type of the 296 /* Note it is intentional that we check ob - the movement type of the
420 * head of the object should correspond for the entire object. 297 * head of the object should correspond for the entire object.
421 */ 298 */
422 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy))) 299 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
423 return AB_NO_PASS; 300 return P_NO_PASS;
424
425 } 301 }
302
426 return 0; 303 return 0;
427} 304}
428 305
429/* When the map is loaded, load_object does not actually insert objects 306/* When the map is loaded, load_object does not actually insert objects
430 * into inventory, but just links them. What this does is go through 307 * into inventory, but just links them. What this does is go through
431 * and insert them properly. 308 * and insert them properly.
432 * The object 'container' is the object that contains the inventory. 309 * The object 'container' is the object that contains the inventory.
433 * This is needed so that we can update the containers weight. 310 * This is needed so that we can update the containers weight.
434 */ 311 */
435 312void
436void fix_container(object *container) 313fix_container (object *container)
437{ 314{
438 object *tmp=container->inv, *next; 315 object *tmp = container->inv, *next;
439 316
440 container->inv=NULL; 317 container->inv = 0;
441 while (tmp!=NULL) { 318 while (tmp)
319 {
442 next = tmp->below; 320 next = tmp->below;
443 if (tmp->inv) 321 if (tmp->inv)
444 fix_container(tmp); 322 fix_container (tmp);
323
445 (void) insert_ob_in_ob(tmp,container); 324 insert_ob_in_ob (tmp, container);
446 tmp = next; 325 tmp = next;
447 } 326 }
327
448 /* sum_weight will go through and calculate what all the containers are 328 /* sum_weight will go through and calculate what all the containers are
449 * carrying. 329 * carrying.
450 */ 330 */
451 sum_weight(container); 331 sum_weight (container);
332}
333
334void
335maptile::set_object_flag (int flag, int value)
336{
337 if (!spaces)
338 return;
339
340 for (mapspace *ms = spaces + size (); ms-- > spaces; )
341 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342 tmp->flag [flag] = value;
452} 343}
453 344
454/* link_multipart_objects go through all the objects on the map looking 345/* link_multipart_objects go through all the objects on the map looking
455 * for objects whose arch says they are multipart yet according to the 346 * for objects whose arch says they are multipart yet according to the
456 * info we have, they only have the head (as would be expected when 347 * info we have, they only have the head (as would be expected when
457 * they are saved). We do have to look for the old maps that did save 348 * they are saved). We do have to look for the old maps that did save
458 * the more sections and not re-add sections for them. 349 * the more sections and not re-add sections for them.
459 */ 350 */
460 351void
461static void link_multipart_objects(mapstruct *m) 352maptile::link_multipart_objects ()
462{ 353{
463 int x,y; 354 if (!spaces)
464 object *tmp, *op, *last, *above; 355 return;
465 archetype *at;
466 356
467 for(x=0;x<MAP_WIDTH(m);x++) 357 for (mapspace *ms = spaces + size (); ms-- > spaces; )
468 for(y=0;y<MAP_HEIGHT(m);y++) 358 for (object *tmp = ms->bot; tmp; )
469 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) { 359 {
470 above=tmp->above; 360 object *above = tmp->above;
471 361
472 /* already multipart - don't do anything more */ 362 /* already multipart - don't do anything more */
473 if (tmp->head || tmp->more) continue; 363 if (!tmp->head && !tmp->more)
474 364 {
475 /* If there is nothing more to this object, this for loop 365 /* If there is nothing more to this object, this for loop
476 * won't do anything. 366 * won't do anything.
367 */
368 archetype *at;
369 object *last, *op;
370 for (at = tmp->arch->more, last = tmp;
371 at;
372 at = at->more, last = op)
373 {
374 op = arch_to_object (at);
375
376 /* update x,y coordinates */
377 op->x += tmp->x;
378 op->y += tmp->y;
379 op->head = tmp;
380 op->map = this;
381 last->more = op;
382 op->name = tmp->name;
383 op->title = tmp->title;
384
385 /* we could link all the parts onto tmp, and then just
386 * call insert_ob_in_map once, but the effect is the same,
387 * as insert_ob_in_map will call itself with each part, and
388 * the coding is simpler to just to it here with each part.
477 */ 389 */
478 for (at = tmp->arch->more, last=tmp; at != NULL; at=at->more, last=op) {
479 op = arch_to_object(at);
480
481 /* update x,y coordinates */
482 op->x += tmp->x;
483 op->y += tmp->y;
484 op->head = tmp;
485 op->map = m;
486 last->more = op;
487 op->name = tmp->name;
488 op->title = tmp->title;
489 /* we could link all the parts onto tmp, and then just
490 * call insert_ob_in_map once, but the effect is the same,
491 * as insert_ob_in_map will call itself with each part, and
492 * the coding is simpler to just to it here with each part.
493 */
494 insert_ob_in_map(op, op->map, tmp,INS_NO_MERGE|INS_ABOVE_FLOOR_ONLY|INS_NO_WALK_ON); 390 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
495 } /* for at = tmp->arch->more */
496 } /* for objects on this space */
497}
498
499 391 }
392 }
393
394 tmp = above;
395 }
396}
500 397
501/* 398/*
502 * Loads (ands parses) the objects into a given map from the specified 399 * Loads (ands parses) the objects into a given map from the specified
503 * file pointer. 400 * file pointer.
504 * mapflags is the same as we get with load_original_map 401 * mapflags is the same as we get with load_original_map
505 */ 402 */
506 403bool
507void load_objects (mapstruct *m, object_thawer &fp, int mapflags) { 404maptile::load_objects (object_thawer &thawer)
508 int i,j,bufstate=LO_NEWFILE; 405{
509 int unique; 406 int unique;
510 object *op, *prev=NULL,*last_more=NULL, *otmp; 407 object *op, *prev = NULL, *last_more = NULL, *otmp;
511 408
512 op=get_object(); 409 op = object::create ();
513 op->map = m; /* To handle buttons correctly */ 410 op->map = this; /* To handle buttons correctly */
514 411
515 while((i = load_object (fp, op, bufstate, mapflags))) { 412 while (int i = load_object (thawer, op, 0))
516 /* Since the loading of the map header does not load an object 413 {
517 * anymore, we need to pass LO_NEWFILE for the first object loaded,
518 * and then switch to LO_REPEAT for faster loading.
519 */
520 bufstate = LO_REPEAT;
521
522 /* if the archetype for the object is null, means that we 414 /* if the archetype for the object is null, means that we
523 * got an invalid object. Don't do anything with it - the game 415 * got an invalid object. Don't do anything with it - the game
524 * or editor will not be able to do anything with it either. 416 * or editor will not be able to do anything with it either.
525 */ 417 */
526 if (op->arch==NULL) { 418 if (op->arch == NULL)
419 {
527 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)"); 420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
528 continue; 421 continue;
529 } 422 }
530 423
531
532 switch(i) { 424 switch (i)
425 {
533 case LL_NORMAL: 426 case LL_NORMAL:
534 /* if we are loading an overlay, put the floors on the bottom */
535 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) ||
536 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
537 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
538 else
539 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
540 428
541 if (op->inv) 429 if (op->inv)
542 sum_weight(op); 430 sum_weight (op);
543 431
544 prev=op,last_more=op; 432 prev = op, last_more = op;
545 break; 433 break;
546 434
547 case LL_MORE: 435 case LL_MORE:
548 insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
549 op->head=prev,last_more->more=op,last_more=op; 437 op->head = prev, last_more->more = op, last_more = op;
550 break; 438 break;
551 } 439 }
552 if (mapflags & MAP_STYLE) { 440
553 remove_from_active_list(op); 441 op = object::create ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 }
462#endif
463
464 return true;
465}
466
467void
468maptile::activate ()
469{
470 if (!spaces)
471 return;
472
473 for (mapspace *ms = spaces + size (); ms-- > spaces; )
474 for (object *op = ms->bot; op; op = op->above)
475 op->activate_recursive ();
476}
477
478void
479maptile::deactivate ()
480{
481 if (!spaces)
482 return;
483
484 for (mapspace *ms = spaces + size (); ms-- > spaces; )
485 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive ();
487}
488
489bool
490maptile::save_objects (object_freezer &freezer, int flags)
491{
492 if (flags & IO_HEADER)
493 save_header (freezer);
494
495 if (!spaces)
496 return false;
497
498 for (int i = 0; i < size (); ++i)
499 {
500 int unique = 0;
501 for (object *op = spaces [i].bot; op; op = op->above)
502 {
503 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
504 unique = 1;
505
506 if (!op->can_map_save ())
507 continue;
508
509 if (unique || op->flag [FLAG_UNIQUE])
510 {
511 if (flags & IO_UNIQUES)
512 save_object (freezer, op, 1);
513 }
514 else if (flags & IO_OBJECTS)
515 save_object (freezer, op, 1);
554 } 516 }
555 op=get_object();
556 op->map = m;
557 } 517 }
558 for (i=0;i<m->width;i++){ 518
559 for (j=0;j<m->height;j++){ 519 return true;
560 unique =0; 520}
561 /* check for unique items, or unique squares */ 521
562 for (otmp = get_map_ob(m, i, j); otmp; otmp = otmp->above) { 522bool
563 if (QUERY_FLAG(otmp, FLAG_UNIQUE) || QUERY_FLAG(otmp, FLAG_OBJ_SAVE_ON_OVL)) 523maptile::load_objects (const char *path, bool skip_header)
564 unique = 1; 524{
565 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique)) 525 object_thawer thawer (path);
566 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL); 526
567 } 527 if (!thawer)
528 return false;
529
530 if (skip_header)
531 for (;;)
532 {
533 keyword kw = thawer.get_kv ();
534
535 if (kw == KW_end)
536 break;
537
538 thawer.skip_kv (kw);
568 } 539 }
569 }
570 free_object(op);
571 link_multipart_objects(m);
572}
573 540
574/* This saves all the objects on the map in a non destructive fashion. 541 return load_objects (thawer);
575 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 542}
576 * and we only save the head of multi part objects - this is needed 543
577 * in order to do map tiling properly. 544bool
545maptile::save_objects (const char *path, int flags)
546{
547 object_freezer freezer;
548
549 if (!save_objects (freezer, flags))
550 return false;
551
552 return freezer.save (path);
553}
554
555maptile::maptile ()
556{
557 in_memory = MAP_SWAPPED;
558
559 /* The maps used to pick up default x and y values from the
560 * map archetype. Mimic that behaviour.
578 */ 561 */
579void save_objects (mapstruct *m, object_freezer &fp, object_freezer &fp2, int flag) { 562 width = 16;
580 int i, j = 0,unique=0; 563 height = 16;
581 object *op; 564 reset_timeout = 0;
582 /* first pass - save one-part objects */ 565 timeout = 300;
583 for(i = 0; i < MAP_WIDTH(m); i++) 566 enter_x = 0;
584 for (j = 0; j < MAP_HEIGHT(m); j++) { 567 enter_y = 0;
585 unique=0; 568}
586 for(op = get_map_ob (m, i, j); op; op = op->above) {
587 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE))
588 unique=1;
589 569
590 if(op->type == PLAYER) { 570maptile::maptile (int w, int h)
591 LOG(llevDebug, "Player on map that is being saved\n"); 571{
592 continue; 572 in_memory = MAP_SWAPPED;
593 }
594 573
595 if (op->head || op->owner) 574 width = w;
596 continue; 575 height = h;
576 reset_timeout = 0;
577 timeout = 300;
578 enter_x = 0;
579 enter_y = 0;
597 580
598 if (unique || QUERY_FLAG(op, FLAG_UNIQUE)) 581 alloc ();
599 save_object (fp2, op, 3);
600 else
601 if (flag == 0 ||
602 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) &&
603 !QUERY_FLAG(op, FLAG_UNPAID))))
604 save_object(fp, op, 3);
605
606 } /* for this space */
607 } /* for this j */
608} 582}
609 583
610/* 584/*
611 * Allocates, initialises, and returns a pointer to a mapstruct.
612 * Modified to no longer take a path option which was not being
613 * used anyways. MSW 2001-07-01
614 */
615
616mapstruct *get_linked_map(void) {
617 mapstruct *map = new mapstruct;
618 mapstruct *mp;
619
620 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next);
621 if(mp==NULL)
622 first_map=map;
623 else
624 mp->next=map;
625
626 map->in_memory=MAP_SWAPPED;
627 /* The maps used to pick up default x and y values from the
628 * map archetype. Mimic that behaviour.
629 */
630 MAP_WIDTH(map)=16;
631 MAP_HEIGHT(map)=16;
632 MAP_RESET_TIMEOUT(map)=0;
633 MAP_TIMEOUT(map)=300;
634 MAP_ENTER_X(map)=0;
635 MAP_ENTER_Y(map)=0;
636 /*set part to -1 indicating conversion to weather map not yet done*/
637 MAP_WORLDPARTX(map)=-1;
638 MAP_WORLDPARTY(map)=-1;
639 return map;
640}
641
642/*
643 * Allocates the arrays contained in a mapstruct. 585 * Allocates the arrays contained in a maptile.
644 * This basically allocates the dynamic array of spaces for the 586 * This basically allocates the dynamic array of spaces for the
645 * map. 587 * map.
646 */ 588 */
647 589void
648void allocate_map(mapstruct *m) { 590maptile::alloc ()
649 m->in_memory = MAP_IN_MEMORY; 591{
650 /* Log this condition and free the storage. We could I suppose
651 * realloc, but if the caller is presuming the data will be intact,
652 * that is their poor assumption.
653 */
654 if (m->spaces) { 592 if (spaces)
655 LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path);
656 free(m->spaces);
657 }
658
659 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace));
660
661 if(m->spaces==NULL)
662 fatal(OUT_OF_MEMORY);
663}
664
665/* Create and returns a map of the specific size. Used
666 * in random map code and the editor.
667 */
668mapstruct *get_empty_map(int sizex, int sizey) {
669 mapstruct *m = get_linked_map();
670 m->width = sizex;
671 m->height = sizey;
672 m->in_memory = MAP_SWAPPED;
673 allocate_map(m);
674 return m; 593 return;
594
595 spaces = salloc0<mapspace> (size ());
675} 596}
676 597
677/* Takes a string from a map definition and outputs a pointer to the array of shopitems 598/* Takes a string from a map definition and outputs a pointer to the array of shopitems
678 * corresponding to that string. Memory is allocated for this, it must be freed 599 * corresponding to that string. Memory is allocated for this, it must be freed
679 * at a later date. 600 * at a later date.
680 * Called by parse_map_headers below. 601 * Called by parse_map_headers below.
681 */ 602 */
682 603static shopitems *
683static shopitems *parse_shop_string (const char *input_string) { 604parse_shop_string (const char *input_string)
605{
684 char *shop_string, *p, *q, *next_semicolon, *next_colon; 606 char *shop_string, *p, *q, *next_semicolon, *next_colon;
685 shopitems *items=NULL; 607 shopitems *items = NULL;
686 int i=0, number_of_entries=0; 608 int i = 0, number_of_entries = 0;
687 const typedata *current_type; 609 const typedata *current_type;
688 610
689 shop_string=strdup_local(input_string); 611 shop_string = strdup (input_string);
690 p=shop_string; 612 p = shop_string;
691 /* first we'll count the entries, we'll need that for allocating the array shortly */ 613 /* first we'll count the entries, we'll need that for allocating the array shortly */
692 while (p) { 614 while (p)
615 {
693 p=strchr(p, ';'); 616 p = strchr (p, ';');
694 number_of_entries++; 617 number_of_entries++;
695 if (p) p++; 618 if (p)
619 p++;
696 } 620 }
621
697 p=shop_string; 622 p = shop_string;
698 strip_endline(p); 623 strip_endline (p);
699 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems)); 624 items = new shopitems[number_of_entries + 1];
700 memset(items, 0, (sizeof(shopitems) * number_of_entries+1));
701 for (i=0; i<number_of_entries; i++) { 625 for (i = 0; i < number_of_entries; i++)
626 {
702 if (!p) { 627 if (!p)
628 {
703 LOG(llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 629 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
704 break; 630 break;
705 } 631 }
632
706 next_semicolon=strchr(p, ';'); 633 next_semicolon = strchr (p, ';');
707 next_colon=strchr(p, ':'); 634 next_colon = strchr (p, ':');
708 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 635 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
709 if (next_colon &&( !next_semicolon || next_colon<next_semicolon)) 636 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
710 items[i].strength=atoi(strchr(p,':')+1); 637 items[i].strength = atoi (strchr (p, ':') + 1);
638
639 if (isdigit (*p) || *p == '*')
711 640 {
712 if (isdigit(*p) || *p=='*') {
713 items[i].typenum = atoi(p); /* atoi returns 0 when we have an asterisk */ 641 items[i].typenum = atoi (p); /* atoi returns 0 when we have an asterisk */
714 current_type=get_typedata(items[i].typenum); 642 current_type = get_typedata (items[i].typenum);
715 if (current_type) { 643 if (current_type)
644 {
716 items[i].name=current_type->name; 645 items[i].name = current_type->name;
717 items[i].name_pl=current_type->name_pl; 646 items[i].name_pl = current_type->name_pl;
718 }
719 }
720 else { /*we have a named type, let's figure out what it is */
721 q=strpbrk(p,";:");
722 if (q) *q='\0';
723
724 current_type=get_typedata_by_name(p);
725 if (current_type) {
726 items[i].name=current_type->name;
727 items[i].typenum=current_type->number;
728 items[i].name_pl=current_type->name_pl;
729 }
730 else { /* oh uh, something's wrong, let's free up this one, and try
731 * the next entry while we're at it, better print a warning
732 */
733 LOG(llevError, "invalid type %s defined in shopitems in string %s\n",
734 p, input_string);
735 } 647 }
736 } 648 }
649 else
650 { /*we have a named type, let's figure out what it is */
651 q = strpbrk (p, ";:");
652 if (q)
653 *q = '\0';
654
655 current_type = get_typedata_by_name (p);
656 if (current_type)
657 {
658 items[i].name = current_type->name;
659 items[i].typenum = current_type->number;
660 items[i].name_pl = current_type->name_pl;
661 }
662 else
663 { /* oh uh, something's wrong, let's free up this one, and try
664 * the next entry while we're at it, better print a warning
665 */
666 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
667 }
668 }
669
737 items[i].index=number_of_entries; 670 items[i].index = number_of_entries;
738 if (next_semicolon) p=++next_semicolon; 671 if (next_semicolon)
672 p = ++next_semicolon;
673 else
739 else p=NULL; 674 p = NULL;
740 } 675 }
676
741 free(shop_string); 677 free (shop_string);
742 return items; 678 return items;
743} 679}
744 680
745/* opposite of parse string, this puts the string that was originally fed in to 681/* opposite of parse string, this puts the string that was originally fed in to
746 * the map (or something equivilent) into output_string. */ 682 * the map (or something equivilent) into output_string. */
683static void
747static void print_shop_string(mapstruct *m, char *output_string) { 684print_shop_string (maptile *m, char *output_string)
685{
748 int i; 686 int i;
749 char tmp[MAX_BUF]; 687 char tmp[MAX_BUF];
688
750 strcpy(output_string, ""); 689 strcpy (output_string, "");
751 for (i=0; i< m->shopitems[0].index; i++) { 690 for (i = 0; i < m->shopitems[0].index; i++)
691 {
752 if (m->shopitems[i].typenum) { 692 if (m->shopitems[i].typenum)
693 {
753 if (m->shopitems[i].strength) { 694 if (m->shopitems[i].strength)
754 sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 695 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
755 } 696 else
756 else sprintf(tmp, "%s;", m->shopitems[i].name); 697 sprintf (tmp, "%s;", m->shopitems[i].name);
757 } 698 }
758 else { 699 else
700 {
759 if (m->shopitems[i].strength) { 701 if (m->shopitems[i].strength)
760 sprintf(tmp, "*:%d;", m->shopitems[i].strength); 702 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
761 } 703 else
762 else sprintf(tmp, "*"); 704 sprintf (tmp, "*");
763 } 705 }
706
764 strcat(output_string, tmp); 707 strcat (output_string, tmp);
765 } 708 }
766} 709}
767 710
768/* This loads the header information of the map. The header 711/* This loads the header information of the map. The header
769 * contains things like difficulty, size, timeout, etc. 712 * contains things like difficulty, size, timeout, etc.
… …
773 * put all the stuff in the map object so that names actually make 716 * put all the stuff in the map object so that names actually make
774 * sense. 717 * sense.
775 * This could be done in lex (like the object loader), but I think 718 * This could be done in lex (like the object loader), but I think
776 * currently, there are few enough fields this is not a big deal. 719 * currently, there are few enough fields this is not a big deal.
777 * MSW 2001-07-01 720 * MSW 2001-07-01
778 * return 0 on success, 1 on failure.
779 */ 721 */
780 722bool
781static int load_map_header(object_thawer &fp, mapstruct *m) 723maptile::load_header (object_thawer &thawer)
782{ 724{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end; 725 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos=0; 726 int msgpos = 0;
785 int maplorepos=0; 727 int maplorepos = 0;
786 728
787 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 729 for (;;)
788 buf[HUGE_BUF-1] = 0; 730 {
789 key = buf; 731 keyword kw = thawer.get_kv ();
790 while (isspace(*key)) key++; 732
791 if (*key == 0) continue; /* empty line */ 733 switch (kw)
792 value = strchr(key, ' ');
793 if (!value) {
794 end = strchr(key, '\n');
795 if (end != NULL) {
796 *end = 0;
797 }
798 } else {
799 *value = 0;
800 value++;
801 end = strchr(value, '\n');
802 while (isspace(*value)) {
803 value++;
804 if (*value == '\0' || value == end) {
805 /* Nothing but spaces. */
806 value = NULL;
807 break;
808 }
809 }
810 } 734 {
811 if (!end) { 735 case KW_EOF:
812 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", 736 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
813 buf); 737 return false;
738
739 case KW_end:
814 return 1; 740 return true;
815 } 741
742 case KW_msg:
743 thawer.get_ml (KW_endmsg, msg);
816 744 break;
817 745
818 /* key is the field name, value is what it should be set 746 case KW_lore: // CF+ extension
819 * to. We've already done the work to null terminate key, 747 thawer.get_ml (KW_endlore, maplore);
820 * and strip off any leading spaces for both of these.
821 * We have not touched the newline at the end of the line -
822 * these are needed for some values. the end pointer
823 * points to the first of the newlines.
824 * value could be NULL! It would be easy enough to just point
825 * this to "" to prevent cores, but that would let more errors slide
826 * through.
827 *
828 * First check for entries that do not use the value parameter, then
829 * validate that value is given and check for the remaining entries
830 * that use the parameter.
831 */
832
833 if (!strcmp(key,"msg")) {
834 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
835 if (!strcmp(buf,"endmsg\n")) break;
836 else {
837 /* slightly more efficient than strcat */
838 strcpy(msgbuf+msgpos, buf);
839 msgpos += strlen(buf);
840 }
841 } 748 break;
842 /* There are lots of maps that have empty messages (eg, msg/endmsg 749
843 * with nothing between). There is no reason in those cases to 750 case KW_maplore:
844 * keep the empty message. Also, msgbuf contains garbage data 751 thawer.get_ml (KW_endmaplore, maplore);
845 * when msgpos is zero, so copying it results in crashes
846 */
847 if (msgpos != 0)
848 m->msg = strdup_local(msgbuf);
849 }
850 else if (!strcmp(key,"maplore")) {
851 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
852 if (!strcmp(buf,"endmaplore\n")) break;
853 else {
854 /* slightly more efficient than strcat */
855 strcpy(maplorebuf+maplorepos, buf);
856 maplorepos += strlen(buf);
857 }
858 } 752 break;
859 if (maplorepos != 0) 753
860 m->maplore = strdup_local(maplorebuf); 754 case KW_arch:
861 } 755 if (strcmp (thawer.get_str (), "map"))
862 else if (!strcmp(key,"end")) { 756 LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
757 break;
758
759 case KW_oid:
760 thawer.get (this, thawer.get_sint32 ());
761 break;
762
763 case KW_file_format_version: break; // nop
764
765 case KW_name: thawer.get (name); break;
766 case KW_attach: thawer.get (attach); break;
767 case KW_reset_time: thawer.get (reset_time); break;
768 case KW_shopgreed: thawer.get (shopgreed); break;
769 case KW_shopmin: thawer.get (shopmin); break;
770 case KW_shopmax: thawer.get (shopmax); break;
771 case KW_shoprace: thawer.get (shoprace); break;
772 case KW_outdoor: thawer.get (outdoor); break;
773 case KW_temp: thawer.get (temp); break;
774 case KW_pressure: thawer.get (pressure); break;
775 case KW_humid: thawer.get (humid); break;
776 case KW_windspeed: thawer.get (windspeed); break;
777 case KW_winddir: thawer.get (winddir); break;
778 case KW_sky: thawer.get (sky); break;
779
780 case KW_per_player: thawer.get (per_player); break;
781 case KW_per_party: thawer.get (per_party); break;
782
783 case KW_region: get_region_by_name (thawer.get_str ()); break;
784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
785
786 // old names new names
787 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
788 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
789 case KW_x: case KW_width: thawer.get (width); break;
790 case KW_y: case KW_height: thawer.get (height); break;
791 case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
792 case KW_value: case KW_swap_time: thawer.get (timeout); break;
793 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
794 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
795 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
796
797 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break;
801
802 default:
803 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
863 break; 804 break;
864 } 805 }
865 else if (value == NULL) {
866 LOG(llevError, "Got '%s' line without parameter in map header\n", key);
867 }
868 else if (!strcmp(key, "arch")) {
869 /* This is an oddity, but not something we care about much. */
870 if (strcmp(value,"map\n"))
871 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value);
872 }
873 else if (!strcmp(key,"name")) {
874 *end=0;
875 m->name = strdup_local(value);
876 }
877 /* first strcmp value on these are old names supported
878 * for compatibility reasons. The new values (second) are
879 * what really should be used.
880 */
881 else if (!strcmp(key,"oid")) {
882 fp.get (m, atoi(value));
883 } else if (!strcmp(key, "attach")) {
884 m->attach = value;
885 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
886 m->enter_x = atoi(value);
887 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
888 m->enter_y = atoi(value);
889 } else if (!strcmp(key,"x") || !strcmp(key, "width")) {
890 m->width = atoi(value);
891 } else if (!strcmp(key,"y") || !strcmp(key, "height")) {
892 m->height = atoi(value);
893 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) {
894 m->reset_timeout = atoi(value);
895 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) {
896 m->timeout = atoi(value);
897 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) {
898 m->difficulty = atoi(value);
899 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) {
900 m->darkness = atoi(value);
901 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) {
902 m->fixed_resettime = atoi(value);
903 } else if (!strcmp(key,"unique")) {
904 m->unique = atoi(value);
905 } else if (!strcmp(key,"template")) {
906 m->templatemap = atoi(value);
907 } else if (!strcmp(key,"region")) {
908 m->region = get_region_by_name(value);
909 } else if (!strcmp(key,"shopitems")) {
910 *end=0;
911 m->shopitems = parse_shop_string(value);
912 } else if (!strcmp(key,"shopgreed")) {
913 m->shopgreed = atof(value);
914 } else if (!strcmp(key,"shopmin")) {
915 m->shopmin = atol(value);
916 } else if (!strcmp(key,"shopmax")) {
917 m->shopmax = atol(value);
918 } else if (!strcmp(key,"shoprace")) {
919 *end=0;
920 m->shoprace = strdup_local(value);
921 } else if (!strcmp(key,"outdoor")) {
922 m->outdoor = atoi(value);
923 } else if (!strcmp(key, "temp")) {
924 m->temp = atoi(value);
925 } else if (!strcmp(key, "pressure")) {
926 m->pressure = atoi(value);
927 } else if (!strcmp(key, "humid")) {
928 m->humid = atoi(value);
929 } else if (!strcmp(key, "windspeed")) {
930 m->windspeed = atoi(value);
931 } else if (!strcmp(key, "winddir")) {
932 m->winddir = atoi(value);
933 } else if (!strcmp(key, "sky")) {
934 m->sky = atoi(value);
935 } else if (!strcmp(key, "nosmooth")) {
936 m->nosmooth = atoi(value);
937 }
938 else if (!strncmp(key,"tile_path_", 10)) {
939 int tile=atoi(key+10);
940
941 if (tile<1 || tile>4) {
942 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n",
943 tile, m->path);
944 } else {
945 char *path;
946
947 *end = 0;
948
949 if (m->tile_path[tile-1]) {
950 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n",
951 tile, m->path);
952 free(m->tile_path[tile-1]);
953 m->tile_path[tile-1] = NULL;
954 }
955
956 if (check_path(value, 1) != -1) {
957 /* The unadorned path works. */
958 path = value;
959 } else {
960 /* Try again; it could be a relative exit. */
961
962 path = path_combine_and_normalize(m->path, value);
963
964 if (check_path(path, 1) == -1) {
965 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
966 path = NULL;
967 }
968 }
969
970 if (editor) {
971 /* Use the value as in the file. */
972 m->tile_path[tile-1] = strdup_local(value);
973 } else if (path != NULL) {
974 /* Use the normalized value. */
975 m->tile_path[tile-1] = strdup_local(path);
976 }
977 } /* end if tile direction (in)valid */
978 }
979 else {
980 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value);
981 }
982 }
983 if (!key || strcmp(key,"end")) {
984 LOG(llevError,"Got premature eof on map header!\n");
985 return 1;
986 }
987 return 0;
988}
989
990/*
991 * Opens the file "filename" and reads information about the map
992 * from the given file, and stores it in a newly allocated
993 * mapstruct. A pointer to this structure is returned, or NULL on failure.
994 * flags correspond to those in map.h. Main ones used are
995 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
996 * MAP_BLOCK, in which case we block on this load. This happens in all
997 * cases, no matter if this flag is set or not.
998 * MAP_STYLE: style map - don't add active objects, don't add to server
999 * managed map list.
1000 */
1001
1002mapstruct *load_original_map(const char *filename, int flags) {
1003 mapstruct *m;
1004 char pathname[MAX_BUF];
1005 806 }
1006 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1007 if (flags & MAP_PLAYER_UNIQUE)
1008 strcpy(pathname, filename);
1009 else if (flags & MAP_OVERLAY)
1010 strcpy(pathname, create_overlay_pathname(filename));
1011 else
1012 strcpy(pathname, create_pathname(filename));
1013 807
808 abort ();
809}
810
811bool
812maptile::load_header (const char *path)
813{
1014 object_thawer thawer (pathname); 814 object_thawer thawer (path);
1015 815
1016 if (!thawer) 816 if (!thawer)
1017 return 0;
1018
1019 m = get_linked_map();
1020
1021 strcpy (m->path, filename);
1022 if (load_map_header(thawer, m)) {
1023 LOG(llevError,"Error loading map header for %s, flags=%d\n",
1024 filename, flags);
1025 delete_map(m);
1026 return NULL;
1027 }
1028
1029 allocate_map(m);
1030
1031 m->in_memory=MAP_LOADING;
1032 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
1033
1034 m->in_memory=MAP_IN_MEMORY;
1035 if (!MAP_DIFFICULTY(m))
1036 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1037 set_map_reset_time(m);
1038 m->instantiate ();
1039 return (m);
1040}
1041
1042/*
1043 * Loads a map, which has been loaded earlier, from file.
1044 * Return the map object we load into (this can change from the passed
1045 * option if we can't find the original map)
1046 */
1047
1048static mapstruct *load_temporary_map(mapstruct *m) {
1049 int comp;
1050 char buf[MAX_BUF];
1051
1052 if (!m->tmpname) {
1053 LOG(llevError, "No temporary filename for map %s\n", m->path);
1054 strcpy(buf, m->path);
1055 delete_map(m);
1056 m = load_original_map(buf, 0);
1057 if(m==NULL) return NULL;
1058 fix_auto_apply(m); /* Chests which open as default */
1059 return m;
1060 }
1061
1062 object_thawer thawer (m->tmpname);
1063
1064 if (!thawer)
1065 {
1066 strcpy (buf, m->path);
1067 delete_map (m);
1068 m = load_original_map (buf, 0);
1069 if (!m) return NULL;
1070 fix_auto_apply (m); /* Chests which open as default */
1071 return m;
1072 }
1073
1074 if (load_map_header(thawer, m)) {
1075 LOG(llevError,"Error loading map header for %s (%s)\n",
1076 m->path, m->tmpname);
1077 delete_map(m);
1078 m = load_original_map(m->path, 0);
1079 return NULL;
1080 }
1081 allocate_map(m);
1082
1083 m->in_memory=MAP_LOADING;
1084 load_objects (m, thawer, 0);
1085
1086 m->in_memory=MAP_IN_MEMORY;
1087 INVOKE_MAP (SWAPIN, m);
1088 return m; 817 return false;
1089}
1090 818
1091/* 819 return load_header (thawer);
1092 * Loads a map, which has been loaded earlier, from file.
1093 * Return the map object we load into (this can change from the passed
1094 * option if we can't find the original map)
1095 */
1096
1097mapstruct *load_overlay_map(const char *filename, mapstruct *m) {
1098 char pathname[MAX_BUF];
1099
1100 strcpy(pathname, create_overlay_pathname(filename));
1101
1102 object_thawer thawer (pathname);
1103
1104 if (!thawer)
1105 return m;
1106
1107 if (load_map_header(thawer, m)) {
1108 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1109 m->path, pathname);
1110 delete_map(m);
1111 m = load_original_map(m->path, 0);
1112 return NULL;
1113 }
1114 /*allocate_map(m);*/
1115
1116 m->in_memory=MAP_LOADING;
1117 load_objects (m, thawer, MAP_OVERLAY);
1118
1119 m->in_memory=MAP_IN_MEMORY;
1120 return m;
1121} 820}
1122 821
1123/****************************************************************************** 822/******************************************************************************
1124 * This is the start of unique map handling code 823 * This is the start of unique map handling code
1125 *****************************************************************************/ 824 *****************************************************************************/
1126 825
1127/* This goes through map 'm' and removed any unique items on the map. */ 826/* This goes through the maptile and removed any unique items on the map. */
1128static void delete_unique_items(mapstruct *m) 827void
828maptile::clear_unique_items ()
1129{ 829{
1130 int i,j,unique; 830 for (int i = 0; i < size (); ++i)
1131 object *op, *next; 831 {
1132
1133 for(i=0; i<MAP_WIDTH(m); i++)
1134 for(j=0; j<MAP_HEIGHT(m); j++) {
1135 unique=0; 832 int unique = 0;
1136 for (op=get_map_ob(m, i, j); op; op=next) { 833 for (object *op = spaces [i].bot; op; )
1137 next = op->above; 834 {
835 object *above = op->above;
836
1138 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 837 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1139 unique=1; 838 unique = 1;
839
1140 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { 840 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1141 clean_object(op);
1142 if (QUERY_FLAG(op, FLAG_IS_LINKED))
1143 remove_button_link(op);
1144 remove_ob(op);
1145 free_object(op);
1146 } 841 {
842 op->destroy_inv (false);
843 op->destroy ();
1147 } 844 }
845
846 op = above;
1148 } 847 }
1149}
1150
1151
1152/*
1153 * Loads unique objects from file(s) into the map which is in memory
1154 * m is the map to load unique items into.
1155 */
1156static void load_unique_objects(mapstruct *m) {
1157 int count;
1158 char firstname[MAX_BUF];
1159
1160 for (count=0; count<10; count++) {
1161 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1162 if (!access(firstname, R_OK)) break;
1163 }
1164 /* If we get here, we did not find any map */
1165 if (count==10) return;
1166
1167 object_thawer thawer (firstname);
1168
1169 if (!thawer)
1170 return;
1171
1172 m->in_memory=MAP_LOADING;
1173 if (m->tmpname == NULL) /* if we have loaded unique items from */
1174 delete_unique_items(m); /* original map before, don't duplicate them */
1175 load_object(thawer, NULL, LO_NOREAD,0);
1176 load_objects (m, thawer, 0);
1177
1178 m->in_memory=MAP_IN_MEMORY;
1179}
1180
1181
1182/*
1183 * Saves a map to file. If flag is set, it is saved into the same
1184 * file it was (originally) loaded from. Otherwise a temporary
1185 * filename will be genarated, and the file will be stored there.
1186 * The temporary filename will be stored in the mapstructure.
1187 * If the map is unique, we also save to the filename in the map
1188 * (this should have been updated when first loaded)
1189 */
1190
1191int
1192new_save_map (mapstruct * m, int flag)
1193{
1194 char filename[MAX_BUF], buf[MAX_BUF], buf_s[MAX_BUF], shop[MAX_BUF];
1195 int i;
1196
1197 if (flag && !*m->path)
1198 { 848 }
1199 LOG (llevError, "Tried to save map without path.\n"); 849}
1200 return -1; 850
851bool
852maptile::save_header (object_freezer &freezer)
853{
854#define MAP_OUT(k) freezer.put (KW_ ## k, k)
855#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
856
857 MAP_OUT2 (arch, "map");
858
859 if (name) MAP_OUT (name);
860 MAP_OUT (swap_time);
861 MAP_OUT (reset_time);
862 MAP_OUT (reset_timeout);
863 MAP_OUT (fixed_resettime);
864 MAP_OUT (difficulty);
865
866 if (region) MAP_OUT2 (region, region->name);
867
868 if (shopitems)
1201 } 869 {
1202 870 char shop[MAX_BUF];
1203 if (flag || (m->unique) || (m->templatemap)) 871 print_shop_string (this, shop);
872 MAP_OUT2 (shopitems, shop);
1204 { 873 }
1205 if (!m->unique && !m->templatemap)
1206 { /* flag is set */
1207 if (flag == 2)
1208 strcpy (filename, create_overlay_pathname (m->path));
1209 else
1210 strcpy (filename, create_pathname (m->path));
1211 }
1212 else
1213 strcpy (filename, m->path);
1214 874
1215 make_path_to_file (filename); 875 MAP_OUT (shopgreed);
1216 } 876 MAP_OUT (shopmin);
1217 else 877 MAP_OUT (shopmax);
1218 { 878 if (shoprace) MAP_OUT (shoprace);
1219 if (!m->tmpname) 879 MAP_OUT (darkness);
1220 m->tmpname = tempnam_local (settings.tmpdir, NULL); 880 MAP_OUT (width);
881 MAP_OUT (height);
882 MAP_OUT (enter_x);
883 MAP_OUT (enter_y);
1221 884
1222 strcpy (filename, m->tmpname); 885 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
1223 } 886 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
1224 887
1225 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 888 MAP_OUT (outdoor);
1226 m->in_memory = MAP_SAVING; 889 MAP_OUT (temp);
890 MAP_OUT (pressure);
891 MAP_OUT (humid);
892 MAP_OUT (windspeed);
893 MAP_OUT (winddir);
894 MAP_OUT (sky);
1227 895
896 MAP_OUT (per_player);
897 MAP_OUT (per_party);
898
899 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
900 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
901 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
902 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
903
904 freezer.put (this);
905 freezer.put (KW_end);
906
907 return true;
908}
909
910bool
911maptile::save_header (const char *path)
912{
1228 object_freezer freezer; 913 object_freezer freezer;
1229 914
1230 /* legacy */ 915 if (!save_header (freezer))
1231 fprintf (freezer, "arch map\n"); 916 return false;
1232 if (m->name)
1233 fprintf (freezer, "name %s\n", m->name);
1234 if (!flag)
1235 fprintf (freezer, "swap_time %d\n", m->swap_time);
1236 if (m->reset_timeout)
1237 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1238 if (m->fixed_resettime)
1239 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1240 /* we unfortunately have no idea if this is a value the creator set
1241 * or a difficulty value we generated when the map was first loaded
1242 */
1243 if (m->difficulty)
1244 fprintf (freezer, "difficulty %d\n", m->difficulty);
1245 if (m->region)
1246 fprintf (freezer, "region %s\n", m->region->name);
1247 if (m->shopitems)
1248 {
1249 print_shop_string (m, shop);
1250 fprintf (freezer, "shopitems %s\n", shop);
1251 }
1252 if (m->shopgreed)
1253 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1254#ifndef WIN32
1255 if (m->shopmin)
1256 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1257 if (m->shopmax)
1258 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1259#else
1260 if (m->shopmin)
1261 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1262 if (m->shopmax)
1263 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1264#endif
1265 if (m->shoprace)
1266 fprintf (freezer, "shoprace %s\n", m->shoprace);
1267 if (m->darkness)
1268 fprintf (freezer, "darkness %d\n", m->darkness);
1269 if (m->width)
1270 fprintf (freezer, "width %d\n", m->width);
1271 if (m->height)
1272 fprintf (freezer, "height %d\n", m->height);
1273 if (m->enter_x)
1274 fprintf (freezer, "enter_x %d\n", m->enter_x);
1275 if (m->enter_y)
1276 fprintf (freezer, "enter_y %d\n", m->enter_y);
1277 if (m->msg)
1278 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1279 if (m->maplore)
1280 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1281 if (m->unique)
1282 fprintf (freezer, "unique %d\n", m->unique);
1283 if (m->templatemap)
1284 fprintf (freezer, "template %d\n", m->templatemap);
1285 if (m->outdoor)
1286 fprintf (freezer, "outdoor %d\n", m->outdoor);
1287 if (m->temp)
1288 fprintf (freezer, "temp %d\n", m->temp);
1289 if (m->pressure)
1290 fprintf (freezer, "pressure %d\n", m->pressure);
1291 if (m->humid)
1292 fprintf (freezer, "humid %d\n", m->humid);
1293 if (m->windspeed)
1294 fprintf (freezer, "windspeed %d\n", m->windspeed);
1295 if (m->winddir)
1296 fprintf (freezer, "winddir %d\n", m->winddir);
1297 if (m->sky)
1298 fprintf (freezer, "sky %d\n", m->sky);
1299 if (m->nosmooth)
1300 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1301 917
1302 /* Save any tiling information, except on overlays */ 918 return freezer.save (path);
1303 if (flag != 2)
1304 for (i = 0; i < 4; i++)
1305 if (m->tile_path[i])
1306 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1307
1308 freezer.put (m);
1309 fprintf (freezer, "end\n");
1310
1311 /* In the game save unique items in the different file, but
1312 * in the editor save them to the normal map file.
1313 * If unique map, save files in the proper destination (set by
1314 * player)
1315 */
1316 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1317 {
1318 object_freezer unique;
1319
1320 if (flag == 2)
1321 save_objects (m, freezer, unique, 2);
1322 else
1323 save_objects (m, freezer, unique, 0);
1324
1325 sprintf (buf, "%s.v00", create_items_path (m->path));
1326
1327 unique.save (buf);
1328 }
1329 else
1330 { /* save same file when not playing, like in editor */
1331 save_objects (m, freezer, freezer, 0);
1332 }
1333
1334 freezer.save (filename);
1335
1336 return 0;
1337}
1338
1339
1340/*
1341 * Remove and free all objects in the inventory of the given object.
1342 * object.c ?
1343 */
1344
1345void clean_object(object *op)
1346{
1347 object *tmp, *next;
1348
1349 for(tmp = op->inv; tmp; tmp = next)
1350 {
1351 next = tmp->below;
1352 clean_object(tmp);
1353 if (QUERY_FLAG(tmp, FLAG_IS_LINKED))
1354 remove_button_link(tmp);
1355 remove_ob(tmp);
1356 free_object(tmp);
1357 }
1358} 919}
1359 920
1360/* 921/*
1361 * Remove and free all objects in the given map. 922 * Remove and free all objects in the given map.
1362 */ 923 */
924void
925maptile::clear ()
926{
927 if (!spaces)
928 return;
1363 929
1364void free_all_objects(mapstruct *m) { 930 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1365 int i,j; 931 while (object *op = ms->bot)
1366 object *op; 932 {
1367 933 if (op->head)
1368 for(i=0;i<MAP_WIDTH(m);i++)
1369 for(j=0;j<MAP_HEIGHT(m);j++) {
1370 object *previous_obj=NULL;
1371 while((op=GET_MAP_OB(m,i,j))!=NULL) {
1372 if (op==previous_obj) {
1373 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n");
1374 break;
1375 }
1376 previous_obj=op;
1377 if(op->head!=NULL)
1378 op = op->head; 934 op = op->head;
1379 935
1380 /* If the map isn't in memory, free_object will remove and 936 op->destroy_inv (false);
1381 * free objects in op's inventory. So let it do the job. 937 op->destroy ();
1382 */
1383 if (m->in_memory==MAP_IN_MEMORY)
1384 clean_object(op);
1385 remove_ob(op);
1386 free_object(op);
1387 }
1388 } 938 }
939
940 sfree (spaces, size ()), spaces = 0;
941
942 if (buttons)
943 free_objectlinkpt (buttons), buttons = 0;
944}
945
946void
947maptile::clear_header ()
948{
949 name = 0;
950 msg = 0;
951 maplore = 0;
952 shoprace = 0;
953 delete [] shopitems, shopitems = 0;
954
955 for (int i = 0; i < 4; i++)
956 tile_path [i] = 0;
957}
958
959maptile::~maptile ()
960{
961 assert (destroyed ());
962}
963
964void
965maptile::clear_links_to (maptile *m)
966{
967 /* We need to look through all the maps and see if any maps
968 * are pointing at this one for tiling information. Since
969 * tiling can be asymetric, we just can not look to see which
970 * maps this map tiles with and clears those.
971 */
972 for (int i = 0; i < 4; i++)
973 if (tile_map[i] == m)
974 tile_map[i] = 0;
975}
976
977void
978maptile::do_destroy ()
979{
980 attachable::do_destroy ();
981
982 clear ();
1389} 983}
1390 984
1391/* 985/*
1392 * Frees everything allocated by the given mapstructure. 986 * Updates every button on the map (by calling update_button() for them).
1393 * don't free tmpname - our caller is left to do that
1394 */ 987 */
1395 988void
1396void free_map(mapstruct *m,int flag) { 989maptile::update_buttons ()
1397 int i; 990{
1398 991 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1399 if (!m->in_memory) { 992 for (objectlink *ol = obp->link; ol; ol = ol->next)
1400 LOG(llevError,"Trying to free freed map.\n"); 993 {
1401 return; 994 if (!ol->ob)
1402 }
1403 if (flag && m->spaces) free_all_objects(m);
1404 if (m->name) FREE_AND_CLEAR(m->name);
1405 if (m->spaces) FREE_AND_CLEAR(m->spaces);
1406 if (m->msg) FREE_AND_CLEAR(m->msg);
1407 if (m->maplore) FREE_AND_CLEAR(m->maplore);
1408 if (m->shopitems) FREE_AND_CLEAR(m->shopitems);
1409 if (m->shoprace) FREE_AND_CLEAR(m->shoprace);
1410 if (m->buttons)
1411 free_objectlinkpt(m->buttons);
1412 m->buttons = NULL;
1413 for (i=0; i<4; i++) {
1414 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]);
1415 m->tile_map[i] = NULL;
1416 }
1417 m->in_memory = MAP_SWAPPED;
1418}
1419
1420/*
1421 * function: vanish mapstruct
1422 * m : pointer to mapstruct, if NULL no action
1423 * this deletes all the data on the map (freeing pointers)
1424 * and then removes this map from the global linked list of maps.
1425 */
1426
1427void delete_map(mapstruct *m) {
1428 mapstruct *tmp, *last;
1429 int i;
1430
1431 if (!m)
1432 return;
1433
1434 m->clear ();
1435
1436 if (m->in_memory == MAP_IN_MEMORY) {
1437 /* change to MAP_SAVING, even though we are not,
1438 * so that remove_ob doesn't do as much work.
1439 */ 995 {
1440 m->in_memory = MAP_SAVING; 996 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1441 free_map (m, 1); 997 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1442 } 998 continue;
1443 /* move this out of free_map, since tmpname can still be needed if
1444 * the map is swapped out.
1445 */
1446 if (m->tmpname) {
1447 free(m->tmpname);
1448 m->tmpname=NULL;
1449 }
1450 last = NULL;
1451 /* We need to look through all the maps and see if any maps
1452 * are pointing at this one for tiling information. Since
1453 * tiling can be assymetric, we just can not look to see which
1454 * maps this map tiles with and clears those.
1455 */
1456 for (tmp = first_map; tmp != NULL; tmp = tmp->next) {
1457 if (tmp->next == m) last = tmp;
1458
1459 /* This should hopefully get unrolled on a decent compiler */
1460 for (i=0; i<4; i++)
1461 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL;
1462 }
1463
1464 /* If last is null, then this should be the first map in the list */
1465 if (!last) {
1466 if (m == first_map)
1467 first_map = m->next;
1468 else
1469 /* m->path is a static char, so should hopefully still have
1470 * some useful data in it.
1471 */
1472 LOG(llevError,"delete_map: Unable to find map %s in list\n",
1473 m->path);
1474 }
1475 else
1476 last->next = m->next;
1477
1478 delete m;
1479}
1480
1481
1482
1483/*
1484 * Makes sure the given map is loaded and swapped in.
1485 * name is path name of the map.
1486 * flags meaning:
1487 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1488 * and don't do unique items or the like.
1489 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1490 * dont do any more name translation on it.
1491 *
1492 * Returns a pointer to the given map.
1493 */
1494
1495mapstruct *ready_map_name(const char *name, int flags) {
1496 mapstruct *m;
1497
1498 if (!name)
1499 return (NULL);
1500
1501 /* Have we been at this level before? */
1502 m = has_been_loaded (name);
1503
1504 /* Map is good to go, so just return it */
1505 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) {
1506 return m;
1507 }
1508
1509 /* unique maps always get loaded from their original location, and never
1510 * a temp location. Likewise, if map_flush is set, or we have never loaded
1511 * this map, load it now. I removed the reset checking from here -
1512 * it seems the probability of a player trying to enter a map that should
1513 * reset but hasn't yet is quite low, and removing that makes this function
1514 * a bit cleaner (and players probably shouldn't rely on exact timing for
1515 * resets in any case - if they really care, they should use the 'maps command.
1516 */
1517 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) {
1518
1519 /* first visit or time to reset */
1520 if (m) {
1521 clean_tmp_map(m); /* Doesn't make much difference */
1522 delete_map(m);
1523 } 999 }
1524 1000
1525 /* create and load a map */ 1001 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1526 if (flags & MAP_PLAYER_UNIQUE)
1527 LOG(llevDebug, "Trying to load map %s.\n", name);
1528 else
1529 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name));
1530
1531 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE))))
1532 return (NULL);
1533
1534 fix_auto_apply(m); /* Chests which open as default */
1535
1536 /* If a player unique map, no extra unique object file to load.
1537 * if from the editor, likewise.
1538 */ 1002 {
1539 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) 1003 update_button (ol->ob);
1540 load_unique_objects(m); 1004 break;
1541
1542 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) {
1543 m=load_overlay_map(name, m);
1544 if (m==NULL)
1545 return NULL;
1546 } 1005 }
1547
1548 if (flags & MAP_PLAYER_UNIQUE)
1549 INVOKE_MAP (SWAPIN, m);
1550
1551 } else {
1552 /* If in this loop, we found a temporary map, so load it up. */
1553
1554 m=load_temporary_map (m);
1555 if(m==NULL) return NULL;
1556 load_unique_objects(m);
1557
1558 clean_tmp_map(m);
1559 m->in_memory = MAP_IN_MEMORY;
1560 /* tempnam() on sun systems (probably others) uses malloc
1561 * to allocated space for the string. Free it here.
1562 * In some cases, load_temporary_map above won't find the
1563 * temporary map, and so has reloaded a new map. If that
1564 * is the case, tmpname is now null
1565 */
1566 if (m->tmpname) free(m->tmpname);
1567 m->tmpname = NULL;
1568 /* It's going to be saved anew anyway */
1569 } 1006 }
1570
1571 /* Below here is stuff common to both first time loaded maps and
1572 * temp maps.
1573 */
1574
1575 decay_objects(m); /* start the decay */
1576 /* In case other objects press some buttons down */
1577 update_buttons(m);
1578 if (m->outdoor)
1579 set_darkness_map(m);
1580 /* run the weather over this map */
1581 weather_effect(name);
1582 return m;
1583} 1007}
1584
1585 1008
1586/* 1009/*
1587 * This routine is supposed to find out the difficulty of the map. 1010 * This routine is supposed to find out the difficulty of the map.
1588 * difficulty does not have a lot to do with character level, 1011 * difficulty does not have a lot to do with character level,
1589 * but does have a lot to do with treasure on the map. 1012 * but does have a lot to do with treasure on the map.
… …
1591 * Difficulty can now be set by the map creature. If the value stored 1014 * Difficulty can now be set by the map creature. If the value stored
1592 * in the map is zero, then use this routine. Maps should really 1015 * in the map is zero, then use this routine. Maps should really
1593 * have a difficulty set than using this function - human calculation 1016 * have a difficulty set than using this function - human calculation
1594 * is much better than this functions guesswork. 1017 * is much better than this functions guesswork.
1595 */ 1018 */
1596 1019int
1597int calculate_difficulty(mapstruct *m) { 1020maptile::estimate_difficulty () const
1598 object *op; 1021{
1599 archetype *at;
1600 int x, y, i, diff;
1601 long monster_cnt = 0; 1022 long monster_cnt = 0;
1602 double avgexp = 0; 1023 double avgexp = 0;
1603 sint64 total_exp = 0; 1024 sint64 total_exp = 0;
1604 1025
1605 if (MAP_DIFFICULTY (m)) 1026 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1606 { 1027 for (object *op = ms->bot; op; op = op->above)
1607 LOG(llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1608 return MAP_DIFFICULTY (m);
1609 }
1610
1611 for(x = 0; x < MAP_WIDTH(m); x++)
1612 for(y = 0; y < MAP_HEIGHT(m); y++)
1613 for(op = get_map_ob(m, x, y); op != NULL; op = op->above)
1614 { 1028 {
1615 if(QUERY_FLAG (op, FLAG_MONSTER)) 1029 if (QUERY_FLAG (op, FLAG_MONSTER))
1616 { 1030 {
1617 total_exp += op->stats.exp; 1031 total_exp += op->stats.exp;
1618 monster_cnt++; 1032 monster_cnt++;
1619 } 1033 }
1620 1034
1621 if(QUERY_FLAG (op, FLAG_GENERATOR)) 1035 if (QUERY_FLAG (op, FLAG_GENERATOR))
1622 { 1036 {
1623 total_exp += op->stats.exp; 1037 total_exp += op->stats.exp;
1038
1624 at = type_to_archetype(GENERATE_TYPE (op)); 1039 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1625
1626 if(at != NULL)
1627 total_exp += at->clone.stats.exp * 8; 1040 total_exp += at->clone.stats.exp * 8;
1628 1041
1629 monster_cnt++; 1042 monster_cnt++;
1630 } 1043 }
1631 } 1044 }
1632 1045
1633 avgexp = (double) total_exp / monster_cnt; 1046 avgexp = (double) total_exp / monster_cnt;
1634 1047
1635 for (i = 1; i <= settings.max_level; i++) 1048 for (int i = 1; i <= settings.max_level; i++)
1636 {
1637 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) 1049 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1638 {
1639 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1640 return i; 1050 return i;
1641 }
1642 }
1643 1051
1644 return 1; 1052 return 1;
1645}
1646
1647void clean_tmp_map(mapstruct *m) {
1648 if(m->tmpname == NULL)
1649 return;
1650 INVOKE_MAP (CLEAN, m);
1651 (void) unlink(m->tmpname);
1652}
1653
1654void free_all_maps(void)
1655{
1656 int real_maps=0;
1657
1658 while (first_map) {
1659 /* I think some of the callers above before it gets here set this to be
1660 * saving, but we still want to free this data
1661 */
1662 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY;
1663 delete_map(first_map);
1664 real_maps++;
1665 }
1666 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps);
1667} 1053}
1668 1054
1669/* change_map_light() - used to change map light level (darkness) 1055/* change_map_light() - used to change map light level (darkness)
1670 * up or down. Returns true if successful. It should now be 1056 * up or down. Returns true if successful. It should now be
1671 * possible to change a value by more than 1. 1057 * possible to change a value by more than 1.
1672 * Move this from los.c to map.c since this is more related 1058 * Move this from los.c to map.c since this is more related
1673 * to maps than los. 1059 * to maps than los.
1674 * postive values make it darker, negative make it brighter 1060 * postive values make it darker, negative make it brighter
1675 */ 1061 */
1676 1062int
1677int change_map_light(mapstruct *m, int change) { 1063maptile::change_map_light (int change)
1064{
1678 int new_level = m->darkness + change; 1065 int new_level = darkness + change;
1679 1066
1680 /* Nothing to do */ 1067 /* Nothing to do */
1681 if(!change || (new_level <= 0 && m->darkness == 0) || 1068 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1682 (new_level >= MAX_DARKNESS && m->darkness >=MAX_DARKNESS)) {
1683 return 0; 1069 return 0;
1684 }
1685 1070
1686 /* inform all players on the map */ 1071 /* inform all players on the map */
1687 if (change>0) 1072 if (change > 0)
1688 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker."); 1073 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1689 else 1074 else
1690 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); 1075 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1691 1076
1692 /* Do extra checking. since m->darkness is a unsigned value, 1077 /* Do extra checking. since darkness is a unsigned value,
1693 * we need to be extra careful about negative values. 1078 * we need to be extra careful about negative values.
1694 * In general, the checks below are only needed if change 1079 * In general, the checks below are only needed if change
1695 * is not +/-1 1080 * is not +/-1
1696 */ 1081 */
1697 if (new_level < 0) m->darkness = 0; 1082 if (new_level < 0)
1698 else if (new_level >=MAX_DARKNESS) m->darkness = MAX_DARKNESS; 1083 darkness = 0;
1084 else if (new_level >= MAX_DARKNESS)
1085 darkness = MAX_DARKNESS;
1086 else
1699 else m->darkness=new_level; 1087 darkness = new_level;
1700 1088
1701 /* All clients need to get re-updated for the change */ 1089 /* All clients need to get re-updated for the change */
1702 update_all_map_los(m); 1090 update_all_map_los (this);
1703 return 1; 1091 return 1;
1704} 1092}
1705
1706 1093
1707/* 1094/*
1708 * This function updates various attributes about a specific space 1095 * This function updates various attributes about a specific space
1709 * on the map (what it looks like, whether it blocks magic, 1096 * on the map (what it looks like, whether it blocks magic,
1710 * has a living creatures, prevents people from passing 1097 * has a living creatures, prevents people from passing
1711 * through, etc) 1098 * through, etc)
1712 */ 1099 */
1713void update_position (mapstruct *m, int x, int y) { 1100void
1101mapspace::update_ ()
1102{
1714 object *tmp, *last = NULL; 1103 object *tmp, *last = 0;
1715 uint8 flags = 0, oldflags, light=0, anywhere=0; 1104 uint8 flags = 0, light = 0, anywhere = 0;
1716 New_Face *top,*floor, *middle; 1105 New_Face *top, *floor, *middle;
1717 object *top_obj, *floor_obj, *middle_obj; 1106 object *top_obj, *floor_obj, *middle_obj;
1718 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0; 1107 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1719 1108
1720 oldflags = GET_MAP_FLAGS(m,x,y);
1721 if (!(oldflags & P_NEED_UPDATE)) {
1722 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n",
1723 m->path, x, y);
1724 return;
1725 }
1726
1727 middle=blank_face; 1109 middle = blank_face;
1728 top=blank_face; 1110 top = blank_face;
1729 floor=blank_face; 1111 floor = blank_face;
1730 1112
1731 middle_obj = NULL; 1113 middle_obj = 0;
1732 top_obj = NULL; 1114 top_obj = 0;
1733 floor_obj = NULL; 1115 floor_obj = 0;
1734 1116
1735 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { 1117 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1736 1118 {
1737 /* This could be made additive I guess (two lights better than 1119 /* This could be made additive I guess (two lights better than
1738 * one). But if so, it shouldn't be a simple additive - 2 1120 * one). But if so, it shouldn't be a simple additive - 2
1739 * light bulbs do not illuminate twice as far as once since 1121 * light bulbs do not illuminate twice as far as once since
1740 * it is a disapation factor that is squared (or is it cubed?) 1122 * it is a dissapation factor that is cubed.
1741 */ 1123 */
1742 if (tmp->glow_radius > light) light = tmp->glow_radius; 1124 if (tmp->glow_radius > light)
1125 light = tmp->glow_radius;
1743 1126
1744 /* This call is needed in order to update objects the player 1127 /* This call is needed in order to update objects the player
1745 * is standing in that have animations (ie, grass, fire, etc). 1128 * is standing in that have animations (ie, grass, fire, etc).
1746 * However, it also causes the look window to be re-drawn 1129 * However, it also causes the look window to be re-drawn
1747 * 3 times each time the player moves, because many of the 1130 * 3 times each time the player moves, because many of the
1748 * functions the move_player calls eventualy call this. 1131 * functions the move_player calls eventualy call this.
1749 * 1132 *
1750 * Always put the player down for drawing. 1133 * Always put the player down for drawing.
1751 */ 1134 */
1752 if (!tmp->invisible) { 1135 if (!tmp->invisible)
1136 {
1753 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { 1137 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1138 {
1754 top = tmp->face; 1139 top = tmp->face;
1755 top_obj = tmp; 1140 top_obj = tmp;
1756 } 1141 }
1757 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { 1142 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1143 {
1758 /* If we got a floor, that means middle and top were below it, 1144 /* If we got a floor, that means middle and top were below it,
1759 * so should not be visible, so we clear them. 1145 * so should not be visible, so we clear them.
1760 */ 1146 */
1761 middle=blank_face; 1147 middle = blank_face;
1762 top=blank_face; 1148 top = blank_face;
1763 floor = tmp->face; 1149 floor = tmp->face;
1764 floor_obj = tmp; 1150 floor_obj = tmp;
1765 } 1151 }
1766 /* Flag anywhere have high priority */ 1152 /* Flag anywhere have high priority */
1767 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { 1153 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1154 {
1768 middle = tmp->face; 1155 middle = tmp->face;
1769 1156
1770 middle_obj = tmp; 1157 middle_obj = tmp;
1771 anywhere =1; 1158 anywhere = 1;
1772 } 1159 }
1773 /* Find the highest visible face around. If equal 1160 /* Find the highest visible face around. If equal
1774 * visibilities, we still want the one nearer to the 1161 * visibilities, we still want the one nearer to the
1775 * top 1162 * top
1776 */ 1163 */
1777 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { 1164 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere))
1165 {
1778 middle = tmp->face; 1166 middle = tmp->face;
1779 middle_obj = tmp; 1167 middle_obj = tmp;
1780 } 1168 }
1781 } 1169 }
1170
1782 if (tmp==tmp->above) { 1171 if (tmp == tmp->above)
1172 {
1783 LOG(llevError, "Error in structure of map\n"); 1173 LOG (llevError, "Error in structure of map\n");
1784 exit (-1); 1174 exit (-1);
1785 } 1175 }
1786 1176
1787 move_slow |= tmp->move_slow; 1177 move_slow |= tmp->move_slow;
1788 move_block |= tmp->move_block; 1178 move_block |= tmp->move_block;
1789 move_on |= tmp->move_on; 1179 move_on |= tmp->move_on;
1790 move_off |= tmp->move_off; 1180 move_off |= tmp->move_off;
1791 move_allow |= tmp->move_allow; 1181 move_allow |= tmp->move_allow;
1792 1182
1793 if (QUERY_FLAG(tmp,FLAG_ALIVE))
1794 flags |= P_IS_ALIVE;
1795 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC))
1796 flags |= P_NO_MAGIC;
1797 if (QUERY_FLAG(tmp,FLAG_DAMNED))
1798 flags |= P_NO_CLERIC;
1799 if (tmp->type == SAFE_GROUND)
1800 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC;
1801
1802 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 1183 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
1803 flags |= P_BLOCKSVIEW; 1184 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
1804 } /* for stack of objects */ 1185 if (tmp->type == PLAYER) flags |= P_PLAYER;
1805 1186 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1806 /* we don't want to rely on this function to have accurate flags, but 1187 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1807 * since we're already doing the work, we calculate them here. 1188 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1808 * if they don't match, logic is broken someplace.
1809 */
1810 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) &&
1811 (!(oldflags & P_NO_ERROR))) {
1812 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1813 m->path, x, y,
1814 (oldflags & ~P_NEED_UPDATE), flags);
1815 } 1189 }
1816 SET_MAP_FLAGS(m, x, y, flags);
1817 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow);
1818 SET_MAP_MOVE_ON(m, x, y, move_on);
1819 SET_MAP_MOVE_OFF(m, x, y, move_off);
1820 SET_MAP_MOVE_SLOW(m, x, y, move_slow);
1821 1190
1191 this->light = light;
1192 this->flags_ = flags;
1193 this->move_block = move_block & ~move_allow;
1194 this->move_on = move_on;
1195 this->move_off = move_off;
1196 this->move_slow = move_slow;
1197
1822 /* At this point, we have a floor face (if there is a floor), 1198 /* At this point, we have a floor face (if there is a floor),
1823 * and the floor is set - we are not going to touch it at 1199 * and the floor is set - we are not going to touch it at
1824 * this point. 1200 * this point.
1825 * middle contains the highest visibility face. 1201 * middle contains the highest visibility face.
1826 * top contains a player/monster face, if there is one. 1202 * top contains a player/monster face, if there is one.
1827 * 1203 *
1828 * We now need to fill in top.face and/or middle.face. 1204 * We now need to fill in top.face and/or middle.face.
1829 */ 1205 */
1830 1206
1831 /* If the top face also happens to be high visibility, re-do our 1207 /* If the top face also happens to be high visibility, re-do our
1832 * middle face. This should not happen, as we already have the 1208 * middle face. This should not happen, as we already have the
1833 * else statement above so middle should not get set. OTOH, it 1209 * else statement above so middle should not get set. OTOH, it
1834 * may be possible for the faces to match but be different objects. 1210 * may be possible for the faces to match but be different objects.
1835 */ 1211 */
1836 if (top == middle) middle=blank_face; 1212 if (top == middle)
1213 middle = blank_face;
1837 1214
1838 /* There are three posibilities at this point: 1215 /* There are three posibilities at this point:
1839 * 1) top face is set, need middle to be set. 1216 * 1) top face is set, need middle to be set.
1840 * 2) middle is set, need to set top. 1217 * 2) middle is set, need to set top.
1841 * 3) neither middle or top is set - need to set both. 1218 * 3) neither middle or top is set - need to set both.
1842 */ 1219 */
1843 1220
1844 for (tmp=last; tmp; tmp=tmp->below) { 1221 for (tmp = last; tmp; tmp = tmp->below)
1222 {
1845 /* Once we get to a floor, stop, since we already have a floor object */ 1223 /* Once we get to a floor, stop, since we already have a floor object */
1846 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; 1224 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1225 break;
1847 1226
1848 /* If two top faces are already set, quit processing */ 1227 /* If two top faces are already set, quit processing */
1849 if ((top != blank_face) && (middle != blank_face)) break; 1228 if ((top != blank_face) && (middle != blank_face))
1229 break;
1850 1230
1851 /* Only show visible faces, unless its the editor - show all */ 1231 /* Only show visible faces, unless its the editor - show all */
1852 if (!tmp->invisible || editor) { 1232 if (!tmp->invisible || editor)
1233 {
1853 /* Fill in top if needed */ 1234 /* Fill in top if needed */
1854 if (top == blank_face) { 1235 if (top == blank_face)
1236 {
1855 top = tmp->face; 1237 top = tmp->face;
1856 top_obj = tmp; 1238 top_obj = tmp;
1239 if (top == middle)
1857 if (top == middle) middle=blank_face; 1240 middle = blank_face;
1241 }
1858 } else { 1242 else
1243 {
1859 /* top is already set - we should only get here if 1244 /* top is already set - we should only get here if
1860 * middle is not set 1245 * middle is not set
1861 * 1246 *
1862 * Set the middle face and break out, since there is nothing 1247 * Set the middle face and break out, since there is nothing
1863 * more to fill in. We don't check visiblity here, since 1248 * more to fill in. We don't check visiblity here, since
1864 * 1249 *
1865 */ 1250 */
1866 if (tmp->face != top ) { 1251 if (tmp->face != top)
1252 {
1867 middle = tmp->face; 1253 middle = tmp->face;
1868 middle_obj = tmp; 1254 middle_obj = tmp;
1869 break; 1255 break;
1870 } 1256 }
1871 } 1257 }
1872 } 1258 }
1873 } 1259 }
1874 if (middle == floor) middle = blank_face; 1260
1875 if (top == middle) middle = blank_face; 1261 if (middle == floor)
1876 SET_MAP_FACE(m,x,y,top,0);
1877 if(top != blank_face)
1878 SET_MAP_FACE_OBJ(m,x,y,top_obj,0);
1879 else
1880 SET_MAP_FACE_OBJ(m,x,y,NULL,0);
1881 SET_MAP_FACE(m,x,y,middle,1);
1882 if(middle != blank_face) 1262 middle = blank_face;
1883 SET_MAP_FACE_OBJ(m,x,y,middle_obj,1);
1884 else
1885 SET_MAP_FACE_OBJ(m,x,y,NULL,1);
1886 SET_MAP_FACE(m,x,y,floor,2);
1887 if(floor != blank_face)
1888 SET_MAP_FACE_OBJ(m,x,y,floor_obj,2);
1889 else
1890 SET_MAP_FACE_OBJ(m,x,y,NULL,2);
1891 SET_MAP_LIGHT(m,x,y,light);
1892}
1893 1263
1264 if (top == middle)
1265 middle = blank_face;
1894 1266
1895void set_map_reset_time(mapstruct *map) { 1267 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1896 int timeout; 1268 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1897 1269 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1898 timeout = MAP_RESET_TIMEOUT(map);
1899 if (timeout <= 0)
1900 timeout = MAP_DEFAULTRESET;
1901 if (timeout >= MAP_MAXRESET)
1902 timeout = MAP_MAXRESET;
1903 MAP_WHEN_RESET(map) = seconds()+timeout;
1904} 1270}
1905 1271
1906/* this updates the orig_map->tile_map[tile_num] value after loading 1272/* this updates the orig_map->tile_map[tile_num] value after loading
1907 * the map. It also takes care of linking back the freshly loaded 1273 * the map. It also takes care of linking back the freshly loaded
1908 * maps tile_map values if it tiles back to this one. It returns 1274 * maps tile_map values if it tiles back to this one. It returns
1909 * the value of orig_map->tile_map[tile_num]. It really only does this 1275 * the value of orig_map->tile_map[tile_num]. It really only does this
1910 * so that it is easier for calling functions to verify success. 1276 * so that it is easier for calling functions to verify success.
1911 */ 1277 */
1912 1278static maptile *
1913static mapstruct *load_and_link_tiled_map(mapstruct *orig_map, int tile_num) 1279load_and_link_tiled_map (maptile *orig_map, int tile_num)
1914{ 1280{
1281 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map);
1282
1283 if (!mp || mp->in_memory != MAP_IN_MEMORY)
1284 {
1285 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1286 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1287 &orig_map->tile_path[tile_num], &orig_map->path);
1288 mp = new maptile (1, 1);
1289 mp->alloc ();
1290 mp->in_memory = MAP_IN_MEMORY;
1291 }
1292
1915 int dest_tile = (tile_num +2) % 4; 1293 int dest_tile = (tile_num + 2) % 4;
1916 char *path = path_combine_and_normalize(orig_map->path, orig_map->tile_path[tile_num]);
1917 1294
1918 orig_map->tile_map[tile_num] = ready_map_name(path, 0); 1295 orig_map->tile_map[tile_num] = mp;
1919 1296
1920 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1297 // optimisation: back-link map to origin map if euclidean
1921 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && 1298 //TODO: non-euclidean maps MUST GO
1922 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1299 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1923 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1300 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1924 1301
1925 return orig_map->tile_map[tile_num]; 1302 return mp;
1926} 1303}
1927 1304
1928/* this returns TRUE if the coordinates (x,y) are out of 1305/* this returns TRUE if the coordinates (x,y) are out of
1929 * map m. This function also takes into account any 1306 * map m. This function also takes into account any
1930 * tiling considerations, loading adjacant maps as needed. 1307 * tiling considerations, loading adjacant maps as needed.
1931 * This is the function should always be used when it 1308 * This is the function should always be used when it
1932 * necessary to check for valid coordinates. 1309 * necessary to check for valid coordinates.
1933 * This function will recursively call itself for the 1310 * This function will recursively call itself for the
1934 * tiled maps. 1311 * tiled maps.
1935 * 1312 */
1936 * 1313int
1937 */
1938int out_of_map(mapstruct *m, int x, int y) 1314out_of_map (maptile *m, int x, int y)
1939{ 1315{
1940
1941 /* If we get passed a null map, this is obviously the 1316 /* If we get passed a null map, this is obviously the
1942 * case. This generally shouldn't happen, but if the 1317 * case. This generally shouldn't happen, but if the
1943 * map loads fail below, it could happen. 1318 * map loads fail below, it could happen.
1944 */ 1319 */
1945 if (!m) return 0; 1320 if (!m)
1946
1947 if (x<0) {
1948 if (!m->tile_path[3]) return 1;
1949 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1950 load_and_link_tiled_map(m, 3);
1951 }
1952 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y));
1953 }
1954 if (x>=MAP_WIDTH(m)) {
1955 if (!m->tile_path[1]) return 1;
1956 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) {
1957 load_and_link_tiled_map(m, 1);
1958 }
1959 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y));
1960 }
1961 if (y<0) {
1962 if (!m->tile_path[0]) return 1;
1963 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) {
1964 load_and_link_tiled_map(m, 0);
1965 }
1966 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0])));
1967 }
1968 if (y>=MAP_HEIGHT(m)) {
1969 if (!m->tile_path[2]) return 1;
1970 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
1971 load_and_link_tiled_map(m, 2);
1972 }
1973 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
1974 }
1975
1976 /* Simple case - coordinates are within this local
1977 * map.
1978 */
1979 return 0; 1321 return 0;
1322
1323 if (x < 0)
1324 {
1325 if (!m->tile_path[3])
1326 return 1;
1327
1328 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1329 load_and_link_tiled_map (m, 3);
1330
1331 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1332 }
1333
1334 if (x >= m->width)
1335 {
1336 if (!m->tile_path[1])
1337 return 1;
1338
1339 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 1);
1341
1342 return out_of_map (m->tile_map[1], x - m->width, y);
1343 }
1344
1345 if (y < 0)
1346 {
1347 if (!m->tile_path[0])
1348 return 1;
1349
1350 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 0);
1352
1353 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1354 }
1355
1356 if (y >= m->height)
1357 {
1358 if (!m->tile_path[2])
1359 return 1;
1360
1361 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 2);
1363
1364 return out_of_map (m->tile_map[2], x, y - m->height);
1365 }
1366
1367 /* Simple case - coordinates are within this local
1368 * map.
1369 */
1370 return 0;
1980} 1371}
1981 1372
1982/* This is basically the same as out_of_map above, but 1373/* This is basically the same as out_of_map above, but
1983 * instead we return NULL if no map is valid (coordinates 1374 * instead we return NULL if no map is valid (coordinates
1984 * out of bounds and no tiled map), otherwise it returns 1375 * out of bounds and no tiled map), otherwise it returns
1985 * the map as that the coordinates are really on, and 1376 * the map as that the coordinates are really on, and
1986 * updates x and y to be the localized coordinates. 1377 * updates x and y to be the localized coordinates.
1987 * Using this is more efficient of calling out_of_map 1378 * Using this is more efficient of calling out_of_map
1988 * and then figuring out what the real map is 1379 * and then figuring out what the real map is
1989 */ 1380 */
1381maptile *
1990mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 1382get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1991{ 1383{
1992
1993 if (*x<0) { 1384 if (*x < 0)
1385 {
1994 if (!m->tile_path[3]) return NULL; 1386 if (!m->tile_path[3])
1387 return 0;
1388
1995 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1389 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1996 load_and_link_tiled_map(m, 3); 1390 load_and_link_tiled_map (m, 3);
1997 1391
1998 *x += MAP_WIDTH(m->tile_map[3]); 1392 *x += m->tile_map[3]->width;
1999 return (get_map_from_coord(m->tile_map[3], x, y)); 1393 return (get_map_from_coord (m->tile_map[3], x, y));
1394 }
1395
1396 if (*x >= m->width)
2000 } 1397 {
2001 if (*x>=MAP_WIDTH(m)) {
2002 if (!m->tile_path[1]) return NULL; 1398 if (!m->tile_path[1])
1399 return 0;
1400
2003 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1401 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2004 load_and_link_tiled_map(m, 1); 1402 load_and_link_tiled_map (m, 1);
2005 1403
2006 *x -= MAP_WIDTH(m); 1404 *x -= m->width;
2007 return (get_map_from_coord(m->tile_map[1], x, y)); 1405 return (get_map_from_coord (m->tile_map[1], x, y));
1406 }
1407
1408 if (*y < 0)
2008 } 1409 {
2009 if (*y<0) {
2010 if (!m->tile_path[0]) return NULL; 1410 if (!m->tile_path[0])
1411 return 0;
1412
2011 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1413 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2012 load_and_link_tiled_map(m, 0); 1414 load_and_link_tiled_map (m, 0);
2013 1415
2014 *y += MAP_HEIGHT(m->tile_map[0]); 1416 *y += m->tile_map[0]->height;
2015 return (get_map_from_coord(m->tile_map[0], x, y)); 1417 return (get_map_from_coord (m->tile_map[0], x, y));
1418 }
1419
1420 if (*y >= m->height)
2016 } 1421 {
2017 if (*y>=MAP_HEIGHT(m)) {
2018 if (!m->tile_path[2]) return NULL; 1422 if (!m->tile_path[2])
1423 return 0;
1424
2019 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1425 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2020 load_and_link_tiled_map(m, 2); 1426 load_and_link_tiled_map (m, 2);
2021 1427
2022 *y -= MAP_HEIGHT(m); 1428 *y -= m->height;
2023 return (get_map_from_coord(m->tile_map[2], x, y)); 1429 return (get_map_from_coord (m->tile_map[2], x, y));
2024 } 1430 }
2025 1431
2026 /* Simple case - coordinates are within this local 1432 /* Simple case - coordinates are within this local
2027 * map. 1433 * map.
2028 */ 1434 */
2029
2030 return m; 1435 return m;
2031} 1436}
2032 1437
2033/** 1438/**
2034 * Return whether map2 is adjacent to map1. If so, store the distance from 1439 * Return whether map2 is adjacent to map1. If so, store the distance from
2035 * map1 to map2 in dx/dy. 1440 * map1 to map2 in dx/dy.
2036 */ 1441 */
1442static int
2037static int adjacent_map(const mapstruct *map1, const mapstruct *map2, int *dx, int *dy) { 1443adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1444{
2038 if (!map1 || !map2) 1445 if (!map1 || !map2)
2039 return 0; 1446 return 0;
2040 1447
2041 if (map1 == map2) { 1448 if (map1 == map2)
1449 {
2042 *dx = 0; 1450 *dx = 0;
2043 *dy = 0; 1451 *dy = 0;
2044 1452 }
2045 } else if (map1->tile_map[0] == map2) { /* up */ 1453 else if (map1->tile_map[0] == map2)
1454 { /* up */
2046 *dx = 0; 1455 *dx = 0;
2047 *dy = -MAP_HEIGHT(map2); 1456 *dy = -map2->height;
1457 }
2048 } else if (map1->tile_map[1] == map2) { /* right */ 1458 else if (map1->tile_map[1] == map2)
2049 *dx = MAP_WIDTH(map1); 1459 { /* right */
1460 *dx = map1->width;
2050 *dy = 0; 1461 *dy = 0;
1462 }
2051 } else if (map1->tile_map[2] == map2) { /* down */ 1463 else if (map1->tile_map[2] == map2)
1464 { /* down */
2052 *dx = 0; 1465 *dx = 0;
2053 *dy = MAP_HEIGHT(map1); 1466 *dy = map1->height;
1467 }
2054 } else if (map1->tile_map[3] == map2) { /* left */ 1468 else if (map1->tile_map[3] == map2)
2055 *dx = -MAP_WIDTH(map2); 1469 { /* left */
1470 *dx = -map2->width;
2056 *dy = 0; 1471 *dy = 0;
2057 1472 }
2058 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) { /* up right */ 1473 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
1474 { /* up right */
2059 *dx = MAP_WIDTH(map1->tile_map[0]); 1475 *dx = map1->tile_map[0]->width;
2060 *dy = -MAP_HEIGHT(map1->tile_map[0]); 1476 *dy = -map1->tile_map[0]->height;
1477 }
2061 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) { /* up left */ 1478 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2062 *dx = -MAP_WIDTH(map2); 1479 { /* up left */
2063 *dy = -MAP_HEIGHT(map1->tile_map[0]); 1480 *dx = -map2->width;
1481 *dy = -map1->tile_map[0]->height;
1482 }
2064 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) { /* right up */ 1483 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2065 *dx = MAP_WIDTH(map1); 1484 { /* right up */
2066 *dy = -MAP_HEIGHT(map2); 1485 *dx = map1->width;
1486 *dy = -map2->height;
1487 }
2067 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) { /* right down */ 1488 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2068 *dx = MAP_WIDTH(map1); 1489 { /* right down */
2069 *dy = MAP_HEIGHT(map1->tile_map[1]); 1490 *dx = map1->width;
1491 *dy = map1->tile_map[1]->height;
1492 }
2070 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) { /* down right */ 1493 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
1494 { /* down right */
2071 *dx = MAP_WIDTH(map1->tile_map[2]); 1495 *dx = map1->tile_map[2]->width;
2072 *dy = MAP_HEIGHT(map1); 1496 *dy = map1->height;
1497 }
2073 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) { /* down left */ 1498 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2074 *dx = -MAP_WIDTH(map2); 1499 { /* down left */
2075 *dy = MAP_HEIGHT(map1); 1500 *dx = -map2->width;
1501 *dy = map1->height;
1502 }
2076 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) { /* left up */ 1503 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
1504 { /* left up */
2077 *dx = -MAP_WIDTH(map1->tile_map[3]); 1505 *dx = -map1->tile_map[3]->width;
2078 *dy = -MAP_HEIGHT(map2); 1506 *dy = -map2->height;
1507 }
2079 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) { /* left down */ 1508 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
1509 { /* left down */
2080 *dx = -MAP_WIDTH(map1->tile_map[3]); 1510 *dx = -map1->tile_map[3]->width;
2081 *dy = MAP_HEIGHT(map1->tile_map[3]); 1511 *dy = map1->tile_map[3]->height;
2082
2083 } else { /* not "adjacent" enough */
2084 return 0;
2085 } 1512 }
2086 1513 else
2087 return 1; 1514 return 0;
1515
1516 return 1;
2088} 1517}
2089 1518
2090/* From map.c 1519/* From map.c
2091 * This is used by get_player to determine where the other 1520 * This is used by get_player to determine where the other
2092 * creature is. get_rangevector takes into account map tiling, 1521 * creature is. get_rangevector takes into account map tiling,
… …
2105 * be unexpected 1534 * be unexpected
2106 * 1535 *
2107 * currently, the only flag supported (0x1) is don't translate for 1536 * currently, the only flag supported (0x1) is don't translate for
2108 * closest body part of 'op1' 1537 * closest body part of 'op1'
2109 */ 1538 */
2110 1539void
2111void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) { 1540get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1541{
2112 if (!adjacent_map(op1->map, op2->map, &retval->distance_x, &retval->distance_y)) { 1542 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1543 {
2113 /* be conservative and fill in _some_ data */ 1544 /* be conservative and fill in _some_ data */
2114 retval->distance = 100000; 1545 retval->distance = 100000;
2115 retval->distance_x = 32767; 1546 retval->distance_x = 32767;
2116 retval->distance_y = 32767; 1547 retval->distance_y = 32767;
2117 retval->direction = 0; 1548 retval->direction = 0;
2118 retval->part = 0; 1549 retval->part = 0;
2119 } else { 1550 }
1551 else
1552 {
2120 object *best; 1553 object *best;
2121 1554
2122 retval->distance_x += op2->x-op1->x; 1555 retval->distance_x += op2->x - op1->x;
2123 retval->distance_y += op2->y-op1->y; 1556 retval->distance_y += op2->y - op1->y;
2124 1557
2125 best = op1; 1558 best = op1;
2126 /* If this is multipart, find the closest part now */ 1559 /* If this is multipart, find the closest part now */
2127 if (!(flags&0x1) && op1->more) { 1560 if (!(flags & 0x1) && op1->more)
1561 {
2128 object *tmp; 1562 object *tmp;
2129 int best_distance = retval->distance_x*retval->distance_x+ 1563 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
2130 retval->distance_y*retval->distance_y, tmpi;
2131 1564
2132 /* we just take the offset of the piece to head to figure 1565 /* we just take the offset of the piece to head to figure
2133 * distance instead of doing all that work above again 1566 * distance instead of doing all that work above again
2134 * since the distance fields we set above are positive in the 1567 * since the distance fields we set above are positive in the
2135 * same axis as is used for multipart objects, the simply arithmetic 1568 * same axis as is used for multipart objects, the simply arithmetic
2136 * below works. 1569 * below works.
2137 */ 1570 */
2138 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) { 1571 for (tmp = op1->more; tmp != NULL; tmp = tmp->more)
1572 {
2139 tmpi = (op1->x-tmp->x+retval->distance_x)*(op1->x-tmp->x+retval->distance_x)+ 1573 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
2140 (op1->y-tmp->y+retval->distance_y)*(op1->y-tmp->y+retval->distance_y); 1574 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
2141 if (tmpi < best_distance) { 1575 if (tmpi < best_distance)
1576 {
2142 best_distance = tmpi; 1577 best_distance = tmpi;
2143 best = tmp; 1578 best = tmp;
2144 } 1579 }
2145 } 1580 }
2146 if (best != op1) { 1581 if (best != op1)
1582 {
2147 retval->distance_x += op1->x-best->x; 1583 retval->distance_x += op1->x - best->x;
2148 retval->distance_y += op1->y-best->y; 1584 retval->distance_y += op1->y - best->y;
2149 } 1585 }
2150 } 1586 }
2151 retval->part = best; 1587 retval->part = best;
2152 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 1588 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
2153 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 1589 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2154 } 1590 }
2155} 1591}
2156 1592
2157/* this is basically the same as get_rangevector above, but instead of 1593/* this is basically the same as get_rangevector above, but instead of
2158 * the first parameter being an object, it instead is the map 1594 * the first parameter being an object, it instead is the map
… …
2163 * be more consistant with the above function and also in case they are needed 1599 * be more consistant with the above function and also in case they are needed
2164 * for something in the future. Also, since no object is pasted, the best 1600 * for something in the future. Also, since no object is pasted, the best
2165 * field of the rv_vector is set to NULL. 1601 * field of the rv_vector is set to NULL.
2166 */ 1602 */
2167 1603
1604void
2168void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags) { 1605get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)
1606{
2169 if (!adjacent_map(m, op2->map, &retval->distance_x, &retval->distance_y)) { 1607 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1608 {
2170 /* be conservative and fill in _some_ data */ 1609 /* be conservative and fill in _some_ data */
2171 retval->distance = 100000; 1610 retval->distance = 100000;
2172 retval->distance_x = 32767; 1611 retval->distance_x = 32767;
2173 retval->distance_y = 32767; 1612 retval->distance_y = 32767;
2174 retval->direction = 0; 1613 retval->direction = 0;
2175 retval->part = 0; 1614 retval->part = 0;
2176 } else { 1615 }
1616 else
1617 {
2177 retval->distance_x += op2->x-x; 1618 retval->distance_x += op2->x - x;
2178 retval->distance_y += op2->y-y; 1619 retval->distance_y += op2->y - y;
2179 1620
2180 retval->part = NULL; 1621 retval->part = NULL;
2181 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 1622 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
2182 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2183 } 1624 }
2184} 1625}
2185 1626
2186/* Returns true of op1 and op2 are effectively on the same map 1627/* Returns true of op1 and op2 are effectively on the same map
2187 * (as related to map tiling). Note that this looks for a path from 1628 * (as related to map tiling). Note that this looks for a path from
2188 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1629 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2189 * to op1, this will still return false. 1630 * to op1, this will still return false.
2190 * Note we only look one map out to keep the processing simple 1631 * Note we only look one map out to keep the processing simple
2191 * and efficient. This could probably be a macro. 1632 * and efficient. This could probably be a macro.
2192 * MSW 2001-08-05 1633 * MSW 2001-08-05
2193 */ 1634 */
1635int
2194int on_same_map(const object *op1, const object *op2) { 1636on_same_map (const object *op1, const object *op2)
1637{
2195 int dx, dy; 1638 int dx, dy;
2196 1639
2197 return adjacent_map(op1->map, op2->map, &dx, &dy); 1640 return adjacent_map (op1->map, op2->map, &dx, &dy);
2198} 1641}
1642
1643object *
1644maptile::insert (object *op, int x, int y, object *originator, int flags)
1645{
1646 if (!op->flag [FLAG_REMOVED])
1647 op->remove ();
1648
1649 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1650}
1651

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines