ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.24 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.45 by root, Wed Dec 20 09:14:21 2006 UTC

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

Diff Legend

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