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.5 by elmex, Sun Aug 20 20:57:34 2006 UTC vs.
Revision 1.68 by root, Thu Jan 4 16:19:31 2007 UTC

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

Diff Legend

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