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.2 by elmex, Tue Aug 15 15:00:20 2006 UTC vs.
Revision 1.61 by root, Sun Dec 31 17:17:22 2006 UTC

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

Diff Legend

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