projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed old data and contrib, new files will follow
[supertux.git]
/
src
/
tile_manager.cpp
diff --git
a/src/tile_manager.cpp
b/src/tile_manager.cpp
index
e3a5b59
..
2bf90bf
100644
(file)
--- a/
src/tile_manager.cpp
+++ b/
src/tile_manager.cpp
@@
-23,8
+23,6
@@
#include <stdexcept>
#include <assert.h>
#include "video/drawing_context.h"
#include <stdexcept>
#include <assert.h>
#include "video/drawing_context.h"
-#include "app/setup.h"
-#include "app/globals.h"
#include "lisp/lisp.h"
#include "lisp/parser.h"
#include "lisp/list_iterator.h"
#include "lisp/lisp.h"
#include "lisp/parser.h"
#include "lisp/list_iterator.h"
@@
-56,7
+54,7
@@
void TileManager::load_tileset(std::string filename)
} else {
tiles_path = filename.substr(0, t+1);
}
} else {
tiles_path = filename.substr(0, t+1);
}
-
+
lisp::Parser parser;
std::auto_ptr<lisp::Lisp> root (parser.parse(
get_resource_filename(filename)));
lisp::Parser parser;
std::auto_ptr<lisp::Lisp> root (parser.parse(
get_resource_filename(filename)));
@@
-83,7
+81,7
@@
void TileManager::load_tileset(std::string filename)
} else if(iter.item() == "properties") {
// deprecated
} else {
} else if(iter.item() == "properties") {
// deprecated
} else {
- std::cerr << "Unknown symbol '" << iter.item() << "'.\n";
+ std::cerr << "Unknown symbol '" << iter.item() << "'
tile defintion file
.\n";
}
}
}
}
}
}