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.3 by elmex, Tue Aug 15 17:35:50 2006 UTC vs.
Revision 1.63 by root, Mon Jan 1 00:41:02 2007 UTC

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

Diff Legend

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