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.24 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.44 by root, Mon Dec 18 04:07:30 2006 UTC

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

Diff Legend

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