fiddlerwoaroof/crawl - Change X3CWUWK437W32BTAAQY7DQ3P4KI5CM3KQW5AW4E2VCHGEOP5WKCAC

Rearrange the order of a few functions.

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

Created by dolorous on May 25, 2008

X3CWUWK437W32BTAAQY7DQ3P4KI5CM3KQW5AW4E2VCHGEOP5WKCAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 30 [5.800304]

[4.294]

};
// Calls did_god_conduct() when the object goes out of scope.
struct god_conduct_trigger
{
    conduct_type conduct;
    int pgain;
    bool known;
    bool enabled;
    std::auto_ptr<monsters> victim;
    god_conduct_trigger(conduct_type c = NUM_CONDUCTS,
                        int pg = 0,
                        bool kn = true,
                        const monsters *vict = NULL);
    void set(conduct_type c = NUM_CONDUCTS,
             int pg = 0,
             bool kn = true,
             const monsters *vict = NULL);
    ~god_conduct_trigger();

Insertion in crawl-ref/source/religion.h at line 54 [5.800304]

[4.298]

[6.986]

bool is_evil_god(god_type god);
bool is_good_god(god_type god);
bool is_chaotic_god(god_type god);

Deletion in crawl-ref/source/religion.h at line 111 [5.800304]

∅:D[7.262] → [8.171:235]

B:BD[9.398] → [8.171:235]

B:BD[8.235] → [2.2508:2543]

∅:D[2.2543] → [7.263:464]

B:BD[8.235] → [7.263:464]

∅:D[7.464] → [8.235:236]

B:BD[8.235] → [8.235:236]

B:BD[8.236] → [7.465:825]

bool is_evil_god(god_type god);
bool is_good_god(god_type god);
bool is_chaotic_god(god_type god);
// Calls did_god_conduct when the object goes out of scope.
struct god_conduct_trigger
{
    conduct_type conduct;
    int pgain;
    bool known;
    bool enabled;
    std::auto_ptr<monsters> victim;
    god_conduct_trigger(conduct_type c = NUM_CONDUCTS,
                        int pg = 0,
                        bool kn = true,
                        const monsters *vict = NULL);
    void set(conduct_type c = NUM_CONDUCTS,
             int pg = 0,
             bool kn = true,
             const monsters *vict = NULL);
    ~god_conduct_trigger();
};

Insertion in crawl-ref/source/religion.cc at line 106 [5.804403]
[10.2666]
[10.2666]

Insertion in crawl-ref/source/religion.cc at line 383 [5.804403]

[3.2589]

[11.988]


/////////////////////////////////////////////////////////////////////
// god_conduct_trigger
god_conduct_trigger::god_conduct_trigger(
    conduct_type c, int pg, bool kn, const monsters *vict)
  : conduct(c), pgain(pg), known(kn), enabled(true), victim(NULL)
{
    if (vict)
    {
        victim.reset(new monsters);
        *(victim.get()) = *vict;
    }
}
void god_conduct_trigger::set(conduct_type c, int pg, bool kn,
                              const monsters *vict)
{
    conduct = c;
    pgain = pg;
    known = kn;
    victim.reset(NULL);
    if (vict)
    {
        victim.reset(new monsters);
        *victim.get() = *vict;
    }
}

Insertion in crawl-ref/source/religion.cc at line 412 [5.804403]

[11.989]

[8.238]

god_conduct_trigger::~god_conduct_trigger()
{
    if (enabled && conduct != NUM_CONDUCTS)
        did_god_conduct(conduct, pgain, known, victim.get());
}

Insertion in crawl-ref/source/religion.cc at line 434 [5.804403]

[12.182]

[6.1022]

}
bool is_chaotic_god(god_type god)
{
    return
        god == GOD_MAKHLEB ||
        god == GOD_XOM;

Deletion in crawl-ref/source/religion.cc at line 451 [5.804403]

B:BD[12.185] → [2.2545:2649]

bool is_chaotic_god(god_type god)
{
    return
        god == GOD_MAKHLEB ||
        god == GOD_XOM;
}

Deletion in crawl-ref/source/religion.cc at line 5449 [5.804403]

B:BD[7.3100] → [7.3100:3459]

∅:D[7.3459] → [13.488:490]

B:BD[13.488] → [13.488:490]

B:BD[13.490] → [7.3460:3901]


/////////////////////////////////////////////////////////////////////
// god_conduct_trigger
god_conduct_trigger::god_conduct_trigger(
    conduct_type c, int pg, bool kn, const monsters *vict)
  : conduct(c), pgain(pg), known(kn), enabled(true), victim(NULL)
{
    if (vict)
    {
        victim.reset(new monsters);
        *(victim.get()) = *vict;
    }
}
void god_conduct_trigger::set(conduct_type c, int pg, bool kn,
                              const monsters *vict)
{
    conduct = c;
    pgain = pg;
    known = kn;
    victim.reset(NULL);
    if (vict)
    {
        victim.reset(new monsters);
        *victim.get() = *vict;
    }
}
god_conduct_trigger::~god_conduct_trigger()
{
    if (enabled && conduct != NUM_CONDUCTS)
        did_god_conduct(conduct, pgain, known, victim.get());
}