src/model filenames cleanup, parse .map texture coordinates, early loading of material textures

1 files changed, 3 insertions, 3 deletions

diff --git a/src/model/model.cc b/src/model/model.cc
index b02f127..1f9fcb5 100644
--- a/src/model/model.cc
+++ b/src/model/model.cc
@@ -5,9 +5,9 @@
 */
 
 #include "sys/sys.h"
-#include "model/asefile.h"
 #include "model/model.h"
-#include "model/map.h"
+#include "model/asefile.h"
+#include "model/mapfile.h"
 #include "model/vertexarray.h"
 
 namespace model
@@ -112,7 +112,7 @@ Model *Model::load(std::string const & name)
 	}
 	
 	if (!model) {	
-		con_warn << "Could not open " << name << std::endl;
+		con_warn << "Could not open model " << name << std::endl;
 	} else {
 		model_registry[model->name()] = model;
 	}