immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Exist() to resource manager, updated model

dev-mp
Krzysztof Dermont 2014-06-22 16:29:26 +02:00
parent 754154341d
commit 0556b5dfbc
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/resources/resourcemanager.cpp
View File

@ -130,6 +130,12 @@ CSNDFile* CResourceManager::GetSNDFileHandler(const std::string &filename)
} }
bool CResourceManager::Exists(const std::string &filename)
{
return PHYSFS_exists(filename.c_str());
}
int CResourceManager::SDLClose(SDL_RWops *context) int CResourceManager::SDLClose(SDL_RWops *context)
{ {
if (CheckSDLContext(context)) if (CheckSDLContext(context))

1
src/common/resources/resourcemanager.h
View File

@ -33,6 +33,7 @@ public:
static std::string GetLanguageLocation(); static std::string GetLanguageLocation();
static SDL_RWops* GetSDLFileHandler(const std::string &filename); static SDL_RWops* GetSDLFileHandler(const std::string &filename);
static CSNDFile* GetSNDFileHandler(const std::string &filename); static CSNDFile* GetSNDFileHandler(const std::string &filename);
static bool Exists(const std::string &filename);
private: private:
static int SDLSeek(SDL_RWops *context, int offset, int whence); static int SDLSeek(SDL_RWops *context, int offset, int whence);

14
src/graphics/engine/modelfile.cpp
View File

@ -22,6 +22,8 @@
#include "common/logger.h" #include "common/logger.h"
#include "common/stringutils.h" #include "common/stringutils.h"
#include "common/resources/inputstream.h"
#include "graphics/engine/engine.h" #include "graphics/engine/engine.h"
#include "math/geometry.h" #include "math/geometry.h"
@ -432,8 +434,8 @@ bool CModelFile::ReadModel(const std::string& fileName)
{ {
m_triangles.clear(); m_triangles.clear();
std::ifstream stream; CInputStream stream;
stream.open(fileName.c_str(), std::ios_base::in | std::ios_base::binary); stream.open(fileName.c_str());
if (!stream.good()) if (!stream.good())
{ {
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
@ -823,8 +825,8 @@ struct NewModelTriangle1
bool CModelFile::ReadTextModel(const std::string& fileName) bool CModelFile::ReadTextModel(const std::string& fileName)
{ {
std::ifstream stream; CInputStream stream;
stream.open(fileName.c_str(), std::ios_base::in); stream.open(fileName.c_str());
if (!stream.good()) if (!stream.good())
{ {
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());
@ -1020,8 +1022,8 @@ bool CModelFile::WriteTextModel(std::ostream& stream)
bool CModelFile::ReadBinaryModel(const std::string& fileName) bool CModelFile::ReadBinaryModel(const std::string& fileName)
{ {
std::ifstream stream; CInputStream stream;
stream.open(fileName.c_str(), std::ios_base::in | std::ios_base::binary); stream.open(fileName.c_str());
if (!stream.good()) if (!stream.good())
{ {
GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); GetLogger()->Error("Could not open file '%s'\n", fileName.c_str());