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.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.44 by root, Mon Dec 18 04:07:30 2006 UTC

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

Diff Legend

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