Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-09 20:32:43 +01:00
Code Issues Projects Releases Activity

Improve vehicle and item interaction

Browse Source
This commit is contained in:
Daniel Evans 2014-06-30 02:18:02 +01:00
parent 799127f8f8
commit 39cf86f056
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rwengine/src/objects/CharacterObject.cpp
View File

@ -456,6 +456,7 @@ void CharacterObject::setActiveItem(int slot)
InventoryItem *CharacterObject::getActiveItem()
{
if ( currentVehicle ) return nullptr;
return _inventory[_activeInventoryItem];
}

2
rwengine/src/objects/VehicleObject.cpp
View File

@ -13,7 +13,7 @@ VehicleObject::VehicleObject(GameWorld* engine, const glm::vec3& pos, const glm:
damageFlags(0), vehicle(data), info(info), colourPrimary(prim),
colourSecondary(sec), physBody(nullptr), physVehicle(nullptr)
{
mHealth = 100.f;
mHealth = 1000.f;
if(! data->modelName.empty()) {
btTransform wt(
btQuaternion(