mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-17 10:10:23 +00:00
Code Issues Projects Releases Wiki Activity

Backslash working in linux

Browse Source
This commit is contained in:
Jason Hooks 2011-06-04 01:29:57 -04:00
parent b92955763a
commit 2aaa0f4578
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/engine.cpp
View File

@ -300,6 +300,8 @@ void OMW::Engine::loadBSA()
std::string m = mDataDir.string(); std::string m = mDataDir.string();
std::cout << "Data dir" << m << "\n"; std::cout << "Data dir" << m << "\n";
addDir(m); addDir(m);
//std::string s = "f\n";
//std::cout <<"S: " << s.size() << "\n";
} }

2
apps/openmw/mwclass/npc.cpp
View File

@ -118,7 +118,7 @@ namespace MWClass
Ogre::Vector3 pos2 = Ogre::Vector3( 0, .5, 75); Ogre::Vector3 pos2 = Ogre::Vector3( 0, .5, 75);
if (groin){ if (groin){
//cellRender.insertMesh("Meshes/bald_MJ_hat.NIF"); //w/W_6th_Hammer.NIF cellRender.insertMesh("Meshes\\bald_MJ_hat.NIF"); //w/W_6th_Hammer.NIF
//bald_MJ_hat.NIF //bald_MJ_hat.NIF
cellRender.insertMesh("meshes\\" + groin->model, pos2, axis, kOgrePi, npcName + "groin", addresses, numbers); cellRender.insertMesh("meshes\\" + groin->model, pos2, axis, kOgrePi, npcName + "groin", addresses, numbers);
addresses2[numbers] = npcName + "groin"; addresses2[numbers] = npcName + "groin";

24
components/bsa/bsa_archive.cpp
View File

@ -49,9 +49,33 @@ class DirArchive: public Ogre::FileSystemArchive
void load() {} void load() {}
void unload() {} void unload() {}
bool exists(const String& filename) {
std::string copy = filename;
if(OGRE_PLATFORM != OGRE_PLATFORM_WIN32)
{
for (int i = 0; i < filename.size(); i++)
{
if(copy.at(i) == '\\' ){
copy.replace(i, 1, "/");
}
}
}
return FileSystemArchive::exists(copy);
}
DataStreamPtr open(const String& filename, bool readonly = true) const DataStreamPtr open(const String& filename, bool readonly = true) const
{ {
std::string copy = filename; std::string copy = filename;
if(OGRE_PLATFORM != OGRE_PLATFORM_WIN32){
//std::cout << "In Open\n";
for (int i = 0; i < filename.size(); i++)
{
if(copy.at(i) == '\\' ){
copy.replace(i, 1, "/");
}
}
}
return FileSystemArchive::open(copy, readonly); return FileSystemArchive::open(copy, readonly);
} }