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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.20 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.54 by root, Wed Dec 27 13:13:46 2006 UTC

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