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.27 by root, Fri Sep 8 12:56:42 2006 UTC vs.
Revision 1.45 by root, Wed Dec 20 09:14:21 2006 UTC

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

Diff Legend

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