mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fixed crashes with M2 loader

Browse Source
This commit is contained in:
false_genesis 2008-04-06 15:53:32 +00:00
parent 3c236757ce
commit 79a7f0dfae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Client/GUI/CM2MeshFileLoader.cpp
View File

@ -10,6 +10,7 @@ namespace scene
CM2MeshFileLoader::CM2MeshFileLoader(IrrlichtDevice* device, c8* texdir):Device(device), Texdir(texdir) CM2MeshFileLoader::CM2MeshFileLoader(IrrlichtDevice* device, c8* texdir):Device(device), Texdir(texdir)
{ {
Mesh = NULL;
} }
@ -192,6 +193,7 @@ std::string tempTexFileName="";
M2MTextureFiles.reallocate(M2MTextureDef.size()); M2MTextureFiles.reallocate(M2MTextureDef.size());
for(u32 i=0; i<M2MTextureDef.size(); i++) for(u32 i=0; i<M2MTextureDef.size(); i++)
{ {
tempTexFileName.reserve(M2MTextureDef[i].texFileLen + 1);
file->seek(M2MTextureDef[i].texFileOfs); file->seek(M2MTextureDef[i].texFileOfs);
file->read(&tempTexFileName[0],M2MTextureDef[i].texFileLen); file->read(&tempTexFileName[0],M2MTextureDef[i].texFileLen);
M2MTextureFiles.push_back(tempTexFileName.c_str()); M2MTextureFiles.push_back(tempTexFileName.c_str());

6
src/Client/GUI/DrawObject.cpp
View File

@ -66,10 +66,10 @@ void DrawObject::_Init(void)
{ {
cube = _smgr->addCubeSceneNode(2); cube = _smgr->addCubeSceneNode(2);
} }
cube->getMaterial(0).DiffuseColor.setAlpha(opacity); //cube->getMaterial(0).DiffuseColor.setAlpha(opacity);
cube->setName("OBJECT"); cube->setName("OBJECT");
cube->getMaterial(0).setFlag(video::EMF_LIGHTING, true); //cube->getMaterial(0).setFlag(video::EMF_LIGHTING, true);
cube->getMaterial(0).setFlag(video::EMF_FOG_ENABLE, true); //cube->getMaterial(0).setFlag(video::EMF_FOG_ENABLE, true);
text=_smgr->addTextSceneNode(_guienv->getBuiltInFont(), L"TestText" , irr::video::SColor(255,255,255,255),cube, irr::core::vector3df(0,5,0)); text=_smgr->addTextSceneNode(_guienv->getBuiltInFont(), L"TestText" , irr::video::SColor(255,255,255,255),cube, irr::core::vector3df(0,5,0));
if(_obj->IsPlayer()) if(_obj->IsPlayer())