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

Diff Legend

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