diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-02-05 19:22:46 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-02-05 19:22:46 +0100 |
commit | f099462e0ddb5e3304b06ea1d7727bd01d82453b (patch) | |
tree | d1195f4d966bb2a3ac21c92120eb72eb12b41889 | |
parent | 437b72f56737f16356ba61d769d85d85b7e70926 (diff) |
Remove mentions of the borg
-rw-r--r-- | lib/help/command.txt | 4 | ||||
-rw-r--r-- | lib/mods/theme/help/command.txt | 4 | ||||
-rw-r--r-- | src/defines.h | 3 | ||||
-rw-r--r-- | src/files.cc | 9 |
4 files changed, 4 insertions, 16 deletions
diff --git a/lib/help/command.txt b/lib/help/command.txt index 04a63fd8..d39cc861 100644 --- a/lib/help/command.txt +++ b/lib/help/command.txt @@ -136,7 +136,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east". *****command.txt*72[, Stay still (with pickup)] ^W (special - wizard mode) *****command.txt*74[< Go up staircase] *****command.txt*75[^X Save and quit] *****command.txt*76[. Run] ^Y (unused) - *****command.txt*77[> Go down staircase] ^Z (special - borg command) + *****command.txt*77[> Go down staircase] ^Z (unused) *****command.txt*79[\ (special - bypass keymap)] *****command.txt*81[` (special - escape)] *****command.txt*82[~ Display current knowledge] *****command.txt*83[/ Identify symbol] *****command.txt*84[? Help] @@ -197,7 +197,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east". *****command.txt*76[, Run] ^W (special - wizard mode) *****command.txt*74[< Go up staircase] *****command.txt*75[^X Save and quit] *****command.txt*72[. Stay still (with pickup)] *****command.txt*95[^Y (tunnel - north west)] - *****command.txt*77[> Go down staircase] ^Z (special - borg command) + *****command.txt*77[> Go down staircase] ^Z (unused) *****command.txt*79[\ (special - bypass keymap)] *****command.txt*81[` (special - escape)] *****command.txt*82[~ Display current knowledge] *****command.txt*83[/ Identify symbol] *****command.txt*84[? Help] diff --git a/lib/mods/theme/help/command.txt b/lib/mods/theme/help/command.txt index 04a63fd8..d39cc861 100644 --- a/lib/mods/theme/help/command.txt +++ b/lib/mods/theme/help/command.txt @@ -136,7 +136,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east". *****command.txt*72[, Stay still (with pickup)] ^W (special - wizard mode) *****command.txt*74[< Go up staircase] *****command.txt*75[^X Save and quit] *****command.txt*76[. Run] ^Y (unused) - *****command.txt*77[> Go down staircase] ^Z (special - borg command) + *****command.txt*77[> Go down staircase] ^Z (unused) *****command.txt*79[\ (special - bypass keymap)] *****command.txt*81[` (special - escape)] *****command.txt*82[~ Display current knowledge] *****command.txt*83[/ Identify symbol] *****command.txt*84[? Help] @@ -197,7 +197,7 @@ that you can always, for example, use "\" + "." + "6", to specify "run east". *****command.txt*76[, Run] ^W (special - wizard mode) *****command.txt*74[< Go up staircase] *****command.txt*75[^X Save and quit] *****command.txt*72[. Stay still (with pickup)] *****command.txt*95[^Y (tunnel - north west)] - *****command.txt*77[> Go down staircase] ^Z (special - borg command) + *****command.txt*77[> Go down staircase] ^Z (unused) *****command.txt*79[\ (special - bypass keymap)] *****command.txt*81[` (special - escape)] *****command.txt*82[~ Display current knowledge] *****command.txt*83[/ Identify symbol] *****command.txt*84[? Help] diff --git a/src/defines.h b/src/defines.h index fc1f61f5..b722d29a 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2062,9 +2062,6 @@ /* xxx */ #define PW_SNAPSHOT 0x00000800L /* Display snap-shot */ /* xxx */ -/* xxx */ -#define PW_BORG_1 0x00004000L /* Display borg messages */ -#define PW_BORG_2 0x00008000L /* Display borg status */ /* jk */ diff --git a/src/files.cc b/src/files.cc index 09c9f8e7..558cfcab 100644 --- a/src/files.cc +++ b/src/files.cc @@ -5095,15 +5095,6 @@ static errr top_twenty(void) goto out; } - /* Borg-mode pre-empts scoring */ - if (noscore & 0x00F0) - { - msg_print("Score not registered for borgs."); - msg_print(NULL); - display_scores_aux(highscore_fd, 0, 10, -1, NULL); - goto out; - } - /* Cheaters are not scored */ if (noscore & 0xFF00) { |