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