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

Diff Legend

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