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.9 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.10 by root, Mon Aug 28 14:05:23 2006 UTC

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

Diff Legend

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