Changeset 7661 in orxonox.OLD for trunk/src/story_entities

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

File:

• trunk/src/story_entities/story_entity.cc (modified) (2 diffs)

trunk/src/story_entities/story_entity.cc

@@ -22 +22 @@
 #include "story_entity.h"
 
+#include "util/file.h"
+#include "util/loading/load_param.h"
 #include "util/loading/resource_manager.h"
-#include "util/loading/load_param.h"
 
 
@@ -102 +103 @@
 void StoryEntity::setLoadFile(const std::string& fileName)
 {
-  if (ResourceManager::isFile(fileName))
+  if (File(fileName).isFile())
   {
     this->loadFile =  fileName;