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.12 by root, Mon Aug 28 16:52:51 2006 UTC vs.
Revision 1.30 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

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