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.21 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.48 by root, Mon Dec 25 14:43:22 2006 UTC

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

Diff Legend

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