a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 07:40:01 +00:00
Code Issues Projects Releases Wiki Activity

got rid of superfluous enum; update librw

Browse source
This commit is contained in:
aap 2020-05-07 12:48:57 +02:00
parent 876e402d1e
commit 5c30b3a188
6 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
librw

@ -1 +1 @@
Subproject commit bdbc92d86eef28344e01c992d55a9c4f43629f84 Subproject commit 661feeabf4a4f0a8b0bee23b53ba557a14352d00

3
src/control/CarCtrl.h
View file

@ -23,6 +23,7 @@ enum{
class CCarCtrl class CCarCtrl
{ {
public:
enum eCarClass { enum eCarClass {
POOR = 0, POOR = 0,
RICH, RICH,
@ -43,7 +44,7 @@ class CCarCtrl
GANG9, GANG9,
COPS COPS
}; };
public:
static void SwitchVehicleToRealPhysics(CVehicle*); static void SwitchVehicleToRealPhysics(CVehicle*);
static void AddToCarArray(int32 id, int32 vehclass); static void AddToCarArray(int32 id, int32 vehclass);
static void UpdateCarCount(CVehicle*, bool); static void UpdateCarCount(CVehicle*, bool);

28
src/core/FileLoader.cpp
View file

@ -812,33 +812,33 @@ CFileLoader::LoadVehicleObject(const char *line)
// Well this is kinda dumb.... // Well this is kinda dumb....
if(strncmp(vehclass, "poorfamily", 11) == 0){ if(strncmp(vehclass, "poorfamily", 11) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_POOR; mi->m_vehicleClass = CCarCtrl::POOR;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_POOR); CCarCtrl::AddToCarArray(id, CCarCtrl::POOR);
}else if(strncmp(vehclass, "richfamily", 11) == 0){ }else if(strncmp(vehclass, "richfamily", 11) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_RICH; mi->m_vehicleClass = CCarCtrl::RICH;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_RICH); CCarCtrl::AddToCarArray(id, CCarCtrl::RICH);
}else if(strncmp(vehclass, "executive", 10) == 0){ }else if(strncmp(vehclass, "executive", 10) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_EXECUTIVE; mi->m_vehicleClass = CCarCtrl::EXEC;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_EXECUTIVE); CCarCtrl::AddToCarArray(id, CCarCtrl::EXEC);
}else if(strncmp(vehclass, "worker", 7) == 0){ }else if(strncmp(vehclass, "worker", 7) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_WORKER; mi->m_vehicleClass = CCarCtrl::WORKER;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_WORKER); CCarCtrl::AddToCarArray(id, CCarCtrl::WORKER);
}else if(strncmp(vehclass, "special", 8) == 0){ }else if(strncmp(vehclass, "special", 8) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_SPECIAL; mi->m_vehicleClass = CCarCtrl::SPECIAL;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_SPECIAL); CCarCtrl::AddToCarArray(id, CCarCtrl::SPECIAL);
}else if(strncmp(vehclass, "big", 4) == 0){ }else if(strncmp(vehclass, "big", 4) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_BIG; mi->m_vehicleClass = CCarCtrl::BIG;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_BIG); CCarCtrl::AddToCarArray(id, CCarCtrl::BIG);
}else if(strncmp(vehclass, "taxi", 5) == 0){ }else if(strncmp(vehclass, "taxi", 5) == 0){
mi->m_vehicleClass = VEHICLE_CLASS_TAXI; mi->m_vehicleClass = CCarCtrl::TAXI;
while(frequency-- > 0) while(frequency-- > 0)
CCarCtrl::AddToCarArray(id, VEHICLE_CLASS_TAXI); CCarCtrl::AddToCarArray(id, CCarCtrl::TAXI);
} }
} }

2
src/core/Streaming.cpp
View file

@ -1331,7 +1331,7 @@ CStreaming::StreamVehiclesAndPeds(void)
for(i = 1; i <= 10; i++){ for(i = 1; i <= 10; i++){
model = CCarCtrl::ChooseCarModel(modelQualityClass); model = CCarCtrl::ChooseCarModel(modelQualityClass);
modelQualityClass++; modelQualityClass++;
if(modelQualityClass >= NUM_VEHICLE_CLASSES) if(modelQualityClass >= CCarCtrl::TOTAL_CUSTOM_CLASSES)
modelQualityClass = 0; modelQualityClass = 0;
// check if we want to load this model // check if we want to load this model

20
src/fakerw/fake.cpp
View file

@ -756,6 +756,7 @@ RwCamera *RwCameraForAllClumpsNotInFrustum(RwCamera *camera, RwInt32 numClumps,
RwBool RpMatFXPluginAttach( void ) { registerMatFXPlugin(); return true; } RwBool RpMatFXPluginAttach( void ) { registerMatFXPlugin(); return true; }
RpAtomic *RpMatFXAtomicEnableEffects( RpAtomic *atomic ) { MatFX::enableEffects(atomic); return atomic; } RpAtomic *RpMatFXAtomicEnableEffects( RpAtomic *atomic ) { MatFX::enableEffects(atomic); return atomic; }
RpMatFXMaterialFlags RpMatFXMaterialGetEffects( const RpMaterial *material ){ return (RpMatFXMaterialFlags)MatFX::getEffects(material); }
RpMaterial *RpMatFXMaterialSetEffects( RpMaterial *material, RpMatFXMaterialFlags flags ) { MatFX::setEffects(material, (uint32)flags); return material; } RpMaterial *RpMatFXMaterialSetEffects( RpMaterial *material, RpMatFXMaterialFlags flags ) { MatFX::setEffects(material, (uint32)flags); return material; }
RpMaterial *RpMatFXMaterialSetupEnvMap( RpMaterial *material, RwTexture *texture, RwFrame *frame, RwBool useFrameBufferAlpha, RwReal coef ) { RpMaterial *RpMatFXMaterialSetupEnvMap( RpMaterial *material, RwTexture *texture, RwFrame *frame, RwBool useFrameBufferAlpha, RwReal coef ) {
MatFX *mfx = MatFX::get(material); MatFX *mfx = MatFX::get(material);
@ -764,8 +765,23 @@ RpMaterial *RpMatFXMaterialSetupEnvMap( RpMaterial *material, RwTexture *texture
mfx->setEnvCoefficient(coef); mfx->setEnvCoefficient(coef);
return material; return material;
} }
RpMaterial *RpMatFXMaterialSetEnvMapFrame( RpMaterial *material, RwFrame *frame )
{
MatFX *mfx = MatFX::get(material);
mfx->setEnvFrame(frame);
return material;
}
RpMaterial *RpMatFXMaterialSetEnvMapCoefficient( RpMaterial *material, RwReal coef )
{
MatFX *mfx = MatFX::get(material);
mfx->setEnvCoefficient(coef);
return material;
}
RwReal RpMatFXMaterialGetEnvMapCoefficient( const RpMaterial *material )
{
MatFX *mfx = MatFX::get(material);
return mfx->getEnvCoefficient();
}

11
src/modelinfo/VehicleModelInfo.h
View file

@ -35,17 +35,6 @@ enum eVehicleType {
NUM_VEHICLE_TYPES NUM_VEHICLE_TYPES
}; };
enum {
VEHICLE_CLASS_POOR,
VEHICLE_CLASS_RICH,
VEHICLE_CLASS_EXECUTIVE,
VEHICLE_CLASS_WORKER,
VEHICLE_CLASS_SPECIAL,
VEHICLE_CLASS_BIG,
VEHICLE_CLASS_TAXI,
NUM_VEHICLE_CLASSES
};
enum { enum {
NUM_VEHICLE_POSITIONS = 10 NUM_VEHICLE_POSITIONS = 10
}; };