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.8 by root, Sat Aug 26 08:44:04 2006 UTC vs.
Revision 1.23 by root, Mon Sep 4 15:51:24 2006 UTC

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

Diff Legend

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