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.32 by root, Thu Oct 5 16:50:06 2006 UTC

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

Diff Legend

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