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.27 by root, Fri Sep 8 12:56:42 2006 UTC vs.
Revision 1.56 by root, Sat Dec 30 10:16:10 2006 UTC

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

Diff Legend

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