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

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.30 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

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