Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-09 16:34:38 +0000
committerStijn Buys <ingar@osirion.org>2009-08-09 16:34:38 +0000
commit324f5431245f2a550acddea70ea72770430a19d1 (patch)
treeaa05d127c20f5bb5995a3fdceb915b5280887e4b /src/model/map.cc
parentb808c0e24cc4a59bd801059147bc9805944bee9a (diff)
initial .ase support
Diffstat (limited to 'src/model/map.cc')
-rw-r--r--src/model/map.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/model/map.cc b/src/model/map.cc
index c2b184f..8165e3a 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -1,5 +1,5 @@
/*
- filesystem/map.cc
+ model/map.cc
This file is part of the Osirion project and is distributed under
the terms of the GNU General Public License version 2
*/
@@ -15,6 +15,7 @@
#include <sstream>
#include <string>
+#include <cstring>
namespace model
{
@@ -71,7 +72,6 @@ bool Map::open(std::string const & mapname)
mapfile_ifs.open(mapfile_name);
if (!mapfile_ifs.is_open()) {
- con_warn << "Could not open " << mapfile_name << "!\n";
return false;
}
return true;
@@ -97,8 +97,6 @@ bool Map::getline()
{
using math::Vector3f;
- char data[1024];
-
last_read_was_classname = false;
last_read_was_key = false;
last_read_was_classend = false;
@@ -108,6 +106,9 @@ bool Map::getline()
if (!mapfile_ifs.is_open())
return false;
+
+ char data[1024];
+ memset(data, 0, sizeof(data));
if (mapfile_ifs.getline(data, 1023)) {
line_number++;