diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2010-09-06 06:33:57 +0200 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2010-09-05 12:56:13 +0200 |
commit | 31adfd48395f3c74daad1f72b874f497020481a7 (patch) | |
tree | d7733b7e157fa13c4af485ed7c51b3f97c6b1a72 /crawl-ref/source/state.h | |
parent | a49e4492fc269271c7809d2caeb1e4d80bb0b7bf (diff) | |
download | crawl-ref-31adfd48395f3c74daad1f72b874f497020481a7.tar.gz crawl-ref-31adfd48395f3c74daad1f72b874f497020481a7.zip |
Rename class "monsters" to "monster".
Diffstat (limited to 'crawl-ref/source/state.h')
-rw-r--r-- | crawl-ref/source/state.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/state.h b/crawl-ref/source/state.h index 8ae02d68e9..42dc4d9a68 100644 --- a/crawl-ref/source/state.h +++ b/crawl-ref/source/state.h @@ -10,7 +10,7 @@ #include "player.h" #include <vector> -class monsters; +class monster; class mon_acting; struct god_act_state @@ -107,8 +107,8 @@ protected: god_act_state god_act; std::vector<god_act_state> god_act_stack; - monsters* mon_act; - std::vector<monsters*> mon_act_stack; + monster* mon_act; + std::vector<monster* > mon_act_stack; public: game_state(); @@ -148,11 +148,11 @@ public: std::vector<god_act_state> other_gods_acting() const; bool is_mon_acting() const; - monsters* which_mon_acting() const; - void inc_mon_acting(monsters* mon); - void dec_mon_acting(monsters* mon); + monster* which_mon_acting() const; + void inc_mon_acting(monster* mon); + void dec_mon_acting(monster* mon); void clear_mon_acting(); - void mon_gone(monsters* mon); + void mon_gone(monster* mon); void dump(); bool player_is_dead() const; @@ -202,7 +202,7 @@ private: class mon_acting { public: - mon_acting(monsters* _mon) : mon(_mon) + mon_acting(monster* _mon) : mon(_mon) { crawl_state.inc_mon_acting(_mon); } @@ -215,7 +215,7 @@ public: } private: - monsters *mon; + monster* mon; }; |