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

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.28 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

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

Diff Legend

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