… | |
… | |
354 | { |
354 | { |
355 | if (!spaces) |
355 | if (!spaces) |
356 | return; |
356 | return; |
357 | |
357 | |
358 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
358 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
359 | for (object *tmp = ms->bot; tmp; ) |
359 | for (object *tmp = ms->bot; tmp; tmp = tmp->above) |
360 | { |
360 | { |
361 | object *above = tmp->above; |
|
|
362 | |
|
|
363 | /* already multipart - don't do anything more */ |
361 | /* already multipart - don't do anything more */ |
364 | if (!tmp->head && !tmp->more) |
362 | if (!tmp->head && !tmp->more) |
365 | { |
363 | { |
366 | /* If there is nothing more to this object, this for loop |
364 | /* If there is nothing more to this object, this for loop |
367 | * won't do anything. |
365 | * won't do anything. |
… | |
… | |
389 | * the coding is simpler to just to it here with each part. |
387 | * the coding is simpler to just to it here with each part. |
390 | */ |
388 | */ |
391 | insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); |
389 | insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); |
392 | } |
390 | } |
393 | } |
391 | } |
394 | |
|
|
395 | tmp = above; |
|
|
396 | } |
392 | } |
397 | } |
393 | } |
398 | |
394 | |
399 | /* |
395 | /* |
400 | * Loads (ands parses) the objects into a given map from the specified |
396 | * Loads (ands parses) the objects into a given map from the specified |
401 | * file pointer. |
397 | * file pointer. |
402 | * mapflags is the same as we get with load_original_map |
|
|
403 | */ |
398 | */ |
404 | bool |
399 | bool |
405 | maptile::_load_objects (object_thawer &thawer) |
400 | maptile::_load_objects (object_thawer &f) |
406 | { |
401 | { |
407 | int unique; |
402 | for (;;) |
408 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
|
|
409 | |
|
|
410 | op = object::create (); |
|
|
411 | op->map = this; /* To handle buttons correctly */ |
|
|
412 | |
|
|
413 | while (int i = load_object (thawer, op, 0)) |
|
|
414 | { |
403 | { |
415 | /* if the archetype for the object is null, means that we |
404 | coroapi::cede_every (1000); // cede once in a while |
416 | * got an invalid object. Don't do anything with it - the game |
405 | |
417 | * or editor will not be able to do anything with it either. |
406 | switch (f.kw) |
418 | */ |
|
|
419 | if (op->arch == NULL) |
|
|
420 | { |
407 | { |
421 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
408 | case KW_arch: |
422 | continue; |
409 | if (object *op = object::read (f, this)) |
423 | } |
|
|
424 | |
|
|
425 | switch (i) |
|
|
426 | { |
410 | { |
427 | case LL_NORMAL: |
411 | if (op->inv) |
|
|
412 | sum_weight (op); |
|
|
413 | |
428 | insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
414 | insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
|
|
415 | } |
429 | |
416 | |
430 | if (op->inv) |
417 | continue; |
431 | sum_weight (op); |
|
|
432 | |
418 | |
433 | prev = op, last_more = op; |
|
|
434 | break; |
|
|
435 | |
|
|
436 | case LL_MORE: |
419 | case KW_EOF: |
437 | insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
420 | return true; |
438 | op->head = prev, last_more->more = op, last_more = op; |
421 | |
|
|
422 | default: |
|
|
423 | if (!f.parse_error ("map file")) |
|
|
424 | return false; |
439 | break; |
425 | break; |
440 | } |
426 | } |
441 | |
427 | |
442 | op = object::create (); |
428 | f.next (); |
443 | op->map = this; |
|
|
444 | } |
|
|
445 | |
|
|
446 | op->destroy (); |
|
|
447 | |
|
|
448 | #if 0 |
|
|
449 | for (i = 0; i < width; i++) |
|
|
450 | for (j = 0; j < height; j++) |
|
|
451 | { |
|
|
452 | unique = 0; |
|
|
453 | /* check for unique items, or unique squares */ |
|
|
454 | for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) |
|
|
455 | { |
|
|
456 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
|
|
457 | unique = 1; |
|
|
458 | |
|
|
459 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
|
|
460 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
|
|
461 | } |
|
|
462 | } |
429 | } |
463 | #endif |
|
|
464 | |
430 | |
465 | return true; |
431 | return true; |
466 | } |
432 | } |
467 | |
433 | |
468 | void |
434 | void |
… | |
… | |
486 | for (object *op = ms->bot; op; op = op->above) |
452 | for (object *op = ms->bot; op; op = op->above) |
487 | op->deactivate_recursive (); |
453 | op->deactivate_recursive (); |
488 | } |
454 | } |
489 | |
455 | |
490 | bool |
456 | bool |
491 | maptile::_save_objects (object_freezer &freezer, int flags) |
457 | maptile::_save_objects (object_freezer &f, int flags) |
492 | { |
458 | { |
493 | static int cede_count = 0; |
459 | static int cede_count = 0; |
494 | |
460 | |
495 | if (flags & IO_HEADER) |
461 | if (flags & IO_HEADER) |
496 | _save_header (freezer); |
462 | _save_header (f); |
497 | |
463 | |
498 | if (!spaces) |
464 | if (!spaces) |
499 | return false; |
465 | return false; |
500 | |
466 | |
501 | for (int i = 0; i < size (); ++i) |
467 | for (int i = 0; i < size (); ++i) |
… | |
… | |
521 | continue; |
487 | continue; |
522 | |
488 | |
523 | if (unique || op->flag [FLAG_UNIQUE]) |
489 | if (unique || op->flag [FLAG_UNIQUE]) |
524 | { |
490 | { |
525 | if (flags & IO_UNIQUES) |
491 | if (flags & IO_UNIQUES) |
526 | save_object (freezer, op, 1); |
492 | op->write (f); |
527 | } |
493 | } |
528 | else if (flags & IO_OBJECTS) |
494 | else if (flags & IO_OBJECTS) |
529 | save_object (freezer, op, 1); |
495 | op->write (f); |
530 | } |
496 | } |
531 | } |
497 | } |
532 | |
498 | |
533 | return true; |
499 | return true; |
534 | } |
500 | } |
535 | |
501 | |
536 | bool |
502 | bool |
537 | maptile::_load_objects (const char *path, bool skip_header) |
503 | maptile::_load_objects (const char *path, bool skip_header) |
538 | { |
504 | { |
539 | object_thawer thawer (path); |
505 | object_thawer f (path); |
540 | |
506 | |
541 | if (!thawer) |
507 | if (!f) |
542 | return false; |
508 | return false; |
|
|
509 | |
|
|
510 | f.next (); |
543 | |
511 | |
544 | if (skip_header) |
512 | if (skip_header) |
545 | for (;;) |
513 | for (;;) |
546 | { |
514 | { |
|
|
515 | keyword kw = f.kw; |
|
|
516 | f.skip (); |
547 | if (thawer.kw == KW_end) |
517 | if (kw == KW_end) |
548 | break; |
518 | break; |
549 | |
|
|
550 | thawer.skip_kv (); |
|
|
551 | } |
519 | } |
552 | |
520 | |
553 | return _load_objects (thawer); |
521 | return _load_objects (f); |
554 | } |
522 | } |
555 | |
523 | |
556 | bool |
524 | bool |
557 | maptile::_save_objects (const char *path, int flags) |
525 | maptile::_save_objects (const char *path, int flags) |
558 | { |
526 | { |