archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-07 00:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse Source 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
This commit is contained in:
Sergeanur
2021-01-22 15:04:09 +02:00
parent 8dab92d158 feb993e751
commit cea6b20c09
130 changed files with 92 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modelinfo/BaseModelInfo.cpp
View File

@ -8,8 +8,6 @@
#include "ModelInfo.h"
#include "KeyGen.h"
//--MIAMI: file done
CBaseModelInfo::CBaseModelInfo(ModelInfoType type)
{
m_colModel = nil;

4
src/modelinfo/ClumpModelInfo.cpp
View File

@ -7,8 +7,6 @@
#include "ModelInfo.h"
#include "AnimManager.h"
//--MIAMI: file done
void
CClumpModelInfo::DeleteRwObject(void)
{
@ -150,7 +148,7 @@ CClumpModelInfo::FindFrameFromIdCB(RwFrame *frame, void *data)
return assoc->frame ? nil : frame;
}
//--MIAMI: unused
// unused
RwFrame*
CClumpModelInfo::FindFrameFromNameCB(RwFrame *frame, void *data)
{

2
src/modelinfo/ModelInfo.cpp
View File

@ -6,8 +6,6 @@
#include "ModelInfo.h"
#include "KeyGen.h"
// --MIAMI: file done
CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore;

2
src/modelinfo/PedModelInfo.cpp
View File

@ -10,8 +10,6 @@
#include "ModelInfo.h"
#include "custompipes.h"
//--MIAMI: file done
void
CPedModelInfo::DeleteRwObject(void)
{

2
src/modelinfo/SimpleModelInfo.cpp
View File

@ -6,8 +6,6 @@
#include "AnimManager.h"
#include "custompipes.h"
//--MIAMI: file done
#define LOD_DISTANCE (300.0f)
void

4
src/modelinfo/VehicleModelInfo.cpp
View File

@ -21,8 +21,6 @@
#include "ModelInfo.h"
#include "custompipes.h"
//--MIAMI: done
int8 CVehicleModelInfo::ms_compsToUse[2] = { -2, -2 };
int8 CVehicleModelInfo::ms_compsUsed[2];
RwRGBA CVehicleModelInfo::ms_vehicleColourTable[256];
@ -924,7 +922,7 @@ CVehicleModelInfo::AvoidSameVehicleColour(uint8 *col1, uint8 *col2)
}
}
//--MIAMI: unused
// unused
RwTexture*
CreateCarColourTexture(uint8 r, uint8 g, uint8 b)
{

2
src/modelinfo/WeaponModelInfo.cpp
View File

@ -4,8 +4,6 @@
#include "AnimManager.h"
#include "VisibilityPlugins.h"
//--MIAMI: file done
void
CWeaponModelInfo::SetAnimFile(const char *file)
{