diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
| commit | d6b913d3ca2e84b75f3675fd6e9f5246c100cf27 (patch) | |
| tree | 5fc28b7efc737bf2c79dc7d799e0a6013957fe11 /src/spells4.cc | |
| parent | c42f029316c0c004a795ca170bdb50644a800534 (diff) | |
| parent | 73a0259be1d44fdb2ab34266ae0ff63f0d8f0b60 (diff) | |
Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1
Diffstat (limited to 'src/spells4.cc')
| -rw-r--r-- | src/spells4.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/spells4.cc b/src/spells4.cc index 62586758..97c3d523 100644 --- a/src/spells4.cc +++ b/src/spells4.cc @@ -210,7 +210,6 @@ void init_school_books() push_spell(TOME_TRANSLOCATION, RECALL); push_spell(TOME_TRANSLOCATION, TELEAWAY); push_spell(TOME_TRANSLOCATION, TELEPORT); - push_spell(TOME_TRANSLOCATION, DISARM); push_spell(TOME_TRANSLOCATION, BLINK); /* Create the book of the tree */ @@ -512,10 +511,7 @@ void lua_cast_school_spell(s32b s, bool_ no_cost) /* failures are dangerous; we'll flush the input buffer so it isn't missed. */ - if (flush_failure) - { - flush(); - } + flush_on_failure(); msg_print("You failed to get the spell off!"); } |