summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-29 05:33:01 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-29 05:33:01 +0000
commit253496da889864afbddbaea897571342f6b38d21 (patch)
treed4f6dc5377d04239727e4b83b10481cbbb29018d
parentb37df0d27e7f17b6879c1d60a187c0af144d4165 (diff)
downloadcrawl-ref-253496da889864afbddbaea897571342f6b38d21.tar.gz
crawl-ref-253496da889864afbddbaea897571342f6b38d21.zip
Removed doubled "Okay, then" when cancelling out of an ability target prompt.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1117 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/abl-show.cc10
-rw-r--r--crawl-ref/source/stuff.cc3
2 files changed, 1 insertions, 12 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index f36059cd72..01eb25959d 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -624,7 +624,6 @@ bool activate_ability(void)
}
else if (spell_direction(abild, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
else
@@ -685,7 +684,6 @@ bool activate_ability(void)
}
else if (spell_direction( abild, beam ) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -838,7 +836,6 @@ bool activate_ability(void)
case ABIL_CONTROL_DEMON:
if (spell_direction(abild, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -864,7 +861,6 @@ bool activate_ability(void)
case ABIL_THROW_FROST:
if (spell_direction(abild, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -877,7 +873,6 @@ bool activate_ability(void)
case ABIL_BOLT_OF_DRAINING:
if (spell_direction(abild, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -967,7 +962,6 @@ bool activate_ability(void)
case ABIL_TSO_ANNIHILATE_UNDEAD:
if (spell_direction(spd, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -978,7 +972,6 @@ bool activate_ability(void)
case ABIL_TSO_CLEANSING_FLAME:
if (spell_direction(spd, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -999,7 +992,6 @@ bool activate_ability(void)
case ABIL_KIKU_ENSLAVE_UNDEAD:
if (spell_direction(spd, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -1073,7 +1065,6 @@ bool activate_ability(void)
case ABIL_MAKHLEB_MINOR_DESTRUCTION:
if (spell_direction(spd, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
@@ -1103,7 +1094,6 @@ bool activate_ability(void)
case ABIL_MAKHLEB_MAJOR_DESTRUCTION:
if (spell_direction(spd, beam) == -1)
{
- canned_msg(MSG_OK);
return (false);
}
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 5cad777335..31aa0de613 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -19,11 +19,11 @@
#include "stuff.h"
#include "view.h"
+#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-
#include <time.h>
#include <stack>
@@ -41,7 +41,6 @@
#ifdef DOS
#include <conio.h>
-#include <errno.h>
#endif
#ifdef UNIX