summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/newgame.cc
diff options
context:
space:
mode:
authorStefan O'Rear <stefanor@cox.net>2009-11-15 00:04:52 -0800
committerStefan O'Rear <stefanor@cox.net>2009-11-15 00:04:52 -0800
commit05010f1d267b268e68821223680f34545c443f5c (patch)
tree967466e274aa990271509d232af4a6c1fd0ad1a5 /crawl-ref/source/newgame.cc
parentdd56050f2d05db6ed7ff5bc99acd1032707c27fd (diff)
parent5bba7e89fd395a2cde9cbf596208785508e22331 (diff)
downloadcrawl-ref-05010f1d267b268e68821223680f34545c443f5c.tar.gz
crawl-ref-05010f1d267b268e68821223680f34545c443f5c.zip
Merge Johnny Shelley's arcane marksman patch
Diffstat (limited to 'crawl-ref/source/newgame.cc')
-rw-r--r--crawl-ref/source/newgame.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 6cbc55326d..d6e6d578db 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -19,11 +19,6 @@
#include <time.h>
#include <algorithm>
-#ifdef TARGET_OS_DOS
-#include <conio.h>
-#include <dos.h>
-#endif
-
#ifdef UNIX
#include <sys/types.h>
#include <fcntl.h>
@@ -2378,7 +2373,7 @@ static void _give_wanderer_spell(skill_type skill)
spell_type spell = SPELL_NO_SPELL;
// Doing a rejection loop for this because I am lazy.
- while (skill == SK_SPELLCASTING || skill == SK_DIVINATIONS)
+ while (skill == SK_SPELLCASTING)
{
int value = SK_POISON_MAGIC-SK_CONJURATIONS + 1;
skill = skill_type(SK_CONJURATIONS + random2(value));