fiddlerwoaroof/crawl - Change 6PDCEA2CDME5PVGWTDVXI62APFIWKRDPZIBGO4DBYATYDZPPFU5QC

Fix [2573054]: idle time not being clamped on level save/load (e.g. SIGHUP or

when the game is saved.)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8931 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on February 6, 2009

6PDCEA2CDME5PVGWTDVXI62APFIWKRDPZIBGO4DBYATYDZPPFU5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.cc at line 658 [3.164589]

B:BD[3.174379] → [3.174379:174905]

B:BD[3.174905] → [4.228752:228844]

∅:D[4.228844] → [3.174905:175083]

B:BD[3.174905] → [3.174905:175083]

B:BD[3.175083] → [5.1058:1135]

B:BD[5.1135] → [6.2331:2373]

∅:D[6.2373] → [5.1135:1154]

B:BD[5.1135] → [5.1135:1154]

∅:D[5.1154] → [3.175083:175165]

B:BD[3.175083] → [3.175083:175165]

        case TAG_YOU:
            tag_construct_you(th);
            break;
        case TAG_YOU_ITEMS:
            tag_construct_you_items(th);
            break;
        case TAG_YOU_DUNGEON:
            tag_construct_you_dungeon(th);
            break;
        case TAG_LEVEL:
            tag_construct_level(th);
            break;
        case TAG_LEVEL_ITEMS:
            tag_construct_level_items(th);
            break;
        case TAG_LEVEL_MONSTERS:
            tag_construct_level_monsters(th);
            break;
        case TAG_LEVEL_TILES:
            tag_construct_level_tiles(th);
            break;
        case TAG_LEVEL_ATTITUDE:
            tag_construct_level_attitude(th);
            break;
        case TAG_GHOST:
            tag_construct_ghost(th);
            break;
        case TAG_LOST_MONSTERS:
            tag_construct_lost_monsters(th);
            tag_construct_lost_items(th);
            break;
        default:
            // I don't know how to make that!
            break;

[3.174379]

[3.175165]

    case TAG_YOU:            tag_construct_you(th);            break;
    case TAG_YOU_ITEMS:      tag_construct_you_items(th);      break;
    case TAG_YOU_DUNGEON:    tag_construct_you_dungeon(th);    break;
    case TAG_LEVEL:          tag_construct_level(th);          break;
    case TAG_LEVEL_ITEMS:    tag_construct_level_items(th);    break;
    case TAG_LEVEL_MONSTERS: tag_construct_level_monsters(th); break;
    case TAG_LEVEL_TILES:    tag_construct_level_tiles(th);    break;
    case TAG_LEVEL_ATTITUDE: tag_construct_level_attitude(th); break;
    case TAG_GHOST:          tag_construct_ghost(th);          break;
    case TAG_LOST_MONSTERS:
        tag_construct_lost_monsters(th);
        tag_construct_lost_items(th);
        break;
    default:
        // I don't know how to make that!
        break;

Replacement in crawl-ref/source/tags.cc at line 705 [3.164589]

B:BD[7.8871] → [7.8871:8914]

        if (tag_id < 0) return TAG_NO_TAG;

[7.8871]

[7.8914]

        if (tag_id < 0)
            return TAG_NO_TAG;

Replacement in crawl-ref/source/tags.cc at line 708 [3.164589]

B:BD[7.8966] → [7.8966:9012]

        if (data_size < 0) return TAG_NO_TAG;

[7.8966]

[3.176258]

        if (data_size < 0)
            return TAG_NO_TAG;

Replacement in crawl-ref/source/tags.cc at line 723 [3.164589]

B:BD[3.176767] → [3.176767:177426]

B:BD[3.177426] → [4.228845:228932]

∅:D[4.228932] → [3.177426:177515]

B:BD[3.177426] → [3.177426:177515]

B:BD[3.177515] → [5.1155:1241]

B:BD[5.1241] → [6.2374:2425]

∅:D[6.2425] → [5.1241:1260]

B:BD[5.1241] → [5.1241:1260]

∅:D[5.1260] → [3.177515:177578]

B:BD[3.177515] → [3.177515:177578]

B:BD[3.177578] → [7.9218:9276]

        case TAG_YOU:
            tag_read_you(th, minorVersion);
            break;
        case TAG_YOU_ITEMS:
            tag_read_you_items(th, minorVersion);
            break;
        case TAG_YOU_DUNGEON:
            tag_read_you_dungeon(th);
            break;
        case TAG_LEVEL:
            tag_read_level(th, minorVersion);
            break;
        case TAG_LEVEL_ITEMS:
            tag_read_level_items(th, minorVersion);
            break;
        case TAG_LEVEL_MONSTERS:
            tag_read_level_monsters(th, minorVersion);
            break;
        case TAG_LEVEL_ATTITUDE:
            tag_read_level_attitude(th);
            break;
        case TAG_LEVEL_TILES:
            tag_read_level_tiles(th);
            break;
        case TAG_GHOST:
            tag_read_ghost(th, minorVersion);
            break;
        case TAG_LOST_MONSTERS:
            tag_read_lost_monsters(th, minorVersion);
            tag_read_lost_items(th, minorVersion);
            break;
        default:
            // I don't know how to read that!
            ASSERT(false);
            return TAG_NO_TAG;

[3.176767]

[3.177600]

    case TAG_YOU:            tag_read_you(th, minorVersion);            break;
    case TAG_YOU_ITEMS:      tag_read_you_items(th, minorVersion);      break;
    case TAG_YOU_DUNGEON:    tag_read_you_dungeon(th);                  break;
    case TAG_LEVEL:          tag_read_level(th, minorVersion);          break;
    case TAG_LEVEL_ITEMS:    tag_read_level_items(th, minorVersion);    break;
    case TAG_LEVEL_MONSTERS: tag_read_level_monsters(th, minorVersion); break;
    case TAG_LEVEL_ATTITUDE: tag_read_level_attitude(th);               break;
    case TAG_LEVEL_TILES:    tag_read_level_tiles(th);                  break;
    case TAG_GHOST:          tag_read_ghost(th, minorVersion);          break;
    case TAG_LOST_MONSTERS:
        tag_read_lost_monsters(th, minorVersion);
        tag_read_lost_items(th, minorVersion);
        break;
    default:
        // I don't know how to read that!
        ASSERT(false);
        return TAG_NO_TAG;

Replacement in crawl-ref/source/tags.cc at line 742 [3.164589]
B:BD[3.177607] → [7.9277:9306]
```
    return (tag_type)tag_id;
```
[3.177607]
[3.177629]
```
    return static_cast<tag_type>(tag_id);
```

Replacement in crawl-ref/source/tags.cc at line 978 [3.164589]

B:BD[3.184187] → [3.184187:184236]

        you.real_time += (now - you.start_time);

[3.184187]

[3.184236]

        you.real_time += std::min<time_t>(now - you.start_time,
                                          IDLE_TIME_CLAMP);

Replacement in crawl-ref/source/files.cc at line 779 [3.3084589]

B:BD[2.5783] → [2.5783:5825]

            tag_write((tag_type)i, outf);

[3.3091307]

[3.3091404]

            tag_write(static_cast<tag_type>(i), outf);