modelinfo fixes
This commit is contained in:
parent
1d3b4d1e9a
commit
4564f7aeea
@ -56,7 +56,7 @@ void
|
|||||||
CBaseModelInfo::SetTexDictionary(const char *name)
|
CBaseModelInfo::SetTexDictionary(const char *name)
|
||||||
{
|
{
|
||||||
int slot = CTxdStore::FindTxdSlot(name);
|
int slot = CTxdStore::FindTxdSlot(name);
|
||||||
if(slot < 0)
|
if(slot == -1)
|
||||||
slot = CTxdStore::AddTxdSlot(name);
|
slot = CTxdStore::AddTxdSlot(name);
|
||||||
m_txdSlot = slot;
|
m_txdSlot = slot;
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,10 @@
|
|||||||
|
|
||||||
#include "General.h"
|
#include "General.h"
|
||||||
#include "Camera.h"
|
#include "Camera.h"
|
||||||
|
#include "Renderer.h"
|
||||||
#include "ModelInfo.h"
|
#include "ModelInfo.h"
|
||||||
#include "custompipes.h"
|
#include "custompipes.h"
|
||||||
|
|
||||||
#define LOD_DISTANCE (300.0f)
|
|
||||||
|
|
||||||
void
|
void
|
||||||
CSimpleModelInfo::DeleteRwObject(void)
|
CSimpleModelInfo::DeleteRwObject(void)
|
||||||
{
|
{
|
||||||
|
@ -553,9 +553,9 @@ CVehicleModelInfo::SetVehicleComponentFlags(RwFrame *frame, uint32 flags)
|
|||||||
SETFLAGS(ATOMIC_FLAG_FRONT);
|
SETFLAGS(ATOMIC_FLAG_FRONT);
|
||||||
else if(flags & VEHICLE_FLAG_REAR && (handling->Flags & HANDLING_IS_VAN || (flags & (VEHICLE_FLAG_LEFT|VEHICLE_FLAG_RIGHT)) == 0))
|
else if(flags & VEHICLE_FLAG_REAR && (handling->Flags & HANDLING_IS_VAN || (flags & (VEHICLE_FLAG_LEFT|VEHICLE_FLAG_RIGHT)) == 0))
|
||||||
SETFLAGS(ATOMIC_FLAG_REAR);
|
SETFLAGS(ATOMIC_FLAG_REAR);
|
||||||
if(flags & VEHICLE_FLAG_LEFT)
|
else if(flags & VEHICLE_FLAG_LEFT)
|
||||||
SETFLAGS(ATOMIC_FLAG_LEFT);
|
SETFLAGS(ATOMIC_FLAG_LEFT);
|
||||||
if(flags & VEHICLE_FLAG_RIGHT)
|
else if(flags & VEHICLE_FLAG_RIGHT)
|
||||||
SETFLAGS(ATOMIC_FLAG_RIGHT);
|
SETFLAGS(ATOMIC_FLAG_RIGHT);
|
||||||
|
|
||||||
if(flags & VEHICLE_FLAG_REARDOOR)
|
if(flags & VEHICLE_FLAG_REARDOOR)
|
||||||
@ -709,7 +709,7 @@ struct editableMatCBData
|
|||||||
RpMaterial*
|
RpMaterial*
|
||||||
CVehicleModelInfo::GetEditableMaterialListCB(RpMaterial *material, void *data)
|
CVehicleModelInfo::GetEditableMaterialListCB(RpMaterial *material, void *data)
|
||||||
{
|
{
|
||||||
static RwRGBA white = { 255, 255, 255, 255 };
|
RwRGBA white = { 255, 255, 255, 255 };
|
||||||
const RwRGBA *col;
|
const RwRGBA *col;
|
||||||
editableMatCBData *cbdata;
|
editableMatCBData *cbdata;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user