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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.11 by root, Mon Aug 28 16:12:59 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.1 2006/08/13 17:16:00 elmex Exp $"; 3 * "$Id: map.C,v 1.11 2006/08/28 16:12:59 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
38#include "path.h" 38#include "path.h"
39 39
40 40
41extern int nrofallocobjects,nroffreeobjects; 41extern int nrofallocobjects,nroffreeobjects;
42 42
43void (*load_original_map_callback)(mapstruct *map);
44void (*load_temporary_map_callback)(mapstruct *map);
45void (*clean_temporary_map_callback)(mapstruct *map);
46
47/* 43/*
48 * Returns the mapstruct which has a name matching the given argument. 44 * Returns the mapstruct which has a name matching the given argument.
49 * return NULL if no match is found. 45 * return NULL if no match is found.
50 */ 46 */
51 47
52mapstruct *has_been_loaded (const char *name) { 48mapstruct *has_been_loaded (const char *name) {
53 mapstruct *map; 49 mapstruct *map;
54 50
55 if (!name || !*name) 51 if (!name || !*name)
56 return 0; 52 return 0;
57 for (map = first_map; map; map = map->next) 53 for (map = first_map; map; map = map->next)
58 if (!strcmp (name, map->path)) 54 if (!strcmp (name, map->path))
59 break; 55 break;
60 return (map); 56 return (map);
61} 57}
62 58
63/* 59/*
64 * This makes a path absolute outside the world of Crossfire. 60 * This makes a path absolute outside the world of Crossfire.
… …
163 struct stat statbuf; 159 struct stat statbuf;
164 int mode = 0, i; 160 int mode = 0, i;
165#endif 161#endif
166 162
167 if (prepend_dir) 163 if (prepend_dir)
168 strcpy (buf, create_pathname(name)); 164 strcpy (buf, create_pathname(name));
169 else 165 else
170 strcpy(buf, name); 166 strcpy(buf, name);
171#ifdef WIN32 /* ***win32: check this sucker in windows style. */ 167#ifdef WIN32 /* ***win32: check this sucker in windows style. */
172 return(_access(buf,0)); 168 return(_access(buf,0));
173#else 169#else
174 170
175 /* old method (strchr(buf, '\0')) seemd very odd to me - 171 /* old method (strchr(buf, '\0')) seemd very odd to me -
176 * this method should be equivalant and is clearer. 172 * this method should be equivalant and is clearer.
177 * Can not use strcat because we need to cycle through 173 * Can not use strcat because we need to cycle through
… …
188 break; 184 break;
189 } 185 }
190 if (i == NROF_COMPRESS_METHODS) 186 if (i == NROF_COMPRESS_METHODS)
191 return (-1); 187 return (-1);
192 if (!S_ISREG (statbuf.st_mode)) 188 if (!S_ISREG (statbuf.st_mode))
193 return (-1); 189 return (-1);
194 190
195 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) || 191 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) ||
196 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) || 192 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) ||
197 (statbuf.st_mode & S_IROTH)) 193 (statbuf.st_mode & S_IROTH))
198 mode |= 4; 194 mode |= 4;
199 195
200 if ((statbuf.st_mode & S_IWGRP && getegid() == statbuf.st_gid) || 196 if ((statbuf.st_mode & S_IWGRP && getegid() == statbuf.st_gid) ||
201 (statbuf.st_mode & S_IWUSR && geteuid() == statbuf.st_uid) || 197 (statbuf.st_mode & S_IWUSR && geteuid() == statbuf.st_uid) ||
202 (statbuf.st_mode & S_IWOTH)) 198 (statbuf.st_mode & S_IWOTH))
203 mode |= 2; 199 mode |= 2;
204 200
205 return (mode); 201 return (mode);
206#endif 202#endif
207} 203}
208 204
… …
213 */ 209 */
214 210
215void dump_map(const mapstruct *m) { 211void dump_map(const mapstruct *m) {
216 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory); 212 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory);
217 LOG(llevError,"Size: %dx%d Start: %d,%d\n", 213 LOG(llevError,"Size: %dx%d Start: %d,%d\n",
218 MAP_WIDTH(m), MAP_HEIGHT(m), 214 MAP_WIDTH(m), MAP_HEIGHT(m),
219 MAP_ENTER_X(m), MAP_ENTER_Y(m)); 215 MAP_ENTER_X(m), MAP_ENTER_Y(m));
220 216
221 if(m->msg!=NULL) 217 if(m->msg!=NULL)
222 LOG(llevError,"Message:\n%s",m->msg); 218 LOG(llevError,"Message:\n%s",m->msg);
223 219
224 if(m->maplore!=NULL) 220 if(m->maplore!=NULL)
225 LOG(llevError,"Lore:\n%s",m->maplore); 221 LOG(llevError,"Lore:\n%s",m->maplore);
226 222
227 if(m->tmpname!=NULL) 223 if(m->tmpname!=NULL)
228 LOG(llevError,"Tmpname: %s\n",m->tmpname); 224 LOG(llevError,"Tmpname: %s\n",m->tmpname);
229 225
230 LOG(llevError,"Difficulty: %d\n",m->difficulty); 226 LOG(llevError,"Difficulty: %d\n",m->difficulty);
231 LOG(llevError,"Darkness: %d\n",m->darkness); 227 LOG(llevError,"Darkness: %d\n",m->darkness);
232} 228}
233 229
… …
238 */ 234 */
239 235
240void dump_all_maps(void) { 236void dump_all_maps(void) {
241 mapstruct *m; 237 mapstruct *m;
242 for(m=first_map;m!=NULL;m=m->next) { 238 for(m=first_map;m!=NULL;m=m->next) {
243 dump_map(m); 239 dump_map(m);
244 } 240 }
245} 241}
246 242
247/* This rolls up wall, blocks_magic, blocks_view, etc, all into 243/* This rolls up wall, blocks_magic, blocks_view, etc, all into
248 * one function that just returns a P_.. value (see map.h) 244 * one function that just returns a P_.. value (see map.h)
… …
263 if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP; 259 if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP;
264 newx = x; 260 newx = x;
265 newy = y; 261 newy = y;
266 mp = get_map_from_coord(oldmap, &newx, &newy); 262 mp = get_map_from_coord(oldmap, &newx, &newy);
267 if (mp != oldmap) 263 if (mp != oldmap)
268 retval |= P_NEW_MAP; 264 retval |= P_NEW_MAP;
269 if (newmap) *newmap = mp; 265 if (newmap) *newmap = mp;
270 if (nx) *nx = newx; 266 if (nx) *nx = newx;
271 if (ny) *ny = newy; 267 if (ny) *ny = newy;
272 retval |= mp->spaces[newx + mp->width * newy].flags; 268 retval |= mp->spaces[newx + mp->width * newy].flags;
269
270 if (retval & P_SAFE)
271 retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these
272
273 return retval; 273 return retval;
274} 274}
275 275
276 276
277/* 277/*
… …
293 293
294 /* Make sure the coordinates are valid - they should be, as caller should 294 /* Make sure the coordinates are valid - they should be, as caller should
295 * have already checked this. 295 * have already checked this.
296 */ 296 */
297 if (OUT_OF_REAL_MAP(m, sx, sy)) { 297 if (OUT_OF_REAL_MAP(m, sx, sy)) {
298 LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n"); 298 LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n");
299 return 1; 299 return 1;
300 } 300 }
301 301
302 /* Save some cycles - instead of calling get_map_flags(), just get the value 302 /* Save some cycles - instead of calling get_map_flags(), just get the value
303 * directly. 303 * directly.
304 */ 304 */
… …
320 * let the player through (inventory checkers for example) 320 * let the player through (inventory checkers for example)
321 */ 321 */
322 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0; 322 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0;
323 323
324 if(ob->head != NULL) 324 if(ob->head != NULL)
325 ob=ob->head; 325 ob=ob->head;
326 326
327 /* We basically go through the stack of objects, and if there is 327 /* We basically go through the stack of objects, and if there is
328 * some other object that has NO_PASS or FLAG_ALIVE set, return 328 * some other object that has NO_PASS or FLAG_ALIVE set, return
329 * true. If we get through the entire stack, that must mean 329 * true. If we get through the entire stack, that must mean
330 * ob is blocking it, so return 0. 330 * ob is blocking it, so return 0.
331 */ 331 */
332 for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) { 332 for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) {
333 333
334 /* This must be before the checks below. Code for inventory checkers. */ 334 /* This must be before the checks below. Code for inventory checkers. */
335 if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) { 335 if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) {
336 /* If last_sp is set, the player/monster needs an object, 336 /* If last_sp is set, the player/monster needs an object,
337 * so we check for it. If they don't have it, they can't 337 * so we check for it. If they don't have it, they can't
338 * pass through this space. 338 * pass through this space.
339 */ 339 */
340 if (tmp->last_sp) { 340 if (tmp->last_sp) {
341 if (check_inv_recursive(ob,tmp)==NULL) 341 if (check_inv_recursive(ob,tmp)==NULL)
342 return 1; 342 return 1;
343 else 343 else
344 continue; 344 continue;
345 } else { 345 } else {
346 /* In this case, the player must not have the object - 346 /* In this case, the player must not have the object -
347 * if they do, they can't pass through. 347 * if they do, they can't pass through.
348 */ 348 */
349 if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */ 349 if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */
350 return 1; 350 return 1;
351 else 351 else
352 continue; 352 continue;
353 } 353 }
354 } /* if check_inv */ 354 } /* if check_inv */
355 else { 355 else {
356 /* Broke apart a big nasty if into several here to make 356 /* Broke apart a big nasty if into several here to make
357 * this more readable. first check - if the space blocks 357 * this more readable. first check - if the space blocks
358 * movement, can't move here. 358 * movement, can't move here.
359 * second - if a monster, can't move there, unles it is a 359 * second - if a monster, can't move there, unles it is a
360 * hidden dm 360 * hidden dm
361 */ 361 */
362 if (OB_MOVE_BLOCK(ob, tmp)) return 1; 362 if (OB_MOVE_BLOCK(ob, tmp)) return 1;
363 if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob && 363 if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
364 tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden)) 364 tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden))
365 return 1; 365 return 1;
366 } 366 }
367 367
368 } 368 }
369 return 0; 369 return 0;
370} 370}
371 371
… …
402 int flag; 402 int flag;
403 mapstruct *m1; 403 mapstruct *m1;
404 sint16 sx, sy; 404 sint16 sx, sy;
405 405
406 if(ob==NULL) { 406 if(ob==NULL) {
407 flag= get_map_flags(m,&m1, x,y, &sx, &sy); 407 flag= get_map_flags(m,&m1, x,y, &sx, &sy);
408 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 408 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP;
409 409
410 /* don't have object, so don't know what types would block */ 410 /* don't have object, so don't know what types would block */
411 return(GET_MAP_MOVE_BLOCK(m1, sx, sy)); 411 return(GET_MAP_MOVE_BLOCK(m1, sx, sy));
412 } 412 }
413 413
414 for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) { 414 for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) {
415 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy); 415 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy);
416 416
417 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 417 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP;
418 if (flag & P_IS_ALIVE) return P_IS_ALIVE; 418 if (flag & P_IS_ALIVE) return P_IS_ALIVE;
419 419
420 /* find_first_free_spot() calls this function. However, often 420 /* find_first_free_spot() calls this function. However, often
421 * ob doesn't have any move type (when used to place exits) 421 * ob doesn't have any move type (when used to place exits)
422 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 422 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
423 */ 423 */
424 424
425 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue; 425 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue;
426 426
427 /* Note it is intentional that we check ob - the movement type of the 427 /* Note it is intentional that we check ob - the movement type of the
428 * head of the object should correspond for the entire object. 428 * head of the object should correspond for the entire object.
429 */ 429 */
430 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy))) 430 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy)))
431 return AB_NO_PASS; 431 return AB_NO_PASS;
432 432
433 } 433 }
434 return 0; 434 return 0;
435} 435}
436 436
… …
445{ 445{
446 object *tmp=container->inv, *next; 446 object *tmp=container->inv, *next;
447 447
448 container->inv=NULL; 448 container->inv=NULL;
449 while (tmp!=NULL) { 449 while (tmp!=NULL) {
450 next = tmp->below; 450 next = tmp->below;
451 if (tmp->inv) 451 if (tmp->inv)
452 fix_container(tmp); 452 fix_container(tmp);
453 (void) insert_ob_in_ob(tmp,container); 453 (void) insert_ob_in_ob(tmp,container);
454 tmp = next; 454 tmp = next;
455 } 455 }
456 /* sum_weight will go through and calculate what all the containers are 456 /* sum_weight will go through and calculate what all the containers are
457 * carrying. 457 * carrying.
458 */ 458 */
459 sum_weight(container); 459 sum_weight(container);
… …
468 468
469static void link_multipart_objects(mapstruct *m) 469static void link_multipart_objects(mapstruct *m)
470{ 470{
471 int x,y; 471 int x,y;
472 object *tmp, *op, *last, *above; 472 object *tmp, *op, *last, *above;
473 archetype *at; 473 archetype *at;
474 474
475 for(x=0;x<MAP_WIDTH(m);x++) 475 for(x=0;x<MAP_WIDTH(m);x++)
476 for(y=0;y<MAP_HEIGHT(m);y++) 476 for(y=0;y<MAP_HEIGHT(m);y++)
477 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) { 477 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) {
478 above=tmp->above; 478 above=tmp->above;
479 479
480 /* already multipart - don't do anything more */ 480 /* already multipart - don't do anything more */
481 if (tmp->head || tmp->more) continue; 481 if (tmp->head || tmp->more) continue;
482 482
483 /* If there is nothing more to this object, this for loop 483 /* If there is nothing more to this object, this for loop
484 * won't do anything. 484 * won't do anything.
485 */ 485 */
486 for (at = tmp->arch->more, last=tmp; at != NULL; at=at->more, last=op) { 486 for (at = tmp->arch->more, last=tmp; at != NULL; at=at->more, last=op) {
487 op = arch_to_object(at); 487 op = arch_to_object(at);
488 488
489 /* update x,y coordinates */ 489 /* update x,y coordinates */
490 op->x += tmp->x; 490 op->x += tmp->x;
491 op->y += tmp->y; 491 op->y += tmp->y;
492 op->head = tmp; 492 op->head = tmp;
493 op->map = m; 493 op->map = m;
494 last->more = op; 494 last->more = op;
495 if (tmp->name != op->name) { 495 if (tmp->name != op->name) {
496 if (op->name) free_string(op->name); 496 if (op->name) free_string(op->name);
497 op->name = add_string(tmp->name); 497 op->name = add_string(tmp->name);
498 } 498 }
499 if (tmp->title != op->title) { 499 if (tmp->title != op->title) {
500 if (op->title) free_string(op->title); 500 if (op->title) free_string(op->title);
501 op->title = add_string(tmp->title); 501 op->title = add_string(tmp->title);
502 } 502 }
503 /* we could link all the parts onto tmp, and then just 503 /* we could link all the parts onto tmp, and then just
504 * call insert_ob_in_map once, but the effect is the same, 504 * call insert_ob_in_map once, but the effect is the same,
505 * as insert_ob_in_map will call itself with each part, and 505 * as insert_ob_in_map will call itself with each part, and
506 * the coding is simpler to just to it here with each part. 506 * the coding is simpler to just to it here with each part.
507 */ 507 */
508 insert_ob_in_map(op, op->map, tmp,INS_NO_MERGE|INS_ABOVE_FLOOR_ONLY|INS_NO_WALK_ON); 508 insert_ob_in_map(op, op->map, tmp,INS_NO_MERGE|INS_ABOVE_FLOOR_ONLY|INS_NO_WALK_ON);
509 } /* for at = tmp->arch->more */ 509 } /* for at = tmp->arch->more */
510 } /* for objects on this space */ 510 } /* for objects on this space */
511} 511}
512 512
513 513
514 514
515/* 515/*
516 * Loads (ands parses) the objects into a given map from the specified 516 * Loads (ands parses) the objects into a given map from the specified
517 * file pointer. 517 * file pointer.
518 * mapflags is the same as we get with load_original_map 518 * mapflags is the same as we get with load_original_map
519 */ 519 */
520 520
521void load_objects (mapstruct *m, FILE *fp, int mapflags) { 521void load_objects (mapstruct *m, object_thawer &fp, int mapflags) {
522 int i,j,bufstate=LO_NEWFILE; 522 int i,j,bufstate=LO_NEWFILE;
523 int unique; 523 int unique;
524 object *op, *prev=NULL,*last_more=NULL, *otmp; 524 object *op, *prev=NULL,*last_more=NULL, *otmp;
525 525
526 op=get_object(); 526 op=get_object();
527 op->map = m; /* To handle buttons correctly */ 527 op->map = m; /* To handle buttons correctly */
528 528
529 while((i=load_object(fp,op,bufstate, mapflags))) { 529 while((i = load_object (fp, op, bufstate, mapflags))) {
530 /* Since the loading of the map header does not load an object 530 /* Since the loading of the map header does not load an object
531 * anymore, we need to pass LO_NEWFILE for the first object loaded, 531 * anymore, we need to pass LO_NEWFILE for the first object loaded,
532 * and then switch to LO_REPEAT for faster loading. 532 * and then switch to LO_REPEAT for faster loading.
533 */ 533 */
534 bufstate = LO_REPEAT; 534 bufstate = LO_REPEAT;
535 535
536 /* if the archetype for the object is null, means that we 536 /* if the archetype for the object is null, means that we
537 * got an invalid object. Don't do anything with it - the game 537 * got an invalid object. Don't do anything with it - the game
538 * or editor will not be able to do anything with it either. 538 * or editor will not be able to do anything with it either.
539 */ 539 */
540 if (op->arch==NULL) { 540 if (op->arch==NULL) {
541 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)"); 541 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)");
542 continue; 542 continue;
543 } 543 }
544 544
545 545
546 switch(i) { 546 switch(i) {
547 case LL_NORMAL: 547 case LL_NORMAL:
548 /* if we are loading an overlay, put the floors on the bottom */ 548 /* if we are loading an overlay, put the floors on the bottom */
549 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) || 549 if ((QUERY_FLAG(op, FLAG_IS_FLOOR) ||
550 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 550 QUERY_FLAG(op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
551 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 551 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
552 else 552 else
553 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 553 insert_ob_in_map(op,m,op,INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
554 554
555 if (op->inv) 555 if (op->inv)
556 sum_weight(op); 556 sum_weight(op);
557 557
558 prev=op,last_more=op; 558 prev=op,last_more=op;
559 break; 559 break;
560 560
561 case LL_MORE: 561 case LL_MORE:
562 insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 562 insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
563 op->head=prev,last_more->more=op,last_more=op; 563 op->head=prev,last_more->more=op,last_more=op;
564 break; 564 break;
565 } 565 }
566 if (mapflags & MAP_STYLE) { 566 if (mapflags & MAP_STYLE) {
567 remove_from_active_list(op); 567 remove_from_active_list(op);
568 } 568 }
569 op=get_object(); 569 op=get_object();
570 op->map = m; 570 op->map = m;
571 } 571 }
572 for (i=0;i<m->width;i++){ 572 for (i=0;i<m->width;i++){
573 for (j=0;j<m->height;j++){ 573 for (j=0;j<m->height;j++){
574 unique =0; 574 unique =0;
575 /* check for unique items, or unique squares */ 575 /* check for unique items, or unique squares */
576 for (otmp = get_map_ob(m, i, j); otmp; otmp = otmp->above) { 576 for (otmp = get_map_ob(m, i, j); otmp; otmp = otmp->above) {
577 if (QUERY_FLAG(otmp, FLAG_UNIQUE) || QUERY_FLAG(otmp, FLAG_OBJ_SAVE_ON_OVL)) 577 if (QUERY_FLAG(otmp, FLAG_UNIQUE) || QUERY_FLAG(otmp, FLAG_OBJ_SAVE_ON_OVL))
578 unique = 1; 578 unique = 1;
579 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique)) 579 if (!(mapflags & (MAP_OVERLAY|MAP_PLAYER_UNIQUE) || unique))
580 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL); 580 SET_FLAG(otmp, FLAG_OBJ_ORIGINAL);
581 } 581 }
582 } 582 }
583 } 583 }
584 free_object(op); 584 free_object(op);
585 link_multipart_objects(m); 585 link_multipart_objects(m);
586} 586}
587 587
588/* This saves all the objects on the map in a non destructive fashion. 588/* This saves all the objects on the map in a non destructive fashion.
589 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 589 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
590 * and we only save the head of multi part objects - this is needed 590 * and we only save the head of multi part objects - this is needed
591 * in order to do map tiling properly. 591 * in order to do map tiling properly.
592 */ 592 */
593void save_objects (mapstruct *m, FILE *fp, FILE *fp2, int flag) { 593void save_objects (mapstruct *m, object_freezer &fp, object_freezer &fp2, int flag) {
594 int i, j = 0,unique=0; 594 int i, j = 0,unique=0;
595 object *op; 595 object *op;
596 /* first pass - save one-part objects */ 596 /* first pass - save one-part objects */
597 for(i = 0; i < MAP_WIDTH(m); i++) 597 for(i = 0; i < MAP_WIDTH(m); i++)
598 for (j = 0; j < MAP_HEIGHT(m); j++) { 598 for (j = 0; j < MAP_HEIGHT(m); j++) {
599 unique=0; 599 unique=0;
600 for(op = get_map_ob (m, i, j); op; op = op->above) { 600 for(op = get_map_ob (m, i, j); op; op = op->above) {
601 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 601 if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE))
602 unique=1; 602 unique=1;
603 603
604 if(op->type == PLAYER) { 604 if(op->type == PLAYER) {
605 LOG(llevDebug, "Player on map that is being saved\n"); 605 LOG(llevDebug, "Player on map that is being saved\n");
606 continue; 606 continue;
607 } 607 }
608 608
609 if (op->head || op->owner) 609 if (op->head || op->owner)
610 continue; 610 continue;
611 611
612 if (unique || QUERY_FLAG(op, FLAG_UNIQUE)) 612 if (unique || QUERY_FLAG(op, FLAG_UNIQUE))
613 save_object( fp2 , op, 3); 613 save_object (fp2, op, 3);
614 else 614 else
615 if (flag == 0 || 615 if (flag == 0 ||
616 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) && 616 (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) &&
617 !QUERY_FLAG(op, FLAG_UNPAID)))) 617 !QUERY_FLAG(op, FLAG_UNPAID))))
618 save_object(fp, op, 3); 618 save_object(fp, op, 3);
619 619
620 } /* for this space */ 620 } /* for this space */
621 } /* for this j */ 621 } /* for this j */
622} 622}
623 623
624/* 624/*
625 * Allocates, initialises, and returns a pointer to a mapstruct. 625 * Allocates, initialises, and returns a pointer to a mapstruct.
626 * Modified to no longer take a path option which was not being 626 * Modified to no longer take a path option which was not being
… …
630mapstruct *get_linked_map(void) { 630mapstruct *get_linked_map(void) {
631 mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct)); 631 mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct));
632 mapstruct *mp; 632 mapstruct *mp;
633 633
634 if(map==NULL) 634 if(map==NULL)
635 fatal(OUT_OF_MEMORY); 635 fatal(OUT_OF_MEMORY);
636 636
637 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next); 637 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next);
638 if(mp==NULL) 638 if(mp==NULL)
639 first_map=map; 639 first_map=map;
640 else 640 else
641 mp->next=map; 641 mp->next=map;
642 642
643 map->in_memory=MAP_SWAPPED; 643 map->in_memory=MAP_SWAPPED;
644 /* The maps used to pick up default x and y values from the 644 /* The maps used to pick up default x and y values from the
645 * map archetype. Mimic that behaviour. 645 * map archetype. Mimic that behaviour.
646 */ 646 */
… …
648 MAP_HEIGHT(map)=16; 648 MAP_HEIGHT(map)=16;
649 MAP_RESET_TIMEOUT(map)=0; 649 MAP_RESET_TIMEOUT(map)=0;
650 MAP_TIMEOUT(map)=300; 650 MAP_TIMEOUT(map)=300;
651 MAP_ENTER_X(map)=0; 651 MAP_ENTER_X(map)=0;
652 MAP_ENTER_Y(map)=0; 652 MAP_ENTER_Y(map)=0;
653 /*set part to -1 indicating conversion to weather map not yet done*/ 653 /*set part to -1 indicating conversion to weather map not yet done*/
654 MAP_WORLDPARTX(map)=-1; 654 MAP_WORLDPARTX(map)=-1;
655 MAP_WORLDPARTY(map)=-1; 655 MAP_WORLDPARTY(map)=-1;
656 return map; 656 return map;
657} 657}
658 658
659/* 659/*
660 * Allocates the arrays contained in a mapstruct. 660 * Allocates the arrays contained in a mapstruct.
… …
667 /* Log this condition and free the storage. We could I suppose 667 /* Log this condition and free the storage. We could I suppose
668 * realloc, but if the caller is presuming the data will be intact, 668 * realloc, but if the caller is presuming the data will be intact,
669 * that is their poor assumption. 669 * that is their poor assumption.
670 */ 670 */
671 if (m->spaces) { 671 if (m->spaces) {
672 LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path); 672 LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path);
673 free(m->spaces); 673 free(m->spaces);
674 } 674 }
675 675
676 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace)); 676 m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace));
677 677
678 if(m->spaces==NULL) 678 if(m->spaces==NULL)
679 fatal(OUT_OF_MEMORY); 679 fatal(OUT_OF_MEMORY);
680} 680}
681 681
682/* Create and returns a map of the specific size. Used 682/* Create and returns a map of the specific size. Used
683 * in random map code and the editor. 683 * in random map code and the editor.
684 */ 684 */
… …
705 705
706 shop_string=strdup_local(input_string); 706 shop_string=strdup_local(input_string);
707 p=shop_string; 707 p=shop_string;
708 /* first we'll count the entries, we'll need that for allocating the array shortly */ 708 /* first we'll count the entries, we'll need that for allocating the array shortly */
709 while (p) { 709 while (p) {
710 p=strchr(p, ';'); 710 p=strchr(p, ';');
711 number_of_entries++; 711 number_of_entries++;
712 if (p) p++; 712 if (p) p++;
713 } 713 }
714 p=shop_string; 714 p=shop_string;
715 strip_endline(p); 715 strip_endline(p);
716 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems)); 716 items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems));
717 memset(items, 0, (sizeof(shopitems) * number_of_entries+1)); 717 memset(items, 0, (sizeof(shopitems) * number_of_entries+1));
718 for (i=0; i<number_of_entries; i++) { 718 for (i=0; i<number_of_entries; i++) {
719 if (!p) { 719 if (!p) {
720 LOG(llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 720 LOG(llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
721 break; 721 break;
722 } 722 }
723 next_semicolon=strchr(p, ';'); 723 next_semicolon=strchr(p, ';');
724 next_colon=strchr(p, ':'); 724 next_colon=strchr(p, ':');
725 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 725 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
726 if (next_colon &&( !next_semicolon || next_colon<next_semicolon)) 726 if (next_colon &&( !next_semicolon || next_colon<next_semicolon))
727 items[i].strength=atoi(strchr(p,':')+1); 727 items[i].strength=atoi(strchr(p,':')+1);
728 728
729 if (isdigit(*p) || *p=='*') { 729 if (isdigit(*p) || *p=='*') {
730 items[i].typenum = atoi(p); /* atoi returns 0 when we have an asterisk */ 730 items[i].typenum = atoi(p); /* atoi returns 0 when we have an asterisk */
731 current_type=get_typedata(items[i].typenum); 731 current_type=get_typedata(items[i].typenum);
732 if (current_type) { 732 if (current_type) {
733 items[i].name=current_type->name; 733 items[i].name=current_type->name;
734 items[i].name_pl=current_type->name_pl; 734 items[i].name_pl=current_type->name_pl;
735 } 735 }
736 } 736 }
737 else { /*we have a named type, let's figure out what it is */ 737 else { /*we have a named type, let's figure out what it is */
738 q=strpbrk(p,";:"); 738 q=strpbrk(p,";:");
739 if (q) *q='\0'; 739 if (q) *q='\0';
740
741 current_type=get_typedata_by_name(p);
742 if (current_type) {
743 items[i].name=current_type->name;
744 items[i].typenum=current_type->number;
745 items[i].name_pl=current_type->name_pl;
746 }
747 else { /* oh uh, something's wrong, let's free up this one, and try
748 * the next entry while we're at it, better print a warning
749 */
750 LOG(llevError, "invalid type %s defined in shopitems in string %s\n",
751 p, input_string);
752 }
753 } 740
741 current_type=get_typedata_by_name(p);
742 if (current_type) {
743 items[i].name=current_type->name;
744 items[i].typenum=current_type->number;
745 items[i].name_pl=current_type->name_pl;
746 }
747 else { /* oh uh, something's wrong, let's free up this one, and try
748 * the next entry while we're at it, better print a warning
749 */
750 LOG(llevError, "invalid type %s defined in shopitems in string %s\n",
751 p, input_string);
752 }
753 }
754 items[i].index=number_of_entries; 754 items[i].index=number_of_entries;
755 if (next_semicolon) p=++next_semicolon; 755 if (next_semicolon) p=++next_semicolon;
756 else p=NULL; 756 else p=NULL;
757 } 757 }
758 free(shop_string); 758 free(shop_string);
759 return items; 759 return items;
760} 760}
761 761
… …
764static void print_shop_string(mapstruct *m, char *output_string) { 764static void print_shop_string(mapstruct *m, char *output_string) {
765 int i; 765 int i;
766 char tmp[MAX_BUF]; 766 char tmp[MAX_BUF];
767 strcpy(output_string, ""); 767 strcpy(output_string, "");
768 for (i=0; i< m->shopitems[0].index; i++) { 768 for (i=0; i< m->shopitems[0].index; i++) {
769 if (m->shopitems[i].typenum) { 769 if (m->shopitems[i].typenum) {
770 if (m->shopitems[i].strength) { 770 if (m->shopitems[i].strength) {
771 sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 771 sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
772 } 772 }
773 else sprintf(tmp, "%s;", m->shopitems[i].name); 773 else sprintf(tmp, "%s;", m->shopitems[i].name);
774 } 774 }
775 else { 775 else {
776 if (m->shopitems[i].strength) { 776 if (m->shopitems[i].strength) {
777 sprintf(tmp, "*:%d;", m->shopitems[i].strength); 777 sprintf(tmp, "*:%d;", m->shopitems[i].strength);
778 } 778 }
779 else sprintf(tmp, "*"); 779 else sprintf(tmp, "*");
780 } 780 }
781 strcat(output_string, tmp); 781 strcat(output_string, tmp);
782 } 782 }
783} 783}
784 784
785/* This loads the header information of the map. The header 785/* This loads the header information of the map. The header
786 * contains things like difficulty, size, timeout, etc. 786 * contains things like difficulty, size, timeout, etc.
… …
793 * currently, there are few enough fields this is not a big deal. 793 * currently, there are few enough fields this is not a big deal.
794 * MSW 2001-07-01 794 * MSW 2001-07-01
795 * return 0 on success, 1 on failure. 795 * return 0 on success, 1 on failure.
796 */ 796 */
797 797
798static int load_map_header(FILE *fp, mapstruct *m) 798static int load_map_header(object_thawer &fp, mapstruct *m)
799{ 799{
800 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end; 800 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end;
801 int msgpos=0; 801 int msgpos=0;
802 int maplorepos=0; 802 int maplorepos=0;
803 803
804 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 804 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
805 buf[HUGE_BUF-1] = 0; 805 buf[HUGE_BUF-1] = 0;
806 key = buf; 806 key = buf;
807 while (isspace(*key)) key++; 807 while (isspace(*key)) key++;
808 if (*key == 0) continue; /* empty line */ 808 if (*key == 0) continue; /* empty line */
809 value = strchr(key, ' '); 809 value = strchr(key, ' ');
810 if (!value) { 810 if (!value) {
811 end = strchr(key, '\n'); 811 end = strchr(key, '\n');
812 if (end != NULL) { 812 if (end != NULL) {
813 *end = 0; 813 *end = 0;
814 } 814 }
815 } else { 815 } else {
816 *value = 0; 816 *value = 0;
817 value++; 817 value++;
818 end = strchr(value, '\n'); 818 end = strchr(value, '\n');
819 while (isspace(*value)) { 819 while (isspace(*value)) {
820 value++; 820 value++;
821 if (*value == '\0' || value == end) { 821 if (*value == '\0' || value == end) {
822 /* Nothing but spaces. */ 822 /* Nothing but spaces. */
823 value = NULL; 823 value = NULL;
824 break; 824 break;
825 } 825 }
826 } 826 }
827 } 827 }
828 if (!end) { 828 if (!end) {
829 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", 829 LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n",
830 buf); 830 buf);
831 return 1; 831 return 1;
832 } 832 }
833 833
834 834
835 /* key is the field name, value is what it should be set 835 /* key is the field name, value is what it should be set
836 * to. We've already done the work to null terminate key, 836 * to. We've already done the work to null terminate key,
837 * and strip off any leading spaces for both of these. 837 * and strip off any leading spaces for both of these.
838 * We have not touched the newline at the end of the line - 838 * We have not touched the newline at the end of the line -
839 * these are needed for some values. the end pointer 839 * these are needed for some values. the end pointer
840 * points to the first of the newlines. 840 * points to the first of the newlines.
841 * value could be NULL! It would be easy enough to just point 841 * value could be NULL! It would be easy enough to just point
842 * this to "" to prevent cores, but that would let more errors slide 842 * this to "" to prevent cores, but that would let more errors slide
843 * through. 843 * through.
844 * 844 *
845 * First check for entries that do not use the value parameter, then 845 * First check for entries that do not use the value parameter, then
846 * validate that value is given and check for the remaining entries 846 * validate that value is given and check for the remaining entries
847 * that use the parameter. 847 * that use the parameter.
848 */ 848 */
849 849
850 if (!strcmp(key,"msg")) { 850 if (!strcmp(key,"msg")) {
851 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 851 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
852 if (!strcmp(buf,"endmsg\n")) break; 852 if (!strcmp(buf,"endmsg\n")) break;
853 else { 853 else {
854 /* slightly more efficient than strcat */ 854 /* slightly more efficient than strcat */
855 strcpy(msgbuf+msgpos, buf); 855 strcpy(msgbuf+msgpos, buf);
856 msgpos += strlen(buf); 856 msgpos += strlen(buf);
857 } 857 }
858 } 858 }
859 /* There are lots of maps that have empty messages (eg, msg/endmsg 859 /* There are lots of maps that have empty messages (eg, msg/endmsg
860 * with nothing between). There is no reason in those cases to 860 * with nothing between). There is no reason in those cases to
861 * keep the empty message. Also, msgbuf contains garbage data 861 * keep the empty message. Also, msgbuf contains garbage data
862 * when msgpos is zero, so copying it results in crashes 862 * when msgpos is zero, so copying it results in crashes
863 */ 863 */
864 if (msgpos != 0) 864 if (msgpos != 0)
865 m->msg = strdup_local(msgbuf); 865 m->msg = strdup_local(msgbuf);
866 } 866 }
867 else if (!strcmp(key,"maplore")) { 867 else if (!strcmp(key,"maplore")) {
868 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 868 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
869 if (!strcmp(buf,"endmaplore\n")) break; 869 if (!strcmp(buf,"endmaplore\n")) break;
870 else { 870 else {
871 /* slightly more efficient than strcat */ 871 /* slightly more efficient than strcat */
872 strcpy(maplorebuf+maplorepos, buf); 872 strcpy(maplorebuf+maplorepos, buf);
873 maplorepos += strlen(buf); 873 maplorepos += strlen(buf);
874 } 874 }
875 } 875 }
876 if (maplorepos != 0) 876 if (maplorepos != 0)
877 m->maplore = strdup_local(maplorebuf); 877 m->maplore = strdup_local(maplorebuf);
878 } 878 }
879 else if (!strcmp(key,"end")) { 879 else if (!strcmp(key,"end")) {
880 break; 880 break;
881 } 881 }
882 else if (value == NULL) { 882 else if (value == NULL) {
883 LOG(llevError, "Got '%s' line without parameter in map header\n", key); 883 LOG(llevError, "Got '%s' line without parameter in map header\n", key);
884 } 884 }
885 else if (!strcmp(key, "arch")) { 885 else if (!strcmp(key, "arch")) {
886 /* This is an oddity, but not something we care about much. */ 886 /* This is an oddity, but not something we care about much. */
887 if (strcmp(value,"map\n")) 887 if (strcmp(value,"map\n"))
888 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value); 888 LOG(llevError,"loading map and got a non 'arch map' line(%s %s)?\n",key,value);
889 } 889 }
890 else if (!strcmp(key,"name")) { 890 else if (!strcmp(key,"name")) {
891 *end=0; 891 *end=0;
892 m->name = strdup_local(value); 892 m->name = strdup_local(value);
893 } 893 }
894 /* first strcmp value on these are old names supported 894 /* first strcmp value on these are old names supported
895 * for compatibility reasons. The new values (second) are 895 * for compatibility reasons. The new values (second) are
896 * what really should be used. 896 * what really should be used.
897 */ 897 */
898 else if (!strcmp(key,"oid")) {
899 fp.get (m, atoi(value));
898 else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 900 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
899 m->enter_x = atoi(value); 901 m->enter_x = atoi(value);
900 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 902 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
901 m->enter_y = atoi(value); 903 m->enter_y = atoi(value);
902 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 904 } else if (!strcmp(key,"x") || !strcmp(key, "width")) {
903 m->width = atoi(value); 905 m->width = atoi(value);
904 } else if (!strcmp(key,"y") || !strcmp(key, "height")) { 906 } else if (!strcmp(key,"y") || !strcmp(key, "height")) {
905 m->height = atoi(value); 907 m->height = atoi(value);
906 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) { 908 } else if (!strcmp(key,"weight") || !strcmp(key, "reset_timeout")) {
907 m->reset_timeout = atoi(value); 909 m->reset_timeout = atoi(value);
908 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) { 910 } else if (!strcmp(key,"value") || !strcmp(key, "swap_time")) {
909 m->timeout = atoi(value); 911 m->timeout = atoi(value);
910 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) { 912 } else if (!strcmp(key,"level") || !strcmp(key, "difficulty")) {
911 m->difficulty = atoi(value); 913 m->difficulty = atoi(value);
912 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) { 914 } else if (!strcmp(key,"invisible") || !strcmp(key, "darkness")) {
913 m->darkness = atoi(value); 915 m->darkness = atoi(value);
914 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) { 916 } else if (!strcmp(key,"stand_still") || !strcmp(key, "fixed_resettime")) {
915 m->fixed_resettime = atoi(value); 917 m->fixed_resettime = atoi(value);
916 } else if (!strcmp(key,"unique")) { 918 } else if (!strcmp(key,"unique")) {
917 m->unique = atoi(value); 919 m->unique = atoi(value);
918 } else if (!strcmp(key,"template")) { 920 } else if (!strcmp(key,"template")) {
919 m->templatemap = atoi(value); 921 m->templatemap = atoi(value);
920 } else if (!strcmp(key,"region")) { 922 } else if (!strcmp(key,"region")) {
921 m->region = get_region_by_name(value); 923 m->region = get_region_by_name(value);
922 } else if (!strcmp(key,"shopitems")) { 924 } else if (!strcmp(key,"shopitems")) {
923 *end=0; 925 *end=0;
924 m->shopitems = parse_shop_string(value); 926 m->shopitems = parse_shop_string(value);
925 } else if (!strcmp(key,"shopgreed")) { 927 } else if (!strcmp(key,"shopgreed")) {
926 m->shopgreed = atof(value); 928 m->shopgreed = atof(value);
927 } else if (!strcmp(key,"shopmin")) { 929 } else if (!strcmp(key,"shopmin")) {
928 m->shopmin = atol(value); 930 m->shopmin = atol(value);
929 } else if (!strcmp(key,"shopmax")) { 931 } else if (!strcmp(key,"shopmax")) {
930 m->shopmax = atol(value); 932 m->shopmax = atol(value);
931 } else if (!strcmp(key,"shoprace")) { 933 } else if (!strcmp(key,"shoprace")) {
932 *end=0; 934 *end=0;
933 m->shoprace = strdup_local(value); 935 m->shoprace = strdup_local(value);
934 } else if (!strcmp(key,"outdoor")) { 936 } else if (!strcmp(key,"outdoor")) {
935 m->outdoor = atoi(value); 937 m->outdoor = atoi(value);
936 } else if (!strcmp(key, "temp")) { 938 } else if (!strcmp(key, "temp")) {
937 m->temp = atoi(value); 939 m->temp = atoi(value);
938 } else if (!strcmp(key, "pressure")) { 940 } else if (!strcmp(key, "pressure")) {
939 m->pressure = atoi(value); 941 m->pressure = atoi(value);
940 } else if (!strcmp(key, "humid")) { 942 } else if (!strcmp(key, "humid")) {
941 m->humid = atoi(value); 943 m->humid = atoi(value);
942 } else if (!strcmp(key, "windspeed")) { 944 } else if (!strcmp(key, "windspeed")) {
943 m->windspeed = atoi(value); 945 m->windspeed = atoi(value);
944 } else if (!strcmp(key, "winddir")) { 946 } else if (!strcmp(key, "winddir")) {
945 m->winddir = atoi(value); 947 m->winddir = atoi(value);
946 } else if (!strcmp(key, "sky")) { 948 } else if (!strcmp(key, "sky")) {
947 m->sky = atoi(value); 949 m->sky = atoi(value);
948 } else if (!strcmp(key, "nosmooth")) { 950 } else if (!strcmp(key, "nosmooth")) {
949 m->nosmooth = atoi(value); 951 m->nosmooth = atoi(value);
950 } 952 } else if (!strcmp(key, "safe_map")) {
953 m->safe_map = atoi(value);
954 }
951 else if (!strncmp(key,"tile_path_", 10)) { 955 else if (!strncmp(key,"tile_path_", 10)) {
952 int tile=atoi(key+10); 956 int tile=atoi(key+10);
953 957
954 if (tile<1 || tile>4) { 958 if (tile<1 || tile>4) {
955 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n", 959 LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n",
956 tile, m->path); 960 tile, m->path);
957 } else { 961 } else {
958 char *path; 962 char *path;
959 963
960 *end = 0; 964 *end = 0;
961 965
962 if (m->tile_path[tile-1]) { 966 if (m->tile_path[tile-1]) {
963 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n", 967 LOG(llevError,"load_map_header: tile location %d duplicated (%s)\n",
964 tile, m->path); 968 tile, m->path);
965 free(m->tile_path[tile-1]); 969 free(m->tile_path[tile-1]);
966 m->tile_path[tile-1] = NULL; 970 m->tile_path[tile-1] = NULL;
967 } 971 }
968 972
969 if (check_path(value, 1) != -1) { 973 if (check_path(value, 1) != -1) {
970 /* The unadorned path works. */ 974 /* The unadorned path works. */
971 path = value; 975 path = value;
972 } else { 976 } else {
973 /* Try again; it could be a relative exit. */ 977 /* Try again; it could be a relative exit. */
974 978
975 path = path_combine_and_normalize(m->path, value); 979 path = path_combine_and_normalize(m->path, value);
976 980
977 if (check_path(path, 1) == -1) { 981 if (check_path(path, 1) == -1) {
978 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); 982 LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
979 path = NULL; 983 path = NULL;
980 } 984 }
981 } 985 }
982 986
983 if (editor) { 987 if (editor) {
984 /* Use the value as in the file. */ 988 /* Use the value as in the file. */
985 m->tile_path[tile-1] = strdup_local(value); 989 m->tile_path[tile-1] = strdup_local(value);
986 } else if (path != NULL) { 990 } else if (path != NULL) {
987 /* Use the normalized value. */ 991 /* Use the normalized value. */
988 m->tile_path[tile-1] = strdup_local(path); 992 m->tile_path[tile-1] = strdup_local(path);
989 } 993 }
990 } /* end if tile direction (in)valid */ 994 } /* end if tile direction (in)valid */
991 } 995 }
992 else { 996 else {
993 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value); 997 LOG(llevError,"Got unknown value in map header: %s %s\n", key, value);
994 } 998 }
995 } 999 }
996 if (!key || strcmp(key,"end")) { 1000 if (!key || strcmp(key,"end")) {
997 LOG(llevError,"Got premature eof on map header!\n"); 1001 LOG(llevError,"Got premature eof on map header!\n");
998 return 1; 1002 return 1;
999 } 1003 }
1000 return 0; 1004 return 0;
1001} 1005}
1002 1006
1003/* 1007/*
… …
1007 * flags correspond to those in map.h. Main ones used are 1011 * flags correspond to those in map.h. Main ones used are
1008 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and 1012 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1009 * MAP_BLOCK, in which case we block on this load. This happens in all 1013 * MAP_BLOCK, in which case we block on this load. This happens in all
1010 * cases, no matter if this flag is set or not. 1014 * cases, no matter if this flag is set or not.
1011 * MAP_STYLE: style map - don't add active objects, don't add to server 1015 * MAP_STYLE: style map - don't add active objects, don't add to server
1012 * managed map list. 1016 * managed map list.
1013 */ 1017 */
1014 1018
1015mapstruct *load_original_map(const char *filename, int flags) { 1019mapstruct *load_original_map(const char *filename, int flags) {
1016 FILE *fp; 1020 FILE *fp;
1017 mapstruct *m; 1021 mapstruct *m;
1018 int comp; 1022 int comp;
1019 char pathname[MAX_BUF]; 1023 char pathname[MAX_BUF];
1020 1024
1021 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags); 1025 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1022 if (flags & MAP_PLAYER_UNIQUE) 1026 if (flags & MAP_PLAYER_UNIQUE)
1023 strcpy(pathname, filename); 1027 strcpy(pathname, filename);
1024 else if (flags & MAP_OVERLAY) 1028 else if (flags & MAP_OVERLAY)
1025 strcpy(pathname, create_overlay_pathname(filename)); 1029 strcpy(pathname, create_overlay_pathname(filename));
1026 else 1030 else
1027 strcpy(pathname, create_pathname(filename)); 1031 strcpy(pathname, create_pathname(filename));
1028 1032
1029 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1033 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1030 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno)); 1034 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno));
1031 return (NULL); 1035 return (NULL);
1032 } 1036 }
1037
1038 object_thawer thawer (fp, filename);
1033 1039
1034 m = get_linked_map(); 1040 m = get_linked_map();
1035 1041
1036 strcpy (m->path, filename); 1042 strcpy (m->path, filename);
1037 if (load_map_header(fp, m)) { 1043 if (load_map_header(thawer, m)) {
1038 LOG(llevError,"Error loading map header for %s, flags=%d\n", 1044 LOG(llevError,"Error loading map header for %s, flags=%d\n",
1039 filename, flags); 1045 filename, flags);
1040 delete_map(m); 1046 delete_map(m);
1041 return NULL; 1047 return NULL;
1042 } 1048 }
1043 1049
1044 allocate_map(m); 1050 allocate_map(m);
1045 m->compressed = comp;
1046 1051
1047 m->in_memory=MAP_LOADING; 1052 m->in_memory=MAP_LOADING;
1048 load_objects (m, fp, flags & (MAP_BLOCK|MAP_STYLE)); 1053 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
1049 close_and_delete(fp, comp); 1054 close_and_delete(fp, comp);
1050 m->in_memory=MAP_IN_MEMORY; 1055 m->in_memory=MAP_IN_MEMORY;
1051 if (!MAP_DIFFICULTY(m)) 1056 if (!MAP_DIFFICULTY(m))
1052 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1057 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1053 set_map_reset_time(m); 1058 set_map_reset_time(m);
1054 if (load_original_map_callback) 1059 INVOKE_MAP (INSTANTIATE, m);
1055 load_original_map_callback(m);
1056 return (m); 1060 return (m);
1057} 1061}
1058 1062
1059/* 1063/*
1060 * Loads a map, which has been loaded earlier, from file. 1064 * Loads a map, which has been loaded earlier, from file.
… …
1066 FILE *fp; 1070 FILE *fp;
1067 int comp; 1071 int comp;
1068 char buf[MAX_BUF]; 1072 char buf[MAX_BUF];
1069 1073
1070 if (!m->tmpname) { 1074 if (!m->tmpname) {
1071 LOG(llevError, "No temporary filename for map %s\n", m->path); 1075 LOG(llevError, "No temporary filename for map %s\n", m->path);
1072 strcpy(buf, m->path); 1076 strcpy(buf, m->path);
1073 delete_map(m); 1077 delete_map(m);
1074 m = load_original_map(buf, 0); 1078 m = load_original_map(buf, 0);
1075 if(m==NULL) return NULL; 1079 if(m==NULL) return NULL;
1076 fix_auto_apply(m); /* Chests which open as default */ 1080 fix_auto_apply(m); /* Chests which open as default */
1077 return m; 1081 return m;
1078 } 1082 }
1079 1083
1080 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) { 1084 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) {
1081 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno)); 1085 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno));
1082 strcpy(buf, m->path); 1086 strcpy(buf, m->path);
1083 delete_map(m); 1087 delete_map(m);
1084 m = load_original_map(buf, 0); 1088 m = load_original_map(buf, 0);
1085 if(m==NULL) return NULL; 1089 if(m==NULL) return NULL;
1086 fix_auto_apply(m); /* Chests which open as default */ 1090 fix_auto_apply(m); /* Chests which open as default */
1087 return m; 1091 return m;
1088 }
1089 1092 }
1090 1093
1094 object_thawer thawer (fp, m->tmpname);
1095
1091 if (load_map_header(fp, m)) { 1096 if (load_map_header(thawer, m)) {
1092 LOG(llevError,"Error loading map header for %s (%s)\n", 1097 LOG(llevError,"Error loading map header for %s (%s)\n",
1093 m->path, m->tmpname); 1098 m->path, m->tmpname);
1094 delete_map(m); 1099 delete_map(m);
1095 m = load_original_map(m->path, 0); 1100 m = load_original_map(m->path, 0);
1096 return NULL; 1101 return NULL;
1097 } 1102 }
1098 m->compressed = comp;
1099 allocate_map(m); 1103 allocate_map(m);
1100 1104
1101 m->in_memory=MAP_LOADING; 1105 m->in_memory=MAP_LOADING;
1102 load_objects (m, fp, 0); 1106 load_objects (m, thawer, 0);
1103 close_and_delete(fp, comp); 1107 close_and_delete(fp, comp);
1104 m->in_memory=MAP_IN_MEMORY; 1108 m->in_memory=MAP_IN_MEMORY;
1105 if (load_temporary_map_callback) 1109 INVOKE_MAP (SWAPIN, m);
1106 load_temporary_map_callback(m);
1107 return m; 1110 return m;
1108} 1111}
1109 1112
1110/* 1113/*
1111 * Loads a map, which has been loaded earlier, from file. 1114 * Loads a map, which has been loaded earlier, from file.
… …
1119 char pathname[MAX_BUF]; 1122 char pathname[MAX_BUF];
1120 1123
1121 strcpy(pathname, create_overlay_pathname(filename)); 1124 strcpy(pathname, create_overlay_pathname(filename));
1122 1125
1123 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) { 1126 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1124/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/ 1127/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/
1125 return m; 1128 return m;
1126 } 1129 }
1130
1131 object_thawer thawer (fp, pathname);
1127 1132
1128 if (load_map_header(fp, m)) { 1133 if (load_map_header(thawer, m)) {
1129 LOG(llevError,"Error loading map header for overlay %s (%s)\n", 1134 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1130 m->path, pathname); 1135 m->path, pathname);
1131 delete_map(m); 1136 delete_map(m);
1132 m = load_original_map(m->path, 0); 1137 m = load_original_map(m->path, 0);
1133 return NULL; 1138 return NULL;
1134 } 1139 }
1135 m->compressed = comp;
1136 /*allocate_map(m);*/ 1140 /*allocate_map(m);*/
1137 1141
1138 m->in_memory=MAP_LOADING; 1142 m->in_memory=MAP_LOADING;
1139 load_objects (m, fp, MAP_OVERLAY); 1143 load_objects (m, thawer, MAP_OVERLAY);
1140 close_and_delete(fp, comp); 1144 close_and_delete(fp, comp);
1141 m->in_memory=MAP_IN_MEMORY; 1145 m->in_memory=MAP_IN_MEMORY;
1142 return m; 1146 return m;
1143} 1147}
1144 1148
… …
1151{ 1155{
1152 int i,j,unique; 1156 int i,j,unique;
1153 object *op, *next; 1157 object *op, *next;
1154 1158
1155 for(i=0; i<MAP_WIDTH(m); i++) 1159 for(i=0; i<MAP_WIDTH(m); i++)
1156 for(j=0; j<MAP_HEIGHT(m); j++) { 1160 for(j=0; j<MAP_HEIGHT(m); j++) {
1157 unique=0; 1161 unique=0;
1158 for (op=get_map_ob(m, i, j); op; op=next) { 1162 for (op=get_map_ob(m, i, j); op; op=next) {
1159 next = op->above; 1163 next = op->above;
1160 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) 1164 if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE))
1161 unique=1; 1165 unique=1;
1162 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { 1166 if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) {
1163 clean_object(op); 1167 clean_object(op);
1164 if (QUERY_FLAG(op, FLAG_IS_LINKED)) 1168 if (QUERY_FLAG(op, FLAG_IS_LINKED))
1165 remove_button_link(op); 1169 remove_button_link(op);
1166 remove_ob(op); 1170 remove_ob(op);
1167 free_object(op); 1171 free_object(op);
1168 } 1172 }
1169 } 1173 }
1170 } 1174 }
1171} 1175}
1172 1176
1173 1177
1174/* 1178/*
1175 * Loads unique objects from file(s) into the map which is in memory 1179 * Loads unique objects from file(s) into the map which is in memory
… …
1179 FILE *fp; 1183 FILE *fp;
1180 int comp,count; 1184 int comp,count;
1181 char firstname[MAX_BUF]; 1185 char firstname[MAX_BUF];
1182 1186
1183 for (count=0; count<10; count++) { 1187 for (count=0; count<10; count++) {
1184 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1188 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1185 if (!access(firstname, R_OK)) break; 1189 if (!access(firstname, R_OK)) break;
1186 } 1190 }
1187 /* If we get here, we did not find any map */ 1191 /* If we get here, we did not find any map */
1188 if (count==10) return; 1192 if (count==10) return;
1189 1193
1190 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) { 1194 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) {
1191 /* There is no expectation that every map will have unique items, but this 1195 /* There is no expectation that every map will have unique items, but this
1192 * is debug output, so leave it in. 1196 * is debug output, so leave it in.
1193 */ 1197 */
1194 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path)); 1198 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
1195 return; 1199 return;
1196 } 1200 }
1201
1202 object_thawer thawer (fp, firstname);
1197 1203
1198 m->in_memory=MAP_LOADING; 1204 m->in_memory=MAP_LOADING;
1199 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1205 if (m->tmpname == NULL) /* if we have loaded unique items from */
1200 delete_unique_items(m); /* original map before, don't duplicate them */ 1206 delete_unique_items(m); /* original map before, don't duplicate them */
1201 load_object(fp, NULL, LO_NOREAD,0); 1207 load_object(thawer, NULL, LO_NOREAD,0);
1202 load_objects (m, fp, 0); 1208 load_objects (m, thawer, 0);
1203 close_and_delete(fp, comp); 1209 close_and_delete(fp, comp);
1204 m->in_memory=MAP_IN_MEMORY; 1210 m->in_memory=MAP_IN_MEMORY;
1205} 1211}
1206 1212
1207 1213
… …
1212 * The temporary filename will be stored in the mapstructure. 1218 * The temporary filename will be stored in the mapstructure.
1213 * If the map is unique, we also save to the filename in the map 1219 * If the map is unique, we also save to the filename in the map
1214 * (this should have been updated when first loaded) 1220 * (this should have been updated when first loaded)
1215 */ 1221 */
1216 1222
1223int
1217int new_save_map(mapstruct *m, int flag) { 1224new_save_map (mapstruct * m, int flag)
1218 FILE *fp, *fp2; 1225{
1219 char filename[MAX_BUF],buf[MAX_BUF], shop[MAX_BUF]; 1226 char filename[MAX_BUF], buf[MAX_BUF], buf_s[MAX_BUF], shop[MAX_BUF];
1220 int i; 1227 int i;
1221 1228
1222 if (flag && !*m->path) { 1229 if (flag && !*m->path)
1230 {
1223 LOG(llevError,"Tried to save map without path.\n"); 1231 LOG (llevError, "Tried to save map without path.\n");
1224 return -1; 1232 return -1;
1225 }
1226 1233 }
1234
1227 if (flag || (m->unique) || (m->templatemap)) { 1235 if (flag || (m->unique) || (m->templatemap))
1228 if (!m->unique && !m->templatemap) { /* flag is set */ 1236 {
1237 if (!m->unique && !m->templatemap)
1238 { /* flag is set */
1229 if (flag == 2) 1239 if (flag == 2)
1230 strcpy(filename, create_overlay_pathname(m->path)); 1240 strcpy (filename, create_overlay_pathname (m->path));
1231 else 1241 else
1232 strcpy (filename, create_pathname (m->path)); 1242 strcpy (filename, create_pathname (m->path));
1233 } else 1243 }
1244 else
1234 strcpy (filename, m->path); 1245 strcpy (filename, m->path);
1235 1246
1236 /* If the compression suffix already exists on the filename, don't
1237 * put it on again. This nasty looking strcmp checks to see if the
1238 * compression suffix is at the end of the filename already.
1239 */
1240 if (m->compressed &&
1241 strcmp((filename + strlen(filename)-strlen(uncomp[m->compressed][0])),
1242 uncomp[m->compressed][0]))
1243 strcat(filename, uncomp[m->compressed][0]);
1244 make_path_to_file(filename); 1247 make_path_to_file (filename);
1245 } else { 1248 }
1249 else
1250 {
1246 if (!m->tmpname) 1251 if (!m->tmpname)
1247 m->tmpname = tempnam_local(settings.tmpdir,NULL); 1252 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1248 strcpy(filename, m->tmpname); 1253 strcpy (filename, m->tmpname);
1249 } 1254 }
1255
1250 LOG(llevDebug,"Saving map %s\n",m->path); 1256 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1251 m->in_memory = MAP_SAVING; 1257 m->in_memory = MAP_SAVING;
1252 1258
1253 unlink (filename); // do not overwrite backups if done via hardlinks 1259 object_freezer fp (filename);
1254 1260
1255 /* Compress if it isn't a temporary save. Do compress if unique */
1256 if (m->compressed && (m->unique || m->templatemap || flag)) {
1257 char buf[MAX_BUF];
1258 strcpy(buf, uncomp[m->compressed][2]);
1259 strcat(buf, " > ");
1260 strcat(buf, filename);
1261 fp = popen(buf, "w");
1262 } else
1263 fp = fopen(filename, "w");
1264
1265 if(fp == NULL) {
1266 LOG(llevError, "Cannot write %s: %s\n", filename, strerror_local(errno));
1267 return -1;
1268 }
1269
1270 /* legacy */ 1261 /* legacy */
1271 fprintf(fp,"arch map\n"); 1262 fprintf (fp, "arch map\n");
1263 if (m->name)
1272 if (m->name) fprintf(fp,"name %s\n", m->name); 1264 fprintf (fp, "name %s\n", m->name);
1265 if (!flag)
1273 if (!flag) fprintf(fp,"swap_time %d\n", m->swap_time); 1266 fprintf (fp, "swap_time %d\n", m->swap_time);
1267 if (m->reset_timeout)
1274 if (m->reset_timeout) fprintf(fp,"reset_timeout %d\n", m->reset_timeout); 1268 fprintf (fp, "reset_timeout %d\n", m->reset_timeout);
1269 if (m->fixed_resettime)
1275 if (m->fixed_resettime) fprintf(fp,"fixed_resettime %d\n", m->fixed_resettime); 1270 fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime);
1276 /* we unfortunately have no idea if this is a value the creator set 1271 /* we unfortunately have no idea if this is a value the creator set
1277 * or a difficulty value we generated when the map was first loaded 1272 * or a difficulty value we generated when the map was first loaded
1278 */ 1273 */
1274 if (m->difficulty)
1279 if (m->difficulty) fprintf(fp,"difficulty %d\n", m->difficulty); 1275 fprintf (fp, "difficulty %d\n", m->difficulty);
1276 if (m->region)
1280 if (m->region) fprintf(fp,"region %s\n", m->region->name); 1277 fprintf (fp, "region %s\n", m->region->name);
1281 if (m->shopitems) { 1278 if (m->shopitems)
1279 {
1282 print_shop_string(m, shop); 1280 print_shop_string (m, shop);
1283 fprintf(fp,"shopitems %s\n", shop); 1281 fprintf (fp, "shopitems %s\n", shop);
1284 } 1282 }
1283 if (m->shopgreed)
1285 if (m->shopgreed) fprintf(fp,"shopgreed %f\n", m->shopgreed); 1284 fprintf (fp, "shopgreed %f\n", m->shopgreed);
1286#ifndef WIN32 1285#ifndef WIN32
1286 if (m->shopmin)
1287 if (m->shopmin) fprintf(fp,"shopmin %llu\n", m->shopmin); 1287 fprintf (fp, "shopmin %llu\n", m->shopmin);
1288 if (m->shopmax)
1288 if (m->shopmax) fprintf(fp,"shopmax %llu\n", m->shopmax); 1289 fprintf (fp, "shopmax %llu\n", m->shopmax);
1289#else 1290#else
1291 if (m->shopmin)
1290 if (m->shopmin) fprintf(fp,"shopmin %I64u\n", m->shopmin); 1292 fprintf (fp, "shopmin %I64u\n", m->shopmin);
1293 if (m->shopmax)
1291 if (m->shopmax) fprintf(fp,"shopmax %I64u\n", m->shopmax); 1294 fprintf (fp, "shopmax %I64u\n", m->shopmax);
1292#endif 1295#endif
1296 if (m->shoprace)
1293 if (m->shoprace) fprintf(fp,"shoprace %s\n", m->shoprace); 1297 fprintf (fp, "shoprace %s\n", m->shoprace);
1298 if (m->darkness)
1294 if (m->darkness) fprintf(fp,"darkness %d\n", m->darkness); 1299 fprintf (fp, "darkness %d\n", m->darkness);
1300 if (m->width)
1295 if (m->width) fprintf(fp,"width %d\n", m->width); 1301 fprintf (fp, "width %d\n", m->width);
1302 if (m->height)
1296 if (m->height) fprintf(fp,"height %d\n", m->height); 1303 fprintf (fp, "height %d\n", m->height);
1304 if (m->enter_x)
1297 if (m->enter_x) fprintf(fp,"enter_x %d\n", m->enter_x); 1305 fprintf (fp, "enter_x %d\n", m->enter_x);
1306 if (m->enter_y)
1298 if (m->enter_y) fprintf(fp,"enter_y %d\n", m->enter_y); 1307 fprintf (fp, "enter_y %d\n", m->enter_y);
1308 if (m->msg)
1299 if (m->msg) fprintf(fp,"msg\n%sendmsg\n", m->msg); 1309 fprintf (fp, "msg\n%sendmsg\n", m->msg);
1310 if (m->maplore)
1300 if (m->maplore) fprintf(fp,"maplore\n%sendmaplore\n", m->maplore); 1311 fprintf (fp, "maplore\n%sendmaplore\n", m->maplore);
1312 if (m->unique)
1301 if (m->unique) fprintf(fp,"unique %d\n", m->unique); 1313 fprintf (fp, "unique %d\n", m->unique);
1314 if (m->templatemap)
1302 if (m->templatemap) fprintf(fp,"template %d\n", m->templatemap); 1315 fprintf (fp, "template %d\n", m->templatemap);
1316 if (m->outdoor)
1303 if (m->outdoor) fprintf(fp,"outdoor %d\n", m->outdoor); 1317 fprintf (fp, "outdoor %d\n", m->outdoor);
1318 if (m->temp)
1304 if (m->temp) fprintf(fp, "temp %d\n", m->temp); 1319 fprintf (fp, "temp %d\n", m->temp);
1320 if (m->pressure)
1305 if (m->pressure) fprintf(fp, "pressure %d\n", m->pressure); 1321 fprintf (fp, "pressure %d\n", m->pressure);
1322 if (m->humid)
1306 if (m->humid) fprintf(fp, "humid %d\n", m->humid); 1323 fprintf (fp, "humid %d\n", m->humid);
1324 if (m->windspeed)
1307 if (m->windspeed) fprintf(fp, "windspeed %d\n", m->windspeed); 1325 fprintf (fp, "windspeed %d\n", m->windspeed);
1326 if (m->winddir)
1308 if (m->winddir) fprintf(fp, "winddir %d\n", m->winddir); 1327 fprintf (fp, "winddir %d\n", m->winddir);
1328 if (m->sky)
1309 if (m->sky) fprintf(fp, "sky %d\n", m->sky); 1329 fprintf (fp, "sky %d\n", m->sky);
1330 if (m->nosmooth)
1310 if (m->nosmooth) fprintf(fp, "nosmooth %d\n", m->nosmooth); 1331 fprintf (fp, "nosmooth %d\n", m->nosmooth);
1332 if (m->safe_map)
1333 fprintf (fp, "safe_map %d\n", m->safe_map);
1311 1334
1312 /* Save any tiling information, except on overlays */ 1335 /* Save any tiling information, except on overlays */
1313 if (flag != 2) 1336 if (flag != 2)
1314 for (i=0; i<4; i++) 1337 for (i = 0; i < 4; i++)
1315 if (m->tile_path[i]) 1338 if (m->tile_path[i])
1316 fprintf(fp,"tile_path_%d %s\n", i+1, m->tile_path[i]); 1339 fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1317 1340
1318 fprintf(fp,"end\n"); 1341 fprintf (fp, "end\n");
1319 1342
1320 /* In the game save unique items in the different file, but 1343 /* In the game save unique items in the different file, but
1321 * in the editor save them to the normal map file. 1344 * in the editor save them to the normal map file.
1322 * If unique map, save files in the proper destination (set by 1345 * If unique map, save files in the proper destination (set by
1323 * player) 1346 * player)
1324 */ 1347 */
1325 fp2 = fp; /* save unique items into fp2 */
1326 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) { 1348 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1349 {
1327 sprintf (buf,"%s.v00",create_items_path (m->path)); 1350 sprintf (buf, "%s.v00", create_items_path (m->path));
1328 if ((fp2 = fopen (buf, "w")) == NULL) { 1351
1329 LOG(llevError, "Can't open unique items file %s\n", buf); 1352 object_freezer fp2 (buf);
1330 } 1353
1331 if (flag == 2) 1354 if (flag == 2)
1332 save_objects(m, fp, fp2, 2); 1355 save_objects (m, fp, fp2, 2);
1333 else 1356 else
1357 save_objects (m, fp, fp2, 0);
1358 }
1359 else
1360 { /* save same file when not playing, like in editor */
1334 save_objects (m, fp, fp2, 0); 1361 save_objects (m, fp, fp, 0);
1335 if (fp2 != NULL) {
1336 if (ftell (fp2) == 0) {
1337 fclose (fp2);
1338 unlink (buf);
1339 } else {
1340 fclose (fp2);
1341 chmod (buf, SAVE_MODE);
1342 } 1362 }
1343 }
1344 } else { /* save same file when not playing, like in editor */
1345 save_objects(m, fp, fp, 0);
1346 }
1347 1363
1348 if (m->compressed && (m->unique || m->templatemap || flag))
1349 pclose(fp);
1350 else
1351 fclose(fp);
1352
1353 chmod (filename, SAVE_MODE);
1354 return 0; 1364 return 0;
1355} 1365}
1356 1366
1357 1367
1358/* 1368/*
1359 * Remove and free all objects in the inventory of the given object. 1369 * Remove and free all objects in the inventory of the given object.
… …
1364{ 1374{
1365 object *tmp, *next; 1375 object *tmp, *next;
1366 1376
1367 for(tmp = op->inv; tmp; tmp = next) 1377 for(tmp = op->inv; tmp; tmp = next)
1368 { 1378 {
1369 next = tmp->below; 1379 next = tmp->below;
1370 clean_object(tmp); 1380 clean_object(tmp);
1371 if (QUERY_FLAG(tmp, FLAG_IS_LINKED)) 1381 if (QUERY_FLAG(tmp, FLAG_IS_LINKED))
1372 remove_button_link(tmp); 1382 remove_button_link(tmp);
1373 remove_ob(tmp); 1383 remove_ob(tmp);
1374 free_object(tmp); 1384 free_object(tmp);
1375 } 1385 }
1376} 1386}
1377 1387
1378/* 1388/*
1379 * Remove and free all objects in the given map. 1389 * Remove and free all objects in the given map.
… …
1382void free_all_objects(mapstruct *m) { 1392void free_all_objects(mapstruct *m) {
1383 int i,j; 1393 int i,j;
1384 object *op; 1394 object *op;
1385 1395
1386 for(i=0;i<MAP_WIDTH(m);i++) 1396 for(i=0;i<MAP_WIDTH(m);i++)
1387 for(j=0;j<MAP_HEIGHT(m);j++) { 1397 for(j=0;j<MAP_HEIGHT(m);j++) {
1388 object *previous_obj=NULL; 1398 object *previous_obj=NULL;
1389 while((op=GET_MAP_OB(m,i,j))!=NULL) { 1399 while((op=GET_MAP_OB(m,i,j))!=NULL) {
1390 if (op==previous_obj) { 1400 if (op==previous_obj) {
1391 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n"); 1401 LOG(llevDebug, "free_all_objects: Link error, bailing out.\n");
1392 break; 1402 break;
1393 } 1403 }
1394 previous_obj=op; 1404 previous_obj=op;
1395 if(op->head!=NULL) 1405 if(op->head!=NULL)
1396 op = op->head; 1406 op = op->head;
1397 1407
1398 /* If the map isn't in memory, free_object will remove and 1408 /* If the map isn't in memory, free_object will remove and
1399 * free objects in op's inventory. So let it do the job. 1409 * free objects in op's inventory. So let it do the job.
1400 */ 1410 */
1401 if (m->in_memory==MAP_IN_MEMORY) 1411 if (m->in_memory==MAP_IN_MEMORY)
1402 clean_object(op); 1412 clean_object(op);
1403 remove_ob(op); 1413 remove_ob(op);
1404 free_object(op); 1414 free_object(op);
1405 } 1415 }
1406 } 1416 }
1407#ifdef MANY_CORES 1417#ifdef MANY_CORES
1408 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly 1418 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
1409 * an item on that map was not saved - look for that condition and die as appropriate - 1419 * an item on that map was not saved - look for that condition and die as appropriate -
1410 * this leaves more of the map data intact for better debugging. 1420 * this leaves more of the map data intact for better debugging.
1411 */ 1421 */
1412 for (op=objects; op!=NULL; op=op->next) { 1422 for (op=objects; op!=NULL; op=op->next) {
1413 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) { 1423 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
1414 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name); 1424 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
1415 abort(); 1425 abort();
1416 } 1426 }
1417 } 1427 }
1418#endif 1428#endif
1419} 1429}
1420 1430
1421/* 1431/*
… …
1425 1435
1426void free_map(mapstruct *m,int flag) { 1436void free_map(mapstruct *m,int flag) {
1427 int i; 1437 int i;
1428 1438
1429 if (!m->in_memory) { 1439 if (!m->in_memory) {
1430 LOG(llevError,"Trying to free freed map.\n"); 1440 LOG(llevError,"Trying to free freed map.\n");
1431 return; 1441 return;
1432 } 1442 }
1433 if (flag && m->spaces) free_all_objects(m); 1443 if (flag && m->spaces) free_all_objects(m);
1434 if (m->name) FREE_AND_CLEAR(m->name); 1444 if (m->name) FREE_AND_CLEAR(m->name);
1435 if (m->spaces) FREE_AND_CLEAR(m->spaces); 1445 if (m->spaces) FREE_AND_CLEAR(m->spaces);
1436 if (m->msg) FREE_AND_CLEAR(m->msg); 1446 if (m->msg) FREE_AND_CLEAR(m->msg);
1437 if (m->maplore) FREE_AND_CLEAR(m->maplore); 1447 if (m->maplore) FREE_AND_CLEAR(m->maplore);
1438 if (m->shopitems) FREE_AND_CLEAR(m->shopitems); 1448 if (m->shopitems) FREE_AND_CLEAR(m->shopitems);
1439 if (m->shoprace) FREE_AND_CLEAR(m->shoprace); 1449 if (m->shoprace) FREE_AND_CLEAR(m->shoprace);
1440 if (m->buttons) 1450 if (m->buttons)
1441 free_objectlinkpt(m->buttons); 1451 free_objectlinkpt(m->buttons);
1442 m->buttons = NULL; 1452 m->buttons = NULL;
1443 for (i=0; i<4; i++) { 1453 for (i=0; i<4; i++) {
1444 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]); 1454 if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]);
1445 m->tile_map[i] = NULL; 1455 m->tile_map[i] = NULL;
1446 } 1456 }
1447 m->in_memory = MAP_SWAPPED; 1457 m->in_memory = MAP_SWAPPED;
1448} 1458}
1449 1459
1450/* 1460/*
… …
1458 mapstruct *tmp, *last; 1468 mapstruct *tmp, *last;
1459 int i; 1469 int i;
1460 1470
1461 if (!m) 1471 if (!m)
1462 return; 1472 return;
1473
1474 m->clear ();
1475
1463 if (m->in_memory == MAP_IN_MEMORY) { 1476 if (m->in_memory == MAP_IN_MEMORY) {
1464 /* change to MAP_SAVING, even though we are not, 1477 /* change to MAP_SAVING, even though we are not,
1465 * so that remove_ob doesn't do as much work. 1478 * so that remove_ob doesn't do as much work.
1466 */ 1479 */
1467 m->in_memory = MAP_SAVING; 1480 m->in_memory = MAP_SAVING;
1468 free_map (m, 1); 1481 free_map (m, 1);
1469 } 1482 }
1470 /* move this out of free_map, since tmpname can still be needed if 1483 /* move this out of free_map, since tmpname can still be needed if
1471 * the map is swapped out. 1484 * the map is swapped out.
1472 */ 1485 */
1473 if (m->tmpname) { 1486 if (m->tmpname) {
1474 free(m->tmpname); 1487 free(m->tmpname);
1475 m->tmpname=NULL; 1488 m->tmpname=NULL;
1476 } 1489 }
1477 last = NULL; 1490 last = NULL;
1478 /* We need to look through all the maps and see if any maps 1491 /* We need to look through all the maps and see if any maps
1479 * are pointing at this one for tiling information. Since 1492 * are pointing at this one for tiling information. Since
1480 * tiling can be assymetric, we just can not look to see which 1493 * tiling can be assymetric, we just can not look to see which
1481 * maps this map tiles with and clears those. 1494 * maps this map tiles with and clears those.
1482 */ 1495 */
1483 for (tmp = first_map; tmp != NULL; tmp = tmp->next) { 1496 for (tmp = first_map; tmp != NULL; tmp = tmp->next) {
1484 if (tmp->next == m) last = tmp; 1497 if (tmp->next == m) last = tmp;
1485 1498
1486 /* This should hopefully get unrolled on a decent compiler */ 1499 /* This should hopefully get unrolled on a decent compiler */
1487 for (i=0; i<4; i++) 1500 for (i=0; i<4; i++)
1488 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL; 1501 if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL;
1489 } 1502 }
1490 1503
1491 /* If last is null, then this should be the first map in the list */ 1504 /* If last is null, then this should be the first map in the list */
1492 if (!last) { 1505 if (!last) {
1493 if (m == first_map) 1506 if (m == first_map)
1494 first_map = m->next; 1507 first_map = m->next;
1495 else 1508 else
1496 /* m->path is a static char, so should hopefully still have 1509 /* m->path is a static char, so should hopefully still have
1497 * some useful data in it. 1510 * some useful data in it.
1498 */ 1511 */
1499 LOG(llevError,"delete_map: Unable to find map %s in list\n", 1512 LOG(llevError,"delete_map: Unable to find map %s in list\n",
1500 m->path); 1513 m->path);
1501 } 1514 }
1502 else 1515 else
1503 last->next = m->next; 1516 last->next = m->next;
1504 1517
1505 free (m); 1518 free (m);
1506} 1519}
1507 1520
1508 1521
… …
1528 /* Have we been at this level before? */ 1541 /* Have we been at this level before? */
1529 m = has_been_loaded (name); 1542 m = has_been_loaded (name);
1530 1543
1531 /* Map is good to go, so just return it */ 1544 /* Map is good to go, so just return it */
1532 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) { 1545 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) {
1533 return m; 1546 return m;
1534 } 1547 }
1535 1548
1536 /* unique maps always get loaded from their original location, and never 1549 /* unique maps always get loaded from their original location, and never
1537 * a temp location. Likewise, if map_flush is set, or we have never loaded 1550 * a temp location. Likewise, if map_flush is set, or we have never loaded
1538 * this map, load it now. I removed the reset checking from here - 1551 * this map, load it now. I removed the reset checking from here -
… …
1541 * a bit cleaner (and players probably shouldn't rely on exact timing for 1554 * a bit cleaner (and players probably shouldn't rely on exact timing for
1542 * resets in any case - if they really care, they should use the 'maps command. 1555 * resets in any case - if they really care, they should use the 'maps command.
1543 */ 1556 */
1544 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) { 1557 if ((flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)) || !m) {
1545 1558
1546 /* first visit or time to reset */ 1559 /* first visit or time to reset */
1547 if (m) { 1560 if (m) {
1548 clean_tmp_map(m); /* Doesn't make much difference */ 1561 clean_tmp_map(m); /* Doesn't make much difference */
1549 delete_map(m); 1562 delete_map(m);
1550 } 1563 }
1551 1564
1552 /* create and load a map */ 1565 /* create and load a map */
1553 if (flags & MAP_PLAYER_UNIQUE) 1566 if (flags & MAP_PLAYER_UNIQUE)
1554 LOG(llevDebug, "Trying to load map %s.\n", name); 1567 LOG(llevDebug, "Trying to load map %s.\n", name);
1555 else 1568 else
1556 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name)); 1569 LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name));
1557 1570
1558 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE)))) 1571 if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE))))
1559 return (NULL); 1572 return (NULL);
1560 1573
1561 fix_auto_apply(m); /* Chests which open as default */ 1574 fix_auto_apply(m); /* Chests which open as default */
1562 1575
1563 /* If a player unique map, no extra unique object file to load. 1576 /* If a player unique map, no extra unique object file to load.
1564 * if from the editor, likewise. 1577 * if from the editor, likewise.
1565 */ 1578 */
1566 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) 1579 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE)))
1567 load_unique_objects(m); 1580 load_unique_objects(m);
1568 1581
1569 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1582 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) {
1570 m=load_overlay_map(name, m); 1583 m=load_overlay_map(name, m);
1571 if (m==NULL) 1584 if (m==NULL)
1572 return NULL; 1585 return NULL;
1573 } 1586 }
1574 1587
1575 } else { 1588 } else {
1576 /* If in this loop, we found a temporary map, so load it up. */ 1589 /* If in this loop, we found a temporary map, so load it up. */
1577 1590
1578 m=load_temporary_map (m); 1591 m=load_temporary_map (m);
1579 if(m==NULL) return NULL; 1592 if(m==NULL) return NULL;
1580 load_unique_objects(m); 1593 load_unique_objects(m);
1581 1594
1582 clean_tmp_map(m); 1595 clean_tmp_map(m);
1583 m->in_memory = MAP_IN_MEMORY; 1596 m->in_memory = MAP_IN_MEMORY;
1584 /* tempnam() on sun systems (probably others) uses malloc 1597 /* tempnam() on sun systems (probably others) uses malloc
1585 * to allocated space for the string. Free it here. 1598 * to allocated space for the string. Free it here.
1586 * In some cases, load_temporary_map above won't find the 1599 * In some cases, load_temporary_map above won't find the
1587 * temporary map, and so has reloaded a new map. If that 1600 * temporary map, and so has reloaded a new map. If that
1588 * is the case, tmpname is now null 1601 * is the case, tmpname is now null
1589 */ 1602 */
1590 if (m->tmpname) free(m->tmpname); 1603 if (m->tmpname) free(m->tmpname);
1591 m->tmpname = NULL; 1604 m->tmpname = NULL;
1592 /* It's going to be saved anew anyway */ 1605 /* It's going to be saved anew anyway */
1593 } 1606 }
1594 1607
1595 /* Below here is stuff common to both first time loaded maps and 1608 /* Below here is stuff common to both first time loaded maps and
1596 * temp maps. 1609 * temp maps.
1597 */ 1610 */
1598 1611
1599 decay_objects(m); /* start the decay */ 1612 decay_objects(m); /* start the decay */
1600 /* In case other objects press some buttons down */ 1613 /* In case other objects press some buttons down */
1601 update_buttons(m); 1614 update_buttons(m);
1602 if (m->outdoor) 1615 if (m->outdoor)
1603 set_darkness_map(m); 1616 set_darkness_map(m);
1604 /* run the weather over this map */ 1617 /* run the weather over this map */
1605 weather_effect(name); 1618 weather_effect(name);
1606 return m; 1619 return m;
1607} 1620}
1608 1621
… …
1668 return 1; 1681 return 1;
1669} 1682}
1670 1683
1671void clean_tmp_map(mapstruct *m) { 1684void clean_tmp_map(mapstruct *m) {
1672 if(m->tmpname == NULL) 1685 if(m->tmpname == NULL)
1673 return; 1686 return;
1674 if (clean_temporary_map_callback) 1687 INVOKE_MAP (CLEAN, m);
1675 clean_temporary_map_callback (m);
1676 (void) unlink(m->tmpname); 1688 (void) unlink(m->tmpname);
1677} 1689}
1678 1690
1679void free_all_maps(void) 1691void free_all_maps(void)
1680{ 1692{
1681 int real_maps=0; 1693 int real_maps=0;
1682 1694
1683 while (first_map) { 1695 while (first_map) {
1684 /* I think some of the callers above before it gets here set this to be 1696 /* I think some of the callers above before it gets here set this to be
1685 * saving, but we still want to free this data 1697 * saving, but we still want to free this data
1686 */ 1698 */
1687 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY; 1699 if (first_map->in_memory == MAP_SAVING) first_map->in_memory = MAP_IN_MEMORY;
1688 delete_map(first_map); 1700 delete_map(first_map);
1689 real_maps++; 1701 real_maps++;
1690 } 1702 }
1691 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps); 1703 LOG(llevDebug,"free_all_maps: Freed %d maps\n", real_maps);
1692} 1704}
1693 1705
1694/* change_map_light() - used to change map light level (darkness) 1706/* change_map_light() - used to change map light level (darkness)
… …
1708 return 0; 1720 return 0;
1709 } 1721 }
1710 1722
1711 /* inform all players on the map */ 1723 /* inform all players on the map */
1712 if (change>0) 1724 if (change>0)
1713 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker."); 1725 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes darker.");
1714 else 1726 else
1715 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); 1727 new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter.");
1716 1728
1717 /* Do extra checking. since m->darkness is a unsigned value, 1729 /* Do extra checking. since m->darkness is a unsigned value,
1718 * we need to be extra careful about negative values. 1730 * we need to be extra careful about negative values.
1719 * In general, the checks below are only needed if change 1731 * In general, the checks below are only needed if change
1720 * is not +/-1 1732 * is not +/-1
… …
1738void update_position (mapstruct *m, int x, int y) { 1750void update_position (mapstruct *m, int x, int y) {
1739 object *tmp, *last = NULL; 1751 object *tmp, *last = NULL;
1740 uint8 flags = 0, oldflags, light=0, anywhere=0; 1752 uint8 flags = 0, oldflags, light=0, anywhere=0;
1741 New_Face *top,*floor, *middle; 1753 New_Face *top,*floor, *middle;
1742 object *top_obj, *floor_obj, *middle_obj; 1754 object *top_obj, *floor_obj, *middle_obj;
1743 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0; 1755 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0;
1744 1756
1745 oldflags = GET_MAP_FLAGS(m,x,y); 1757 oldflags = GET_MAP_FLAGS(m,x,y);
1746 if (!(oldflags & P_NEED_UPDATE)) { 1758 if (!(oldflags & P_NEED_UPDATE)) {
1747 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", 1759 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n",
1748 m->path, x, y); 1760 m->path, x, y);
1749 return; 1761 return;
1750 } 1762 }
1751 1763
1752 middle=blank_face; 1764 middle=blank_face;
1753 top=blank_face; 1765 top=blank_face;
1754 floor=blank_face; 1766 floor=blank_face;
… …
1757 top_obj = NULL; 1769 top_obj = NULL;
1758 floor_obj = NULL; 1770 floor_obj = NULL;
1759 1771
1760 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { 1772 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) {
1761 1773
1762 /* This could be made additive I guess (two lights better than 1774 /* This could be made additive I guess (two lights better than
1763 * one). But if so, it shouldn't be a simple additive - 2 1775 * one). But if so, it shouldn't be a simple additive - 2
1764 * light bulbs do not illuminate twice as far as once since 1776 * light bulbs do not illuminate twice as far as once since
1765 * it is a disapation factor that is squared (or is it cubed?) 1777 * it is a disapation factor that is squared (or is it cubed?)
1766 */ 1778 */
1767 if (tmp->glow_radius > light) light = tmp->glow_radius; 1779 if (tmp->glow_radius > light) light = tmp->glow_radius;
1768 1780
1769 /* This call is needed in order to update objects the player 1781 /* This call is needed in order to update objects the player
1770 * is standing in that have animations (ie, grass, fire, etc). 1782 * is standing in that have animations (ie, grass, fire, etc).
1771 * However, it also causes the look window to be re-drawn 1783 * However, it also causes the look window to be re-drawn
1772 * 3 times each time the player moves, because many of the 1784 * 3 times each time the player moves, because many of the
1773 * functions the move_player calls eventualy call this. 1785 * functions the move_player calls eventualy call this.
1774 * 1786 *
1775 * Always put the player down for drawing. 1787 * Always put the player down for drawing.
1776 */ 1788 */
1777 if (!tmp->invisible) { 1789 if (!tmp->invisible) {
1778 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { 1790 if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) {
1779 top = tmp->face; 1791 top = tmp->face;
1780 top_obj = tmp; 1792 top_obj = tmp;
1781 } 1793 }
1782 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { 1794 else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) {
1783 /* If we got a floor, that means middle and top were below it, 1795 /* If we got a floor, that means middle and top were below it,
1784 * so should not be visible, so we clear them. 1796 * so should not be visible, so we clear them.
1785 */ 1797 */
1786 middle=blank_face; 1798 middle=blank_face;
1787 top=blank_face; 1799 top=blank_face;
1788 floor = tmp->face; 1800 floor = tmp->face;
1789 floor_obj = tmp; 1801 floor_obj = tmp;
1790 } 1802 }
1791 /* Flag anywhere have high priority */ 1803 /* Flag anywhere have high priority */
1792 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { 1804 else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) {
1793 middle = tmp->face; 1805 middle = tmp->face;
1794 1806
1795 middle_obj = tmp; 1807 middle_obj = tmp;
1796 anywhere =1; 1808 anywhere =1;
1797 } 1809 }
1798 /* Find the highest visible face around. If equal 1810 /* Find the highest visible face around. If equal
1799 * visibilities, we still want the one nearer to the 1811 * visibilities, we still want the one nearer to the
1800 * top 1812 * top
1801 */ 1813 */
1802 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { 1814 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) {
1803 middle = tmp->face; 1815 middle = tmp->face;
1804 middle_obj = tmp; 1816 middle_obj = tmp;
1805 } 1817 }
1806 } 1818 }
1807 if (tmp==tmp->above) { 1819 if (tmp==tmp->above) {
1808 LOG(llevError, "Error in structure of map\n"); 1820 LOG(llevError, "Error in structure of map\n");
1809 exit (-1); 1821 exit (-1);
1810 } 1822 }
1811 1823
1812 move_slow |= tmp->move_slow; 1824 move_slow |= tmp->move_slow;
1813 move_block |= tmp->move_block; 1825 move_block |= tmp->move_block;
1814 move_on |= tmp->move_on; 1826 move_on |= tmp->move_on;
1815 move_off |= tmp->move_off; 1827 move_off |= tmp->move_off;
1816 move_allow |= tmp->move_allow; 1828 move_allow |= tmp->move_allow;
1817 1829
1818 if (QUERY_FLAG(tmp,FLAG_ALIVE)) 1830 if (QUERY_FLAG(tmp,FLAG_ALIVE))
1819 flags |= P_IS_ALIVE; 1831 flags |= P_IS_ALIVE;
1820 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 1832 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC))
1821 flags |= P_NO_MAGIC; 1833 flags |= P_NO_MAGIC;
1822 if (QUERY_FLAG(tmp,FLAG_DAMNED)) 1834 if (QUERY_FLAG(tmp,FLAG_DAMNED))
1823 flags |= P_NO_CLERIC; 1835 flags |= P_NO_CLERIC;
1836 if (tmp->type == SAFE_GROUND)
1837 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC;
1824 1838
1825 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 1839 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW))
1826 flags |= P_BLOCKSVIEW; 1840 flags |= P_BLOCKSVIEW;
1827 } /* for stack of objects */ 1841 } /* for stack of objects */
1828 1842
1829 /* we don't want to rely on this function to have accurate flags, but 1843 /* we don't want to rely on this function to have accurate flags, but
1830 * since we're already doing the work, we calculate them here. 1844 * since we're already doing the work, we calculate them here.
1831 * if they don't match, logic is broken someplace. 1845 * if they don't match, logic is broken someplace.
1832 */ 1846 */
1833 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) && 1847 if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) &&
1834 (!(oldflags & P_NO_ERROR))) { 1848 (!(oldflags & P_NO_ERROR))) {
1835 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1849 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1836 m->path, x, y, 1850 m->path, x, y,
1837 (oldflags & ~P_NEED_UPDATE), flags); 1851 (oldflags & ~P_NEED_UPDATE), flags);
1838 } 1852 }
1839 SET_MAP_FLAGS(m, x, y, flags); 1853 SET_MAP_FLAGS(m, x, y, flags);
1840 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow); 1854 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow);
1841 SET_MAP_MOVE_ON(m, x, y, move_on); 1855 SET_MAP_MOVE_ON(m, x, y, move_on);
… …
1863 * 2) middle is set, need to set top. 1877 * 2) middle is set, need to set top.
1864 * 3) neither middle or top is set - need to set both. 1878 * 3) neither middle or top is set - need to set both.
1865 */ 1879 */
1866 1880
1867 for (tmp=last; tmp; tmp=tmp->below) { 1881 for (tmp=last; tmp; tmp=tmp->below) {
1868 /* Once we get to a floor, stop, since we already have a floor object */ 1882 /* Once we get to a floor, stop, since we already have a floor object */
1869 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; 1883 if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break;
1870 1884
1871 /* If two top faces are already set, quit processing */ 1885 /* If two top faces are already set, quit processing */
1872 if ((top != blank_face) && (middle != blank_face)) break; 1886 if ((top != blank_face) && (middle != blank_face)) break;
1873 1887
1874 /* Only show visible faces, unless its the editor - show all */ 1888 /* Only show visible faces, unless its the editor - show all */
1875 if (!tmp->invisible || editor) { 1889 if (!tmp->invisible || editor) {
1876 /* Fill in top if needed */ 1890 /* Fill in top if needed */
1877 if (top == blank_face) { 1891 if (top == blank_face) {
1878 top = tmp->face; 1892 top = tmp->face;
1879 top_obj = tmp; 1893 top_obj = tmp;
1880 if (top == middle) middle=blank_face; 1894 if (top == middle) middle=blank_face;
1881 } else { 1895 } else {
1882 /* top is already set - we should only get here if 1896 /* top is already set - we should only get here if
1883 * middle is not set 1897 * middle is not set
1884 * 1898 *
1885 * Set the middle face and break out, since there is nothing 1899 * Set the middle face and break out, since there is nothing
1886 * more to fill in. We don't check visiblity here, since 1900 * more to fill in. We don't check visiblity here, since
1887 * 1901 *
1888 */ 1902 */
1889 if (tmp->face != top ) { 1903 if (tmp->face != top ) {
1890 middle = tmp->face; 1904 middle = tmp->face;
1891 middle_obj = tmp; 1905 middle_obj = tmp;
1892 break; 1906 break;
1893 } 1907 }
1894 } 1908 }
1895 } 1909 }
1896 } 1910 }
1897 if (middle == floor) middle = blank_face; 1911 if (middle == floor) middle = blank_face;
1898 if (top == middle) middle = blank_face; 1912 if (top == middle) middle = blank_face;
1899 SET_MAP_FACE(m,x,y,top,0); 1913 SET_MAP_FACE(m,x,y,top,0);
1900 if(top != blank_face) 1914 if(top != blank_face)
… …
1940 1954
1941 orig_map->tile_map[tile_num] = ready_map_name(path, 0); 1955 orig_map->tile_map[tile_num] = ready_map_name(path, 0);
1942 1956
1943 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1957 /* need to do a strcmp here as the orig_map->path is not a shared string */
1944 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && 1958 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] &&
1945 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1959 !strcmp(orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path))
1946 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1960 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1947 1961
1948 return orig_map->tile_map[tile_num]; 1962 return orig_map->tile_map[tile_num];
1949} 1963}
1950 1964
1951/* this returns TRUE if the coordinates (x,y) are out of 1965/* this returns TRUE if the coordinates (x,y) are out of
… …
1966 * map loads fail below, it could happen. 1980 * map loads fail below, it could happen.
1967 */ 1981 */
1968 if (!m) return 0; 1982 if (!m) return 0;
1969 1983
1970 if (x<0) { 1984 if (x<0) {
1971 if (!m->tile_path[3]) return 1; 1985 if (!m->tile_path[3]) return 1;
1972 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) { 1986 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1973 load_and_link_tiled_map(m, 3); 1987 load_and_link_tiled_map(m, 3);
1974 } 1988 }
1975 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y)); 1989 return (out_of_map(m->tile_map[3], x + MAP_WIDTH(m->tile_map[3]), y));
1976 } 1990 }
1977 if (x>=MAP_WIDTH(m)) { 1991 if (x>=MAP_WIDTH(m)) {
1978 if (!m->tile_path[1]) return 1; 1992 if (!m->tile_path[1]) return 1;
1979 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) { 1993 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) {
1980 load_and_link_tiled_map(m, 1); 1994 load_and_link_tiled_map(m, 1);
1981 } 1995 }
1982 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y)); 1996 return (out_of_map(m->tile_map[1], x - MAP_WIDTH(m), y));
1983 } 1997 }
1984 if (y<0) { 1998 if (y<0) {
1985 if (!m->tile_path[0]) return 1; 1999 if (!m->tile_path[0]) return 1;
1986 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) { 2000 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) {
1987 load_and_link_tiled_map(m, 0); 2001 load_and_link_tiled_map(m, 0);
1988 } 2002 }
1989 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0]))); 2003 return (out_of_map(m->tile_map[0], x, y + MAP_HEIGHT(m->tile_map[0])));
1990 } 2004 }
1991 if (y>=MAP_HEIGHT(m)) { 2005 if (y>=MAP_HEIGHT(m)) {
1992 if (!m->tile_path[2]) return 1; 2006 if (!m->tile_path[2]) return 1;
1993 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) { 2007 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
1994 load_and_link_tiled_map(m, 2); 2008 load_and_link_tiled_map(m, 2);
1995 } 2009 }
1996 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m))); 2010 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
1997 } 2011 }
1998 2012
1999 /* Simple case - coordinates are within this local 2013 /* Simple case - coordinates are within this local
2000 * map. 2014 * map.
2001 */ 2015 */
… …
2012 */ 2026 */
2013mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 2027mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y)
2014{ 2028{
2015 2029
2016 if (*x<0) { 2030 if (*x<0) {
2017 if (!m->tile_path[3]) return NULL; 2031 if (!m->tile_path[3]) return NULL;
2018 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2032 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2019 load_and_link_tiled_map(m, 3); 2033 load_and_link_tiled_map(m, 3);
2020 2034
2021 *x += MAP_WIDTH(m->tile_map[3]); 2035 *x += MAP_WIDTH(m->tile_map[3]);
2022 return (get_map_from_coord(m->tile_map[3], x, y)); 2036 return (get_map_from_coord(m->tile_map[3], x, y));
2023 } 2037 }
2024 if (*x>=MAP_WIDTH(m)) { 2038 if (*x>=MAP_WIDTH(m)) {
2025 if (!m->tile_path[1]) return NULL; 2039 if (!m->tile_path[1]) return NULL;
2026 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2040 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2027 load_and_link_tiled_map(m, 1); 2041 load_and_link_tiled_map(m, 1);
2028 2042
2029 *x -= MAP_WIDTH(m); 2043 *x -= MAP_WIDTH(m);
2030 return (get_map_from_coord(m->tile_map[1], x, y)); 2044 return (get_map_from_coord(m->tile_map[1], x, y));
2031 } 2045 }
2032 if (*y<0) { 2046 if (*y<0) {
2033 if (!m->tile_path[0]) return NULL; 2047 if (!m->tile_path[0]) return NULL;
2034 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2048 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2035 load_and_link_tiled_map(m, 0); 2049 load_and_link_tiled_map(m, 0);
2036 2050
2037 *y += MAP_HEIGHT(m->tile_map[0]); 2051 *y += MAP_HEIGHT(m->tile_map[0]);
2038 return (get_map_from_coord(m->tile_map[0], x, y)); 2052 return (get_map_from_coord(m->tile_map[0], x, y));
2039 } 2053 }
2040 if (*y>=MAP_HEIGHT(m)) { 2054 if (*y>=MAP_HEIGHT(m)) {
2041 if (!m->tile_path[2]) return NULL; 2055 if (!m->tile_path[2]) return NULL;
2042 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2056 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2043 load_and_link_tiled_map(m, 2); 2057 load_and_link_tiled_map(m, 2);
2044 2058
2045 *y -= MAP_HEIGHT(m); 2059 *y -= MAP_HEIGHT(m);
2046 return (get_map_from_coord(m->tile_map[2], x, y)); 2060 return (get_map_from_coord(m->tile_map[2], x, y));
2047 } 2061 }
2048 2062
2049 /* Simple case - coordinates are within this local 2063 /* Simple case - coordinates are within this local
2050 * map. 2064 * map.
2051 */ 2065 */
… …
2195 retval->distance_x = 32767; 2209 retval->distance_x = 32767;
2196 retval->distance_y = 32767; 2210 retval->distance_y = 32767;
2197 retval->direction = 0; 2211 retval->direction = 0;
2198 retval->part = 0; 2212 retval->part = 0;
2199 } else { 2213 } else {
2200 retval->distance_x += op2->x-x; 2214 retval->distance_x += op2->x-x;
2201 retval->distance_y += op2->y-y; 2215 retval->distance_y += op2->y-y;
2202 2216
2203 retval->part = NULL; 2217 retval->part = NULL;
2204 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); 2218 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y);
2205 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2219 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y);
2206 } 2220 }

Diff Legend

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