diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-14 22:04:34 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-14 22:04:34 +0000 |
| commit | 39f1638a065766fa67c70871c95a0a8400f044f1 (patch) | |
| tree | 29de7d191f59b1c55842b25bee2f225e5de1b169 /crawl-ref/source/mapmark.cc | |
| parent | 1c7787b17cee82ed787ff5fed1eea5c943c0cd64 (diff) | |
| download | crawl-ref-39f1638a065766fa67c70871c95a0a8400f044f1.tar.gz crawl-ref-39f1638a065766fa67c70871c95a0a8400f044f1.zip | |
Apply Horst von Brand's (first) patch 1887488: gcc-4.3 compile failures.
I'm not sure what to do about the rest of that tracker item.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4233 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mapmark.cc')
| -rw-r--r-- | crawl-ref/source/mapmark.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc index 4cf22b4057..dfcc66ab34 100644 --- a/crawl-ref/source/mapmark.cc +++ b/crawl-ref/source/mapmark.cc @@ -4,10 +4,13 @@ * Created by: dshaligram on Sat Jul 21 12:17:29 2007 UTC * * Modified for Crawl Reference by $Author$ on $Date$ - * + * */ #include "AppHdr.h" + +#include <algorithm> + #include "mapmark.h" #include "clua.h" @@ -234,7 +237,7 @@ bool map_lua_marker::get_table() const void map_lua_marker::write(writer &outf) const { map_marker::write(outf); - + lua_stack_cleaner clean(dlua); bool init = initialised; if (!get_table()) @@ -242,7 +245,7 @@ void map_lua_marker::write(writer &outf) const mprf(MSGCH_WARN, "Couldn't find table."); init = false; } - + marshallByte(outf, init); if (!init) return; @@ -275,7 +278,7 @@ void map_lua_marker::write(writer &outf) const void map_lua_marker::read(reader &inf) { map_marker::read(inf); - + if (!(initialised = unmarshallByte(inf))) return; @@ -374,7 +377,7 @@ std::string map_lua_marker::property(const std::string &pname) const std::string result; if (lua_isstring(dlua, -1)) result = lua_tostring(dlua, -1); - return (result); + return (result); } map_marker *map_lua_marker::parse( @@ -677,7 +680,7 @@ std::vector<map_marker*> map_markers::get_all(map_marker_type mat) if (mat == MAT_ANY || i->second->get_type() == mat) rmarkers.push_back(i->second); } - return (rmarkers); + return (rmarkers); } std::vector<map_marker*> map_markers::get_all(const std::string &key, @@ -695,7 +698,7 @@ std::vector<map_marker*> map_markers::get_all(const std::string &key, rmarkers.push_back(marker); } - return (rmarkers); + return (rmarkers); } std::vector<map_marker*> map_markers::get_markers_at(const coord_def &c) |