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

* apply basic npc texture (in some cases wrong texture is applied, need find fix)

Browse Source 
* prevent opcode spam with mouse (LMB&RMB) character move
This commit is contained in:
bluma4862 2008-07-03 07:21:05 +00:00
parent 3934f0cbeb
commit 678aff60af
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ void DrawObject::_Init(void)
if(!cube && _obj->IsWorldObject()) // only world objects have coords and can be drawn if(!cube && _obj->IsWorldObject()) // only world objects have coords and can be drawn
{ {
std::string modelfile; std::string modelfile, texture = "";
uint32 opacity = 255; uint32 opacity = 255;
if (_obj->IsUnit()) if (_obj->IsUnit())
{ {
@ -57,6 +57,8 @@ void DrawObject::_Init(void)
SCPDatabase *cmd = _instance->dbmgr.GetDB("creaturemodeldata"); SCPDatabase *cmd = _instance->dbmgr.GetDB("creaturemodeldata");
uint32 modelid = cdi && displayid ? cdi->GetUint32(displayid,"model") : 0; uint32 modelid = cdi && displayid ? cdi->GetUint32(displayid,"model") : 0;
modelfile = std::string("data/model/") + (cmd ? cmd->GetString(modelid,"file") : ""); modelfile = std::string("data/model/") + (cmd ? cmd->GetString(modelid,"file") : "");
if (cdi && strcmp(cdi->GetString(displayid,"name1"), "") != 0)
texture = std::string("data/texture/") + cdi->GetString(displayid,"name1");
opacity = cdi && displayid ? cdi->GetUint32(displayid,"opacity") : 255; opacity = cdi && displayid ? cdi->GetUint32(displayid,"opacity") : 255;
} }
else if (_obj->IsGameObject()) else if (_obj->IsGameObject())
@ -86,6 +88,8 @@ void DrawObject::_Init(void)
} }
} }
scene::IAnimatedMesh *mesh = _smgr->getMesh(modelfile.c_str()); scene::IAnimatedMesh *mesh = _smgr->getMesh(modelfile.c_str());
if(mesh) if(mesh)
{ {
cube = _smgr->addAnimatedMeshSceneNode(mesh); cube = _smgr->addAnimatedMeshSceneNode(mesh);
@ -96,6 +100,9 @@ void DrawObject::_Init(void)
{ {
cube = _smgr->addCubeSceneNode(1); cube = _smgr->addCubeSceneNode(1);
} }
if (!texture.empty())
cube->setMaterialTexture(0, _device->getVideoDriver()->getTexture(texture.c_str()));
//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);

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

@ -269,7 +269,7 @@ void SceneWorld::OnUpdate(s32 timediff)
{ {
movemgr->MoveStopTurn(); movemgr->MoveStopTurn();
} }
if (!eventrecv->key.pressed(KEY_KEY_W) && !eventrecv->key.pressed(KEY_KEY_S)) if (!eventrecv->key.pressed(KEY_KEY_W) && !eventrecv->key.pressed(KEY_KEY_S) && !(mouse_pressed_left && mouse_pressed_right))
{ {
movemgr->MoveStop(); movemgr->MoveStop();
} }