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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.23 by root, Mon Sep 4 15:51:24 2006 UTC vs.
Revision 1.50 by root, Mon Dec 25 15:28:35 2006 UTC

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

Diff Legend

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