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.18 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.41 by root, Tue Dec 12 22:37:05 2006 UTC

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

Diff Legend

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