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.21 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.55 by root, Wed Dec 27 18:09:48 2006 UTC

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

Diff Legend

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