Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Small fixes for linux build

Browse Source
This commit is contained in:
Filip Gawin 2020-07-25 22:04:59 +02:00
parent 3856b932dd
commit b0414c84b9
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fakerw/fake.cpp
View File

@ -855,12 +855,23 @@ RpSkin *RpSkinGeometryGetSkin( RpGeometry *geometry ) { return Skin::get(geometr
RpAtomic *RpSkinAtomicSetHAnimHierarchy( RpAtomic *atomic, RpHAnimHierarchy *hierarchy ) { Skin::setHierarchy(atomic, hierarchy); return atomic; } RpAtomic *RpSkinAtomicSetHAnimHierarchy( RpAtomic *atomic, RpHAnimHierarchy *hierarchy ) { Skin::setHierarchy(atomic, hierarchy); return atomic; }
RpHAnimHierarchy *RpSkinAtomicGetHAnimHierarchy( const RpAtomic *atomic ) { return Skin::getHierarchy(atomic); } RpHAnimHierarchy *RpSkinAtomicGetHAnimHierarchy( const RpAtomic *atomic ) { return Skin::getHierarchy(atomic); }
RwImage *
RtBMPImageWrite(RwImage *image, const RwChar *imageName)
{
char *r = (char *)alloca(strlen((char *)imageName) + 2);
RwImage *RtBMPImageWrite(RwImage * image, const RwChar * imageName) { rw::writeBMP(image, imageName); return image; } // Use default path(and pass error handling to librw) if we can't find any match
RwImage *RtBMPImageRead(const RwChar * imageName) { return rw::readBMP(imageName); } if(!casepath((char *)imageName, r)) r = (char *)imageName;
rw::writeBMP(image, r);
return image;
}
RwImage *
RtBMPImageRead(const RwChar *imageName)
{
char *r = (char *)alloca(strlen((char *)imageName) + 2);
// Use default path(and pass error handling to librw) if we can't find any match
if(!casepath((char *)imageName, r)) r = (char *)imageName;
return rw::readBMP(r);
}
#include "rtquat.h" #include "rtquat.h"

2
src/modelinfo/VehicleModelInfo.h
View File

@ -137,7 +137,7 @@ public:
void SetVehicleComponentFlags(RwFrame *frame, uint32 flags); void SetVehicleComponentFlags(RwFrame *frame, uint32 flags);
void PreprocessHierarchy(void); void PreprocessHierarchy(void);
void GetWheelPosn(int32 n, CVector &pos); void GetWheelPosn(int32 n, CVector &pos);
CVector &GetFrontSeatPosn(void) { return m_positions[m_vehicleType == VEHICLE_TYPE_BOAT ? BOAT_POS_FRONTSEAT : CAR_POS_FRONTSEAT]; }; const CVector &GetFrontSeatPosn(void) { return m_vehicleType == VEHICLE_TYPE_BOAT ? m_positions[BOAT_POS_FRONTSEAT] : m_positions[CAR_POS_FRONTSEAT]; }
int32 ChooseComponent(void); int32 ChooseComponent(void);
int32 ChooseSecondComponent(void); int32 ChooseSecondComponent(void);