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.19 by root, Thu Aug 31 18:59:23 2006 UTC vs.
Revision 1.39 by root, Tue Dec 12 20:53:02 2006 UTC

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

Diff Legend

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