ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.12 by root, Mon Aug 28 16:52:51 2006 UTC vs.
Revision 1.35 by root, Sun Dec 10 01:16:27 2006 UTC

1/*
2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.12 2006/08/28 16:52:51 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 22*/
28 23
29 24
30#include <global.h> 25#include <global.h>
31#include <funcpoint.h> 26#include <funcpoint.h>
32 27
33#include <loader.h> 28#include <loader.h>
34#ifndef WIN32 /* ---win32 exclude header */ 29#ifndef WIN32 /* ---win32 exclude header */
35#include <unistd.h> 30# include <unistd.h>
36#endif /* win32 */ 31#endif /* win32 */
37 32
38#include "path.h" 33#include "path.h"
39 34
40 35
41extern int nrofallocobjects,nroffreeobjects;
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;
807 while (isspace(*key)) key++; 865 while (isspace (*key))
808 if (*key == 0) continue; /* empty line */ 866 key++;
867 if (*key == 0)
868 continue; /* empty line */
809 value = strchr(key, ' '); 869 value = strchr (key, ' ');
810 if (!value) { 870 if (!value)
871 {
811 end = strchr(key, '\n'); 872 end = strchr (key, '\n');
812 if (end != NULL) { 873 if (end != NULL)
874 {
813 *end = 0; 875 *end = 0;
814 } 876 }
877 }
815 } else { 878 else
879 {
816 *value = 0; 880 *value = 0;
817 value++; 881 value++;
818 end = strchr(value, '\n'); 882 end = strchr (value, '\n');
819 while (isspace(*value)) { 883 while (isspace (*value))
884 {
820 value++; 885 value++;
821 if (*value == '\0' || value == end) { 886 if (*value == '\0' || value == end)
887 {
822 /* Nothing but spaces. */ 888 /* Nothing but spaces. */
823 value = NULL; 889 value = NULL;
824 break; 890 break;
825 } 891 }
826 } 892 }
827 } 893 }
894
828 if (!end) { 895 if (!end)
896 {
829 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", 897 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
830 buf);
831 return 1; 898 return 1;
832 }
833 899 }
834 900
835 /* key is the field name, value is what it should be set 901 /* key is the field name, value is what it should be set
836 * to. We've already done the work to null terminate key, 902 * to. We've already done the work to null terminate key,
837 * and strip off any leading spaces for both of these. 903 * and strip off any leading spaces for both of these.
838 * We have not touched the newline at the end of the line - 904 * We have not touched the newline at the end of the line -
839 * these are needed for some values. the end pointer 905 * these are needed for some values. the end pointer
840 * points to the first of the newlines. 906 * points to the first of the newlines.
841 * value could be NULL! It would be easy enough to just point 907 * 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 908 * this to "" to prevent cores, but that would let more errors slide
843 * through. 909 * through.
844 * 910 *
845 * First check for entries that do not use the value parameter, then 911 * First check for entries that do not use the value parameter, then
846 * validate that value is given and check for the remaining entries 912 * validate that value is given and check for the remaining entries
847 * that use the parameter. 913 * that use the parameter.
848 */ 914 */
849 915
850 if (!strcmp(key,"msg")) { 916 if (!strcmp (key, "msg"))
917 {
851 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 918 while (fgets (buf, HUGE_BUF, fp) != NULL)
919 {
852 if (!strcmp(buf,"endmsg\n")) break; 920 if (!strcmp (buf, "endmsg\n"))
921 break;
853 else { 922 else
923 {
854 /* slightly more efficient than strcat */ 924 /* slightly more efficient than strcat */
855 strcpy(msgbuf+msgpos, buf); 925 strcpy (msgbuf + msgpos, buf);
856 msgpos += strlen(buf); 926 msgpos += strlen (buf);
857 } 927 }
858 } 928 }
859 /* There are lots of maps that have empty messages (eg, msg/endmsg 929 /* There are lots of maps that have empty messages (eg, msg/endmsg
860 * with nothing between). There is no reason in those cases to 930 * with nothing between). There is no reason in those cases to
861 * keep the empty message. Also, msgbuf contains garbage data 931 * keep the empty message. Also, msgbuf contains garbage data
862 * when msgpos is zero, so copying it results in crashes 932 * when msgpos is zero, so copying it results in crashes
863 */ 933 */
864 if (msgpos != 0) 934 if (msgpos != 0)
865 m->msg = strdup_local(msgbuf); 935 m->msg = strdup_local (msgbuf);
866 } 936 }
867 else if (!strcmp(key,"maplore")) { 937 else if (!strcmp (key, "maplore"))
938 {
868 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 939 while (fgets (buf, HUGE_BUF, fp) != NULL)
940 {
869 if (!strcmp(buf,"endmaplore\n")) break; 941 if (!strcmp (buf, "endmaplore\n"))
942 break;
870 else { 943 else
944 {
871 /* slightly more efficient than strcat */ 945 /* slightly more efficient than strcat */
872 strcpy(maplorebuf+maplorepos, buf); 946 strcpy (maplorebuf + maplorepos, buf);
873 maplorepos += strlen(buf); 947 maplorepos += strlen (buf);
874 } 948 }
875 } 949 }
876 if (maplorepos != 0) 950 if (maplorepos != 0)
877 m->maplore = strdup_local(maplorebuf); 951 m->maplore = strdup_local (maplorebuf);
878 } 952 }
879 else if (!strcmp(key,"end")) { 953 else if (!strcmp (key, "end"))
954 {
880 break; 955 break;
881 } 956 }
882 else if (value == NULL) { 957 else if (value == NULL)
958 {
883 LOG(llevError, "Got '%s' line without parameter in map header\n", key); 959 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
884 } 960 }
885 else if (!strcmp(key, "arch")) { 961 else if (!strcmp (key, "arch"))
962 {
886 /* This is an oddity, but not something we care about much. */ 963 /* This is an oddity, but not something we care about much. */
887 if (strcmp(value,"map\n")) 964 if (strcmp (value, "map\n"))
888 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value); 965 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
889 } 966 }
890 else if (!strcmp(key,"name")) { 967 else if (!strcmp (key, "name"))
968 {
891 *end=0; 969 *end = 0;
892 m->name = strdup_local(value); 970 m->name = strdup_local (value);
893 } 971 }
894 /* first strcmp value on these are old names supported 972 /* first strcmp value on these are old names supported
895 * for compatibility reasons. The new values (second) are 973 * for compatibility reasons. The new values (second) are
896 * what really should be used. 974 * what really should be used.
897 */ 975 */
898 else if (!strcmp(key,"oid")) { 976 else if (!strcmp (key, "oid"))
977 {
899 fp.get (m, atoi(value)); 978 fp.get (m, atoi (value));
979 }
900 } else if (!strcmp(key, "attach")) { 980 else if (!strcmp (key, "attach"))
981 {
901 m->attach = add_string (value); 982 m->attach = value;
983 }
902 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 984 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
985 {
903 m->enter_x = atoi(value); 986 m->enter_x = atoi (value);
987 }
904 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 988 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
989 {
905 m->enter_y = atoi(value); 990 m->enter_y = atoi (value);
991 }
906 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 992 else if (!strcmp (key, "x") || !strcmp (key, "width"))
993 {
907 m->width = atoi(value); 994 m->width = atoi (value);
995 }
908 } else if (!strcmp(key,"y") || !strcmp(key, "height")) { 996 else if (!strcmp (key, "y") || !strcmp (key, "height"))
997 {
909 m->height = atoi(value); 998 m->height = atoi (value);
999 }
910 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) { 1000 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1001 {
911 m->reset_timeout = atoi(value); 1002 m->reset_timeout = atoi (value);
1003 }
912 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) { 1004 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1005 {
913 m->timeout = atoi(value); 1006 m->timeout = atoi (value);
1007 }
914 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) { 1008 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1009 {
915 m->difficulty = atoi(value); 1010 m->difficulty = atoi (value);
1011 }
916 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) { 1012 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1013 {
917 m->darkness = atoi(value); 1014 m->darkness = atoi (value);
1015 }
918 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) { 1016 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1017 {
919 m->fixed_resettime = atoi(value); 1018 m->fixed_resettime = atoi (value);
1019 }
920 } else if (!strcmp(key,"unique")) { 1020 else if (!strcmp (key, "unique"))
1021 {
921 m->unique = atoi(value); 1022 m->unique = atoi (value);
1023 }
922 } else if (!strcmp(key,"template")) { 1024 else if (!strcmp (key, "template"))
1025 {
923 m->templatemap = atoi(value); 1026 m->templatemap = atoi (value);
1027 }
924 } else if (!strcmp(key,"region")) { 1028 else if (!strcmp (key, "region"))
1029 {
925 m->region = get_region_by_name(value); 1030 m->region = get_region_by_name (value);
1031 }
926 } else if (!strcmp(key,"shopitems")) { 1032 else if (!strcmp (key, "shopitems"))
1033 {
927 *end=0; 1034 *end = 0;
928 m->shopitems = parse_shop_string(value); 1035 m->shopitems = parse_shop_string (value);
1036 }
929 } else if (!strcmp(key,"shopgreed")) { 1037 else if (!strcmp (key, "shopgreed"))
1038 {
930 m->shopgreed = atof(value); 1039 m->shopgreed = atof (value);
1040 }
931 } else if (!strcmp(key,"shopmin")) { 1041 else if (!strcmp (key, "shopmin"))
1042 {
932 m->shopmin = atol(value); 1043 m->shopmin = atol (value);
1044 }
933 } else if (!strcmp(key,"shopmax")) { 1045 else if (!strcmp (key, "shopmax"))
1046 {
934 m->shopmax = atol(value); 1047 m->shopmax = atol (value);
1048 }
935 } else if (!strcmp(key,"shoprace")) { 1049 else if (!strcmp (key, "shoprace"))
1050 {
936 *end=0; 1051 *end = 0;
937 m->shoprace = strdup_local(value); 1052 m->shoprace = strdup_local (value);
1053 }
938 } else if (!strcmp(key,"outdoor")) { 1054 else if (!strcmp (key, "outdoor"))
1055 {
939 m->outdoor = atoi(value); 1056 m->outdoor = atoi (value);
1057 }
940 } else if (!strcmp(key, "temp")) { 1058 else if (!strcmp (key, "temp"))
1059 {
941 m->temp = atoi(value); 1060 m->temp = atoi (value);
1061 }
942 } else if (!strcmp(key, "pressure")) { 1062 else if (!strcmp (key, "pressure"))
1063 {
943 m->pressure = atoi(value); 1064 m->pressure = atoi (value);
1065 }
944 } else if (!strcmp(key, "humid")) { 1066 else if (!strcmp (key, "humid"))
1067 {
945 m->humid = atoi(value); 1068 m->humid = atoi (value);
1069 }
946 } else if (!strcmp(key, "windspeed")) { 1070 else if (!strcmp (key, "windspeed"))
1071 {
947 m->windspeed = atoi(value); 1072 m->windspeed = atoi (value);
1073 }
948 } else if (!strcmp(key, "winddir")) { 1074 else if (!strcmp (key, "winddir"))
1075 {
949 m->winddir = atoi(value); 1076 m->winddir = atoi (value);
1077 }
950 } else if (!strcmp(key, "sky")) { 1078 else if (!strcmp (key, "sky"))
1079 {
951 m->sky = atoi(value); 1080 m->sky = atoi (value);
1081 }
952 } else if (!strcmp(key, "nosmooth")) { 1082 else if (!strcmp (key, "nosmooth"))
1083 {
953 m->nosmooth = atoi(value); 1084 m->nosmooth = atoi (value);
954 } else if (!strcmp(key, "safe_map")) {
955 m->safe_map = atoi(value);
956 } 1085 }
957 else if (!strncmp(key,"tile_path_", 10)) { 1086 else if (!strncmp (key, "tile_path_", 10))
1087 {
958 int tile=atoi(key+10); 1088 int tile = atoi (key + 10);
959 1089
960 if (tile<1 || tile>4) { 1090 if (tile < 1 || tile > 4)
1091 {
961 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n", 1092 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
962 tile, m->path); 1093 }
963 } else { 1094 else
1095 {
964 char *path; 1096 char *path;
965 1097
966 *end = 0; 1098 *end = 0;
967 1099
968 if (m->tile_path[tile-1]) { 1100 if (m->tile_path[tile - 1])
1101 {
969 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n", 1102 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
970 tile, m->path);
971 free(m->tile_path[tile-1]); 1103 free (m->tile_path[tile - 1]);
972 m->tile_path[tile-1] = NULL; 1104 m->tile_path[tile - 1] = NULL;
973 } 1105 }
974 1106
975 if (check_path(value, 1) != -1) { 1107 if (check_path (value, 1) != -1)
1108 {
976 /* The unadorned path works. */ 1109 /* The unadorned path works. */
977 path = value; 1110 path = value;
1111 }
978 } else { 1112 else
1113 {
979 /* Try again; it could be a relative exit. */ 1114 /* Try again; it could be a relative exit. */
980 1115
981 path = path_combine_and_normalize(m->path, value); 1116 path = path_combine_and_normalize (m->path, value);
982 1117
983 if (check_path(path, 1) == -1) { 1118 if (check_path (path, 1) == -1)
1119 {
984 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); 1120 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
985 path = NULL; 1121 path = NULL;
986 } 1122 }
987 } 1123 }
988 1124
989 if (editor) { 1125 if (editor)
1126 {
990 /* Use the value as in the file. */ 1127 /* Use the value as in the file. */
991 m->tile_path[tile-1] = strdup_local(value); 1128 m->tile_path[tile - 1] = strdup_local (value);
992 } else if (path != NULL) {
993 /* Use the normalized value. */
994 m->tile_path[tile-1] = strdup_local(path);
995 } 1129 }
1130 else if (path != NULL)
1131 {
1132 /* Use the normalized value. */
1133 m->tile_path[tile - 1] = strdup_local (path);
1134 }
996 } /* end if tile direction (in)valid */ 1135 } /* end if tile direction (in)valid */
1136 }
1137 else
997 } 1138 {
998 else {
999 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value); 1139 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1000 } 1140 }
1001 } 1141 }
1002 if (!key || strcmp(key,"end")) { 1142 if (!key || strcmp (key, "end"))
1143 {
1003 LOG(llevError,"Got premature eof on map header!\n"); 1144 LOG (llevError, "Got premature eof on map header!\n");
1004 return 1; 1145 return 1;
1005 } 1146 }
1006 return 0; 1147 return 0;
1007} 1148}
1008 1149
1009/* 1150/*
1010 * Opens the file "filename" and reads information about the map 1151 * Opens the file "filename" and reads information about the map
1011 * from the given file, and stores it in a newly allocated 1152 * from the given file, and stores it in a newly allocated
1012 * mapstruct. A pointer to this structure is returned, or NULL on failure. 1153 * maptile. A pointer to this structure is returned, or NULL on failure.
1013 * flags correspond to those in map.h. Main ones used are 1154 * flags correspond to those in map.h. Main ones used are
1014 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and 1155 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1015 * MAP_BLOCK, in which case we block on this load. This happens in all 1156 * MAP_BLOCK, in which case we block on this load. This happens in all
1016 * cases, no matter if this flag is set or not. 1157 * cases, no matter if this flag is set or not.
1017 * MAP_STYLE: style map - don't add active objects, don't add to server 1158 * MAP_STYLE: style map - don't add active objects, don't add to server
1018 * managed map list. 1159 * managed map list.
1019 */ 1160 */
1020 1161
1162maptile *
1021mapstruct *load_original_map(const char *filename, int flags) { 1163load_original_map (const char *filename, int flags)
1022 FILE *fp; 1164{
1023 mapstruct *m; 1165 maptile *m;
1024 int comp;
1025 char pathname[MAX_BUF]; 1166 char pathname[MAX_BUF];
1026 1167
1027 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1028 if (flags & MAP_PLAYER_UNIQUE) 1168 if (flags & MAP_PLAYER_UNIQUE)
1029 strcpy(pathname, filename); 1169 strcpy (pathname, filename);
1030 else if (flags & MAP_OVERLAY) 1170 else if (flags & MAP_OVERLAY)
1031 strcpy(pathname, create_overlay_pathname(filename)); 1171 strcpy (pathname, create_overlay_pathname (filename));
1032 else 1172 else
1033 strcpy(pathname, create_pathname(filename)); 1173 strcpy (pathname, create_pathname (filename));
1034 1174
1035 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1175 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1036 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno));
1037 return (NULL);
1038 }
1039 1176
1040 object_thawer thawer (fp, filename); 1177 object_thawer thawer (pathname);
1041 1178
1179 if (!thawer)
1180 return 0;
1181
1042 m = get_linked_map(); 1182 m = get_linked_map ();
1043 1183
1044 strcpy (m->path, filename); 1184 strcpy (m->path, filename);
1045 if (load_map_header(thawer, m)) { 1185 if (load_map_header (thawer, m))
1186 {
1046 LOG(llevError,"Error loading map header for %s, flags=%d\n", 1187 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1047 filename, flags);
1048 delete_map(m); 1188 delete_map (m);
1049 return NULL; 1189 return NULL;
1050 } 1190 }
1051 1191
1052 allocate_map(m); 1192 m->allocate ();
1053 1193
1054 m->in_memory=MAP_LOADING; 1194 m->in_memory = MAP_LOADING;
1055 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE)); 1195 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1056 close_and_delete(fp, comp); 1196
1057 m->in_memory=MAP_IN_MEMORY; 1197 m->in_memory = MAP_IN_MEMORY;
1058 if (!MAP_DIFFICULTY(m)) 1198 if (!MAP_DIFFICULTY (m))
1059 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1199 MAP_DIFFICULTY (m) = calculate_difficulty (m);
1060 set_map_reset_time(m); 1200 set_map_reset_time (m);
1061 m->instantiate (); 1201 m->instantiate ();
1062 return (m); 1202 return (m);
1063} 1203}
1064 1204
1065/* 1205/*
1066 * Loads a map, which has been loaded earlier, from file. 1206 * Loads a map, which has been loaded earlier, from file.
1067 * Return the map object we load into (this can change from the passed 1207 * Return the map object we load into (this can change from the passed
1068 * option if we can't find the original map) 1208 * option if we can't find the original map)
1069 */ 1209 */
1070 1210
1071static mapstruct *load_temporary_map(mapstruct *m) { 1211static maptile *
1072 FILE *fp; 1212load_temporary_map (maptile *m)
1073 int comp; 1213{
1074 char buf[MAX_BUF]; 1214 char buf[MAX_BUF];
1075 1215
1076 if (!m->tmpname) { 1216 if (!m->tmpname)
1217 {
1077 LOG(llevError, "No temporary filename for map %s\n", m->path); 1218 LOG (llevError, "No temporary filename for map %s\n", m->path);
1078 strcpy(buf, m->path); 1219 strcpy (buf, m->path);
1079 delete_map(m); 1220 delete_map (m);
1080 m = load_original_map(buf, 0); 1221 m = load_original_map (buf, 0);
1081 if(m==NULL) return NULL; 1222 if (m == NULL)
1082 fix_auto_apply(m); /* Chests which open as default */
1083 return m;
1084 }
1085
1086 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) {
1087 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno));
1088 strcpy(buf, m->path);
1089 delete_map(m);
1090 m = load_original_map(buf, 0);
1091 if(m==NULL) return NULL;
1092 fix_auto_apply(m); /* Chests which open as default */
1093 return m;
1094 }
1095
1096 object_thawer thawer (fp, m->tmpname);
1097
1098 if (load_map_header(thawer, m)) {
1099 LOG(llevError,"Error loading map header for %s (%s)\n",
1100 m->path, m->tmpname);
1101 delete_map(m);
1102 m = load_original_map(m->path, 0);
1103 return NULL; 1223 return NULL;
1224 fix_auto_apply (m); /* Chests which open as default */
1225 return m;
1226 }
1227
1228 object_thawer thawer (m->tmpname);
1229
1230 if (!thawer)
1104 } 1231 {
1105 allocate_map(m); 1232 strcpy (buf, m->path);
1233 delete_map (m);
1234 m = load_original_map (buf, 0);
1235 if (!m)
1236 return NULL;
1237 fix_auto_apply (m); /* Chests which open as default */
1238 return m;
1239 }
1106 1240
1241 if (load_map_header (thawer, m))
1242 {
1243 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1244 delete_map (m);
1245 m = load_original_map (m->path, 0);
1246 return NULL;
1247 }
1248
1249 m->allocate ();
1250
1107 m->in_memory=MAP_LOADING; 1251 m->in_memory = MAP_LOADING;
1108 load_objects (m, thawer, 0); 1252 load_objects (m, thawer, 0);
1109 close_and_delete(fp, comp); 1253
1110 m->in_memory=MAP_IN_MEMORY; 1254 m->in_memory = MAP_IN_MEMORY;
1111 INVOKE_MAP (SWAPIN, m); 1255 INVOKE_MAP (SWAPIN, m);
1112 return m; 1256 return m;
1113} 1257}
1114 1258
1115/* 1259/*
1116 * Loads a map, which has been loaded earlier, from file. 1260 * Loads a map, which has been loaded earlier, from file.
1117 * Return the map object we load into (this can change from the passed 1261 * Return the map object we load into (this can change from the passed
1118 * option if we can't find the original map) 1262 * option if we can't find the original map)
1119 */ 1263 */
1120 1264
1265maptile *
1121mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1266load_overlay_map (const char *filename, maptile *m)
1122 FILE *fp; 1267{
1123 int comp;
1124 char pathname[MAX_BUF]; 1268 char pathname[MAX_BUF];
1125 1269
1126 strcpy(pathname, create_overlay_pathname(filename)); 1270 strcpy (pathname, create_overlay_pathname (filename));
1127 1271
1128 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1129/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/
1130 return m;
1131 }
1132
1133 object_thawer thawer (fp, pathname); 1272 object_thawer thawer (pathname);
1134
1135 if (load_map_header(thawer, m)) {
1136 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1137 m->path, pathname);
1138 delete_map(m);
1139 m = load_original_map(m->path, 0);
1140 return NULL;
1141 }
1142 /*allocate_map(m);*/
1143 1273
1144 m->in_memory=MAP_LOADING; 1274 if (!thawer)
1145 load_objects (m, thawer, MAP_OVERLAY);
1146 close_and_delete(fp, comp);
1147 m->in_memory=MAP_IN_MEMORY;
1148 return m; 1275 return m;
1276
1277 if (load_map_header (thawer, m))
1278 {
1279 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1280 delete_map (m);
1281 m = load_original_map (m->path, 0);
1282 return NULL;
1283 }
1284 /*m->allocate ();*/
1285
1286 m->in_memory = MAP_LOADING;
1287 load_objects (m, thawer, MAP_OVERLAY);
1288
1289 m->in_memory = MAP_IN_MEMORY;
1290 return m;
1149} 1291}
1150 1292
1151/****************************************************************************** 1293/******************************************************************************
1152 * This is the start of unique map handling code 1294 * This is the start of unique map handling code
1153 *****************************************************************************/ 1295 *****************************************************************************/
1154 1296
1155/* This goes through map 'm' and removed any unique items on the map. */ 1297/* This goes through map 'm' and removed any unique items on the map. */
1156static void delete_unique_items(mapstruct *m) 1298static void
1299delete_unique_items (maptile *m)
1157{ 1300{
1158 int i,j,unique; 1301 int i, j, unique;
1159 object *op, *next; 1302 object *op, *next;
1160 1303
1161 for(i=0; i<MAP_WIDTH(m); i++) 1304 for (i = 0; i < MAP_WIDTH (m); i++)
1162 for(j=0; j<MAP_HEIGHT(m); j++) { 1305 for (j = 0; j < MAP_HEIGHT (m); j++)
1306 {
1163 unique=0; 1307 unique = 0;
1164 for (op=get_map_ob(m, i, j); op; op=next) { 1308 for (op = get_map_ob (m, i, j); op; op = next)
1309 {
1165 next = op->above; 1310 next = op->above;
1166 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 1311 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1167 unique=1; 1312 unique = 1;
1168 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { 1313 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1314 {
1169 clean_object(op); 1315 clean_object (op);
1170 if (QUERY_FLAG(op, FLAG_IS_LINKED)) 1316 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1171 remove_button_link(op); 1317 remove_button_link (op);
1172 remove_ob(op); 1318 remove_ob (op);
1173 free_object(op); 1319 free_object (op);
1174 } 1320 }
1175 } 1321 }
1176 } 1322 }
1177} 1323}
1178 1324
1179 1325
1180/* 1326/*
1181 * Loads unique objects from file(s) into the map which is in memory 1327 * Loads unique objects from file(s) into the map which is in memory
1182 * m is the map to load unique items into. 1328 * m is the map to load unique items into.
1183 */ 1329 */
1184static void load_unique_objects(mapstruct *m) { 1330static void
1185 FILE *fp; 1331load_unique_objects (maptile *m)
1332{
1186 int comp,count; 1333 int count;
1187 char firstname[MAX_BUF]; 1334 char firstname[MAX_BUF];
1188 1335
1189 for (count=0; count<10; count++) { 1336 for (count = 0; count < 10; count++)
1337 {
1190 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1338 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1191 if (!access(firstname, R_OK)) break; 1339 if (!access (firstname, R_OK))
1340 break;
1192 } 1341 }
1193 /* If we get here, we did not find any map */ 1342 /* If we get here, we did not find any map */
1194 if (count==10) return; 1343 if (count == 10)
1195
1196 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) {
1197 /* There is no expectation that every map will have unique items, but this
1198 * is debug output, so leave it in.
1199 */
1200 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
1201 return; 1344 return;
1202 }
1203 1345
1204 object_thawer thawer (fp, firstname); 1346 object_thawer thawer (firstname);
1205 1347
1348 if (!thawer)
1349 return;
1350
1206 m->in_memory=MAP_LOADING; 1351 m->in_memory = MAP_LOADING;
1207 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1352 if (m->tmpname == NULL) /* if we have loaded unique items from */
1208 delete_unique_items(m); /* original map before, don't duplicate them */ 1353 delete_unique_items (m); /* original map before, don't duplicate them */
1209 load_object(thawer, NULL, LO_NOREAD,0);
1210 load_objects (m, thawer, 0); 1354 load_objects (m, thawer, 0);
1211 close_and_delete(fp, comp); 1355
1212 m->in_memory=MAP_IN_MEMORY; 1356 m->in_memory = MAP_IN_MEMORY;
1213} 1357}
1214 1358
1215 1359
1216/* 1360/*
1217 * Saves a map to file. If flag is set, it is saved into the same 1361 * Saves a map to file. If flag is set, it is saved into the same
1218 * file it was (originally) loaded from. Otherwise a temporary 1362 * file it was (originally) loaded from. Otherwise a temporary
1219 * filename will be genarated, and the file will be stored there. 1363 * filename will be genarated, and the file will be stored there.
1220 * The temporary filename will be stored in the mapstructure. 1364 * The temporary filename will be stored in the maptileure.
1221 * If the map is unique, we also save to the filename in the map 1365 * If the map is unique, we also save to the filename in the map
1222 * (this should have been updated when first loaded) 1366 * (this should have been updated when first loaded)
1223 */ 1367 */
1224 1368
1225int 1369int
1226new_save_map (mapstruct * m, int flag) 1370new_save_map (maptile *m, int flag)
1227{ 1371{
1228 char filename[MAX_BUF], buf[MAX_BUF], buf_s[MAX_BUF], shop[MAX_BUF]; 1372 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1229 int i; 1373 int i;
1230 1374
1231 if (flag && !*m->path) 1375 if (flag && !*m->path)
1232 { 1376 {
1233 LOG (llevError, "Tried to save map without path.\n"); 1377 LOG (llevError, "Tried to save map without path.\n");
… …
1235 } 1379 }
1236 1380
1237 if (flag || (m->unique) || (m->templatemap)) 1381 if (flag || (m->unique) || (m->templatemap))
1238 { 1382 {
1239 if (!m->unique && !m->templatemap) 1383 if (!m->unique && !m->templatemap)
1240 { /* flag is set */ 1384 { /* flag is set */
1241 if (flag == 2) 1385 if (flag == 2)
1242 strcpy (filename, create_overlay_pathname (m->path)); 1386 strcpy (filename, create_overlay_pathname (m->path));
1243 else 1387 else
1244 strcpy (filename, create_pathname (m->path)); 1388 strcpy (filename, create_pathname (m->path));
1245 } 1389 }
… …
1250 } 1394 }
1251 else 1395 else
1252 { 1396 {
1253 if (!m->tmpname) 1397 if (!m->tmpname)
1254 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1398 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1399
1255 strcpy (filename, m->tmpname); 1400 strcpy (filename, m->tmpname);
1256 } 1401 }
1257 1402
1258 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1403 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1259 m->in_memory = MAP_SAVING; 1404 m->in_memory = MAP_SAVING;
1260 1405
1261 object_freezer fp (filename); 1406 object_freezer freezer;
1262 1407
1263 /* legacy */ 1408 /* legacy */
1264 fprintf (fp, "arch map\n"); 1409 fprintf (freezer, "arch map\n");
1265 if (m->name) 1410 if (m->name)
1266 fprintf (fp, "name %s\n", m->name); 1411 fprintf (freezer, "name %s\n", m->name);
1267 if (!flag) 1412 if (!flag)
1268 fprintf (fp, "swap_time %d\n", m->swap_time); 1413 fprintf (freezer, "swap_time %d\n", m->swap_time);
1269 if (m->reset_timeout) 1414 if (m->reset_timeout)
1270 fprintf (fp, "reset_timeout %d\n", m->reset_timeout); 1415 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1271 if (m->fixed_resettime) 1416 if (m->fixed_resettime)
1272 fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime); 1417 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1273 /* we unfortunately have no idea if this is a value the creator set 1418 /* we unfortunately have no idea if this is a value the creator set
1274 * or a difficulty value we generated when the map was first loaded 1419 * or a difficulty value we generated when the map was first loaded
1275 */ 1420 */
1276 if (m->difficulty) 1421 if (m->difficulty)
1277 fprintf (fp, "difficulty %d\n", m->difficulty); 1422 fprintf (freezer, "difficulty %d\n", m->difficulty);
1278 if (m->region) 1423 if (m->region)
1279 fprintf (fp, "region %s\n", m->region->name); 1424 fprintf (freezer, "region %s\n", m->region->name);
1280 if (m->shopitems) 1425 if (m->shopitems)
1281 { 1426 {
1282 print_shop_string (m, shop); 1427 print_shop_string (m, shop);
1283 fprintf (fp, "shopitems %s\n", shop); 1428 fprintf (freezer, "shopitems %s\n", shop);
1284 } 1429 }
1285 if (m->shopgreed) 1430 if (m->shopgreed)
1286 fprintf (fp, "shopgreed %f\n", m->shopgreed); 1431 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1287#ifndef WIN32 1432#ifndef WIN32
1288 if (m->shopmin) 1433 if (m->shopmin)
1289 fprintf (fp, "shopmin %llu\n", m->shopmin); 1434 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1290 if (m->shopmax) 1435 if (m->shopmax)
1291 fprintf (fp, "shopmax %llu\n", m->shopmax); 1436 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1292#else 1437#else
1293 if (m->shopmin) 1438 if (m->shopmin)
1294 fprintf (fp, "shopmin %I64u\n", m->shopmin); 1439 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1295 if (m->shopmax) 1440 if (m->shopmax)
1296 fprintf (fp, "shopmax %I64u\n", m->shopmax); 1441 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1297#endif 1442#endif
1298 if (m->shoprace) 1443 if (m->shoprace)
1299 fprintf (fp, "shoprace %s\n", m->shoprace); 1444 fprintf (freezer, "shoprace %s\n", m->shoprace);
1300 if (m->darkness) 1445 if (m->darkness)
1301 fprintf (fp, "darkness %d\n", m->darkness); 1446 fprintf (freezer, "darkness %d\n", m->darkness);
1302 if (m->width) 1447 if (m->width)
1303 fprintf (fp, "width %d\n", m->width); 1448 fprintf (freezer, "width %d\n", m->width);
1304 if (m->height) 1449 if (m->height)
1305 fprintf (fp, "height %d\n", m->height); 1450 fprintf (freezer, "height %d\n", m->height);
1306 if (m->enter_x) 1451 if (m->enter_x)
1307 fprintf (fp, "enter_x %d\n", m->enter_x); 1452 fprintf (freezer, "enter_x %d\n", m->enter_x);
1308 if (m->enter_y) 1453 if (m->enter_y)
1309 fprintf (fp, "enter_y %d\n", m->enter_y); 1454 fprintf (freezer, "enter_y %d\n", m->enter_y);
1310 if (m->msg) 1455 if (m->msg)
1311 fprintf (fp, "msg\n%sendmsg\n", m->msg); 1456 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1312 if (m->maplore) 1457 if (m->maplore)
1313 fprintf (fp, "maplore\n%sendmaplore\n", m->maplore); 1458 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1314 if (m->unique) 1459 if (m->unique)
1315 fprintf (fp, "unique %d\n", m->unique); 1460 fprintf (freezer, "unique %d\n", m->unique);
1316 if (m->templatemap) 1461 if (m->templatemap)
1317 fprintf (fp, "template %d\n", m->templatemap); 1462 fprintf (freezer, "template %d\n", m->templatemap);
1318 if (m->outdoor) 1463 if (m->outdoor)
1319 fprintf (fp, "outdoor %d\n", m->outdoor); 1464 fprintf (freezer, "outdoor %d\n", m->outdoor);
1320 if (m->temp) 1465 if (m->temp)
1321 fprintf (fp, "temp %d\n", m->temp); 1466 fprintf (freezer, "temp %d\n", m->temp);
1322 if (m->pressure) 1467 if (m->pressure)
1323 fprintf (fp, "pressure %d\n", m->pressure); 1468 fprintf (freezer, "pressure %d\n", m->pressure);
1324 if (m->humid) 1469 if (m->humid)
1325 fprintf (fp, "humid %d\n", m->humid); 1470 fprintf (freezer, "humid %d\n", m->humid);
1326 if (m->windspeed) 1471 if (m->windspeed)
1327 fprintf (fp, "windspeed %d\n", m->windspeed); 1472 fprintf (freezer, "windspeed %d\n", m->windspeed);
1328 if (m->winddir) 1473 if (m->winddir)
1329 fprintf (fp, "winddir %d\n", m->winddir); 1474 fprintf (freezer, "winddir %d\n", m->winddir);
1330 if (m->sky) 1475 if (m->sky)
1331 fprintf (fp, "sky %d\n", m->sky); 1476 fprintf (freezer, "sky %d\n", m->sky);
1332 if (m->nosmooth) 1477 if (m->nosmooth)
1333 fprintf (fp, "nosmooth %d\n", m->nosmooth); 1478 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1334 if (m->safe_map)
1335 fprintf (fp, "safe_map %d\n", m->safe_map);
1336 1479
1337 /* Save any tiling information, except on overlays */ 1480 /* Save any tiling information, except on overlays */
1338 if (flag != 2) 1481 if (flag != 2)
1339 for (i = 0; i < 4; i++) 1482 for (i = 0; i < 4; i++)
1340 if (m->tile_path[i]) 1483 if (m->tile_path[i])
1341 fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]); 1484 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1342 1485
1343 fp.put (m); 1486 freezer.put (m);
1344 fprintf (fp, "end\n"); 1487 fprintf (freezer, "end\n");
1345 1488
1346 /* In the game save unique items in the different file, but 1489 /* In the game save unique items in the different file, but
1347 * in the editor save them to the normal map file. 1490 * in the editor save them to the normal map file.
1348 * If unique map, save files in the proper destination (set by 1491 * If unique map, save files in the proper destination (set by
1349 * player) 1492 * player)
1350 */ 1493 */
1351 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) 1494 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1352 { 1495 {
1496 object_freezer unique;
1497
1498 if (flag == 2)
1499 save_objects (m, freezer, unique, 2);
1500 else
1501 save_objects (m, freezer, unique, 0);
1502
1353 sprintf (buf, "%s.v00", create_items_path (m->path)); 1503 sprintf (buf, "%s.v00", create_items_path (m->path));
1354 1504
1355 object_freezer fp2 (buf); 1505 unique.save (buf);
1356
1357 if (flag == 2)
1358 save_objects (m, fp, fp2, 2);
1359 else
1360 save_objects (m, fp, fp2, 0);
1361 } 1506 }
1362 else 1507 else
1363 { /* save same file when not playing, like in editor */ 1508 { /* save same file when not playing, like in editor */
1364 save_objects (m, fp, fp, 0); 1509 save_objects (m, freezer, freezer, 0);
1365 } 1510 }
1511
1512 freezer.save (filename);
1366 1513
1367 return 0; 1514 return 0;
1368} 1515}
1369 1516
1370 1517
1371/* 1518/*
1372 * Remove and free all objects in the inventory of the given object. 1519 * Remove and free all objects in the inventory of the given object.
1373 * object.c ? 1520 * object.c ?
1374 */ 1521 */
1375 1522
1523void
1376void clean_object(object *op) 1524clean_object (object *op)
1377{ 1525{
1378 object *tmp, *next; 1526 object *tmp, *next;
1379 1527
1380 for(tmp = op->inv; tmp; tmp = next) 1528 for (tmp = op->inv; tmp; tmp = next)
1381 { 1529 {
1382 next = tmp->below; 1530 next = tmp->below;
1383 clean_object(tmp); 1531 clean_object (tmp);
1384 if (QUERY_FLAG(tmp, FLAG_IS_LINKED)) 1532 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1385 remove_button_link(tmp); 1533 remove_button_link (tmp);
1386 remove_ob(tmp); 1534 remove_ob (tmp);
1387 free_object(tmp); 1535 free_object (tmp);
1388 } 1536 }
1389} 1537}
1390 1538
1391/* 1539/*
1392 * Remove and free all objects in the given map. 1540 * Remove and free all objects in the given map.
1393 */ 1541 */
1394 1542
1543void
1395void free_all_objects(mapstruct *m) { 1544free_all_objects (maptile *m)
1545{
1396 int i,j; 1546 int i, j;
1397 object *op; 1547 object *op;
1398 1548
1399 for(i=0;i<MAP_WIDTH(m);i++) 1549 for (i = 0; i < MAP_WIDTH (m); i++)
1400 for(j=0;j<MAP_HEIGHT(m);j++) { 1550 for (j = 0; j < MAP_HEIGHT (m); j++)
1551 {
1401 object *previous_obj=NULL; 1552 object *previous_obj = NULL;
1553
1402 while((op=GET_MAP_OB(m,i,j))!=NULL) { 1554 while ((op = GET_MAP_OB (m, i, j)) != NULL)
1555 {
1403 if (op==previous_obj) { 1556 if (op == previous_obj)
1557 {
1404 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n"); 1558 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1405 break; 1559 break;
1406 } 1560 }
1407 previous_obj=op; 1561 previous_obj = op;
1408 if(op->head!=NULL) 1562 if (op->head != NULL)
1409 op = op->head; 1563 op = op->head;
1410 1564
1411 /* If the map isn't in memory, free_object will remove and 1565 /* If the map isn't in memory, free_object will remove and
1412 * free objects in op's inventory. So let it do the job. 1566 * free objects in op's inventory. So let it do the job.
1413 */ 1567 */
1414 if (m->in_memory==MAP_IN_MEMORY) 1568 if (m->in_memory == MAP_IN_MEMORY)
1415 clean_object(op); 1569 clean_object (op);
1416 remove_ob(op); 1570 remove_ob (op);
1417 free_object(op); 1571 free_object (op);
1418 } 1572 }
1419 } 1573 }
1420#ifdef MANY_CORES
1421 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
1422 * an item on that map was not saved - look for that condition and die as appropriate -
1423 * this leaves more of the map data intact for better debugging.
1424 */
1425 for (op=objects; op!=NULL; op=op->next) {
1426 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
1427 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
1428 abort();
1429 }
1430 }
1431#endif
1432} 1574}
1433 1575
1434/* 1576/*
1435 * Frees everything allocated by the given mapstructure. 1577 * Frees everything allocated by the given maptileure.
1436 * don't free tmpname - our caller is left to do that 1578 * don't free tmpname - our caller is left to do that
1437 */ 1579 */
1438 1580
1581void
1439void free_map(mapstruct *m,int flag) { 1582free_map (maptile *m, int flag)
1583{
1440 int i; 1584 int i;
1441 1585
1442 if (!m->in_memory) { 1586 if (!m->in_memory)
1587 {
1443 LOG(llevError,"Trying to free freed map.\n"); 1588 LOG (llevError, "Trying to free freed map.\n");
1444 return; 1589 return;
1445 } 1590 }
1446 if (flag && m->spaces) free_all_objects(m); 1591 if (flag && m->spaces)
1592 free_all_objects (m);
1593 if (m->name)
1447 if (m->name) FREE_AND_CLEAR(m->name); 1594 FREE_AND_CLEAR (m->name);
1595 if (m->spaces)
1448 if (m->spaces) FREE_AND_CLEAR(m->spaces); 1596 FREE_AND_CLEAR (m->spaces);
1597 if (m->msg)
1449 if (m->msg) FREE_AND_CLEAR(m->msg); 1598 FREE_AND_CLEAR (m->msg);
1599 if (m->maplore)
1450 if (m->maplore) FREE_AND_CLEAR(m->maplore); 1600 FREE_AND_CLEAR (m->maplore);
1451 if (m->shopitems) FREE_AND_CLEAR(m->shopitems); 1601 if (m->shopitems)
1602 delete[]m->shopitems;
1603 m->shopitems = 0;
1604 if (m->shoprace)
1452 if (m->shoprace) FREE_AND_CLEAR(m->shoprace); 1605 FREE_AND_CLEAR (m->shoprace);
1453 if (m->buttons) 1606 if (m->buttons)
1454 free_objectlinkpt(m->buttons); 1607 free_objectlinkpt (m->buttons);
1455 m->buttons = NULL; 1608 m->buttons = NULL;
1456 for (i=0; i<4; i++) { 1609 for (i = 0; i < 4; i++)
1610 {
1611 if (m->tile_path[i])
1457 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]); 1612 FREE_AND_CLEAR (m->tile_path[i]);
1458 m->tile_map[i] = NULL; 1613 m->tile_map[i] = NULL;
1459 } 1614 }
1460 m->in_memory = MAP_SWAPPED; 1615 m->in_memory = MAP_SWAPPED;
1461} 1616}
1462 1617
1463/* 1618/*
1464 * function: vanish mapstruct 1619 * function: vanish maptile
1465 * m : pointer to mapstruct, if NULL no action 1620 * m : pointer to maptile, if NULL no action
1466 * this deletes all the data on the map (freeing pointers) 1621 * this deletes all the data on the map (freeing pointers)
1467 * and then removes this map from the global linked list of maps. 1622 * and then removes this map from the global linked list of maps.
1468 */ 1623 */
1469 1624
1470void delete_map(mapstruct *m) { 1625void
1626delete_map (maptile *m)
1627{
1471 mapstruct *tmp, *last; 1628 maptile *tmp, *last;
1472 int i; 1629 int i;
1473 1630
1474 if (!m) 1631 if (!m)
1475 return; 1632 return;
1476 1633
1477 m->clear (); 1634 m->clear ();
1478 1635
1479 if (m->in_memory == MAP_IN_MEMORY) { 1636 if (m->in_memory == MAP_IN_MEMORY)
1637 {
1480 /* change to MAP_SAVING, even though we are not, 1638 /* change to MAP_SAVING, even though we are not,
1481 * so that remove_ob doesn't do as much work. 1639 * so that remove_ob doesn't do as much work.
1640 */
1641 m->in_memory = MAP_SAVING;
1642 free_map (m, 1);
1643 }
1644 /* move this out of free_map, since tmpname can still be needed if
1645 * the map is swapped out.
1646 */
1647 if (m->tmpname)
1648 {
1649 free (m->tmpname);
1650 m->tmpname = NULL;
1651 }
1652 last = NULL;
1653 /* We need to look through all the maps and see if any maps
1654 * are pointing at this one for tiling information. Since
1655 * tiling can be assymetric, we just can not look to see which
1656 * maps this map tiles with and clears those.
1657 */
1658 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1659 {
1660 if (tmp->next == m)
1661 last = tmp;
1662
1663 /* This should hopefully get unrolled on a decent compiler */
1664 for (i = 0; i < 4; i++)
1665 if (tmp->tile_map[i] == m)
1666 tmp->tile_map[i] = NULL;
1667 }
1668
1669 /* If last is null, then this should be the first map in the list */
1670 if (!last)
1671 {
1672 if (m == first_map)
1673 first_map = m->next;
1674 else
1675 /* m->path is a static char, so should hopefully still have
1676 * some useful data in it.
1482 */ 1677 */
1483 m->in_memory = MAP_SAVING;
1484 free_map (m, 1);
1485 }
1486 /* move this out of free_map, since tmpname can still be needed if
1487 * the map is swapped out.
1488 */
1489 if (m->tmpname) {
1490 free(m->tmpname);
1491 m->tmpname=NULL;
1492 }
1493 last = NULL;
1494 /* We need to look through all the maps and see if any maps
1495 * are pointing at this one for tiling information. Since
1496 * tiling can be assymetric, we just can not look to see which
1497 * maps this map tiles with and clears those.
1498 */
1499 for (tmp = first_map; tmp != NULL; tmp = tmp->next) {
1500 if (tmp->next == m) last = tmp;
1501
1502 /* This should hopefully get unrolled on a decent compiler */
1503 for (i=0; i<4; i++)
1504 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL;
1505 }
1506
1507 /* If last is null, then this should be the first map in the list */
1508 if (!last) {
1509 if (m == first_map)
1510 first_map = m->next;
1511 else
1512 /* m->path is a static char, so should hopefully still have
1513 * some useful data in it.
1514 */
1515 LOG(llevError,"delete_map: Unable to find map %s in list\n", 1678 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1516 m->path);
1517 } 1679 }
1518 else 1680 else
1519 last->next = m->next; 1681 last->next = m->next;
1520 1682
1521 free (m); 1683 delete m;
1522} 1684}
1523 1685
1524 1686
1525 1687
1526/* 1688/*
… …
1533 * dont do any more name translation on it. 1695 * dont do any more name translation on it.
1534 * 1696 *
1535 * Returns a pointer to the given map. 1697 * Returns a pointer to the given map.
1536 */ 1698 */
1537 1699
1700maptile *
1538mapstruct *ready_map_name(const char *name, int flags) { 1701ready_map_name (const char *name, int flags)
1539 mapstruct *m; 1702{
1703 maptile *m;
1540 1704
1541 if (!name) 1705 if (!name)
1542 return (NULL); 1706 return (NULL);
1543 1707
1544 /* Have we been at this level before? */ 1708 /* Have we been at this level before? */
1545 m = has_been_loaded (name); 1709 m = has_been_loaded (name);
1546 1710
1547 /* Map is good to go, so just return it */ 1711 /* Map is good to go, so just return it */
1548 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) { 1712 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1713 {
1549 return m; 1714 return m;
1550 } 1715 }
1551 1716
1552 /* unique maps always get loaded from their original location, and never 1717 /* unique maps always get loaded from their original location, and never
1553 * a temp location. Likewise, if map_flush is set, or we have never loaded 1718 * a temp location. Likewise, if map_flush is set, or we have never loaded
1554 * this map, load it now. I removed the reset checking from here - 1719 * this map, load it now. I removed the reset checking from here -
1555 * it seems the probability of a player trying to enter a map that should 1720 * it seems the probability of a player trying to enter a map that should
1556 * reset but hasn't yet is quite low, and removing that makes this function 1721 * reset but hasn't yet is quite low, and removing that makes this function
1557 * a bit cleaner (and players probably shouldn't rely on exact timing for 1722 * a bit cleaner (and players probably shouldn't rely on exact timing for
1558 * resets in any case - if they really care, they should use the 'maps command. 1723 * resets in any case - if they really care, they should use the 'maps command.
1559 */ 1724 */
1560 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) { 1725 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1726 {
1561 1727
1562 /* first visit or time to reset */ 1728 /* first visit or time to reset */
1563 if (m) { 1729 if (m)
1730 {
1564 clean_tmp_map(m); /* Doesn't make much difference */ 1731 clean_tmp_map (m); /* Doesn't make much difference */
1565 delete_map(m); 1732 delete_map (m);
1566 } 1733 }
1567 1734
1568 /* create and load a map */ 1735 /* create and load a map */
1569 if (flags & MAP_PLAYER_UNIQUE) 1736 if (flags & MAP_PLAYER_UNIQUE)
1570 LOG(llevDebug, "Trying to load map %s.\n", name); 1737 LOG (llevDebug, "Trying to load map %s.\n", name);
1571 else 1738 else
1572 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name)); 1739 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1573 1740
1741 //eval_pv ("$x = Event::time", 1);//D
1574 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE)))) 1742 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1575 return (NULL); 1743 return (NULL);
1744 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1576 1745
1577 fix_auto_apply(m); /* Chests which open as default */ 1746 fix_auto_apply (m); /* Chests which open as default */
1578 1747
1579 /* If a player unique map, no extra unique object file to load. 1748 /* If a player unique map, no extra unique object file to load.
1580 * if from the editor, likewise. 1749 * if from the editor, likewise.
1581 */ 1750 */
1582 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) 1751 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1583 load_unique_objects(m); 1752 load_unique_objects (m);
1584 1753
1585 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1754 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1755 {
1586 m=load_overlay_map(name, m); 1756 m = load_overlay_map (name, m);
1587 if (m==NULL) 1757 if (m == NULL)
1588 return NULL; 1758 return NULL;
1589 } 1759 }
1590 1760
1591 } else { 1761 if (flags & MAP_PLAYER_UNIQUE)
1762 INVOKE_MAP (SWAPIN, m);
1763
1764 }
1765 else
1766 {
1592 /* If in this loop, we found a temporary map, so load it up. */ 1767 /* If in this loop, we found a temporary map, so load it up. */
1593 1768
1594 m=load_temporary_map (m); 1769 m = load_temporary_map (m);
1770 if (m == NULL)
1595 if(m==NULL) return NULL; 1771 return NULL;
1596 load_unique_objects(m); 1772 load_unique_objects (m);
1597 1773
1598 clean_tmp_map(m); 1774 clean_tmp_map (m);
1599 m->in_memory = MAP_IN_MEMORY; 1775 m->in_memory = MAP_IN_MEMORY;
1600 /* tempnam() on sun systems (probably others) uses malloc 1776 /* tempnam() on sun systems (probably others) uses malloc
1601 * to allocated space for the string. Free it here. 1777 * to allocated space for the string. Free it here.
1602 * In some cases, load_temporary_map above won't find the 1778 * In some cases, load_temporary_map above won't find the
1603 * temporary map, and so has reloaded a new map. If that 1779 * temporary map, and so has reloaded a new map. If that
1604 * is the case, tmpname is now null 1780 * is the case, tmpname is now null
1605 */ 1781 */
1606 if (m->tmpname) free(m->tmpname); 1782 if (m->tmpname)
1783 free (m->tmpname);
1607 m->tmpname = NULL; 1784 m->tmpname = NULL;
1608 /* It's going to be saved anew anyway */ 1785 /* It's going to be saved anew anyway */
1609 } 1786 }
1610 1787
1611 /* Below here is stuff common to both first time loaded maps and 1788 /* Below here is stuff common to both first time loaded maps and
1612 * temp maps. 1789 * temp maps.
1613 */ 1790 */
1614 1791
1615 decay_objects(m); /* start the decay */ 1792 decay_objects (m); /* start the decay */
1616 /* In case other objects press some buttons down */ 1793 /* In case other objects press some buttons down */
1617 update_buttons(m); 1794 update_buttons (m);
1618 if (m->outdoor) 1795 if (m->outdoor)
1619 set_darkness_map(m); 1796 set_darkness_map (m);
1620 /* run the weather over this map */ 1797 /* run the weather over this map */
1621 weather_effect(name); 1798 weather_effect (name);
1622 return m; 1799 return m;
1623} 1800}
1624 1801
1625 1802
1626/* 1803/*
1627 * This routine is supposed to find out the difficulty of the map. 1804 * This routine is supposed to find out the difficulty of the map.
… …
1632 * in the map is zero, then use this routine. Maps should really 1809 * in the map is zero, then use this routine. Maps should really
1633 * have a difficulty set than using this function - human calculation 1810 * have a difficulty set than using this function - human calculation
1634 * is much better than this functions guesswork. 1811 * is much better than this functions guesswork.
1635 */ 1812 */
1636 1813
1814int
1637int calculate_difficulty(mapstruct *m) { 1815calculate_difficulty (maptile *m)
1816{
1638 object *op; 1817 object *op;
1639 archetype *at; 1818 archetype *at;
1640 int x, y, i, diff; 1819 int x, y, i;
1641 long monster_cnt = 0; 1820 long monster_cnt = 0;
1642 double avgexp = 0; 1821 double avgexp = 0;
1643 sint64 total_exp = 0; 1822 sint64 total_exp = 0;
1644 1823
1645 if (MAP_DIFFICULTY (m)) 1824 if (MAP_DIFFICULTY (m))
1646 { 1825 {
1647 LOG(llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1826 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1648 return MAP_DIFFICULTY (m); 1827 return MAP_DIFFICULTY (m);
1649 } 1828 }
1650 1829
1651 for(x = 0; x < MAP_WIDTH(m); x++) 1830 for (x = 0; x < MAP_WIDTH (m); x++)
1652 for(y = 0; y < MAP_HEIGHT(m); y++) 1831 for (y = 0; y < MAP_HEIGHT (m); y++)
1653 for(op = get_map_ob(m, x, y); op != NULL; op = op->above) 1832 for (op = get_map_ob (m, x, y); op != NULL; op = op->above)
1654 { 1833 {
1655 if(QUERY_FLAG (op, FLAG_MONSTER)) 1834 if (QUERY_FLAG (op, FLAG_MONSTER))
1656 { 1835 {
1657 total_exp += op->stats.exp; 1836 total_exp += op->stats.exp;
1658 monster_cnt++; 1837 monster_cnt++;
1659 } 1838 }
1660 1839
1661 if(QUERY_FLAG (op, FLAG_GENERATOR)) 1840 if (QUERY_FLAG (op, FLAG_GENERATOR))
1662 { 1841 {
1663 total_exp += op->stats.exp; 1842 total_exp += op->stats.exp;
1664 at = type_to_archetype(GENERATE_TYPE (op)); 1843 at = type_to_archetype (GENERATE_TYPE (op));
1665 1844
1666 if(at != NULL) 1845 if (at != NULL)
1667 total_exp += at->clone.stats.exp * 8; 1846 total_exp += at->clone.stats.exp * 8;
1668 1847
1669 monster_cnt++; 1848 monster_cnt++;
1670 } 1849 }
1671 } 1850 }
… …
1682 } 1861 }
1683 1862
1684 return 1; 1863 return 1;
1685} 1864}
1686 1865
1687void clean_tmp_map(mapstruct *m) { 1866void
1867clean_tmp_map (maptile *m)
1868{
1688 if(m->tmpname == NULL) 1869 if (m->tmpname == NULL)
1689 return; 1870 return;
1690 INVOKE_MAP (CLEAN, m); 1871 INVOKE_MAP (CLEAN, m);
1691 (void) unlink(m->tmpname); 1872 (void) unlink (m->tmpname);
1692} 1873}
1693 1874
1875void
1694void free_all_maps(void) 1876free_all_maps (void)
1695{ 1877{
1696 int real_maps=0; 1878 int real_maps = 0;
1697 1879
1698 while (first_map) { 1880 while (first_map)
1881 {
1699 /* I think some of the callers above before it gets here set this to be 1882 /* I think some of the callers above before it gets here set this to be
1700 * saving, but we still want to free this data 1883 * saving, but we still want to free this data
1701 */ 1884 */
1702 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY; 1885 if (first_map->in_memory == MAP_SAVING)
1886 first_map->in_memory = MAP_IN_MEMORY;
1703 delete_map(first_map); 1887 delete_map (first_map);
1704 real_maps++; 1888 real_maps++;
1705 } 1889 }
1706 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps); 1890 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1707} 1891}
1708 1892
1709/* change_map_light() - used to change map light level (darkness) 1893/* change_map_light() - used to change map light level (darkness)
1710 * up or down. Returns true if successful. It should now be 1894 * up or down. Returns true if successful. It should now be
1711 * possible to change a value by more than 1. 1895 * possible to change a value by more than 1.
1712 * Move this from los.c to map.c since this is more related 1896 * Move this from los.c to map.c since this is more related
1713 * to maps than los. 1897 * to maps than los.
1714 * postive values make it darker, negative make it brighter 1898 * postive values make it darker, negative make it brighter
1715 */ 1899 */
1716 1900
1901int
1717int change_map_light(mapstruct *m, int change) { 1902change_map_light (maptile *m, int change)
1903{
1718 int new_level = m->darkness + change; 1904 int new_level = m->darkness + change;
1719 1905
1720 /* Nothing to do */ 1906 /* Nothing to do */
1721 if(!change || (new_level <= 0 && m->darkness == 0) || 1907 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS))
1722 (new_level >= MAX_DARKNESS && m->darkness >=MAX_DARKNESS)) { 1908 {
1723 return 0; 1909 return 0;
1724 } 1910 }
1725 1911
1726 /* inform all players on the map */ 1912 /* inform all players on the map */
1727 if (change>0) 1913 if (change > 0)
1728 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker."); 1914 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker.");
1729 else 1915 else
1730 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); 1916 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter.");
1731 1917
1732 /* Do extra checking. since m->darkness is a unsigned value, 1918 /* Do extra checking. since m->darkness is a unsigned value,
1733 * we need to be extra careful about negative values. 1919 * we need to be extra careful about negative values.
1734 * In general, the checks below are only needed if change 1920 * In general, the checks below are only needed if change
1735 * is not +/-1 1921 * is not +/-1
1736 */ 1922 */
1737 if (new_level < 0) m->darkness = 0; 1923 if (new_level < 0)
1738 else if (new_level >=MAX_DARKNESS) m->darkness = MAX_DARKNESS; 1924 m->darkness = 0;
1925 else if (new_level >= MAX_DARKNESS)
1926 m->darkness = MAX_DARKNESS;
1927 else
1739 else m->darkness=new_level; 1928 m->darkness = new_level;
1740 1929
1741 /* All clients need to get re-updated for the change */ 1930 /* All clients need to get re-updated for the change */
1742 update_all_map_los(m); 1931 update_all_map_los (m);
1743 return 1; 1932 return 1;
1744} 1933}
1745 1934
1746 1935
1747/* 1936/*
1748 * This function updates various attributes about a specific space 1937 * This function updates various attributes about a specific space
1749 * on the map (what it looks like, whether it blocks magic, 1938 * on the map (what it looks like, whether it blocks magic,
1750 * has a living creatures, prevents people from passing 1939 * has a living creatures, prevents people from passing
1751 * through, etc) 1940 * through, etc)
1752 */ 1941 */
1942void
1753void update_position (mapstruct *m, int x, int y) { 1943update_position (maptile *m, int x, int y)
1944{
1754 object *tmp, *last = NULL; 1945 object *tmp, *last = NULL;
1755 uint8 flags = 0, oldflags, light=0, anywhere=0; 1946 uint8 flags = 0, oldflags, light = 0, anywhere = 0;
1756 New_Face *top,*floor, *middle; 1947 New_Face *top, *floor, *middle;
1757 object *top_obj, *floor_obj, *middle_obj; 1948 object *top_obj, *floor_obj, *middle_obj;
1758 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0; 1949 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1759 1950
1760 oldflags = GET_MAP_FLAGS(m,x,y); 1951 oldflags = GET_MAP_FLAGS (m, x, y);
1761 if (!(oldflags & P_NEED_UPDATE)) { 1952 if (!(oldflags & P_NEED_UPDATE))
1953 {
1762 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", 1954 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1763 m->path, x, y);
1764 return; 1955 return;
1765 } 1956 }
1766 1957
1767 middle=blank_face; 1958 middle = blank_face;
1768 top=blank_face; 1959 top = blank_face;
1769 floor=blank_face; 1960 floor = blank_face;
1770 1961
1771 middle_obj = NULL; 1962 middle_obj = NULL;
1772 top_obj = NULL; 1963 top_obj = NULL;
1773 floor_obj = NULL; 1964 floor_obj = NULL;
1774 1965
1775 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { 1966 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above)
1967 {
1776 1968
1777 /* This could be made additive I guess (two lights better than 1969 /* This could be made additive I guess (two lights better than
1778 * one). But if so, it shouldn't be a simple additive - 2 1970 * one). But if so, it shouldn't be a simple additive - 2
1779 * light bulbs do not illuminate twice as far as once since 1971 * light bulbs do not illuminate twice as far as once since
1780 * it is a disapation factor that is squared (or is it cubed?) 1972 * it is a disapation factor that is squared (or is it cubed?)
1781 */ 1973 */
1782 if (tmp->glow_radius > light) light = tmp->glow_radius; 1974 if (tmp->glow_radius > light)
1975 light = tmp->glow_radius;
1783 1976
1784 /* This call is needed in order to update objects the player 1977 /* This call is needed in order to update objects the player
1785 * is standing in that have animations (ie, grass, fire, etc). 1978 * is standing in that have animations (ie, grass, fire, etc).
1786 * However, it also causes the look window to be re-drawn 1979 * However, it also causes the look window to be re-drawn
1787 * 3 times each time the player moves, because many of the 1980 * 3 times each time the player moves, because many of the
1788 * functions the move_player calls eventualy call this. 1981 * functions the move_player calls eventualy call this.
1789 * 1982 *
1790 * Always put the player down for drawing. 1983 * Always put the player down for drawing.
1791 */ 1984 */
1792 if (!tmp->invisible) { 1985 if (!tmp->invisible)
1986 {
1793 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { 1987 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1988 {
1794 top = tmp->face; 1989 top = tmp->face;
1795 top_obj = tmp; 1990 top_obj = tmp;
1796 } 1991 }
1797 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { 1992 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1993 {
1798 /* If we got a floor, that means middle and top were below it, 1994 /* If we got a floor, that means middle and top were below it,
1799 * so should not be visible, so we clear them. 1995 * so should not be visible, so we clear them.
1800 */ 1996 */
1801 middle=blank_face; 1997 middle = blank_face;
1802 top=blank_face; 1998 top = blank_face;
1803 floor = tmp->face; 1999 floor = tmp->face;
1804 floor_obj = tmp; 2000 floor_obj = tmp;
1805 } 2001 }
1806 /* Flag anywhere have high priority */ 2002 /* Flag anywhere have high priority */
1807 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { 2003 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
2004 {
1808 middle = tmp->face; 2005 middle = tmp->face;
1809 2006
1810 middle_obj = tmp; 2007 middle_obj = tmp;
1811 anywhere =1; 2008 anywhere = 1;
1812 } 2009 }
1813 /* Find the highest visible face around. If equal 2010 /* Find the highest visible face around. If equal
1814 * visibilities, we still want the one nearer to the 2011 * visibilities, we still want the one nearer to the
1815 * top 2012 * top
1816 */ 2013 */
1817 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { 2014 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere))
2015 {
1818 middle = tmp->face; 2016 middle = tmp->face;
1819 middle_obj = tmp; 2017 middle_obj = tmp;
1820 } 2018 }
1821 } 2019 }
1822 if (tmp==tmp->above) { 2020 if (tmp == tmp->above)
2021 {
1823 LOG(llevError, "Error in structure of map\n"); 2022 LOG (llevError, "Error in structure of map\n");
1824 exit (-1); 2023 exit (-1);
1825 }
1826 2024 }
2025
1827 move_slow |= tmp->move_slow; 2026 move_slow |= tmp->move_slow;
1828 move_block |= tmp->move_block; 2027 move_block |= tmp->move_block;
1829 move_on |= tmp->move_on; 2028 move_on |= tmp->move_on;
1830 move_off |= tmp->move_off; 2029 move_off |= tmp->move_off;
1831 move_allow |= tmp->move_allow; 2030 move_allow |= tmp->move_allow;
1832 2031
1833 if (QUERY_FLAG(tmp,FLAG_ALIVE)) 2032 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1834 flags |= P_IS_ALIVE; 2033 flags |= P_IS_ALIVE;
1835 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 2034 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1836 flags |= P_NO_MAGIC; 2035 flags |= P_NO_MAGIC;
1837 if (QUERY_FLAG(tmp,FLAG_DAMNED)) 2036 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1838 flags |= P_NO_CLERIC; 2037 flags |= P_NO_CLERIC;
1839 if (tmp->type == SAFE_GROUND) 2038 if (tmp->type == SAFE_GROUND)
1840 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC; 2039 flags |= P_SAFE;
1841 2040
1842 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 2041 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))
1843 flags |= P_BLOCKSVIEW; 2042 flags |= P_BLOCKSVIEW;
1844 } /* for stack of objects */ 2043 } /* for stack of objects */
1845 2044
1846 /* we don't want to rely on this function to have accurate flags, but 2045 /* we don't want to rely on this function to have accurate flags, but
1847 * since we're already doing the work, we calculate them here. 2046 * since we're already doing the work, we calculate them here.
1848 * if they don't match, logic is broken someplace. 2047 * if they don't match, logic is broken someplace.
1849 */ 2048 */
1850 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) && 2049 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1851 (!(oldflags & P_NO_ERROR))) { 2050 {
1852 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 2051 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1853 m->path, x, y,
1854 (oldflags & ~P_NEED_UPDATE), flags); 2052 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
1855 } 2053 }
1856 SET_MAP_FLAGS(m, x, y, flags); 2054 SET_MAP_FLAGS (m, x, y, flags);
1857 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow); 2055 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow);
1858 SET_MAP_MOVE_ON(m, x, y, move_on); 2056 SET_MAP_MOVE_ON (m, x, y, move_on);
1859 SET_MAP_MOVE_OFF(m, x, y, move_off); 2057 SET_MAP_MOVE_OFF (m, x, y, move_off);
1860 SET_MAP_MOVE_SLOW(m, x, y, move_slow); 2058 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
1861 2059
1862 /* At this point, we have a floor face (if there is a floor), 2060 /* At this point, we have a floor face (if there is a floor),
1863 * and the floor is set - we are not going to touch it at 2061 * and the floor is set - we are not going to touch it at
1864 * this point. 2062 * this point.
1865 * middle contains the highest visibility face. 2063 * middle contains the highest visibility face.
1866 * top contains a player/monster face, if there is one. 2064 * top contains a player/monster face, if there is one.
1867 * 2065 *
1868 * We now need to fill in top.face and/or middle.face. 2066 * We now need to fill in top.face and/or middle.face.
1869 */ 2067 */
1870 2068
1871 /* If the top face also happens to be high visibility, re-do our 2069 /* If the top face also happens to be high visibility, re-do our
1872 * middle face. This should not happen, as we already have the 2070 * middle face. This should not happen, as we already have the
1873 * else statement above so middle should not get set. OTOH, it 2071 * else statement above so middle should not get set. OTOH, it
1874 * may be possible for the faces to match but be different objects. 2072 * may be possible for the faces to match but be different objects.
1875 */ 2073 */
1876 if (top == middle) middle=blank_face; 2074 if (top == middle)
2075 middle = blank_face;
1877 2076
1878 /* There are three posibilities at this point: 2077 /* There are three posibilities at this point:
1879 * 1) top face is set, need middle to be set. 2078 * 1) top face is set, need middle to be set.
1880 * 2) middle is set, need to set top. 2079 * 2) middle is set, need to set top.
1881 * 3) neither middle or top is set - need to set both. 2080 * 3) neither middle or top is set - need to set both.
1882 */ 2081 */
1883 2082
1884 for (tmp=last; tmp; tmp=tmp->below) { 2083 for (tmp = last; tmp; tmp = tmp->below)
2084 {
1885 /* Once we get to a floor, stop, since we already have a floor object */ 2085 /* Once we get to a floor, stop, since we already have a floor object */
1886 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; 2086 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2087 break;
1887 2088
1888 /* If two top faces are already set, quit processing */ 2089 /* If two top faces are already set, quit processing */
1889 if ((top != blank_face) && (middle != blank_face)) break; 2090 if ((top != blank_face) && (middle != blank_face))
2091 break;
1890 2092
1891 /* Only show visible faces, unless its the editor - show all */ 2093 /* Only show visible faces, unless its the editor - show all */
1892 if (!tmp->invisible || editor) { 2094 if (!tmp->invisible || editor)
2095 {
1893 /* Fill in top if needed */ 2096 /* Fill in top if needed */
1894 if (top == blank_face) { 2097 if (top == blank_face)
2098 {
1895 top = tmp->face; 2099 top = tmp->face;
1896 top_obj = tmp; 2100 top_obj = tmp;
2101 if (top == middle)
1897 if (top == middle) middle=blank_face; 2102 middle = blank_face;
2103 }
1898 } else { 2104 else
2105 {
1899 /* top is already set - we should only get here if 2106 /* top is already set - we should only get here if
1900 * middle is not set 2107 * middle is not set
1901 * 2108 *
1902 * Set the middle face and break out, since there is nothing 2109 * Set the middle face and break out, since there is nothing
1903 * more to fill in. We don't check visiblity here, since 2110 * more to fill in. We don't check visiblity here, since
1904 * 2111 *
1905 */ 2112 */
1906 if (tmp->face != top ) { 2113 if (tmp->face != top)
2114 {
1907 middle = tmp->face; 2115 middle = tmp->face;
1908 middle_obj = tmp; 2116 middle_obj = tmp;
1909 break; 2117 break;
1910 } 2118 }
1911 } 2119 }
1912 } 2120 }
1913 } 2121 }
1914 if (middle == floor) middle = blank_face; 2122 if (middle == floor)
1915 if (top == middle) middle = blank_face; 2123 middle = blank_face;
2124 if (top == middle)
2125 middle = blank_face;
1916 SET_MAP_FACE(m,x,y,top,0); 2126 SET_MAP_FACE (m, x, y, top, 0);
1917 if(top != blank_face) 2127 if (top != blank_face)
1918 SET_MAP_FACE_OBJ(m,x,y,top_obj,0); 2128 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
1919 else 2129 else
1920 SET_MAP_FACE_OBJ(m,x,y,NULL,0); 2130 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
1921 SET_MAP_FACE(m,x,y,middle,1); 2131 SET_MAP_FACE (m, x, y, middle, 1);
1922 if(middle != blank_face) 2132 if (middle != blank_face)
1923 SET_MAP_FACE_OBJ(m,x,y,middle_obj,1); 2133 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
1924 else 2134 else
1925 SET_MAP_FACE_OBJ(m,x,y,NULL,1); 2135 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
1926 SET_MAP_FACE(m,x,y,floor,2); 2136 SET_MAP_FACE (m, x, y, floor, 2);
1927 if(floor != blank_face) 2137 if (floor != blank_face)
1928 SET_MAP_FACE_OBJ(m,x,y,floor_obj,2); 2138 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
1929 else 2139 else
1930 SET_MAP_FACE_OBJ(m,x,y,NULL,2); 2140 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
1931 SET_MAP_LIGHT(m,x,y,light); 2141 SET_MAP_LIGHT (m, x, y, light);
1932} 2142}
1933 2143
1934 2144
2145void
1935void set_map_reset_time(mapstruct *map) { 2146set_map_reset_time (maptile *map)
2147{
1936 int timeout; 2148 int timeout;
1937 2149
1938 timeout = MAP_RESET_TIMEOUT(map); 2150 timeout = MAP_RESET_TIMEOUT (map);
1939 if (timeout <= 0) 2151 if (timeout <= 0)
1940 timeout = MAP_DEFAULTRESET; 2152 timeout = MAP_DEFAULTRESET;
1941 if (timeout >= MAP_MAXRESET) 2153 if (timeout >= MAP_MAXRESET)
1942 timeout = MAP_MAXRESET; 2154 timeout = MAP_MAXRESET;
1943 MAP_WHEN_RESET(map) = seconds()+timeout; 2155 MAP_WHEN_RESET (map) = seconds () + timeout;
1944} 2156}
1945 2157
1946/* this updates the orig_map->tile_map[tile_num] value after loading 2158/* this updates the orig_map->tile_map[tile_num] value after loading
1947 * the map. It also takes care of linking back the freshly loaded 2159 * the map. It also takes care of linking back the freshly loaded
1948 * maps tile_map values if it tiles back to this one. It returns 2160 * maps tile_map values if it tiles back to this one. It returns
1949 * the value of orig_map->tile_map[tile_num]. It really only does this 2161 * the value of orig_map->tile_map[tile_num]. It really only does this
1950 * so that it is easier for calling functions to verify success. 2162 * so that it is easier for calling functions to verify success.
1951 */ 2163 */
1952 2164
2165static maptile *
1953static mapstruct *load_and_link_tiled_map(mapstruct *orig_map, int tile_num) 2166load_and_link_tiled_map (maptile *orig_map, int tile_num)
1954{ 2167{
1955 int dest_tile = (tile_num +2) % 4; 2168 int dest_tile = (tile_num + 2) % 4;
1956 char *path = path_combine_and_normalize(orig_map->path, orig_map->tile_path[tile_num]); 2169 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1957 2170
1958 orig_map->tile_map[tile_num] = ready_map_name(path, 0); 2171 orig_map->tile_map[tile_num] = ready_map_name (path, 0);
1959 2172
1960 /* need to do a strcmp here as the orig_map->path is not a shared string */ 2173 /* need to do a strcmp here as the orig_map->path is not a shared string */
1961 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && 2174 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1962 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1963 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 2175 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1964 2176
1965 return orig_map->tile_map[tile_num]; 2177 return orig_map->tile_map[tile_num];
1966} 2178}
1967 2179
1968/* this returns TRUE if the coordinates (x,y) are out of 2180/* this returns TRUE if the coordinates (x,y) are out of
1969 * map m. This function also takes into account any 2181 * map m. This function also takes into account any
1970 * tiling considerations, loading adjacant maps as needed. 2182 * tiling considerations, loading adjacant maps as needed.
… …
1973 * This function will recursively call itself for the 2185 * This function will recursively call itself for the
1974 * tiled maps. 2186 * tiled maps.
1975 * 2187 *
1976 * 2188 *
1977 */ 2189 */
2190int
1978int out_of_map(mapstruct *m, int x, int y) 2191out_of_map (maptile *m, int x, int y)
1979{ 2192{
1980 2193
1981 /* If we get passed a null map, this is obviously the 2194 /* If we get passed a null map, this is obviously the
1982 * case. This generally shouldn't happen, but if the 2195 * case. This generally shouldn't happen, but if the
1983 * map loads fail below, it could happen. 2196 * map loads fail below, it could happen.
1984 */ 2197 */
1985 if (!m) return 0; 2198 if (!m)
1986
1987 if (x<0) {
1988 if (!m->tile_path[3]) return 1;
1989 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1990 load_and_link_tiled_map(m, 3);
1991 }
1992 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y));
1993 }
1994 if (x>=MAP_WIDTH(m)) {
1995 if (!m->tile_path[1]) return 1;
1996 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) {
1997 load_and_link_tiled_map(m, 1);
1998 }
1999 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y));
2000 }
2001 if (y<0) {
2002 if (!m->tile_path[0]) return 1;
2003 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) {
2004 load_and_link_tiled_map(m, 0);
2005 }
2006 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0])));
2007 }
2008 if (y>=MAP_HEIGHT(m)) {
2009 if (!m->tile_path[2]) return 1;
2010 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
2011 load_and_link_tiled_map(m, 2);
2012 }
2013 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
2014 }
2015
2016 /* Simple case - coordinates are within this local
2017 * map.
2018 */
2019 return 0; 2199 return 0;
2200
2201 if (x < 0)
2202 {
2203 if (!m->tile_path[3])
2204 return 1;
2205 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2206 {
2207 load_and_link_tiled_map (m, 3);
2208 }
2209 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));
2210 }
2211 if (x >= MAP_WIDTH (m))
2212 {
2213 if (!m->tile_path[1])
2214 return 1;
2215 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2216 {
2217 load_and_link_tiled_map (m, 1);
2218 }
2219 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));
2220 }
2221 if (y < 0)
2222 {
2223 if (!m->tile_path[0])
2224 return 1;
2225 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2226 {
2227 load_and_link_tiled_map (m, 0);
2228 }
2229 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));
2230 }
2231 if (y >= MAP_HEIGHT (m))
2232 {
2233 if (!m->tile_path[2])
2234 return 1;
2235 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2236 {
2237 load_and_link_tiled_map (m, 2);
2238 }
2239 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));
2240 }
2241
2242 /* Simple case - coordinates are within this local
2243 * map.
2244 */
2245 return 0;
2020} 2246}
2021 2247
2022/* This is basically the same as out_of_map above, but 2248/* This is basically the same as out_of_map above, but
2023 * instead we return NULL if no map is valid (coordinates 2249 * instead we return NULL if no map is valid (coordinates
2024 * out of bounds and no tiled map), otherwise it returns 2250 * out of bounds and no tiled map), otherwise it returns
2025 * the map as that the coordinates are really on, and 2251 * the map as that the coordinates are really on, and
2026 * updates x and y to be the localized coordinates. 2252 * updates x and y to be the localized coordinates.
2027 * Using this is more efficient of calling out_of_map 2253 * Using this is more efficient of calling out_of_map
2028 * and then figuring out what the real map is 2254 * and then figuring out what the real map is
2029 */ 2255 */
2256maptile *
2030mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 2257get_map_from_coord (maptile *m, sint16 * x, sint16 * y)
2031{ 2258{
2032 2259
2033 if (*x<0) { 2260 if (*x < 0)
2261 {
2034 if (!m->tile_path[3]) return NULL; 2262 if (!m->tile_path[3])
2263 return NULL;
2035 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2264 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2036 load_and_link_tiled_map(m, 3); 2265 load_and_link_tiled_map (m, 3);
2037 2266
2038 *x += MAP_WIDTH(m->tile_map[3]); 2267 *x += MAP_WIDTH (m->tile_map[3]);
2039 return (get_map_from_coord(m->tile_map[3], x, y)); 2268 return (get_map_from_coord (m->tile_map[3], x, y));
2040 } 2269 }
2041 if (*x>=MAP_WIDTH(m)) { 2270 if (*x >= MAP_WIDTH (m))
2271 {
2042 if (!m->tile_path[1]) return NULL; 2272 if (!m->tile_path[1])
2273 return NULL;
2043 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2274 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2044 load_and_link_tiled_map(m, 1); 2275 load_and_link_tiled_map (m, 1);
2045 2276
2046 *x -= MAP_WIDTH(m); 2277 *x -= MAP_WIDTH (m);
2047 return (get_map_from_coord(m->tile_map[1], x, y)); 2278 return (get_map_from_coord (m->tile_map[1], x, y));
2279 }
2280 if (*y < 0)
2048 } 2281 {
2049 if (*y<0) {
2050 if (!m->tile_path[0]) return NULL; 2282 if (!m->tile_path[0])
2283 return NULL;
2051 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2284 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2052 load_and_link_tiled_map(m, 0); 2285 load_and_link_tiled_map (m, 0);
2053 2286
2054 *y += MAP_HEIGHT(m->tile_map[0]); 2287 *y += MAP_HEIGHT (m->tile_map[0]);
2055 return (get_map_from_coord(m->tile_map[0], x, y)); 2288 return (get_map_from_coord (m->tile_map[0], x, y));
2056 } 2289 }
2057 if (*y>=MAP_HEIGHT(m)) { 2290 if (*y >= MAP_HEIGHT (m))
2291 {
2058 if (!m->tile_path[2]) return NULL; 2292 if (!m->tile_path[2])
2293 return NULL;
2059 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2294 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2060 load_and_link_tiled_map(m, 2); 2295 load_and_link_tiled_map (m, 2);
2061 2296
2062 *y -= MAP_HEIGHT(m); 2297 *y -= MAP_HEIGHT (m);
2063 return (get_map_from_coord(m->tile_map[2], x, y)); 2298 return (get_map_from_coord (m->tile_map[2], x, y));
2064 } 2299 }
2065 2300
2066 /* Simple case - coordinates are within this local 2301 /* Simple case - coordinates are within this local
2067 * map. 2302 * map.
2068 */ 2303 */
2069 2304
2070 return m; 2305 return m;
2071} 2306}
2072 2307
2073/** 2308/**
2074 * Return whether map2 is adjacent to map1. If so, store the distance from 2309 * Return whether map2 is adjacent to map1. If so, store the distance from
2075 * map1 to map2 in dx/dy. 2310 * map1 to map2 in dx/dy.
2076 */ 2311 */
2312static int
2077static int adjacent_map(const mapstruct *map1, const mapstruct *map2, int *dx, int *dy) { 2313adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
2314{
2078 if (!map1 || !map2) 2315 if (!map1 || !map2)
2079 return 0; 2316 return 0;
2080 2317
2081 if (map1 == map2) { 2318 if (map1 == map2)
2319 {
2082 *dx = 0; 2320 *dx = 0;
2083 *dy = 0; 2321 *dy = 0;
2084 2322
2323 }
2085 } else if (map1->tile_map[0] == map2) { /* up */ 2324 else if (map1->tile_map[0] == map2)
2325 { /* up */
2086 *dx = 0; 2326 *dx = 0;
2087 *dy = -MAP_HEIGHT(map2); 2327 *dy = -MAP_HEIGHT (map2);
2328 }
2088 } else if (map1->tile_map[1] == map2) { /* right */ 2329 else if (map1->tile_map[1] == map2)
2330 { /* right */
2089 *dx = MAP_WIDTH(map1); 2331 *dx = MAP_WIDTH (map1);
2090 *dy = 0; 2332 *dy = 0;
2333 }
2091 } else if (map1->tile_map[2] == map2) { /* down */ 2334 else if (map1->tile_map[2] == map2)
2335 { /* down */
2092 *dx = 0; 2336 *dx = 0;
2093 *dy = MAP_HEIGHT(map1); 2337 *dy = MAP_HEIGHT (map1);
2338 }
2094 } else if (map1->tile_map[3] == map2) { /* left */ 2339 else if (map1->tile_map[3] == map2)
2340 { /* left */
2095 *dx = -MAP_WIDTH(map2); 2341 *dx = -MAP_WIDTH (map2);
2096 *dy = 0; 2342 *dy = 0;
2097 2343
2344 }
2098 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) { /* up right */ 2345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2346 { /* up right */
2099 *dx = MAP_WIDTH(map1->tile_map[0]); 2347 *dx = MAP_WIDTH (map1->tile_map[0]);
2100 *dy = -MAP_HEIGHT(map1->tile_map[0]); 2348 *dy = -MAP_HEIGHT (map1->tile_map[0]);
2349 }
2101 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) { /* up left */ 2350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2351 { /* up left */
2102 *dx = -MAP_WIDTH(map2); 2352 *dx = -MAP_WIDTH (map2);
2103 *dy = -MAP_HEIGHT(map1->tile_map[0]); 2353 *dy = -MAP_HEIGHT (map1->tile_map[0]);
2354 }
2104 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) { /* right up */ 2355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2356 { /* right up */
2105 *dx = MAP_WIDTH(map1); 2357 *dx = MAP_WIDTH (map1);
2106 *dy = -MAP_HEIGHT(map2); 2358 *dy = -MAP_HEIGHT (map2);
2359 }
2107 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) { /* right down */ 2360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2361 { /* right down */
2108 *dx = MAP_WIDTH(map1); 2362 *dx = MAP_WIDTH (map1);
2109 *dy = MAP_HEIGHT(map1->tile_map[1]); 2363 *dy = MAP_HEIGHT (map1->tile_map[1]);
2364 }
2110 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) { /* down right */ 2365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2366 { /* down right */
2111 *dx = MAP_WIDTH(map1->tile_map[2]); 2367 *dx = MAP_WIDTH (map1->tile_map[2]);
2112 *dy = MAP_HEIGHT(map1); 2368 *dy = MAP_HEIGHT (map1);
2369 }
2113 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) { /* down left */ 2370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2371 { /* down left */
2114 *dx = -MAP_WIDTH(map2); 2372 *dx = -MAP_WIDTH (map2);
2115 *dy = MAP_HEIGHT(map1); 2373 *dy = MAP_HEIGHT (map1);
2374 }
2116 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) { /* left up */ 2375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2376 { /* left up */
2117 *dx = -MAP_WIDTH(map1->tile_map[3]); 2377 *dx = -MAP_WIDTH (map1->tile_map[3]);
2118 *dy = -MAP_HEIGHT(map2); 2378 *dy = -MAP_HEIGHT (map2);
2379 }
2119 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) { /* left down */ 2380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2381 { /* left down */
2120 *dx = -MAP_WIDTH(map1->tile_map[3]); 2382 *dx = -MAP_WIDTH (map1->tile_map[3]);
2121 *dy = MAP_HEIGHT(map1->tile_map[3]); 2383 *dy = MAP_HEIGHT (map1->tile_map[3]);
2122 2384
2123 } else { /* not "adjacent" enough */ 2385 }
2386 else
2387 { /* not "adjacent" enough */
2124 return 0; 2388 return 0;
2125 } 2389 }
2126 2390
2127 return 1; 2391 return 1;
2128} 2392}
2129 2393
2130/* From map.c 2394/* From map.c
2131 * This is used by get_player to determine where the other 2395 * This is used by get_player to determine where the other
2132 * creature is. get_rangevector takes into account map tiling, 2396 * creature is. get_rangevector takes into account map tiling,
… …
2146 * 2410 *
2147 * currently, the only flag supported (0x1) is don't translate for 2411 * currently, the only flag supported (0x1) is don't translate for
2148 * closest body part of 'op1' 2412 * closest body part of 'op1'
2149 */ 2413 */
2150 2414
2415void
2151void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) { 2416get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2417{
2152 if (!adjacent_map(op1->map, op2->map, &retval->distance_x, &retval->distance_y)) { 2418 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2419 {
2153 /* be conservative and fill in _some_ data */ 2420 /* be conservative and fill in _some_ data */
2154 retval->distance = 100000; 2421 retval->distance = 100000;
2155 retval->distance_x = 32767; 2422 retval->distance_x = 32767;
2156 retval->distance_y = 32767; 2423 retval->distance_y = 32767;
2157 retval->direction = 0; 2424 retval->direction = 0;
2158 retval->part = 0; 2425 retval->part = 0;
2159 } else { 2426 }
2427 else
2428 {
2160 object *best; 2429 object *best;
2161 2430
2162 retval->distance_x += op2->x-op1->x; 2431 retval->distance_x += op2->x - op1->x;
2163 retval->distance_y += op2->y-op1->y; 2432 retval->distance_y += op2->y - op1->y;
2164 2433
2165 best = op1; 2434 best = op1;
2166 /* If this is multipart, find the closest part now */ 2435 /* If this is multipart, find the closest part now */
2167 if (!(flags&0x1) && op1->more) { 2436 if (!(flags & 0x1) && op1->more)
2437 {
2168 object *tmp; 2438 object *tmp;
2169 int best_distance = retval->distance_x*retval->distance_x+ 2439 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
2170 retval->distance_y*retval->distance_y, tmpi;
2171 2440
2172 /* we just take the offset of the piece to head to figure 2441 /* we just take the offset of the piece to head to figure
2173 * distance instead of doing all that work above again 2442 * distance instead of doing all that work above again
2174 * since the distance fields we set above are positive in the 2443 * since the distance fields we set above are positive in the
2175 * same axis as is used for multipart objects, the simply arithmetic 2444 * same axis as is used for multipart objects, the simply arithmetic
2176 * below works. 2445 * below works.
2177 */ 2446 */
2178 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) { 2447 for (tmp = op1->more; tmp != NULL; tmp = tmp->more)
2448 {
2179 tmpi = (op1->x-tmp->x+retval->distance_x)*(op1->x-tmp->x+retval->distance_x)+ 2449 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
2180 (op1->y-tmp->y+retval->distance_y)*(op1->y-tmp->y+retval->distance_y); 2450 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
2181 if (tmpi < best_distance) { 2451 if (tmpi < best_distance)
2452 {
2182 best_distance = tmpi; 2453 best_distance = tmpi;
2183 best = tmp; 2454 best = tmp;
2184 } 2455 }
2185 } 2456 }
2186 if (best != op1) { 2457 if (best != op1)
2458 {
2187 retval->distance_x += op1->x-best->x; 2459 retval->distance_x += op1->x - best->x;
2188 retval->distance_y += op1->y-best->y; 2460 retval->distance_y += op1->y - best->y;
2189 } 2461 }
2190 } 2462 }
2191 retval->part = best; 2463 retval->part = best;
2192 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 2464 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
2193 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2465 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2194 } 2466 }
2195} 2467}
2196 2468
2197/* this is basically the same as get_rangevector above, but instead of 2469/* this is basically the same as get_rangevector above, but instead of
2198 * the first parameter being an object, it instead is the map 2470 * the first parameter being an object, it instead is the map
… …
2203 * be more consistant with the above function and also in case they are needed 2475 * be more consistant with the above function and also in case they are needed
2204 * for something in the future. Also, since no object is pasted, the best 2476 * for something in the future. Also, since no object is pasted, the best
2205 * field of the rv_vector is set to NULL. 2477 * field of the rv_vector is set to NULL.
2206 */ 2478 */
2207 2479
2480void
2208void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags) { 2481get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)
2482{
2209 if (!adjacent_map(m, op2->map, &retval->distance_x, &retval->distance_y)) { 2483 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
2484 {
2210 /* be conservative and fill in _some_ data */ 2485 /* be conservative and fill in _some_ data */
2211 retval->distance = 100000; 2486 retval->distance = 100000;
2212 retval->distance_x = 32767; 2487 retval->distance_x = 32767;
2213 retval->distance_y = 32767; 2488 retval->distance_y = 32767;
2214 retval->direction = 0; 2489 retval->direction = 0;
2215 retval->part = 0; 2490 retval->part = 0;
2216 } else { 2491 }
2492 else
2493 {
2217 retval->distance_x += op2->x-x; 2494 retval->distance_x += op2->x - x;
2218 retval->distance_y += op2->y-y; 2495 retval->distance_y += op2->y - y;
2219 2496
2220 retval->part = NULL; 2497 retval->part = NULL;
2221 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 2498 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);
2222 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2499 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2223 } 2500 }
2224} 2501}
2225 2502
2226/* Returns true of op1 and op2 are effectively on the same map 2503/* Returns true of op1 and op2 are effectively on the same map
2227 * (as related to map tiling). Note that this looks for a path from 2504 * (as related to map tiling). Note that this looks for a path from
… …
2229 * to op1, this will still return false. 2506 * to op1, this will still return false.
2230 * Note we only look one map out to keep the processing simple 2507 * Note we only look one map out to keep the processing simple
2231 * and efficient. This could probably be a macro. 2508 * and efficient. This could probably be a macro.
2232 * MSW 2001-08-05 2509 * MSW 2001-08-05
2233 */ 2510 */
2511int
2234int on_same_map(const object *op1, const object *op2) { 2512on_same_map (const object *op1, const object *op2)
2513{
2235 int dx, dy; 2514 int dx, dy;
2236 2515
2237 return adjacent_map(op1->map, op2->map, &dx, &dy); 2516 return adjacent_map (op1->map, op2->map, &dx, &dy);
2238} 2517}

Diff Legend

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