fiddlerwoaroof/crawl - Change B3HWU2BEQQ4E6WKVTW3JQQJFMWTVW3XWKY6BHFNBRHSZPRCF2OTQC

Replaced inc_god_acting/dec_god_acting pairing with god_acting objects.

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

Created by dshaligram on October 2, 2007

B3HWU2BEQQ4E6WKVTW3JQQJFMWTVW3XWKY6BHFNBRHSZPRCF2OTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 210 [3.3]
B:BD[3.4329] → [2.163:204]
```
    crawl_state.inc_god_acting(GOD_XOM);
```
[3.4329]
[2.204]
```
    god_acting gdact(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 226 [3.3]
B:BD[3.4742] → [2.206:248]
```
    crawl_state.dec_god_acting(GOD_XOM);
```
Replacement in crawl-ref/source/xom.cc at line 242 [3.3]
B:BD[3.5159] → [2.249:290]
```
    crawl_state.inc_god_acting(GOD_XOM);
```
[3.5159]
[2.290]
```
    god_acting gdact(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 249 [3.3]
B:BD[3.5313] → [2.292:334]
```
    crawl_state.dec_god_acting(GOD_XOM);
```

Replacement in crawl-ref/source/xom.cc at line 282 [3.3]

B:BD[3.6267] → [2.337:473]

    // Can't simply use unwind_var because of the way that god act
    // state is maintained.
    crawl_state.inc_god_acting(GOD_XOM);

[3.6267]

[2.473]

    god_acting gdact(GOD_XOM);

Deletion in crawl-ref/source/xom.cc at line 298 [3.3]
B:BD[3.6876] → [2.475:524]
```
            crawl_state.dec_god_acting(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 310 [3.3]
B:BD[3.7327] → [2.525:574]
```
            crawl_state.dec_god_acting(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 320 [3.3]
B:BD[3.7709] → [2.575:624]
```
            crawl_state.dec_god_acting(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 332 [3.3]
B:BD[3.8239] → [2.625:674]
```
            crawl_state.dec_god_acting(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 348 [3.3]
B:BD[3.8782] → [2.675:724]
```
            crawl_state.dec_god_acting(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 352 [3.3]
B:BD[2.726] → [2.726:767]
```
    crawl_state.dec_god_acting(GOD_XOM);
```
Replacement in crawl-ref/source/xom.cc at line 394 [3.3]
B:BD[2.771] → [2.771:816]
```
        crawl_state.inc_god_acting(GOD_XOM);
```
[2.771]
[3.10226]
```
        god_acting gdact(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 396 [3.3]
B:BD[3.10265] → [2.817:862]
```
        crawl_state.dec_god_acting(GOD_XOM);
```
Replacement in crawl-ref/source/xom.cc at line 482 [3.3]
B:BD[3.12000] → [2.863:904]
```
    crawl_state.inc_god_acting(GOD_XOM);
```
[3.12000]
[3.12000]
```
    god_acting gdact(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 665 [3.3]
B:BD[3.19528] → [2.905:946]
```
    crawl_state.dec_god_acting(GOD_XOM);
```
Replacement in crawl-ref/source/xom.cc at line 675 [3.3]
B:BD[3.19735] → [3.19735:19740]
B:BD[3.19740] → [2.947:988]
```
    
    crawl_state.inc_god_acting(GOD_XOM);
```
[3.19735]
[2.988]
```
    god_acting gdact(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 866 [3.3]
B:BD[2.991] → [2.991:1032]
∅:D[2.1032] → [3.27193:27194]
B:BD[3.27193] → [3.27193:27194]
```
    crawl_state.dec_god_acting(GOD_XOM);
```
Insertion in crawl-ref/source/state.h at line 110 [4.42804]
[4.44714]
[4.44714]

Insertion in crawl-ref/source/state.h at line 112 [4.42804]

[4.44745]


class god_acting
{
public:
    god_acting(bool is_retribution = false)
        : god(you.religion)
    {
        crawl_state.inc_god_acting(god, is_retribution);
    }
    god_acting(god_type who, bool is_retribution = false)
        : god(who)
    {
        crawl_state.inc_god_acting(god, is_retribution);
    }
    ~god_acting()
    {
        crawl_state.dec_god_acting(god);
    }
private:
    god_type god;
};

Replacement in crawl-ref/source/religion.cc at line 562 [5.804403]
B:BD[2.4140] → [2.4140:4174]
```
    crawl_state.inc_god_acting();
```
[2.4140]
[6.1743]
```
    god_acting gdact;
```
Deletion in crawl-ref/source/religion.cc at line 838 [5.804403]
B:BD[6.3918] → [2.4175:4209]
```
    crawl_state.dec_god_acting();
```
Replacement in crawl-ref/source/religion.cc at line 1147 [5.804403]
B:BD[5.836773] → [2.4210:4244]
```
    crawl_state.inc_god_acting();
```
[5.836773]
[2.4244]
```
    god_acting gdact;
```
Deletion in crawl-ref/source/religion.cc at line 1604 [5.804403]
B:BD[7.190551] → [7.190551:190552]
B:BD[7.190552] → [2.4246:4280]
```
    crawl_state.dec_god_acting();
```
Replacement in crawl-ref/source/religion.cc at line 1726 [5.804403]
∅:D[8.241] → [9.834:843]
B:BD[9.834] → [9.834:843]
B:BD[9.843] → [2.4282:4316]
```
        
    crawl_state.inc_god_acting();
```
[8.241]
[2.4316]
```
    god_acting gdact;
```
Deletion in crawl-ref/source/religion.cc at line 1770 [5.804403]
B:BD[9.1978] → [2.4318:4353]
∅:D[2.4353] → [8.559:560]
B:BD[9.1978] → [8.559:560]
```
    crawl_state.dec_god_acting();
```
Replacement in crawl-ref/source/religion.cc at line 1779 [5.804403]
B:BD[9.2057] → [2.4354:4388]
```
    crawl_state.inc_god_acting();
```
[9.2057]
[2.4388]
```
    god_acting gdact;
```
Deletion in crawl-ref/source/religion.cc at line 1885 [5.804403]
B:BD[9.5299] → [2.4390:4424]
```
    crawl_state.dec_god_acting();
```
Replacement in crawl-ref/source/religion.cc at line 2539 [5.804403]
B:BD[5.875926] → [2.4425:4468]
```
    crawl_state.inc_god_acting(god, true);
```
[5.875926]
[2.4468]
```
    god_acting gdact(god, true);
```
Deletion in crawl-ref/source/religion.cc at line 2591 [5.804403]
B:BD[5.877073] → [2.4470:4507]
```
    crawl_state.dec_god_acting(god);
```
Replacement in crawl-ref/source/religion.cc at line 2683 [5.804403]
B:BD[10.446] → [2.4508:4557]
```
    crawl_state.inc_god_acting(GOD_BEOGH, true);
```
[10.446]
[2.4557]
```
    god_acting gdact(GOD_BEOGH, true);
```
Deletion in crawl-ref/source/religion.cc at line 2740 [5.804403]
B:BD[10.1592] → [2.4559:4603]
```
    crawl_state.dec_god_acting(GOD_BEOGH);
```
Replacement in crawl-ref/source/religion.cc at line 2745 [5.804403]
∅:D[3.30347] → [5.877214:877215]
B:BD[5.877214] → [5.877214:877215]
B:BD[5.877215] → [2.4604:4651]
```
    crawl_state.inc_god_acting(old_god, true);
```
[3.30347]
[2.4651]
```
    god_acting gdact(old_god, true);
```
Deletion in crawl-ref/source/religion.cc at line 2838 [5.804403]
B:BD[5.879419] → [2.4653:4695]
```
    crawl_state.dec_god_acting(old_god);
```
Replacement in crawl-ref/source/religion.cc at line 2900 [5.804403]
B:BD[2.4697] → [2.4697:4731]
```
    crawl_state.inc_god_acting();
```
[2.4697]
[7.194583]
```
    god_acting gdact;
```
Deletion in crawl-ref/source/religion.cc at line 2954 [5.804403]
B:BD[11.292] → [2.4732:4767]
```
    crawl_state.dec_god_acting();
```
Replacement in crawl-ref/source/religion.cc at line 3000 [5.804403]
B:BD[2.4769] → [2.4769:4803]
```
    crawl_state.inc_god_acting();
```
[2.4769]
[12.162]
```
    god_acting gdact;
```
Deletion in crawl-ref/source/religion.cc at line 3126 [5.804403]
B:BD[6.6724] → [2.4804:4839]
```
    crawl_state.dec_god_acting();
```
Replacement in crawl-ref/source/religion.cc at line 3149 [5.804403]
B:BD[13.185] → [2.4840:4894]
```
        crawl_state.inc_god_acting(GOD_LUGONU, true);
```
[13.185]
[14.20265]
```
        god_acting gdact(GOD_LUGONU, true);
```
Deletion in crawl-ref/source/religion.cc at line 3151 [5.804403]
B:BD[14.20295] → [2.4895:4943]
```
        crawl_state.dec_god_acting(GOD_LUGONU);
```

Replaced inc_god_acting/dec_god_acting pairing with god_acting objects.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 210 [3.3]

Deletion in crawl-ref/source/xom.cc at line 226 [3.3]

Replacement in crawl-ref/source/xom.cc at line 242 [3.3]

Deletion in crawl-ref/source/xom.cc at line 249 [3.3]

Replacement in crawl-ref/source/xom.cc at line 282 [3.3]

Deletion in crawl-ref/source/xom.cc at line 298 [3.3]

Deletion in crawl-ref/source/xom.cc at line 310 [3.3]

Deletion in crawl-ref/source/xom.cc at line 320 [3.3]

Deletion in crawl-ref/source/xom.cc at line 332 [3.3]

Deletion in crawl-ref/source/xom.cc at line 348 [3.3]

Deletion in crawl-ref/source/xom.cc at line 352 [3.3]

Replacement in crawl-ref/source/xom.cc at line 394 [3.3]

Deletion in crawl-ref/source/xom.cc at line 396 [3.3]

Replacement in crawl-ref/source/xom.cc at line 482 [3.3]

Deletion in crawl-ref/source/xom.cc at line 665 [3.3]

Replacement in crawl-ref/source/xom.cc at line 675 [3.3]

Deletion in crawl-ref/source/xom.cc at line 866 [3.3]

Insertion in crawl-ref/source/state.h at line 110 [4.42804]

Insertion in crawl-ref/source/state.h at line 112 [4.42804]

Replacement in crawl-ref/source/religion.cc at line 562 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 1147 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 1726 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 1779 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 2539 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 2683 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 2745 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 2900 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 3000 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 3149 [5.804403]

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