From 253496da889864afbddbaea897571342f6b38d21 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 29 Mar 2007 05:33:01 +0000
Subject: 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
---
 crawl-ref/source/abl-show.cc | 10 ----------
 crawl-ref/source/stuff.cc    |  3 +--
 2 files changed, 1 insertion(+), 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
-- 
cgit v1.2.3-54-g00ecf