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

Diff Legend

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