mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Windows fix

Browse Source
This commit is contained in:
Jason Hooks 2011-06-08 00:35:30 -04:00
parent a719a6b468
commit 3a9007849d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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\\1\\red_MJ_hat_org.NIf"); //w/W_6th_Hammer.NIF cellRender.insertMesh("Meshes\\2\\red_MJ_hat_org.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";

12
components/bsa/bsa_archive.cpp
View File

@ -107,7 +107,7 @@ class DirArchive: public Ogre::FileSystemArchive
small = original.substr(cutoff - 1, original.size() - cutoff); small = original.substr(cutoff - 1, original.size() - cutoff);
//boost::filesystem::path smallp = small; //boost::filesystem::path smallp = small;
m[small] = filesind; m[small] = filesind;
//std::cout << "Directory: " << smallp.string() << " " << filesind.size() << "\n"; //std::cout << "Directory: " << small << " " << filesind.size() << "\n";
} }
@ -126,8 +126,7 @@ class DirArchive: public Ogre::FileSystemArchive
std::string copy = filename; std::string copy = filename;
if(OGRE_PLATFORM != OGRE_PLATFORM_WIN32)
{
for (int i = 0; i < filename.size(); i++) for (int i = 0; i < filename.size(); i++)
{ {
@ -135,7 +134,7 @@ class DirArchive: public Ogre::FileSystemArchive
copy.replace(i, 1, "/"); copy.replace(i, 1, "/");
} }
} }
}
if(copy.at(0) == '\\' || copy.at(0) == '/') if(copy.at(0) == '\\' || copy.at(0) == '/')
{ {
@ -189,8 +188,7 @@ class DirArchive: public Ogre::FileSystemArchive
//std::cout << "Open\n"; //std::cout << "Open\n";
std::string copy = filename; std::string copy = filename;
if(OGRE_PLATFORM != OGRE_PLATFORM_WIN32)
{
for (int i = 0; i < filename.size(); i++) for (int i = 0; i < filename.size(); i++)
{ {
@ -198,7 +196,7 @@ class DirArchive: public Ogre::FileSystemArchive
copy.replace(i, 1, "/"); copy.replace(i, 1, "/");
} }
} }
}
if(copy.at(0) == '\\' || copy.at(0) == '/') if(copy.at(0) == '\\' || copy.at(0) == '/')
{ {