summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/externs.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-06 10:25:27 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-06 10:25:27 +0000
commited4c002077536bdd2ed29d52afcca5b03a55de0e (patch)
treeda71d6924b98711260f6d914e09580269ac3ef1d /crawl-ref/source/externs.h
parent8b6403164380ecbc2a0a16b15757fd2cdce548eb (diff)
downloadcrawl-ref-ed4c002077536bdd2ed29d52afcca5b03a55de0e.tar.gz
crawl-ref-ed4c002077536bdd2ed29d52afcca5b03a55de0e.zip
Merged trunk (1226-1231) into 0.2 branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1232 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/externs.h')
-rw-r--r--crawl-ref/source/externs.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index e5ab195f50..0560a0e2be 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -881,8 +881,8 @@ public:
int hit_dice;
int ac;
int ev;
- unsigned int speed;
- unsigned int speed_increment;
+ int speed;
+ int speed_increment;
unsigned char x;
unsigned char y;
unsigned char target_x;
@@ -1008,6 +1008,12 @@ public:
actor_type atype() const { return ACT_MONSTER; }
+ // Hack, with a capital H.
+ void fix_speed();
+ void check_speed();
+
+ static int base_speed(int mcls);
+
private:
void init_with(const monsters &mons);
};