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.6 by elmex, Mon Aug 21 02:55:10 2006 UTC vs.
Revision 1.13 by elmex, Tue Aug 29 09:35:51 2006 UTC

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

Diff Legend

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