diff options
author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
---|---|---|
committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
commit | 77b5cadac636ddee4ed39bcaf1344c270fcaa447 (patch) | |
tree | 909c1ce1e1fa67eb83548c97790da2287c4d01e1 /crawl-ref/source/Kills.h | |
parent | de978e5fed84aaa1b077fed70b93eba1a3d82edc (diff) | |
download | crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.tar.gz crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.zip |
Batch of tiny changes for MSVC compiles.
Most of these fall into the category:
- don't use struct to refer to a class, and vice versa
- msvc doesn't like unistd.h or dirent.h
Doesn't fix all the struct/class problems; I think I'll silence
those for now and move on because it's not all that important.
Tested on OS X.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3571 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/Kills.h')
-rw-r--r-- | crawl-ref/source/Kills.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/Kills.h b/crawl-ref/source/Kills.h index fe20ce7030..9f7b002ea5 100644 --- a/crawl-ref/source/Kills.h +++ b/crawl-ref/source/Kills.h @@ -17,12 +17,12 @@ std::string apostrophise(const std::string &name); -struct monsters; +class monsters; // Not intended for external use! struct kill_monster_desc { - kill_monster_desc(const struct monsters *); + kill_monster_desc(const monsters *); kill_monster_desc() { } void save(FILE*) const; @@ -52,7 +52,7 @@ struct kill_monster_desc class kill_def { public: - kill_def(const struct monsters *mon); + kill_def(const monsters *mon); kill_def() : kills(0), exp(0) { // This object just says to the world that it's uninitialized @@ -61,7 +61,7 @@ public: void save(FILE*) const; void load(FILE*); - void add_kill(const struct monsters *mon, unsigned short place); + void add_kill(const monsters *mon, unsigned short place); void add_place(unsigned short place, bool force = false); void merge(const kill_def &k, bool unique_monster); @@ -83,7 +83,7 @@ private: class kill_ghost { public: - kill_ghost(const struct monsters *mon); + kill_ghost(const monsters *mon); kill_ghost() { } void save(FILE*) const; @@ -151,7 +151,7 @@ private: kill_map kills; ghost_vec ghosts; - void record_ghost_kill(const struct monsters *mon); + void record_ghost_kill(const monsters *mon); }; class KillMaster |