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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.25 by root, Mon Sep 4 17:36:12 2006 UTC vs.
Revision 1.54 by root, Wed Dec 27 13:13:46 2006 UTC

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

Diff Legend

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