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.23 by root, Mon Sep 4 15:51:24 2006 UTC vs.
Revision 1.35 by root, Sun Dec 10 01:16:27 2006 UTC

1/*
2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.23 2006/09/04 15:51:24 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)
540{
508 int i,j; 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, mapflags))) { 548 while ((i = load_object (fp, op, mapflags)))
549 {
516 /* if the archetype for the object is null, means that we 550 /* if the archetype for the object is null, means that we
517 * 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
518 * 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.
519 */ 553 */
520 if (op->arch==NULL) { 554 if (op->arch == NULL)
555 {
521 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)");
522 continue; 557 continue;
558 }
559
560
561 switch (i)
523 } 562 {
524
525
526 switch(i) {
527 case LL_NORMAL: 563 case LL_NORMAL:
528 /* 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 */
529 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) ||
530 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)
531 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);
532 else 567 else
533 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);
534 569
535 if (op->inv) 570 if (op->inv)
536 sum_weight(op); 571 sum_weight (op);
537 572
538 prev=op,last_more=op; 573 prev = op, last_more = op;
539 break; 574 break;
540 575
541 case LL_MORE: 576 case LL_MORE:
542 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);
543 op->head=prev,last_more->more=op,last_more=op; 578 op->head = prev, last_more->more = op, last_more = op;
544 break; 579 break;
545 } 580 }
581
546 if (mapflags & MAP_STYLE) { 582 if (mapflags & MAP_STYLE)
547 remove_from_active_list(op); 583 remove_from_active_list (op);
548 } 584
549 op=get_object(); 585 op = get_object ();
550 op->map = m; 586 op->map = m;
551 } 587 }
588
552 for (i=0;i<m->width;i++){ 589 for (i = 0; i < m->width; i++)
590 {
553 for (j=0;j<m->height;j++){ 591 for (j = 0; j < m->height; j++)
592 {
554 unique =0; 593 unique = 0;
555 /* check for unique items, or unique squares */ 594 /* check for unique items, or unique squares */
556 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 {
557 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))
558 unique = 1; 598 unique = 1;
559 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique)) 599 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
560 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL); 600 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
561 } 601 }
562 } 602 }
563 } 603 }
604
564 free_object(op); 605 free_object (op);
565 link_multipart_objects(m); 606 link_multipart_objects (m);
566} 607}
567 608
568/* 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.
569 * 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,
570 * 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
571 * in order to do map tiling properly. 612 * in order to do map tiling properly.
572 */ 613 */
614void
573void 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{
574 int i, j = 0,unique=0; 617 int i, j = 0, unique = 0;
575 object *op; 618 object *op;
619
576 /* first pass - save one-part objects */ 620 /* first pass - save one-part objects */
577 for(i = 0; i < MAP_WIDTH(m); i++) 621 for (i = 0; i < MAP_WIDTH (m); i++)
578 for (j = 0; j < MAP_HEIGHT(m); j++) { 622 for (j = 0; j < MAP_HEIGHT (m); j++)
623 {
579 unique=0; 624 unique = 0;
580 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 {
581 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))
582 unique=1; 628 unique = 1;
583 629
584 if(op->type == PLAYER) { 630 if (op->type == PLAYER)
631 {
585 LOG(llevDebug, "Player on map that is being saved\n"); 632 LOG (llevDebug, "Player on map that is being saved\n");
586 continue; 633 continue;
587 } 634 }
588 635
589 if (op->head || op->owner) 636 if (op->head || op->owner)
590 continue; 637 continue;
591 638
592 if (unique || QUERY_FLAG(op, FLAG_UNIQUE)) 639 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
593 save_object (fp2, op, 3); 640 save_object (fp2, op, 3);
594 else 641 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
595 if (flag == 0 ||
596 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) &&
597 !QUERY_FLAG(op, FLAG_UNPAID))))
598 save_object(fp, op, 3); 642 save_object (fp, op, 3);
599 643
600 } /* for this space */ 644 } /* for this space */
601 } /* 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;
602} 663}
603 664
604/* 665/*
605 * Allocates, initialises, and returns a pointer to a mapstruct. 666 * Allocates, initialises, and returns a pointer to a maptile.
606 * 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
607 * used anyways. MSW 2001-07-01 668 * used anyways. MSW 2001-07-01
608 */ 669 */
670maptile *
671get_linked_map (void)
672{
673 maptile *mp, *map = new maptile;
609 674
610mapstruct *get_linked_map(void) {
611 mapstruct *map = new mapstruct;
612 mapstruct *mp;
613
614 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next); 675 for (mp = first_map; mp && mp->next; mp = mp->next);
676
615 if(mp==NULL) 677 if (mp == NULL)
616 first_map=map; 678 first_map = map;
617 else 679 else
618 mp->next=map; 680 mp->next = map;
619 681
620 map->in_memory=MAP_SWAPPED;
621 /* The maps used to pick up default x and y values from the
622 * map archetype. Mimic that behaviour.
623 */
624 MAP_WIDTH(map)=16;
625 MAP_HEIGHT(map)=16;
626 MAP_RESET_TIMEOUT(map)=0;
627 MAP_TIMEOUT(map)=300;
628 MAP_ENTER_X(map)=0;
629 MAP_ENTER_Y(map)=0;
630 /*set part to -1 indicating conversion to weather map not yet done*/
631 MAP_WORLDPARTX(map)=-1;
632 MAP_WORLDPARTY(map)=-1;
633 return map; 682 return map;
634} 683}
635 684
636/* 685/*
637 * Allocates the arrays contained in a mapstruct. 686 * Allocates the arrays contained in a maptile.
638 * This basically allocates the dynamic array of spaces for the 687 * This basically allocates the dynamic array of spaces for the
639 * map. 688 * map.
640 */ 689 */
641 690void
642void allocate_map(mapstruct *m) { 691maptile::allocate ()
692{
643 m->in_memory = MAP_IN_MEMORY; 693 in_memory = MAP_IN_MEMORY;
694
644 /* Log this condition and free the storage. We could I suppose 695 /* Log this condition and free the storage. We could I suppose
645 * 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,
646 * that is their poor assumption. 697 * that is their poor assumption.
647 */ 698 */
648 if (m->spaces) { 699 if (spaces)
700 {
649 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);
650 free(m->spaces); 702 free (spaces);
651 } 703 }
652 704
653 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace)); 705 spaces = (MapSpace *)
706 calloc (1, width * height * sizeof (MapSpace));
654 707
655 if(m->spaces==NULL) 708 if (!spaces)
656 fatal(OUT_OF_MEMORY); 709 fatal (OUT_OF_MEMORY);
657} 710}
658 711
659/* Create and returns a map of the specific size. Used 712/* Create and returns a map of the specific size. Used
660 * in random map code and the editor. 713 * in random map code and the editor.
661 */ 714 */
715maptile *
662mapstruct *get_empty_map(int sizex, int sizey) { 716get_empty_map (int sizex, int sizey)
717{
663 mapstruct *m = get_linked_map(); 718 maptile *m = get_linked_map ();
719
664 m->width = sizex; 720 m->width = sizex;
665 m->height = sizey; 721 m->height = sizey;
666 m->in_memory = MAP_SWAPPED; 722 m->in_memory = MAP_SWAPPED;
667 allocate_map(m); 723 m->allocate ();
724
668 return m; 725 return m;
669} 726}
670 727
671/* 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
672 * 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
673 * at a later date. 730 * at a later date.
674 * Called by parse_map_headers below. 731 * Called by parse_map_headers below.
675 */ 732 */
676 733
734static shopitems *
677static shopitems *parse_shop_string (const char *input_string) { 735parse_shop_string (const char *input_string)
736{
678 char *shop_string, *p, *q, *next_semicolon, *next_colon; 737 char *shop_string, *p, *q, *next_semicolon, *next_colon;
679 shopitems *items=NULL; 738 shopitems *items = NULL;
680 int i=0, number_of_entries=0; 739 int i = 0, number_of_entries = 0;
681 const typedata *current_type; 740 const typedata *current_type;
682 741
683 shop_string=strdup_local(input_string); 742 shop_string = strdup_local (input_string);
684 p=shop_string; 743 p = shop_string;
685 /* 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 */
686 while (p) { 745 while (p)
746 {
687 p=strchr(p, ';'); 747 p = strchr (p, ';');
688 number_of_entries++; 748 number_of_entries++;
689 if (p) p++; 749 if (p)
750 p++;
690 } 751 }
691 p=shop_string; 752 p = shop_string;
692 strip_endline(p); 753 strip_endline (p);
693 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems)); 754 items = new shopitems[number_of_entries + 1];
694 memset(items, 0, (sizeof(shopitems) * number_of_entries+1));
695 for (i=0; i<number_of_entries; i++) { 755 for (i = 0; i < number_of_entries; i++)
756 {
696 if (!p) { 757 if (!p)
758 {
697 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");
698 break; 760 break;
699 } 761 }
700 next_semicolon=strchr(p, ';'); 762 next_semicolon = strchr (p, ';');
701 next_colon=strchr(p, ':'); 763 next_colon = strchr (p, ':');
702 /* 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. */
703 if (next_colon &&( !next_semicolon || next_colon<next_semicolon)) 765 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
704 items[i].strength=atoi(strchr(p,':')+1); 766 items[i].strength = atoi (strchr (p, ':') + 1);
767
768 if (isdigit (*p) || *p == '*')
705 769 {
706 if (isdigit(*p) || *p=='*') {
707 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 */
708 current_type=get_typedata(items[i].typenum); 771 current_type = get_typedata (items[i].typenum);
709 if (current_type) { 772 if (current_type)
773 {
710 items[i].name=current_type->name; 774 items[i].name = current_type->name;
711 items[i].name_pl=current_type->name_pl; 775 items[i].name_pl = current_type->name_pl;
712 }
713 }
714 else { /*we have a named type, let's figure out what it is */
715 q=strpbrk(p,";:");
716 if (q) *q='\0';
717
718 current_type=get_typedata_by_name(p);
719 if (current_type) {
720 items[i].name=current_type->name;
721 items[i].typenum=current_type->number;
722 items[i].name_pl=current_type->name_pl;
723 } 776 }
724 else { /* oh uh, something's wrong, let's free up this one, and try 777 }
725 * the next entry while we're at it, better print a warning 778 else
726 */ 779 { /*we have a named type, let's figure out what it is */
727 LOG(llevError, "invalid type %s defined in shopitems in string %s\n", 780 q = strpbrk (p, ";:");
728 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;
729 } 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);
730 } 796 }
797 }
731 items[i].index=number_of_entries; 798 items[i].index = number_of_entries;
732 if (next_semicolon) p=++next_semicolon; 799 if (next_semicolon)
800 p = ++next_semicolon;
801 else
733 else p=NULL; 802 p = NULL;
734 } 803 }
735 free(shop_string); 804 free (shop_string);
736 return items; 805 return items;
737} 806}
738 807
739/* 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
740 * the map (or something equivilent) into output_string. */ 809 * the map (or something equivilent) into output_string. */
810static void
741static void print_shop_string(mapstruct *m, char *output_string) { 811print_shop_string (maptile *m, char *output_string)
812{
742 int i; 813 int i;
743 char tmp[MAX_BUF]; 814 char tmp[MAX_BUF];
815
744 strcpy(output_string, ""); 816 strcpy (output_string, "");
745 for (i=0; i< m->shopitems[0].index; i++) { 817 for (i = 0; i < m->shopitems[0].index; i++)
818 {
746 if (m->shopitems[i].typenum) { 819 if (m->shopitems[i].typenum)
820 {
747 if (m->shopitems[i].strength) { 821 if (m->shopitems[i].strength)
822 {
748 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);
749 } 824 }
825 else
750 else sprintf(tmp, "%s;", m->shopitems[i].name); 826 sprintf (tmp, "%s;", m->shopitems[i].name);
827 }
828 else
751 } 829 {
752 else {
753 if (m->shopitems[i].strength) { 830 if (m->shopitems[i].strength)
831 {
754 sprintf(tmp, "*:%d;", m->shopitems[i].strength); 832 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
755 } 833 }
834 else
756 else sprintf(tmp, "*"); 835 sprintf (tmp, "*");
757 } 836 }
758 strcat(output_string, tmp); 837 strcat (output_string, tmp);
759 } 838 }
760} 839}
761 840
762/* This loads the header information of the map. The header 841/* This loads the header information of the map. The header
763 * contains things like difficulty, size, timeout, etc. 842 * contains things like difficulty, size, timeout, etc.
… …
770 * 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.
771 * MSW 2001-07-01 850 * MSW 2001-07-01
772 * return 0 on success, 1 on failure. 851 * return 0 on success, 1 on failure.
773 */ 852 */
774 853
854static int
775static int load_map_header(object_thawer &fp, mapstruct *m) 855load_map_header (object_thawer & fp, maptile *m)
776{ 856{
777 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;
778 int msgpos=0; 858 int msgpos = 0;
779 int maplorepos=0; 859 int maplorepos = 0;
780 860
781 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 861 while (fgets (buf, HUGE_BUF, fp) != NULL)
862 {
782 buf[HUGE_BUF-1] = 0; 863 buf[HUGE_BUF - 1] = 0;
783 key = buf; 864 key = buf;
784 while (isspace(*key)) key++; 865 while (isspace (*key))
785 if (*key == 0) continue; /* empty line */ 866 key++;
867 if (*key == 0)
868 continue; /* empty line */
786 value = strchr(key, ' '); 869 value = strchr (key, ' ');
787 if (!value) { 870 if (!value)
871 {
788 end = strchr(key, '\n'); 872 end = strchr (key, '\n');
789 if (end != NULL) { 873 if (end != NULL)
874 {
790 *end = 0; 875 *end = 0;
791 } 876 }
877 }
792 } else { 878 else
879 {
793 *value = 0; 880 *value = 0;
794 value++; 881 value++;
795 end = strchr(value, '\n'); 882 end = strchr (value, '\n');
796 while (isspace(*value)) { 883 while (isspace (*value))
884 {
797 value++; 885 value++;
798 if (*value == '\0' || value == end) { 886 if (*value == '\0' || value == end)
887 {
799 /* Nothing but spaces. */ 888 /* Nothing but spaces. */
800 value = NULL; 889 value = NULL;
801 break; 890 break;
802 } 891 }
803 } 892 }
804 } 893 }
805 894
806 if (!end) { 895 if (!end)
896 {
807 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);
808 buf);
809 return 1; 898 return 1;
810 } 899 }
811 900
812 /* 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
813 * to. We've already done the work to null terminate key, 902 * to. We've already done the work to null terminate key,
814 * and strip off any leading spaces for both of these. 903 * and strip off any leading spaces for both of these.
815 * 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 -
816 * these are needed for some values. the end pointer 905 * these are needed for some values. the end pointer
817 * points to the first of the newlines. 906 * points to the first of the newlines.
818 * 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
819 * 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
820 * through. 909 * through.
821 * 910 *
822 * 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
823 * validate that value is given and check for the remaining entries 912 * validate that value is given and check for the remaining entries
824 * that use the parameter. 913 * that use the parameter.
825 */ 914 */
826 915
827 if (!strcmp(key,"msg")) { 916 if (!strcmp (key, "msg"))
917 {
828 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 918 while (fgets (buf, HUGE_BUF, fp) != NULL)
919 {
829 if (!strcmp(buf,"endmsg\n")) break; 920 if (!strcmp (buf, "endmsg\n"))
921 break;
830 else { 922 else
923 {
831 /* slightly more efficient than strcat */ 924 /* slightly more efficient than strcat */
832 strcpy(msgbuf+msgpos, buf); 925 strcpy (msgbuf + msgpos, buf);
833 msgpos += strlen(buf); 926 msgpos += strlen (buf);
834 } 927 }
835 } 928 }
836 /* 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
837 * with nothing between). There is no reason in those cases to 930 * with nothing between). There is no reason in those cases to
838 * keep the empty message. Also, msgbuf contains garbage data 931 * keep the empty message. Also, msgbuf contains garbage data
839 * when msgpos is zero, so copying it results in crashes 932 * when msgpos is zero, so copying it results in crashes
840 */ 933 */
841 if (msgpos != 0) 934 if (msgpos != 0)
842 m->msg = strdup_local(msgbuf); 935 m->msg = strdup_local (msgbuf);
843 } 936 }
844 else if (!strcmp(key,"maplore")) { 937 else if (!strcmp (key, "maplore"))
938 {
845 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 939 while (fgets (buf, HUGE_BUF, fp) != NULL)
940 {
846 if (!strcmp(buf,"endmaplore\n")) break; 941 if (!strcmp (buf, "endmaplore\n"))
942 break;
847 else { 943 else
944 {
848 /* slightly more efficient than strcat */ 945 /* slightly more efficient than strcat */
849 strcpy(maplorebuf+maplorepos, buf); 946 strcpy (maplorebuf + maplorepos, buf);
850 maplorepos += strlen(buf); 947 maplorepos += strlen (buf);
851 } 948 }
852 } 949 }
853 if (maplorepos != 0) 950 if (maplorepos != 0)
854 m->maplore = strdup_local(maplorebuf); 951 m->maplore = strdup_local (maplorebuf);
855 } 952 }
856 else if (!strcmp(key,"end")) { 953 else if (!strcmp (key, "end"))
954 {
857 break; 955 break;
858 } 956 }
859 else if (value == NULL) { 957 else if (value == NULL)
958 {
860 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);
861 } 960 }
862 else if (!strcmp(key, "arch")) { 961 else if (!strcmp (key, "arch"))
962 {
863 /* This is an oddity, but not something we care about much. */ 963 /* This is an oddity, but not something we care about much. */
864 if (strcmp(value,"map\n")) 964 if (strcmp (value, "map\n"))
865 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);
866 } 966 }
867 else if (!strcmp(key,"name")) { 967 else if (!strcmp (key, "name"))
968 {
868 *end=0; 969 *end = 0;
869 m->name = strdup_local(value); 970 m->name = strdup_local (value);
870 } 971 }
871 /* first strcmp value on these are old names supported 972 /* first strcmp value on these are old names supported
872 * for compatibility reasons. The new values (second) are 973 * for compatibility reasons. The new values (second) are
873 * what really should be used. 974 * what really should be used.
874 */ 975 */
875 else if (!strcmp(key,"oid")) { 976 else if (!strcmp (key, "oid"))
977 {
876 fp.get (m, atoi(value)); 978 fp.get (m, atoi (value));
979 }
877 } else if (!strcmp(key, "attach")) { 980 else if (!strcmp (key, "attach"))
981 {
878 m->attach = value; 982 m->attach = value;
983 }
879 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 984 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
985 {
880 m->enter_x = atoi(value); 986 m->enter_x = atoi (value);
987 }
881 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 988 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
989 {
882 m->enter_y = atoi(value); 990 m->enter_y = atoi (value);
991 }
883 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 992 else if (!strcmp (key, "x") || !strcmp (key, "width"))
993 {
884 m->width = atoi(value); 994 m->width = atoi (value);
995 }
885 } else if (!strcmp(key,"y") || !strcmp(key, "height")) { 996 else if (!strcmp (key, "y") || !strcmp (key, "height"))
997 {
886 m->height = atoi(value); 998 m->height = atoi (value);
999 }
887 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) { 1000 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1001 {
888 m->reset_timeout = atoi(value); 1002 m->reset_timeout = atoi (value);
1003 }
889 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) { 1004 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1005 {
890 m->timeout = atoi(value); 1006 m->timeout = atoi (value);
1007 }
891 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) { 1008 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1009 {
892 m->difficulty = atoi(value); 1010 m->difficulty = atoi (value);
1011 }
893 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) { 1012 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1013 {
894 m->darkness = atoi(value); 1014 m->darkness = atoi (value);
1015 }
895 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) { 1016 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1017 {
896 m->fixed_resettime = atoi(value); 1018 m->fixed_resettime = atoi (value);
1019 }
897 } else if (!strcmp(key,"unique")) { 1020 else if (!strcmp (key, "unique"))
1021 {
898 m->unique = atoi(value); 1022 m->unique = atoi (value);
1023 }
899 } else if (!strcmp(key,"template")) { 1024 else if (!strcmp (key, "template"))
1025 {
900 m->templatemap = atoi(value); 1026 m->templatemap = atoi (value);
1027 }
901 } else if (!strcmp(key,"region")) { 1028 else if (!strcmp (key, "region"))
1029 {
902 m->region = get_region_by_name(value); 1030 m->region = get_region_by_name (value);
1031 }
903 } else if (!strcmp(key,"shopitems")) { 1032 else if (!strcmp (key, "shopitems"))
1033 {
904 *end=0; 1034 *end = 0;
905 m->shopitems = parse_shop_string(value); 1035 m->shopitems = parse_shop_string (value);
1036 }
906 } else if (!strcmp(key,"shopgreed")) { 1037 else if (!strcmp (key, "shopgreed"))
1038 {
907 m->shopgreed = atof(value); 1039 m->shopgreed = atof (value);
1040 }
908 } else if (!strcmp(key,"shopmin")) { 1041 else if (!strcmp (key, "shopmin"))
1042 {
909 m->shopmin = atol(value); 1043 m->shopmin = atol (value);
1044 }
910 } else if (!strcmp(key,"shopmax")) { 1045 else if (!strcmp (key, "shopmax"))
1046 {
911 m->shopmax = atol(value); 1047 m->shopmax = atol (value);
1048 }
912 } else if (!strcmp(key,"shoprace")) { 1049 else if (!strcmp (key, "shoprace"))
1050 {
913 *end=0; 1051 *end = 0;
914 m->shoprace = strdup_local(value); 1052 m->shoprace = strdup_local (value);
1053 }
915 } else if (!strcmp(key,"outdoor")) { 1054 else if (!strcmp (key, "outdoor"))
1055 {
916 m->outdoor = atoi(value); 1056 m->outdoor = atoi (value);
1057 }
917 } else if (!strcmp(key, "temp")) { 1058 else if (!strcmp (key, "temp"))
1059 {
918 m->temp = atoi(value); 1060 m->temp = atoi (value);
1061 }
919 } else if (!strcmp(key, "pressure")) { 1062 else if (!strcmp (key, "pressure"))
1063 {
920 m->pressure = atoi(value); 1064 m->pressure = atoi (value);
1065 }
921 } else if (!strcmp(key, "humid")) { 1066 else if (!strcmp (key, "humid"))
1067 {
922 m->humid = atoi(value); 1068 m->humid = atoi (value);
1069 }
923 } else if (!strcmp(key, "windspeed")) { 1070 else if (!strcmp (key, "windspeed"))
1071 {
924 m->windspeed = atoi(value); 1072 m->windspeed = atoi (value);
1073 }
925 } else if (!strcmp(key, "winddir")) { 1074 else if (!strcmp (key, "winddir"))
1075 {
926 m->winddir = atoi(value); 1076 m->winddir = atoi (value);
1077 }
927 } else if (!strcmp(key, "sky")) { 1078 else if (!strcmp (key, "sky"))
1079 {
928 m->sky = atoi(value); 1080 m->sky = atoi (value);
1081 }
929 } else if (!strcmp(key, "nosmooth")) { 1082 else if (!strcmp (key, "nosmooth"))
1083 {
930 m->nosmooth = atoi(value); 1084 m->nosmooth = atoi (value);
931 } 1085 }
932 else if (!strncmp(key,"tile_path_", 10)) { 1086 else if (!strncmp (key, "tile_path_", 10))
1087 {
933 int tile=atoi(key+10); 1088 int tile = atoi (key + 10);
934 1089
935 if (tile<1 || tile>4) { 1090 if (tile < 1 || tile > 4)
1091 {
936 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);
937 tile, m->path); 1093 }
938 } else { 1094 else
1095 {
939 char *path; 1096 char *path;
940 1097
941 *end = 0; 1098 *end = 0;
942 1099
943 if (m->tile_path[tile-1]) { 1100 if (m->tile_path[tile - 1])
1101 {
944 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);
945 tile, m->path);
946 free(m->tile_path[tile-1]); 1103 free (m->tile_path[tile - 1]);
947 m->tile_path[tile-1] = NULL; 1104 m->tile_path[tile - 1] = NULL;
948 } 1105 }
949 1106
950 if (check_path(value, 1) != -1) { 1107 if (check_path (value, 1) != -1)
1108 {
951 /* The unadorned path works. */ 1109 /* The unadorned path works. */
952 path = value; 1110 path = value;
1111 }
953 } else { 1112 else
1113 {
954 /* Try again; it could be a relative exit. */ 1114 /* Try again; it could be a relative exit. */
955 1115
956 path = path_combine_and_normalize(m->path, value); 1116 path = path_combine_and_normalize (m->path, value);
957 1117
958 if (check_path(path, 1) == -1) { 1118 if (check_path (path, 1) == -1)
1119 {
959 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);
960 path = NULL; 1121 path = NULL;
961 } 1122 }
962 } 1123 }
963 1124
964 if (editor) { 1125 if (editor)
1126 {
965 /* Use the value as in the file. */ 1127 /* Use the value as in the file. */
966 m->tile_path[tile-1] = strdup_local(value); 1128 m->tile_path[tile - 1] = strdup_local (value);
967 } else if (path != NULL) {
968 /* Use the normalized value. */
969 m->tile_path[tile-1] = strdup_local(path);
970 } 1129 }
1130 else if (path != NULL)
1131 {
1132 /* Use the normalized value. */
1133 m->tile_path[tile - 1] = strdup_local (path);
1134 }
971 } /* end if tile direction (in)valid */ 1135 } /* end if tile direction (in)valid */
1136 }
1137 else
972 } 1138 {
973 else {
974 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);
975 } 1140 }
976 } 1141 }
977 if (!key || strcmp(key,"end")) { 1142 if (!key || strcmp (key, "end"))
1143 {
978 LOG(llevError,"Got premature eof on map header!\n"); 1144 LOG (llevError, "Got premature eof on map header!\n");
979 return 1; 1145 return 1;
980 } 1146 }
981 return 0; 1147 return 0;
982} 1148}
983 1149
984/* 1150/*
985 * Opens the file "filename" and reads information about the map 1151 * Opens the file "filename" and reads information about the map
986 * from the given file, and stores it in a newly allocated 1152 * from the given file, and stores it in a newly allocated
987 * 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.
988 * flags correspond to those in map.h. Main ones used are 1154 * flags correspond to those in map.h. Main ones used are
989 * 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
990 * 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
991 * cases, no matter if this flag is set or not. 1157 * cases, no matter if this flag is set or not.
992 * 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
993 * managed map list. 1159 * managed map list.
994 */ 1160 */
995 1161
1162maptile *
996mapstruct *load_original_map(const char *filename, int flags) { 1163load_original_map (const char *filename, int flags)
997 mapstruct *m; 1164{
1165 maptile *m;
998 char pathname[MAX_BUF]; 1166 char pathname[MAX_BUF];
999 1167
1000 if (flags & MAP_PLAYER_UNIQUE) 1168 if (flags & MAP_PLAYER_UNIQUE)
1001 strcpy(pathname, filename); 1169 strcpy (pathname, filename);
1002 else if (flags & MAP_OVERLAY) 1170 else if (flags & MAP_OVERLAY)
1003 strcpy(pathname, create_overlay_pathname(filename)); 1171 strcpy (pathname, create_overlay_pathname (filename));
1004 else 1172 else
1005 strcpy(pathname, create_pathname(filename)); 1173 strcpy (pathname, create_pathname (filename));
1006 1174
1007 LOG(llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname); 1175 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1008 1176
1009 object_thawer thawer (pathname); 1177 object_thawer thawer (pathname);
1010 1178
1011 if (!thawer) 1179 if (!thawer)
1012 return 0; 1180 return 0;
1013 1181
1014 m = get_linked_map(); 1182 m = get_linked_map ();
1015 1183
1016 strcpy (m->path, filename); 1184 strcpy (m->path, filename);
1017 if (load_map_header(thawer, m)) { 1185 if (load_map_header (thawer, m))
1186 {
1018 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);
1019 filename, flags);
1020 delete_map(m); 1188 delete_map (m);
1021 return NULL; 1189 return NULL;
1022 } 1190 }
1023 1191
1024 allocate_map(m); 1192 m->allocate ();
1025 1193
1026 m->in_memory=MAP_LOADING; 1194 m->in_memory = MAP_LOADING;
1027 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE)); 1195 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1028 1196
1029 m->in_memory=MAP_IN_MEMORY; 1197 m->in_memory = MAP_IN_MEMORY;
1030 if (!MAP_DIFFICULTY(m)) 1198 if (!MAP_DIFFICULTY (m))
1031 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1199 MAP_DIFFICULTY (m) = calculate_difficulty (m);
1032 set_map_reset_time(m); 1200 set_map_reset_time (m);
1033 m->instantiate (); 1201 m->instantiate ();
1034 return (m); 1202 return (m);
1035} 1203}
1036 1204
1037/* 1205/*
1038 * Loads a map, which has been loaded earlier, from file. 1206 * Loads a map, which has been loaded earlier, from file.
1039 * 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
1040 * option if we can't find the original map) 1208 * option if we can't find the original map)
1041 */ 1209 */
1042 1210
1043static mapstruct *load_temporary_map(mapstruct *m) { 1211static maptile *
1044 int comp; 1212load_temporary_map (maptile *m)
1213{
1045 char buf[MAX_BUF]; 1214 char buf[MAX_BUF];
1046 1215
1047 if (!m->tmpname) { 1216 if (!m->tmpname)
1217 {
1048 LOG(llevError, "No temporary filename for map %s\n", m->path); 1218 LOG (llevError, "No temporary filename for map %s\n", m->path);
1049 strcpy(buf, m->path);
1050 delete_map(m);
1051 m = load_original_map(buf, 0);
1052 if(m==NULL) return NULL;
1053 fix_auto_apply(m); /* Chests which open as default */
1054 return m;
1055 }
1056
1057 object_thawer thawer (m->tmpname);
1058
1059 if (!thawer)
1060 {
1061 strcpy (buf, m->path); 1219 strcpy (buf, m->path);
1062 delete_map (m); 1220 delete_map (m);
1063 m = load_original_map (buf, 0); 1221 m = load_original_map (buf, 0);
1064 if (!m) return NULL; 1222 if (m == NULL)
1065 fix_auto_apply (m); /* Chests which open as default */
1066 return m;
1067 }
1068
1069 if (load_map_header(thawer, m)) {
1070 LOG(llevError,"Error loading map header for %s (%s)\n",
1071 m->path, m->tmpname);
1072 delete_map(m);
1073 m = load_original_map(m->path, 0);
1074 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)
1075 } 1231 {
1076 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 }
1077 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
1078 m->in_memory=MAP_LOADING; 1251 m->in_memory = MAP_LOADING;
1079 load_objects (m, thawer, 0); 1252 load_objects (m, thawer, 0);
1080 1253
1081 m->in_memory=MAP_IN_MEMORY; 1254 m->in_memory = MAP_IN_MEMORY;
1082 INVOKE_MAP (SWAPIN, m); 1255 INVOKE_MAP (SWAPIN, m);
1083 return m; 1256 return m;
1084} 1257}
1085 1258
1086/* 1259/*
1087 * Loads a map, which has been loaded earlier, from file. 1260 * Loads a map, which has been loaded earlier, from file.
1088 * 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
1089 * option if we can't find the original map) 1262 * option if we can't find the original map)
1090 */ 1263 */
1091 1264
1265maptile *
1092mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1266load_overlay_map (const char *filename, maptile *m)
1267{
1093 char pathname[MAX_BUF]; 1268 char pathname[MAX_BUF];
1094 1269
1095 strcpy(pathname, create_overlay_pathname(filename)); 1270 strcpy (pathname, create_overlay_pathname (filename));
1096 1271
1097 object_thawer thawer (pathname); 1272 object_thawer thawer (pathname);
1098 1273
1099 if (!thawer) 1274 if (!thawer)
1100 return m;
1101
1102 if (load_map_header(thawer, m)) {
1103 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1104 m->path, pathname);
1105 delete_map(m);
1106 m = load_original_map(m->path, 0);
1107 return NULL;
1108 }
1109 /*allocate_map(m);*/
1110
1111 m->in_memory=MAP_LOADING;
1112 load_objects (m, thawer, MAP_OVERLAY);
1113
1114 m->in_memory=MAP_IN_MEMORY;
1115 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;
1116} 1291}
1117 1292
1118/****************************************************************************** 1293/******************************************************************************
1119 * This is the start of unique map handling code 1294 * This is the start of unique map handling code
1120 *****************************************************************************/ 1295 *****************************************************************************/
1121 1296
1122/* 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. */
1123static void delete_unique_items(mapstruct *m) 1298static void
1299delete_unique_items (maptile *m)
1124{ 1300{
1125 int i,j,unique; 1301 int i, j, unique;
1126 object *op, *next; 1302 object *op, *next;
1127 1303
1128 for(i=0; i<MAP_WIDTH(m); i++) 1304 for (i = 0; i < MAP_WIDTH (m); i++)
1129 for(j=0; j<MAP_HEIGHT(m); j++) { 1305 for (j = 0; j < MAP_HEIGHT (m); j++)
1306 {
1130 unique=0; 1307 unique = 0;
1131 for (op=get_map_ob(m, i, j); op; op=next) { 1308 for (op = get_map_ob (m, i, j); op; op = next)
1309 {
1132 next = op->above; 1310 next = op->above;
1133 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))
1134 unique=1; 1312 unique = 1;
1135 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { 1313 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1314 {
1136 clean_object(op); 1315 clean_object (op);
1137 if (QUERY_FLAG(op, FLAG_IS_LINKED)) 1316 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1138 remove_button_link(op); 1317 remove_button_link (op);
1139 remove_ob(op); 1318 remove_ob (op);
1140 free_object(op); 1319 free_object (op);
1141 } 1320 }
1142 } 1321 }
1143 } 1322 }
1144} 1323}
1145 1324
1146 1325
1147/* 1326/*
1148 * 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
1149 * m is the map to load unique items into. 1328 * m is the map to load unique items into.
1150 */ 1329 */
1151static void load_unique_objects(mapstruct *m) { 1330static void
1331load_unique_objects (maptile *m)
1332{
1152 int count; 1333 int count;
1153 char firstname[MAX_BUF]; 1334 char firstname[MAX_BUF];
1154 1335
1155 for (count=0; count<10; count++) { 1336 for (count = 0; count < 10; count++)
1337 {
1156 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1338 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1157 if (!access(firstname, R_OK)) break; 1339 if (!access (firstname, R_OK))
1340 break;
1158 } 1341 }
1159 /* If we get here, we did not find any map */ 1342 /* If we get here, we did not find any map */
1160 if (count==10) return; 1343 if (count == 10)
1344 return;
1161 1345
1162 object_thawer thawer (firstname); 1346 object_thawer thawer (firstname);
1163 1347
1164 if (!thawer) 1348 if (!thawer)
1165 return; 1349 return;
1166 1350
1167 m->in_memory=MAP_LOADING; 1351 m->in_memory = MAP_LOADING;
1168 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1352 if (m->tmpname == NULL) /* if we have loaded unique items from */
1169 delete_unique_items(m); /* original map before, don't duplicate them */ 1353 delete_unique_items (m); /* original map before, don't duplicate them */
1170 load_objects (m, thawer, 0); 1354 load_objects (m, thawer, 0);
1171 1355
1172 m->in_memory=MAP_IN_MEMORY; 1356 m->in_memory = MAP_IN_MEMORY;
1173} 1357}
1174 1358
1175 1359
1176/* 1360/*
1177 * 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
1178 * file it was (originally) loaded from. Otherwise a temporary 1362 * file it was (originally) loaded from. Otherwise a temporary
1179 * filename will be genarated, and the file will be stored there. 1363 * filename will be genarated, and the file will be stored there.
1180 * The temporary filename will be stored in the mapstructure. 1364 * The temporary filename will be stored in the maptileure.
1181 * 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
1182 * (this should have been updated when first loaded) 1366 * (this should have been updated when first loaded)
1183 */ 1367 */
1184 1368
1185int 1369int
1186new_save_map (mapstruct * m, int flag) 1370new_save_map (maptile *m, int flag)
1187{ 1371{
1188 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];
1189 int i; 1373 int i;
1190 1374
1191 if (flag && !*m->path) 1375 if (flag && !*m->path)
1192 { 1376 {
1193 LOG (llevError, "Tried to save map without path.\n"); 1377 LOG (llevError, "Tried to save map without path.\n");
… …
1195 } 1379 }
1196 1380
1197 if (flag || (m->unique) || (m->templatemap)) 1381 if (flag || (m->unique) || (m->templatemap))
1198 { 1382 {
1199 if (!m->unique && !m->templatemap) 1383 if (!m->unique && !m->templatemap)
1200 { /* flag is set */ 1384 { /* flag is set */
1201 if (flag == 2) 1385 if (flag == 2)
1202 strcpy (filename, create_overlay_pathname (m->path)); 1386 strcpy (filename, create_overlay_pathname (m->path));
1203 else 1387 else
1204 strcpy (filename, create_pathname (m->path)); 1388 strcpy (filename, create_pathname (m->path));
1205 } 1389 }
… …
1319 sprintf (buf, "%s.v00", create_items_path (m->path)); 1503 sprintf (buf, "%s.v00", create_items_path (m->path));
1320 1504
1321 unique.save (buf); 1505 unique.save (buf);
1322 } 1506 }
1323 else 1507 else
1324 { /* save same file when not playing, like in editor */ 1508 { /* save same file when not playing, like in editor */
1325 save_objects (m, freezer, freezer, 0); 1509 save_objects (m, freezer, freezer, 0);
1326 } 1510 }
1327 1511
1328 freezer.save (filename); 1512 freezer.save (filename);
1329 1513
… …
1334/* 1518/*
1335 * 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.
1336 * object.c ? 1520 * object.c ?
1337 */ 1521 */
1338 1522
1523void
1339void clean_object(object *op) 1524clean_object (object *op)
1340{ 1525{
1341 object *tmp, *next; 1526 object *tmp, *next;
1342 1527
1343 for(tmp = op->inv; tmp; tmp = next) 1528 for (tmp = op->inv; tmp; tmp = next)
1344 { 1529 {
1345 next = tmp->below; 1530 next = tmp->below;
1346 clean_object(tmp); 1531 clean_object (tmp);
1347 if (QUERY_FLAG(tmp, FLAG_IS_LINKED)) 1532 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1348 remove_button_link(tmp); 1533 remove_button_link (tmp);
1349 remove_ob(tmp); 1534 remove_ob (tmp);
1350 free_object(tmp); 1535 free_object (tmp);
1351 } 1536 }
1352} 1537}
1353 1538
1354/* 1539/*
1355 * Remove and free all objects in the given map. 1540 * Remove and free all objects in the given map.
1356 */ 1541 */
1357 1542
1543void
1358void free_all_objects(mapstruct *m) { 1544free_all_objects (maptile *m)
1545{
1359 int i,j; 1546 int i, j;
1360 object *op; 1547 object *op;
1361 1548
1362 for(i=0;i<MAP_WIDTH(m);i++) 1549 for (i = 0; i < MAP_WIDTH (m); i++)
1363 for(j=0;j<MAP_HEIGHT(m);j++) { 1550 for (j = 0; j < MAP_HEIGHT (m); j++)
1551 {
1364 object *previous_obj=NULL; 1552 object *previous_obj = NULL;
1553
1365 while((op=GET_MAP_OB(m,i,j))!=NULL) { 1554 while ((op = GET_MAP_OB (m, i, j)) != NULL)
1555 {
1366 if (op==previous_obj) { 1556 if (op == previous_obj)
1557 {
1367 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n"); 1558 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1368 break; 1559 break;
1369 } 1560 }
1370 previous_obj=op; 1561 previous_obj = op;
1371 if(op->head!=NULL) 1562 if (op->head != NULL)
1372 op = op->head; 1563 op = op->head;
1373 1564
1374 /* 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
1375 * 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.
1376 */ 1567 */
1377 if (m->in_memory==MAP_IN_MEMORY) 1568 if (m->in_memory == MAP_IN_MEMORY)
1378 clean_object(op); 1569 clean_object (op);
1379 remove_ob(op); 1570 remove_ob (op);
1380 free_object(op); 1571 free_object (op);
1381 } 1572 }
1382 } 1573 }
1383} 1574}
1384 1575
1385/* 1576/*
1386 * Frees everything allocated by the given mapstructure. 1577 * Frees everything allocated by the given maptileure.
1387 * don't free tmpname - our caller is left to do that 1578 * don't free tmpname - our caller is left to do that
1388 */ 1579 */
1389 1580
1581void
1390void free_map(mapstruct *m,int flag) { 1582free_map (maptile *m, int flag)
1583{
1391 int i; 1584 int i;
1392 1585
1393 if (!m->in_memory) { 1586 if (!m->in_memory)
1587 {
1394 LOG(llevError,"Trying to free freed map.\n"); 1588 LOG (llevError, "Trying to free freed map.\n");
1395 return; 1589 return;
1396 } 1590 }
1397 if (flag && m->spaces) free_all_objects(m); 1591 if (flag && m->spaces)
1592 free_all_objects (m);
1593 if (m->name)
1398 if (m->name) FREE_AND_CLEAR(m->name); 1594 FREE_AND_CLEAR (m->name);
1595 if (m->spaces)
1399 if (m->spaces) FREE_AND_CLEAR(m->spaces); 1596 FREE_AND_CLEAR (m->spaces);
1597 if (m->msg)
1400 if (m->msg) FREE_AND_CLEAR(m->msg); 1598 FREE_AND_CLEAR (m->msg);
1599 if (m->maplore)
1401 if (m->maplore) FREE_AND_CLEAR(m->maplore); 1600 FREE_AND_CLEAR (m->maplore);
1402 if (m->shopitems) FREE_AND_CLEAR(m->shopitems); 1601 if (m->shopitems)
1602 delete[]m->shopitems;
1603 m->shopitems = 0;
1604 if (m->shoprace)
1403 if (m->shoprace) FREE_AND_CLEAR(m->shoprace); 1605 FREE_AND_CLEAR (m->shoprace);
1404 if (m->buttons) 1606 if (m->buttons)
1405 free_objectlinkpt(m->buttons); 1607 free_objectlinkpt (m->buttons);
1406 m->buttons = NULL; 1608 m->buttons = NULL;
1407 for (i=0; i<4; i++) { 1609 for (i = 0; i < 4; i++)
1610 {
1611 if (m->tile_path[i])
1408 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]); 1612 FREE_AND_CLEAR (m->tile_path[i]);
1409 m->tile_map[i] = NULL; 1613 m->tile_map[i] = NULL;
1410 } 1614 }
1411 m->in_memory = MAP_SWAPPED; 1615 m->in_memory = MAP_SWAPPED;
1412} 1616}
1413 1617
1414/* 1618/*
1415 * function: vanish mapstruct 1619 * function: vanish maptile
1416 * m : pointer to mapstruct, if NULL no action 1620 * m : pointer to maptile, if NULL no action
1417 * this deletes all the data on the map (freeing pointers) 1621 * this deletes all the data on the map (freeing pointers)
1418 * 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.
1419 */ 1623 */
1420 1624
1421void delete_map(mapstruct *m) { 1625void
1626delete_map (maptile *m)
1627{
1422 mapstruct *tmp, *last; 1628 maptile *tmp, *last;
1423 int i; 1629 int i;
1424 1630
1425 if (!m) 1631 if (!m)
1426 return; 1632 return;
1427 1633
1428 m->clear (); 1634 m->clear ();
1429 1635
1430 if (m->in_memory == MAP_IN_MEMORY) { 1636 if (m->in_memory == MAP_IN_MEMORY)
1637 {
1431 /* change to MAP_SAVING, even though we are not, 1638 /* change to MAP_SAVING, even though we are not,
1432 * 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.
1433 */ 1677 */
1434 m->in_memory = MAP_SAVING;
1435 free_map (m, 1);
1436 }
1437 /* move this out of free_map, since tmpname can still be needed if
1438 * the map is swapped out.
1439 */
1440 if (m->tmpname) {
1441 free(m->tmpname);
1442 m->tmpname=NULL;
1443 }
1444 last = NULL;
1445 /* We need to look through all the maps and see if any maps
1446 * are pointing at this one for tiling information. Since
1447 * tiling can be assymetric, we just can not look to see which
1448 * maps this map tiles with and clears those.
1449 */
1450 for (tmp = first_map; tmp != NULL; tmp = tmp->next) {
1451 if (tmp->next == m) last = tmp;
1452
1453 /* This should hopefully get unrolled on a decent compiler */
1454 for (i=0; i<4; i++)
1455 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL;
1456 }
1457
1458 /* If last is null, then this should be the first map in the list */
1459 if (!last) {
1460 if (m == first_map)
1461 first_map = m->next;
1462 else
1463 /* m->path is a static char, so should hopefully still have
1464 * some useful data in it.
1465 */
1466 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);
1467 m->path);
1468 } 1679 }
1469 else 1680 else
1470 last->next = m->next; 1681 last->next = m->next;
1471 1682
1472 delete m; 1683 delete m;
1473} 1684}
1474 1685
1475 1686
1476 1687
1477/* 1688/*
… …
1484 * dont do any more name translation on it. 1695 * dont do any more name translation on it.
1485 * 1696 *
1486 * Returns a pointer to the given map. 1697 * Returns a pointer to the given map.
1487 */ 1698 */
1488 1699
1700maptile *
1489mapstruct *ready_map_name(const char *name, int flags) { 1701ready_map_name (const char *name, int flags)
1490 mapstruct *m; 1702{
1703 maptile *m;
1491 1704
1492 if (!name) 1705 if (!name)
1493 return (NULL); 1706 return (NULL);
1494 1707
1495 /* Have we been at this level before? */ 1708 /* Have we been at this level before? */
1496 m = has_been_loaded (name); 1709 m = has_been_loaded (name);
1497 1710
1498 /* Map is good to go, so just return it */ 1711 /* Map is good to go, so just return it */
1499 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 {
1500 return m; 1714 return m;
1501 } 1715 }
1502 1716
1503 /* unique maps always get loaded from their original location, and never 1717 /* unique maps always get loaded from their original location, and never
1504 * 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
1505 * 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 -
1506 * 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
1507 * 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
1508 * 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
1509 * 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.
1510 */ 1724 */
1511 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) { 1725 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1726 {
1512 1727
1513 /* first visit or time to reset */ 1728 /* first visit or time to reset */
1514 if (m) { 1729 if (m)
1730 {
1515 clean_tmp_map(m); /* Doesn't make much difference */ 1731 clean_tmp_map (m); /* Doesn't make much difference */
1516 delete_map(m); 1732 delete_map (m);
1517 } 1733 }
1518 1734
1519 /* create and load a map */ 1735 /* create and load a map */
1520 if (flags & MAP_PLAYER_UNIQUE) 1736 if (flags & MAP_PLAYER_UNIQUE)
1521 LOG(llevDebug, "Trying to load map %s.\n", name); 1737 LOG (llevDebug, "Trying to load map %s.\n", name);
1522 else 1738 else
1523 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name)); 1739 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1524 1740
1525 //0.427459955215454 /var/crossfire/players/Saladon/_scorn_apartment_apartments
1526 //0.414906024932861
1527 //0.427063941955566
1528 eval_pv ("$x = Event::time", 1);//D 1741 //eval_pv ("$x = Event::time", 1);//D
1529 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE)))) 1742 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1530 return (NULL); 1743 return (NULL);
1531 eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D 1744 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1532 1745
1533 fix_auto_apply(m); /* Chests which open as default */ 1746 fix_auto_apply (m); /* Chests which open as default */
1534 1747
1535 /* 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.
1536 * if from the editor, likewise. 1749 * if from the editor, likewise.
1537 */ 1750 */
1538 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) 1751 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1539 load_unique_objects(m); 1752 load_unique_objects (m);
1540 1753
1541 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1754 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1755 {
1542 m=load_overlay_map(name, m); 1756 m = load_overlay_map (name, m);
1543 if (m==NULL) 1757 if (m == NULL)
1544 return NULL; 1758 return NULL;
1545 } 1759 }
1546 1760
1547 if (flags & MAP_PLAYER_UNIQUE) 1761 if (flags & MAP_PLAYER_UNIQUE)
1548 INVOKE_MAP (SWAPIN, m); 1762 INVOKE_MAP (SWAPIN, m);
1549 1763
1550 } else { 1764 }
1765 else
1766 {
1551 /* 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. */
1552 1768
1553 m=load_temporary_map (m); 1769 m = load_temporary_map (m);
1770 if (m == NULL)
1554 if(m==NULL) return NULL; 1771 return NULL;
1555 load_unique_objects(m); 1772 load_unique_objects (m);
1556 1773
1557 clean_tmp_map(m); 1774 clean_tmp_map (m);
1558 m->in_memory = MAP_IN_MEMORY; 1775 m->in_memory = MAP_IN_MEMORY;
1559 /* tempnam() on sun systems (probably others) uses malloc 1776 /* tempnam() on sun systems (probably others) uses malloc
1560 * to allocated space for the string. Free it here. 1777 * to allocated space for the string. Free it here.
1561 * In some cases, load_temporary_map above won't find the 1778 * In some cases, load_temporary_map above won't find the
1562 * temporary map, and so has reloaded a new map. If that 1779 * temporary map, and so has reloaded a new map. If that
1563 * is the case, tmpname is now null 1780 * is the case, tmpname is now null
1564 */ 1781 */
1565 if (m->tmpname) free(m->tmpname); 1782 if (m->tmpname)
1783 free (m->tmpname);
1566 m->tmpname = NULL; 1784 m->tmpname = NULL;
1567 /* It's going to be saved anew anyway */ 1785 /* It's going to be saved anew anyway */
1568 } 1786 }
1569 1787
1570 /* 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
1571 * temp maps. 1789 * temp maps.
1572 */ 1790 */
1573 1791
1574 decay_objects(m); /* start the decay */ 1792 decay_objects (m); /* start the decay */
1575 /* In case other objects press some buttons down */ 1793 /* In case other objects press some buttons down */
1576 update_buttons(m); 1794 update_buttons (m);
1577 if (m->outdoor) 1795 if (m->outdoor)
1578 set_darkness_map(m); 1796 set_darkness_map (m);
1579 /* run the weather over this map */ 1797 /* run the weather over this map */
1580 weather_effect(name); 1798 weather_effect (name);
1581 return m; 1799 return m;
1582} 1800}
1583 1801
1584 1802
1585/* 1803/*
1586 * 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.
… …
1591 * 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
1592 * have a difficulty set than using this function - human calculation 1810 * have a difficulty set than using this function - human calculation
1593 * is much better than this functions guesswork. 1811 * is much better than this functions guesswork.
1594 */ 1812 */
1595 1813
1814int
1596int calculate_difficulty(mapstruct *m) { 1815calculate_difficulty (maptile *m)
1816{
1597 object *op; 1817 object *op;
1598 archetype *at; 1818 archetype *at;
1599 int x, y, i, diff; 1819 int x, y, i;
1600 long monster_cnt = 0; 1820 long monster_cnt = 0;
1601 double avgexp = 0; 1821 double avgexp = 0;
1602 sint64 total_exp = 0; 1822 sint64 total_exp = 0;
1603 1823
1604 if (MAP_DIFFICULTY (m)) 1824 if (MAP_DIFFICULTY (m))
1605 { 1825 {
1606 LOG(llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1826 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1607 return MAP_DIFFICULTY (m); 1827 return MAP_DIFFICULTY (m);
1608 } 1828 }
1609 1829
1610 for(x = 0; x < MAP_WIDTH(m); x++) 1830 for (x = 0; x < MAP_WIDTH (m); x++)
1611 for(y = 0; y < MAP_HEIGHT(m); y++) 1831 for (y = 0; y < MAP_HEIGHT (m); y++)
1612 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)
1613 { 1833 {
1614 if(QUERY_FLAG (op, FLAG_MONSTER)) 1834 if (QUERY_FLAG (op, FLAG_MONSTER))
1615 { 1835 {
1616 total_exp += op->stats.exp; 1836 total_exp += op->stats.exp;
1617 monster_cnt++; 1837 monster_cnt++;
1618 } 1838 }
1619 1839
1620 if(QUERY_FLAG (op, FLAG_GENERATOR)) 1840 if (QUERY_FLAG (op, FLAG_GENERATOR))
1621 { 1841 {
1622 total_exp += op->stats.exp; 1842 total_exp += op->stats.exp;
1623 at = type_to_archetype(GENERATE_TYPE (op)); 1843 at = type_to_archetype (GENERATE_TYPE (op));
1624 1844
1625 if(at != NULL) 1845 if (at != NULL)
1626 total_exp += at->clone.stats.exp * 8; 1846 total_exp += at->clone.stats.exp * 8;
1627 1847
1628 monster_cnt++; 1848 monster_cnt++;
1629 } 1849 }
1630 } 1850 }
… …
1641 } 1861 }
1642 1862
1643 return 1; 1863 return 1;
1644} 1864}
1645 1865
1646void clean_tmp_map(mapstruct *m) { 1866void
1867clean_tmp_map (maptile *m)
1868{
1647 if(m->tmpname == NULL) 1869 if (m->tmpname == NULL)
1648 return; 1870 return;
1649 INVOKE_MAP (CLEAN, m); 1871 INVOKE_MAP (CLEAN, m);
1650 (void) unlink(m->tmpname); 1872 (void) unlink (m->tmpname);
1651} 1873}
1652 1874
1875void
1653void free_all_maps(void) 1876free_all_maps (void)
1654{ 1877{
1655 int real_maps=0; 1878 int real_maps = 0;
1656 1879
1657 while (first_map) { 1880 while (first_map)
1881 {
1658 /* 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
1659 * saving, but we still want to free this data 1883 * saving, but we still want to free this data
1660 */ 1884 */
1661 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;
1662 delete_map(first_map); 1887 delete_map (first_map);
1663 real_maps++; 1888 real_maps++;
1664 } 1889 }
1665 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps); 1890 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1666} 1891}
1667 1892
1668/* change_map_light() - used to change map light level (darkness) 1893/* change_map_light() - used to change map light level (darkness)
1669 * up or down. Returns true if successful. It should now be 1894 * up or down. Returns true if successful. It should now be
1670 * possible to change a value by more than 1. 1895 * possible to change a value by more than 1.
1671 * 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
1672 * to maps than los. 1897 * to maps than los.
1673 * postive values make it darker, negative make it brighter 1898 * postive values make it darker, negative make it brighter
1674 */ 1899 */
1675 1900
1901int
1676int change_map_light(mapstruct *m, int change) { 1902change_map_light (maptile *m, int change)
1903{
1677 int new_level = m->darkness + change; 1904 int new_level = m->darkness + change;
1678 1905
1679 /* Nothing to do */ 1906 /* Nothing to do */
1680 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))
1681 (new_level >= MAX_DARKNESS && m->darkness >=MAX_DARKNESS)) { 1908 {
1682 return 0; 1909 return 0;
1683 } 1910 }
1684 1911
1685 /* inform all players on the map */ 1912 /* inform all players on the map */
1686 if (change>0) 1913 if (change > 0)
1687 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker."); 1914 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker.");
1688 else 1915 else
1689 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); 1916 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter.");
1690 1917
1691 /* Do extra checking. since m->darkness is a unsigned value, 1918 /* Do extra checking. since m->darkness is a unsigned value,
1692 * we need to be extra careful about negative values. 1919 * we need to be extra careful about negative values.
1693 * In general, the checks below are only needed if change 1920 * In general, the checks below are only needed if change
1694 * is not +/-1 1921 * is not +/-1
1695 */ 1922 */
1696 if (new_level < 0) m->darkness = 0; 1923 if (new_level < 0)
1697 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
1698 else m->darkness=new_level; 1928 m->darkness = new_level;
1699 1929
1700 /* All clients need to get re-updated for the change */ 1930 /* All clients need to get re-updated for the change */
1701 update_all_map_los(m); 1931 update_all_map_los (m);
1702 return 1; 1932 return 1;
1703} 1933}
1704 1934
1705 1935
1706/* 1936/*
1707 * This function updates various attributes about a specific space 1937 * This function updates various attributes about a specific space
1708 * on the map (what it looks like, whether it blocks magic, 1938 * on the map (what it looks like, whether it blocks magic,
1709 * has a living creatures, prevents people from passing 1939 * has a living creatures, prevents people from passing
1710 * through, etc) 1940 * through, etc)
1711 */ 1941 */
1942void
1712void update_position (mapstruct *m, int x, int y) { 1943update_position (maptile *m, int x, int y)
1944{
1713 object *tmp, *last = NULL; 1945 object *tmp, *last = NULL;
1714 uint8 flags = 0, oldflags, light=0, anywhere=0; 1946 uint8 flags = 0, oldflags, light = 0, anywhere = 0;
1715 New_Face *top,*floor, *middle; 1947 New_Face *top, *floor, *middle;
1716 object *top_obj, *floor_obj, *middle_obj; 1948 object *top_obj, *floor_obj, *middle_obj;
1717 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;
1718 1950
1719 oldflags = GET_MAP_FLAGS(m,x,y); 1951 oldflags = GET_MAP_FLAGS (m, x, y);
1720 if (!(oldflags & P_NEED_UPDATE)) { 1952 if (!(oldflags & P_NEED_UPDATE))
1953 {
1721 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);
1722 m->path, x, y);
1723 return; 1955 return;
1724 } 1956 }
1725 1957
1726 middle=blank_face; 1958 middle = blank_face;
1727 top=blank_face; 1959 top = blank_face;
1728 floor=blank_face; 1960 floor = blank_face;
1729 1961
1730 middle_obj = NULL; 1962 middle_obj = NULL;
1731 top_obj = NULL; 1963 top_obj = NULL;
1732 floor_obj = NULL; 1964 floor_obj = NULL;
1733 1965
1734 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 {
1735 1968
1736 /* This could be made additive I guess (two lights better than 1969 /* This could be made additive I guess (two lights better than
1737 * 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
1738 * light bulbs do not illuminate twice as far as once since 1971 * light bulbs do not illuminate twice as far as once since
1739 * 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?)
1740 */ 1973 */
1741 if (tmp->glow_radius > light) light = tmp->glow_radius; 1974 if (tmp->glow_radius > light)
1975 light = tmp->glow_radius;
1742 1976
1743 /* This call is needed in order to update objects the player 1977 /* This call is needed in order to update objects the player
1744 * is standing in that have animations (ie, grass, fire, etc). 1978 * is standing in that have animations (ie, grass, fire, etc).
1745 * However, it also causes the look window to be re-drawn 1979 * However, it also causes the look window to be re-drawn
1746 * 3 times each time the player moves, because many of the 1980 * 3 times each time the player moves, because many of the
1747 * functions the move_player calls eventualy call this. 1981 * functions the move_player calls eventualy call this.
1748 * 1982 *
1749 * Always put the player down for drawing. 1983 * Always put the player down for drawing.
1750 */ 1984 */
1751 if (!tmp->invisible) { 1985 if (!tmp->invisible)
1986 {
1752 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { 1987 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1988 {
1753 top = tmp->face; 1989 top = tmp->face;
1754 top_obj = tmp; 1990 top_obj = tmp;
1755 } 1991 }
1756 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { 1992 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1993 {
1757 /* 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,
1758 * so should not be visible, so we clear them. 1995 * so should not be visible, so we clear them.
1759 */ 1996 */
1760 middle=blank_face; 1997 middle = blank_face;
1761 top=blank_face; 1998 top = blank_face;
1762 floor = tmp->face; 1999 floor = tmp->face;
1763 floor_obj = tmp; 2000 floor_obj = tmp;
1764 } 2001 }
1765 /* Flag anywhere have high priority */ 2002 /* Flag anywhere have high priority */
1766 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { 2003 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
2004 {
1767 middle = tmp->face; 2005 middle = tmp->face;
1768 2006
1769 middle_obj = tmp; 2007 middle_obj = tmp;
1770 anywhere =1; 2008 anywhere = 1;
1771 } 2009 }
1772 /* Find the highest visible face around. If equal 2010 /* Find the highest visible face around. If equal
1773 * visibilities, we still want the one nearer to the 2011 * visibilities, we still want the one nearer to the
1774 * top 2012 * top
1775 */ 2013 */
1776 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { 2014 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere))
2015 {
1777 middle = tmp->face; 2016 middle = tmp->face;
1778 middle_obj = tmp; 2017 middle_obj = tmp;
1779 } 2018 }
1780 } 2019 }
1781 if (tmp==tmp->above) { 2020 if (tmp == tmp->above)
2021 {
1782 LOG(llevError, "Error in structure of map\n"); 2022 LOG (llevError, "Error in structure of map\n");
1783 exit (-1); 2023 exit (-1);
1784 }
1785 2024 }
2025
1786 move_slow |= tmp->move_slow; 2026 move_slow |= tmp->move_slow;
1787 move_block |= tmp->move_block; 2027 move_block |= tmp->move_block;
1788 move_on |= tmp->move_on; 2028 move_on |= tmp->move_on;
1789 move_off |= tmp->move_off; 2029 move_off |= tmp->move_off;
1790 move_allow |= tmp->move_allow; 2030 move_allow |= tmp->move_allow;
1791 2031
1792 if (QUERY_FLAG(tmp,FLAG_ALIVE)) 2032 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1793 flags |= P_IS_ALIVE; 2033 flags |= P_IS_ALIVE;
1794 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 2034 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1795 flags |= P_NO_MAGIC; 2035 flags |= P_NO_MAGIC;
1796 if (QUERY_FLAG(tmp,FLAG_DAMNED)) 2036 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1797 flags |= P_NO_CLERIC; 2037 flags |= P_NO_CLERIC;
1798 if (tmp->type == SAFE_GROUND) 2038 if (tmp->type == SAFE_GROUND)
1799 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC; 2039 flags |= P_SAFE;
1800 2040
1801 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 2041 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW))
1802 flags |= P_BLOCKSVIEW; 2042 flags |= P_BLOCKSVIEW;
1803 } /* for stack of objects */ 2043 } /* for stack of objects */
1804 2044
1805 /* 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
1806 * since we're already doing the work, we calculate them here. 2046 * since we're already doing the work, we calculate them here.
1807 * if they don't match, logic is broken someplace. 2047 * if they don't match, logic is broken someplace.
1808 */ 2048 */
1809 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) && 2049 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1810 (!(oldflags & P_NO_ERROR))) { 2050 {
1811 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",
1812 m->path, x, y,
1813 (oldflags & ~P_NEED_UPDATE), flags); 2052 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
1814 } 2053 }
1815 SET_MAP_FLAGS(m, x, y, flags); 2054 SET_MAP_FLAGS (m, x, y, flags);
1816 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow); 2055 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow);
1817 SET_MAP_MOVE_ON(m, x, y, move_on); 2056 SET_MAP_MOVE_ON (m, x, y, move_on);
1818 SET_MAP_MOVE_OFF(m, x, y, move_off); 2057 SET_MAP_MOVE_OFF (m, x, y, move_off);
1819 SET_MAP_MOVE_SLOW(m, x, y, move_slow); 2058 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
1820 2059
1821 /* 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),
1822 * 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
1823 * this point. 2062 * this point.
1824 * middle contains the highest visibility face. 2063 * middle contains the highest visibility face.
1825 * top contains a player/monster face, if there is one. 2064 * top contains a player/monster face, if there is one.
1826 * 2065 *
1827 * 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.
1828 */ 2067 */
1829 2068
1830 /* 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
1831 * middle face. This should not happen, as we already have the 2070 * middle face. This should not happen, as we already have the
1832 * else statement above so middle should not get set. OTOH, it 2071 * else statement above so middle should not get set. OTOH, it
1833 * 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.
1834 */ 2073 */
1835 if (top == middle) middle=blank_face; 2074 if (top == middle)
2075 middle = blank_face;
1836 2076
1837 /* There are three posibilities at this point: 2077 /* There are three posibilities at this point:
1838 * 1) top face is set, need middle to be set. 2078 * 1) top face is set, need middle to be set.
1839 * 2) middle is set, need to set top. 2079 * 2) middle is set, need to set top.
1840 * 3) neither middle or top is set - need to set both. 2080 * 3) neither middle or top is set - need to set both.
1841 */ 2081 */
1842 2082
1843 for (tmp=last; tmp; tmp=tmp->below) { 2083 for (tmp = last; tmp; tmp = tmp->below)
2084 {
1844 /* 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 */
1845 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; 2086 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2087 break;
1846 2088
1847 /* If two top faces are already set, quit processing */ 2089 /* If two top faces are already set, quit processing */
1848 if ((top != blank_face) && (middle != blank_face)) break; 2090 if ((top != blank_face) && (middle != blank_face))
2091 break;
1849 2092
1850 /* Only show visible faces, unless its the editor - show all */ 2093 /* Only show visible faces, unless its the editor - show all */
1851 if (!tmp->invisible || editor) { 2094 if (!tmp->invisible || editor)
2095 {
1852 /* Fill in top if needed */ 2096 /* Fill in top if needed */
1853 if (top == blank_face) { 2097 if (top == blank_face)
2098 {
1854 top = tmp->face; 2099 top = tmp->face;
1855 top_obj = tmp; 2100 top_obj = tmp;
2101 if (top == middle)
1856 if (top == middle) middle=blank_face; 2102 middle = blank_face;
2103 }
1857 } else { 2104 else
2105 {
1858 /* top is already set - we should only get here if 2106 /* top is already set - we should only get here if
1859 * middle is not set 2107 * middle is not set
1860 * 2108 *
1861 * Set the middle face and break out, since there is nothing 2109 * Set the middle face and break out, since there is nothing
1862 * more to fill in. We don't check visiblity here, since 2110 * more to fill in. We don't check visiblity here, since
1863 * 2111 *
1864 */ 2112 */
1865 if (tmp->face != top ) { 2113 if (tmp->face != top)
2114 {
1866 middle = tmp->face; 2115 middle = tmp->face;
1867 middle_obj = tmp; 2116 middle_obj = tmp;
1868 break; 2117 break;
1869 } 2118 }
1870 } 2119 }
1871 } 2120 }
1872 } 2121 }
1873 if (middle == floor) middle = blank_face; 2122 if (middle == floor)
1874 if (top == middle) middle = blank_face; 2123 middle = blank_face;
2124 if (top == middle)
2125 middle = blank_face;
1875 SET_MAP_FACE(m,x,y,top,0); 2126 SET_MAP_FACE (m, x, y, top, 0);
1876 if(top != blank_face) 2127 if (top != blank_face)
1877 SET_MAP_FACE_OBJ(m,x,y,top_obj,0); 2128 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
1878 else 2129 else
1879 SET_MAP_FACE_OBJ(m,x,y,NULL,0); 2130 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
1880 SET_MAP_FACE(m,x,y,middle,1); 2131 SET_MAP_FACE (m, x, y, middle, 1);
1881 if(middle != blank_face) 2132 if (middle != blank_face)
1882 SET_MAP_FACE_OBJ(m,x,y,middle_obj,1); 2133 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
1883 else 2134 else
1884 SET_MAP_FACE_OBJ(m,x,y,NULL,1); 2135 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
1885 SET_MAP_FACE(m,x,y,floor,2); 2136 SET_MAP_FACE (m, x, y, floor, 2);
1886 if(floor != blank_face) 2137 if (floor != blank_face)
1887 SET_MAP_FACE_OBJ(m,x,y,floor_obj,2); 2138 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
1888 else 2139 else
1889 SET_MAP_FACE_OBJ(m,x,y,NULL,2); 2140 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
1890 SET_MAP_LIGHT(m,x,y,light); 2141 SET_MAP_LIGHT (m, x, y, light);
1891} 2142}
1892 2143
1893 2144
2145void
1894void set_map_reset_time(mapstruct *map) { 2146set_map_reset_time (maptile *map)
2147{
1895 int timeout; 2148 int timeout;
1896 2149
1897 timeout = MAP_RESET_TIMEOUT(map); 2150 timeout = MAP_RESET_TIMEOUT (map);
1898 if (timeout <= 0) 2151 if (timeout <= 0)
1899 timeout = MAP_DEFAULTRESET; 2152 timeout = MAP_DEFAULTRESET;
1900 if (timeout >= MAP_MAXRESET) 2153 if (timeout >= MAP_MAXRESET)
1901 timeout = MAP_MAXRESET; 2154 timeout = MAP_MAXRESET;
1902 MAP_WHEN_RESET(map) = seconds()+timeout; 2155 MAP_WHEN_RESET (map) = seconds () + timeout;
1903} 2156}
1904 2157
1905/* 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
1906 * 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
1907 * 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
1908 * 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
1909 * so that it is easier for calling functions to verify success. 2162 * so that it is easier for calling functions to verify success.
1910 */ 2163 */
1911 2164
2165static maptile *
1912static mapstruct *load_and_link_tiled_map(mapstruct *orig_map, int tile_num) 2166load_and_link_tiled_map (maptile *orig_map, int tile_num)
1913{ 2167{
1914 int dest_tile = (tile_num +2) % 4; 2168 int dest_tile = (tile_num + 2) % 4;
1915 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]);
1916 2170
1917 orig_map->tile_map[tile_num] = ready_map_name(path, 0); 2171 orig_map->tile_map[tile_num] = ready_map_name (path, 0);
1918 2172
1919 /* 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 */
1920 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))
1921 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1922 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;
1923 2176
1924 return orig_map->tile_map[tile_num]; 2177 return orig_map->tile_map[tile_num];
1925} 2178}
1926 2179
1927/* this returns TRUE if the coordinates (x,y) are out of 2180/* this returns TRUE if the coordinates (x,y) are out of
1928 * map m. This function also takes into account any 2181 * map m. This function also takes into account any
1929 * tiling considerations, loading adjacant maps as needed. 2182 * tiling considerations, loading adjacant maps as needed.
… …
1932 * This function will recursively call itself for the 2185 * This function will recursively call itself for the
1933 * tiled maps. 2186 * tiled maps.
1934 * 2187 *
1935 * 2188 *
1936 */ 2189 */
2190int
1937int out_of_map(mapstruct *m, int x, int y) 2191out_of_map (maptile *m, int x, int y)
1938{ 2192{
1939 2193
1940 /* If we get passed a null map, this is obviously the 2194 /* If we get passed a null map, this is obviously the
1941 * case. This generally shouldn't happen, but if the 2195 * case. This generally shouldn't happen, but if the
1942 * map loads fail below, it could happen. 2196 * map loads fail below, it could happen.
1943 */ 2197 */
1944 if (!m) return 0; 2198 if (!m)
1945
1946 if (x<0) {
1947 if (!m->tile_path[3]) return 1;
1948 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1949 load_and_link_tiled_map(m, 3);
1950 }
1951 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y));
1952 }
1953 if (x>=MAP_WIDTH(m)) {
1954 if (!m->tile_path[1]) return 1;
1955 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) {
1956 load_and_link_tiled_map(m, 1);
1957 }
1958 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y));
1959 }
1960 if (y<0) {
1961 if (!m->tile_path[0]) return 1;
1962 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) {
1963 load_and_link_tiled_map(m, 0);
1964 }
1965 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0])));
1966 }
1967 if (y>=MAP_HEIGHT(m)) {
1968 if (!m->tile_path[2]) return 1;
1969 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
1970 load_and_link_tiled_map(m, 2);
1971 }
1972 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
1973 }
1974
1975 /* Simple case - coordinates are within this local
1976 * map.
1977 */
1978 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;
1979} 2246}
1980 2247
1981/* This is basically the same as out_of_map above, but 2248/* This is basically the same as out_of_map above, but
1982 * instead we return NULL if no map is valid (coordinates 2249 * instead we return NULL if no map is valid (coordinates
1983 * out of bounds and no tiled map), otherwise it returns 2250 * out of bounds and no tiled map), otherwise it returns
1984 * the map as that the coordinates are really on, and 2251 * the map as that the coordinates are really on, and
1985 * updates x and y to be the localized coordinates. 2252 * updates x and y to be the localized coordinates.
1986 * Using this is more efficient of calling out_of_map 2253 * Using this is more efficient of calling out_of_map
1987 * and then figuring out what the real map is 2254 * and then figuring out what the real map is
1988 */ 2255 */
2256maptile *
1989mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 2257get_map_from_coord (maptile *m, sint16 * x, sint16 * y)
1990{ 2258{
1991 2259
1992 if (*x<0) { 2260 if (*x < 0)
2261 {
1993 if (!m->tile_path[3]) return NULL; 2262 if (!m->tile_path[3])
2263 return NULL;
1994 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)
1995 load_and_link_tiled_map(m, 3); 2265 load_and_link_tiled_map (m, 3);
1996 2266
1997 *x += MAP_WIDTH(m->tile_map[3]); 2267 *x += MAP_WIDTH (m->tile_map[3]);
1998 return (get_map_from_coord(m->tile_map[3], x, y)); 2268 return (get_map_from_coord (m->tile_map[3], x, y));
1999 } 2269 }
2000 if (*x>=MAP_WIDTH(m)) { 2270 if (*x >= MAP_WIDTH (m))
2271 {
2001 if (!m->tile_path[1]) return NULL; 2272 if (!m->tile_path[1])
2273 return NULL;
2002 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)
2003 load_and_link_tiled_map(m, 1); 2275 load_and_link_tiled_map (m, 1);
2004 2276
2005 *x -= MAP_WIDTH(m); 2277 *x -= MAP_WIDTH (m);
2006 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)
2007 } 2281 {
2008 if (*y<0) {
2009 if (!m->tile_path[0]) return NULL; 2282 if (!m->tile_path[0])
2283 return NULL;
2010 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)
2011 load_and_link_tiled_map(m, 0); 2285 load_and_link_tiled_map (m, 0);
2012 2286
2013 *y += MAP_HEIGHT(m->tile_map[0]); 2287 *y += MAP_HEIGHT (m->tile_map[0]);
2014 return (get_map_from_coord(m->tile_map[0], x, y)); 2288 return (get_map_from_coord (m->tile_map[0], x, y));
2015 } 2289 }
2016 if (*y>=MAP_HEIGHT(m)) { 2290 if (*y >= MAP_HEIGHT (m))
2291 {
2017 if (!m->tile_path[2]) return NULL; 2292 if (!m->tile_path[2])
2293 return NULL;
2018 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)
2019 load_and_link_tiled_map(m, 2); 2295 load_and_link_tiled_map (m, 2);
2020 2296
2021 *y -= MAP_HEIGHT(m); 2297 *y -= MAP_HEIGHT (m);
2022 return (get_map_from_coord(m->tile_map[2], x, y)); 2298 return (get_map_from_coord (m->tile_map[2], x, y));
2023 } 2299 }
2024 2300
2025 /* Simple case - coordinates are within this local 2301 /* Simple case - coordinates are within this local
2026 * map. 2302 * map.
2027 */ 2303 */
2028 2304
2029 return m; 2305 return m;
2030} 2306}
2031 2307
2032/** 2308/**
2033 * 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
2034 * map1 to map2 in dx/dy. 2310 * map1 to map2 in dx/dy.
2035 */ 2311 */
2312static int
2036static 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{
2037 if (!map1 || !map2) 2315 if (!map1 || !map2)
2038 return 0; 2316 return 0;
2039 2317
2040 if (map1 == map2) { 2318 if (map1 == map2)
2319 {
2041 *dx = 0; 2320 *dx = 0;
2042 *dy = 0; 2321 *dy = 0;
2043 2322
2323 }
2044 } else if (map1->tile_map[0] == map2) { /* up */ 2324 else if (map1->tile_map[0] == map2)
2325 { /* up */
2045 *dx = 0; 2326 *dx = 0;
2046 *dy = -MAP_HEIGHT(map2); 2327 *dy = -MAP_HEIGHT (map2);
2328 }
2047 } else if (map1->tile_map[1] == map2) { /* right */ 2329 else if (map1->tile_map[1] == map2)
2330 { /* right */
2048 *dx = MAP_WIDTH(map1); 2331 *dx = MAP_WIDTH (map1);
2049 *dy = 0; 2332 *dy = 0;
2333 }
2050 } else if (map1->tile_map[2] == map2) { /* down */ 2334 else if (map1->tile_map[2] == map2)
2335 { /* down */
2051 *dx = 0; 2336 *dx = 0;
2052 *dy = MAP_HEIGHT(map1); 2337 *dy = MAP_HEIGHT (map1);
2338 }
2053 } else if (map1->tile_map[3] == map2) { /* left */ 2339 else if (map1->tile_map[3] == map2)
2340 { /* left */
2054 *dx = -MAP_WIDTH(map2); 2341 *dx = -MAP_WIDTH (map2);
2055 *dy = 0; 2342 *dy = 0;
2056 2343
2344 }
2057 } 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 */
2058 *dx = MAP_WIDTH(map1->tile_map[0]); 2347 *dx = MAP_WIDTH (map1->tile_map[0]);
2059 *dy = -MAP_HEIGHT(map1->tile_map[0]); 2348 *dy = -MAP_HEIGHT (map1->tile_map[0]);
2349 }
2060 } 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 */
2061 *dx = -MAP_WIDTH(map2); 2352 *dx = -MAP_WIDTH (map2);
2062 *dy = -MAP_HEIGHT(map1->tile_map[0]); 2353 *dy = -MAP_HEIGHT (map1->tile_map[0]);
2354 }
2063 } 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 */
2064 *dx = MAP_WIDTH(map1); 2357 *dx = MAP_WIDTH (map1);
2065 *dy = -MAP_HEIGHT(map2); 2358 *dy = -MAP_HEIGHT (map2);
2359 }
2066 } 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 */
2067 *dx = MAP_WIDTH(map1); 2362 *dx = MAP_WIDTH (map1);
2068 *dy = MAP_HEIGHT(map1->tile_map[1]); 2363 *dy = MAP_HEIGHT (map1->tile_map[1]);
2364 }
2069 } 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 */
2070 *dx = MAP_WIDTH(map1->tile_map[2]); 2367 *dx = MAP_WIDTH (map1->tile_map[2]);
2071 *dy = MAP_HEIGHT(map1); 2368 *dy = MAP_HEIGHT (map1);
2369 }
2072 } 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 */
2073 *dx = -MAP_WIDTH(map2); 2372 *dx = -MAP_WIDTH (map2);
2074 *dy = MAP_HEIGHT(map1); 2373 *dy = MAP_HEIGHT (map1);
2374 }
2075 } 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 */
2076 *dx = -MAP_WIDTH(map1->tile_map[3]); 2377 *dx = -MAP_WIDTH (map1->tile_map[3]);
2077 *dy = -MAP_HEIGHT(map2); 2378 *dy = -MAP_HEIGHT (map2);
2379 }
2078 } 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 */
2079 *dx = -MAP_WIDTH(map1->tile_map[3]); 2382 *dx = -MAP_WIDTH (map1->tile_map[3]);
2080 *dy = MAP_HEIGHT(map1->tile_map[3]); 2383 *dy = MAP_HEIGHT (map1->tile_map[3]);
2081 2384
2082 } else { /* not "adjacent" enough */ 2385 }
2386 else
2387 { /* not "adjacent" enough */
2083 return 0; 2388 return 0;
2084 } 2389 }
2085 2390
2086 return 1; 2391 return 1;
2087} 2392}
2088 2393
2089/* From map.c 2394/* From map.c
2090 * This is used by get_player to determine where the other 2395 * This is used by get_player to determine where the other
2091 * creature is. get_rangevector takes into account map tiling, 2396 * creature is. get_rangevector takes into account map tiling,
… …
2105 * 2410 *
2106 * currently, the only flag supported (0x1) is don't translate for 2411 * currently, the only flag supported (0x1) is don't translate for
2107 * closest body part of 'op1' 2412 * closest body part of 'op1'
2108 */ 2413 */
2109 2414
2415void
2110void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) { 2416get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2417{
2111 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 {
2112 /* be conservative and fill in _some_ data */ 2420 /* be conservative and fill in _some_ data */
2113 retval->distance = 100000; 2421 retval->distance = 100000;
2114 retval->distance_x = 32767; 2422 retval->distance_x = 32767;
2115 retval->distance_y = 32767; 2423 retval->distance_y = 32767;
2116 retval->direction = 0; 2424 retval->direction = 0;
2117 retval->part = 0; 2425 retval->part = 0;
2118 } else { 2426 }
2427 else
2428 {
2119 object *best; 2429 object *best;
2120 2430
2121 retval->distance_x += op2->x-op1->x; 2431 retval->distance_x += op2->x - op1->x;
2122 retval->distance_y += op2->y-op1->y; 2432 retval->distance_y += op2->y - op1->y;
2123 2433
2124 best = op1; 2434 best = op1;
2125 /* If this is multipart, find the closest part now */ 2435 /* If this is multipart, find the closest part now */
2126 if (!(flags&0x1) && op1->more) { 2436 if (!(flags & 0x1) && op1->more)
2437 {
2127 object *tmp; 2438 object *tmp;
2128 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;
2129 retval->distance_y*retval->distance_y, tmpi;
2130 2440
2131 /* 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
2132 * distance instead of doing all that work above again 2442 * distance instead of doing all that work above again
2133 * since the distance fields we set above are positive in the 2443 * since the distance fields we set above are positive in the
2134 * same axis as is used for multipart objects, the simply arithmetic 2444 * same axis as is used for multipart objects, the simply arithmetic
2135 * below works. 2445 * below works.
2136 */ 2446 */
2137 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) { 2447 for (tmp = op1->more; tmp != NULL; tmp = tmp->more)
2448 {
2138 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) +
2139 (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);
2140 if (tmpi < best_distance) { 2451 if (tmpi < best_distance)
2452 {
2141 best_distance = tmpi; 2453 best_distance = tmpi;
2142 best = tmp; 2454 best = tmp;
2143 } 2455 }
2144 } 2456 }
2145 if (best != op1) { 2457 if (best != op1)
2458 {
2146 retval->distance_x += op1->x-best->x; 2459 retval->distance_x += op1->x - best->x;
2147 retval->distance_y += op1->y-best->y; 2460 retval->distance_y += op1->y - best->y;
2148 } 2461 }
2149 } 2462 }
2150 retval->part = best; 2463 retval->part = best;
2151 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);
2152 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2465 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2153 } 2466 }
2154} 2467}
2155 2468
2156/* 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
2157 * the first parameter being an object, it instead is the map 2470 * the first parameter being an object, it instead is the map
… …
2162 * 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
2163 * 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
2164 * field of the rv_vector is set to NULL. 2477 * field of the rv_vector is set to NULL.
2165 */ 2478 */
2166 2479
2480void
2167void 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{
2168 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 {
2169 /* be conservative and fill in _some_ data */ 2485 /* be conservative and fill in _some_ data */
2170 retval->distance = 100000; 2486 retval->distance = 100000;
2171 retval->distance_x = 32767; 2487 retval->distance_x = 32767;
2172 retval->distance_y = 32767; 2488 retval->distance_y = 32767;
2173 retval->direction = 0; 2489 retval->direction = 0;
2174 retval->part = 0; 2490 retval->part = 0;
2175 } else { 2491 }
2492 else
2493 {
2176 retval->distance_x += op2->x-x; 2494 retval->distance_x += op2->x - x;
2177 retval->distance_y += op2->y-y; 2495 retval->distance_y += op2->y - y;
2178 2496
2179 retval->part = NULL; 2497 retval->part = NULL;
2180 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);
2181 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2499 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
2182 } 2500 }
2183} 2501}
2184 2502
2185/* 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
2186 * (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
… …
2188 * to op1, this will still return false. 2506 * to op1, this will still return false.
2189 * 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
2190 * and efficient. This could probably be a macro. 2508 * and efficient. This could probably be a macro.
2191 * MSW 2001-08-05 2509 * MSW 2001-08-05
2192 */ 2510 */
2511int
2193int on_same_map(const object *op1, const object *op2) { 2512on_same_map (const object *op1, const object *op2)
2513{
2194 int dx, dy; 2514 int dx, dy;
2195 2515
2196 return adjacent_map(op1->map, op2->map, &dx, &dy); 2516 return adjacent_map (op1->map, op2->map, &dx, &dy);
2197} 2517}

Diff Legend

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