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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.20 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.32 by root, Thu Oct 5 16:50:06 2006 UTC

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

Diff Legend

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