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.22 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 2006 UTC

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

Diff Legend

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