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.29 by root, Sun Sep 10 16:00:23 2006 UTC

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

Diff Legend

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