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.15 by root, Wed Aug 30 08:28:32 2006 UTC vs.
Revision 1.36 by root, Mon Dec 11 02:41:25 2006 UTC

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

Diff Legend

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