fiddlerwoaroof/crawl - Change 347OTVM5V6C5UE5ERARQJQTVNTHKQNL5NEKE43TI2SYUH64CWT6QC

Handle the good neutral attitude properly in debugging information and

the wizard mode attitude toggle.

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

Created by dolorous on May 19, 2008

347OTVM5V6C5UE5ERARQJQTVNTHKQNL5NEKE43TI2SYUH64CWT6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/directn.cc at line 848 [4.3697945]

B:BD[3.4411] → [3.4411:4458]

                     m.attitude = ATT_NEUTRAL;

[3.4411]

[3.4458]

                     m.attitude = ATT_GOOD_NEUTRAL;

Insertion in crawl-ref/source/directn.cc at line 852 [4.3697945]

[3.4588]

                 case ATT_GOOD_NEUTRAL:
                     m.attitude = ATT_NEUTRAL;
                     break;

Replacement in crawl-ref/source/debug.cc at line 1429 [4.4016436]

B:BD[5.22218] → [5.22218:22337]

B:BD[5.22337] → [6.11143:11200]

∅:D[6.11200] → [5.22395:22466]

B:BD[5.22395] → [5.22395:22466]

         ((menv[i].attitude == ATT_FRIENDLY) ? "friendly" :
          (menv[i].attitude == ATT_HOSTILE)  ? "hostile" :
          (menv[i].attitude == ATT_NEUTRAL)  ? "neutral"
                                             : "unknown alignment") );

[5.22218]

[4.4047364]

         ((menv[i].attitude == ATT_HOSTILE)       ? "hostile" :
          (menv[i].attitude == ATT_FRIENDLY)      ? "friendly" :
          (menv[i].attitude == ATT_NEUTRAL)       ? "neutral" :
          (menv[i].attitude == ATT_GOOD_NEUTRAL)  ? "good neutral"
                                                  : "unknown alignment") );

Replacement in crawl-ref/source/command.cc at line 577 [4.4082507]

B:BD[7.48500] → [8.2862:2919]

    "<w>F</w>: toggle target friendly/neutral/hostile\n"

[7.48500]

[2.4527]

    "<w>F</w>: toggle target friendly/good neutral/neutral/hostile\n"