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

Diff Legend

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