fiddlerwoaroof/crawl - Change 3EREXXQMWTOWPI5ZV4UABEIR4RTGPNM7V2O6CG2EOFPHA5GEB2WAC

Slightly improved handling of ties and suicidal giant spores, plus more sanity

checking.

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

Created by zelgadis on January 6, 2009

3EREXXQMWTOWPI5ZV4UABEIR4RTGPNM7V2O6CG2EOFPHA5GEB2WAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/arena.cc at line 40 [3.10815]
B:BD[2.2947] → [2.2947:2983]
```
        bool        suicide_attack;
```
[2.2947]
[3.11467]
```
        bool        won;
```

Replacement in crawl-ref/source/arena.cc at line 43 [3.10815]

B:BD[2.3055] → [2.3055:3108]

                           suicide_attack(false) { }

[2.3055]

[3.11523]

                           won(false) { }

Replacement in crawl-ref/source/arena.cc at line 50 [3.10815]
B:BD[2.3172] → [2.3172:3208]
```
            suicide_attack = false;
```
[2.3172]
[2.3208]
```
            won            = false;
```

Insertion in crawl-ref/source/arena.cc at line 468 [3.10815]

[2.3692]

        if (orig_a < 0)
        {
            mpr("Book-keeping says faction_a has negative active members.",
                MSGCH_ERROR);
            more();
        }
        if (orig_b < 0)
        {
            mpr("Book-keeping says faction_b has negative active members.",
                MSGCH_ERROR);
            more();
        }

Insertion in crawl-ref/source/arena.cc at line 502 [3.10815]

[2.4074]


            if (faction_a.active_members > 0
                && faction_b.active_members <= 0)
            {
                faction_a.won = true;
                faction_b.won = false;
            }
            else if (faction_b.active_members > 0
                     && faction_a.active_members <= 0)
            {
                faction_b.won = true;
                faction_a.won = false;
            }

Replacement in crawl-ref/source/arena.cc at line 516 [3.10815]
B:BD[2.4084] → [2.4084:4090]
```
    }
```
[2.4084]
[2.4090]
```
    } // count_foes()
```

Insertion in crawl-ref/source/arena.cc at line 522 [3.10815]

[2.4271]

        {
            if (faction_a.won || faction_b.won)
            {
                mpr("Both factions alive but one delcared the winner.",
                    MSGCH_ERROR);
                more();
                faction_a.won = false;
                faction_b.won = false;
            }

Insertion in crawl-ref/source/arena.cc at line 532 [3.10815]
[2.4296]
[2.4296]
```
        }
```

Replacement in crawl-ref/source/arena.cc at line 534 [3.10815]

B:BD[2.4297] → [2.4297:4356]

        // Sync up our book-keeping with the actual state.

[2.4297]

[2.4356]

        // Sync up our book-keeping with the actual state, and report
        // any inconsistencies.

Insertion in crawl-ref/source/arena.cc at line 613 [3.10815]
[3.20674]
[3.20674]
```
            int turns = 0;
```

Insertion in crawl-ref/source/arena.cc at line 627 [3.10815]

[4.12628]

[3.20843]


                // Check the consistency of our book-keeping every 100 turns.
                if ((turns++ % 100) == 0)
                    count_foes();

Replacement in crawl-ref/source/arena.cc at line 653 [3.10815]

B:BD[3.21347] → [2.4459:4595]

        bool team_a_won = false;
        bool was_tied   = false;
        if (faction_a.active_members > 0 || faction_a.suicide_attack)

[3.21347]

[2.4595]

        // We bother with all this to properly deal ties, and with ball
        // lightning or giant spores winning the fight via suicide.
        // The sanity checking is probably just paranoia.
        bool was_tied = false;
        if (!faction_a.won && !faction_b.won)

Replacement in crawl-ref/source/arena.cc at line 659 [3.10815]

∅:D[2.4605] → [3.21371:21398]

B:BD[3.21371] → [3.21371:21398]

B:BD[3.21398] → [2.4606:4637]

            team_a_wins++;
            team_a_won = true;

[2.4605]

[2.4637]

            if (faction_a.active_members > 0)
            {
                mpr("Tie declared, but faction_a won.", MSGCH_ERROR);
                more();
                team_a_wins++;
                faction_a.won = true;
            }
            else if (faction_b.active_members > 0)
            {
                mpr("Tie declared, but faction_b won.", MSGCH_ERROR);
                more();
                faction_b.won = true;
            }
            else
            {
                ties++;
                was_tied = true;
            }

Replacement in crawl-ref/source/arena.cc at line 678 [3.10815]

B:BD[2.4647] → [2.4647:4764]

        else if (faction_a.active_members == faction_b.active_members
                 && !faction_b.suicide_attack)

[2.4647]

[2.4764]

        else if (faction_a.won && faction_b.won)

Replacement in crawl-ref/source/arena.cc at line 680 [3.10815]

B:BD[2.4774] → [2.4774:4823]

            ties++;
            was_tied = true;

[2.4774]

[2.4823]

            faction_a.won = false;
            faction_b.won = false;
            mpr("*BOTH* factions won?!", MSGCH_ERROR);
            if (faction_a.active_members > 0)
            {
                mpr("Faction_a real winner.", MSGCH_ERROR);
                team_a_wins++;
                faction_a.won = true;
            }
            else if (faction_b.active_members > 0)
            {
                mpr("Faction_b real winner.", MSGCH_ERROR);
                faction_b.won = true;
            }
            else
            {
                mpr("Both sides dead.", MSGCH_ERROR);
                ties++;
                was_tied = true;
            }
            more();

Insertion in crawl-ref/source/arena.cc at line 703 [3.10815]

[2.4833]

[3.21398]

        else if (faction_a.won)
            team_a_wins++;

Replacement in crawl-ref/source/arena.cc at line 721 [3.10815]

B:BD[2.5121] → [2.5121:5201]

                 team_a_won ? faction_a.desc.c_str() : faction_b.desc.c_str());

[2.5121]

[5.5919]

                 faction_a.won ? faction_a.desc.c_str()
                               : faction_b.desc.c_str());

Insertion in crawl-ref/source/arena.cc at line 941 [3.10815]

[2.5925]


    if (arena::faction_a.active_members > 0
        && arena::faction_b.active_members <= 0)
    {
        arena::faction_a.won = true;
        return;
    }
    else if (arena::faction_b.active_members > 0
             && arena::faction_a.active_members <= 0)
    {
        arena::faction_b.won = true;
        return;
    }

Replacement in crawl-ref/source/arena.cc at line 967 [3.10815]

B:BD[2.6433] → [2.6433:6489]

                arena::faction_a.suicide_attack = true;

[2.6433]

[2.6489]

                arena::faction_a.won = true;

Replacement in crawl-ref/source/arena.cc at line 969 [3.10815]

B:BD[2.6540] → [2.6540:6596]

                arena::faction_b.suicide_attack = true;

[2.6540]

[2.6596]

                arena::faction_b.won = true;