summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dgnevent.cc
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/dgnevent.cc
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-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/dgnevent.cc')
-rw-r--r--crawl-ref/source/dgnevent.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/dgnevent.cc b/crawl-ref/source/dgnevent.cc
index 9f07997d1d..f93d247da7 100644
--- a/crawl-ref/source/dgnevent.cc
+++ b/crawl-ref/source/dgnevent.cc
@@ -52,8 +52,7 @@ bool dgn_event_dispatcher::fire_vetoable_position_event(
if (alarm && (alarm->eventmask & et.type))
{
dgn_square_alarm alcopy(*alarm);
- for (std::list<dgn_event_listener*>::iterator
- i = alcopy.listeners.begin();
+ for (list<dgn_event_listener*>::iterator i = alcopy.listeners.begin();
i != alcopy.listeners.end(); ++i)
{
if (!(*i)->notify_dgn_event(et))
@@ -77,8 +76,7 @@ void dgn_event_dispatcher::fire_position_event(
if (alarm && (alarm->eventmask & et.type))
{
dgn_square_alarm alcopy = *alarm;
- for (std::list<dgn_event_listener*>::iterator
- i = alcopy.listeners.begin();
+ for (list<dgn_event_listener*>::iterator i = alcopy.listeners.begin();
i != alcopy.listeners.end(); ++i)
{
(*i)->notify_dgn_event(et);
@@ -90,8 +88,8 @@ void dgn_event_dispatcher::fire_event(const dgn_event &e)
{
if (global_event_mask & e.type)
{
- std::list<dgn_listener_def> lcopy = listeners;
- for (std::list<dgn_listener_def>::iterator i = lcopy.begin();
+ list<dgn_listener_def> lcopy = listeners;
+ for (list<dgn_listener_def>::iterator i = lcopy.begin();
i != lcopy.end(); ++i)
{
if (i->eventmask & e.type)
@@ -114,7 +112,7 @@ void dgn_event_dispatcher::register_listener(unsigned mask,
else
{
global_event_mask |= mask;
- for (std::list<dgn_listener_def>::iterator i = listeners.begin();
+ for (list<dgn_listener_def>::iterator i = listeners.begin();
i != listeners.end(); ++i)
{
if (i->listener == listener)
@@ -136,9 +134,11 @@ void dgn_event_dispatcher::register_listener_at(unsigned mask,
dgn_square_alarm *alarm = grid_triggers[c.x][c.y].get();
alarm->eventmask |= mask;
- if (std::find(alarm->listeners.begin(), alarm->listeners.end(),
- listener) == alarm->listeners.end())
+ if (find(alarm->listeners.begin(), alarm->listeners.end(), listener)
+ == alarm->listeners.end())
+ {
alarm->listeners.push_back(listener);
+ }
}
void dgn_event_dispatcher::remove_listener(dgn_event_listener *listener,
@@ -148,7 +148,7 @@ void dgn_event_dispatcher::remove_listener(dgn_event_listener *listener,
remove_listener_at(pos, listener);
else
{
- for (std::list<dgn_listener_def>::iterator i = listeners.begin();
+ for (list<dgn_listener_def>::iterator i = listeners.begin();
i != listeners.end(); ++i)
{
if (i->listener == listener)
@@ -165,9 +165,9 @@ void dgn_event_dispatcher::remove_listener_at(const coord_def &pos,
{
if (dgn_square_alarm *alarm = grid_triggers[pos.x][pos.y].get())
{
- std::list<dgn_event_listener*>::iterator i =
- std::find(alarm->listeners.begin(), alarm->listeners.end(),
- listener);
+ list<dgn_event_listener*>::iterator i = find(alarm->listeners.begin(),
+ alarm->listeners.end(),
+ listener);
if (i != alarm->listeners.end())
alarm->listeners.erase(i);
}