diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/noise.h | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip | |
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/noise.h')
| -rw-r--r-- | crawl-ref/source/noise.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/noise.h b/crawl-ref/source/noise.h index e33cec5df8..ee56a6037e 100644 --- a/crawl-ref/source/noise.h +++ b/crawl-ref/source/noise.h @@ -37,7 +37,7 @@ struct noise_t { coord_def noise_source; - std::string noise_player_msg; + string noise_player_msg; // Thousandths of noise intensity (i.e. the intensity passed to // noisy() * 1000) @@ -50,7 +50,7 @@ struct noise_t uint16_t noise_flags; noise_t(coord_def _noise_source = coord_def(), - std::string _noise_player_msg = "", + string _noise_player_msg = "", int _noise_intensity_millis = 0, int16_t _noise_producer_id = -1, uint16_t _flags = 0) @@ -127,7 +127,7 @@ public: bool dirty() const { return !noises.empty(); } #ifdef DEBUG_NOISE_PROPAGATION - void dump_noise_grid(const std::string &filename) const; + void dump_noise_grid(const string &filename) const; void write_noise_grid(FILE *outf) const; void write_cell(FILE *outf, coord_def p, int ch) const; #endif @@ -149,7 +149,7 @@ private: private: FixedArray<noise_cell, GXM, GYM> cells; - std::vector<noise_t> noises; + vector<noise_t> noises; int affected_actor_count; }; |