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.20 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.48 by root, Mon Dec 25 14:43:22 2006 UTC

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

Diff Legend

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