diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 17:29:26 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 17:29:26 +0000 |
| commit | ad56ba63d755da4dca3d44947f3f86a26faf7aa3 (patch) | |
| tree | 85187a3a6cd379b29adf98d057c46dddb5cbf9e9 /crawl-ref/source | |
| parent | e8f0d9e7d82341a70175b6eaf78e5db32a314775 (diff) | |
| download | crawl-ref-ad56ba63d755da4dca3d44947f3f86a26faf7aa3.tar.gz crawl-ref-ad56ba63d755da4dca3d44947f3f86a26faf7aa3.zip | |
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
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/command.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/debug.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/directn.cc | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index e2b57b2dd1..add0c8e773 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -574,7 +574,7 @@ static const char *targeting_help_1 = #ifdef WIZARD " \n" "<h>Wizard targeting comands:</h>\n" - "<w>F</w>: toggle target friendly/neutral/hostile\n" + "<w>F</w>: toggle target friendly/good neutral/neutral/hostile\n" "<w>P</w>: apply divine blessing to target\n" "<w>s</w>: force target to shout or speak\n" "<w>g</w>: give item to monster\n" diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 6ab2eb2a63..49b856195a 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -1426,10 +1426,11 @@ void stethoscope(int mwh) mprf(MSGCH_DIAGNOSTICS, "%s (id #%d; type=%d loc=(%d,%d) align=%s)", menv[i].name(DESC_CAP_THE, true).c_str(), i, menv[i].type, menv[i].x, menv[i].y, - ((menv[i].attitude == ATT_FRIENDLY) ? "friendly" : - (menv[i].attitude == ATT_HOSTILE) ? "hostile" : - (menv[i].attitude == ATT_NEUTRAL) ? "neutral" - : "unknown alignment") ); + ((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") ); // print stats and other info mprf(MSGCH_DIAGNOSTICS, diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 33d2bb0a2e..3d544e6ba7 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -845,10 +845,13 @@ void direction(dist& moves, targeting_type restricts, switch (m.attitude) { case ATT_FRIENDLY: - m.attitude = ATT_NEUTRAL; + m.attitude = ATT_GOOD_NEUTRAL; m.flags &= ~MF_CREATED_FRIENDLY; m.flags |= MF_WAS_NEUTRAL; break; + case ATT_GOOD_NEUTRAL: + m.attitude = ATT_NEUTRAL; + break; case ATT_NEUTRAL: m.attitude = ATT_HOSTILE; m.flags &= ~MF_WAS_NEUTRAL; |