1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 07:50:01 +00:00

Includes overhaul, fix some compiler warnings

This commit is contained in:
erorcun 2021-01-16 16:44:59 +03:00
parent cc6d5374d5
commit f85b5e99ed
45 changed files with 110 additions and 142 deletions

View file

@ -41,7 +41,7 @@
#include "WindModifiers.h" #include "WindModifiers.h"
#include "Fluff.h" #include "Fluff.h"
#include "Script.h" #include "Script.h"
#include "Wanted.h"
const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples); const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
const int policeChannel = channels + 1; const int policeChannel = channels + 1;

View file

@ -13,6 +13,7 @@
#include "World.h" #include "World.h"
#include "Zones.h" #include "Zones.h"
#include "sampman.h" #include "sampman.h"
#include "Wanted.h"
const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples); const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
const int policeChannel = channels + 1; const int policeChannel = channels + 1;

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Wanted.h" #include "Crime.h"
struct cAMCrime { struct cAMCrime {
int32 type; int32 type;

View file

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "common.h"
#include "AudioSamples.h" #include "AudioSamples.h"
#define MAX_VOLUME 127 #define MAX_VOLUME 127

View file

@ -1,8 +1,5 @@
#include "common.h"
#ifdef AUDIO_MSS #ifdef AUDIO_MSS
#include <windows.h> #include <shlobj.h>
#include <shobjidl.h>
#include <shlguid.h> #include <shlguid.h>
#include <time.h> #include <time.h>
@ -11,6 +8,7 @@
#include "eax-util.h" #include "eax-util.h"
#include "mss.h" #include "mss.h"
#include "common.h"
#include "sampman.h" #include "sampman.h"
#include "AudioManager.h" #include "AudioManager.h"
#include "MusicManager.h" #include "MusicManager.h"

View file

@ -1,17 +1,11 @@
//#define JUICY_OAL //#define JUICY_OAL
#ifdef AUDIO_OAL #ifdef AUDIO_OAL
#include "sampman.h"
#include <time.h> #include <time.h>
#include "eax.h" #include "eax.h"
#include "eax-util.h" #include "eax-util.h"
#define WITHWINDOWS
#include "common.h"
#include "crossplatform.h"
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>
#include <AL/al.h> #include <AL/al.h>
@ -19,8 +13,24 @@
#include <AL/alext.h> #include <AL/alext.h>
#include <AL/efx.h> #include <AL/efx.h>
#include <AL/efx-presets.h> #include <AL/efx-presets.h>
// for user MP3s
#include <direct.h>
#include <shlobj.h>
#include <shlguid.h>
#else
#define _getcwd getcwd
#endif #endif
#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
#pragma comment( lib, "OpenAL32.lib" )
#endif
#include "common.h"
#include "crossplatform.h"
#include "sampman.h"
#include "oal/oal_utils.h" #include "oal/oal_utils.h"
#include "oal/aldlist.h" #include "oal/aldlist.h"
#include "oal/channel.h" #include "oal/channel.h"
@ -38,19 +48,6 @@
//TODO: max channels //TODO: max channels
//TODO: loop count //TODO: loop count
#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
#pragma comment( lib, "OpenAL32.lib" )
#endif
// for user MP3s
#ifdef _WIN32
#include <direct.h>
#include <shobjidl.h>
#include <shlguid.h>
#else
#define _getcwd getcwd
#endif
cSampleManager SampleManager; cSampleManager SampleManager;
bool _bSampmanInitialised = false; bool _bSampmanInitialised = false;

View file

@ -1,6 +1,7 @@
#include "common.h" #include "common.h"
#include "TempColModels.h" #include "TempColModels.h"
#include "Game.h"
CColModel CTempColModels::ms_colModelPed1; CColModel CTempColModels::ms_colModelPed1;
CColModel CTempColModels::ms_colModelPed2; CColModel CTempColModels::ms_colModelPed2;

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Collision.h" #include "ColModel.h"
class CTempColModels class CTempColModels
{ {

View file

@ -1,11 +1,10 @@
#pragma once #pragma once
#include "Automobile.h"
#include "audio_enums.h" #include "audio_enums.h"
#include "Camera.h" #include "Camera.h"
#include "config.h" #include "config.h"
#include "Lists.h"
class CVehicle; class CVehicle;
class CCamera;
enum eGarageState enum eGarageState
{ {

View file

@ -1,7 +1,5 @@
#pragma once #pragma once
#include "common.h"
#include "Font.h" #include "Font.h"
#include "Ped.h"
#include "PedType.h" #include "PedType.h"
#include "Text.h" #include "Text.h"
#include "Sprite2d.h" #include "Sprite2d.h"
@ -38,9 +36,11 @@ void FlushLog();
#define SPHERE_MARKER_PULSE_FRACTION 0.1f #define SPHERE_MARKER_PULSE_FRACTION 0.1f
#ifdef USE_PRECISE_MEASUREMENT_CONVERTION #ifdef USE_PRECISE_MEASUREMENT_CONVERTION
#define MILES_IN_METER (0.000621371192f)
#define METERS_IN_FOOT (0.3048f) #define METERS_IN_FOOT (0.3048f)
#define FEET_IN_METER (3.28084f) #define FEET_IN_METER (3.28084f)
#else #else
#define MILES_IN_METER (1 / 1670.f)
#define METERS_IN_FOOT (0.3f) #define METERS_IN_FOOT (0.3f)
#define FEET_IN_METER (3.33f) #define FEET_IN_METER (3.33f)
#endif #endif

View file

@ -34,6 +34,7 @@
#include "Zones.h" #include "Zones.h"
#include "GameLogic.h" #include "GameLogic.h"
#include "Bike.h" #include "Bike.h"
#include "Wanted.h"
int8 CRunningScript::ProcessCommands500To599(int32 command) int8 CRunningScript::ProcessCommands500To599(int32 command)
{ {

View file

@ -39,6 +39,7 @@
#include "World.h" #include "World.h"
#include "Zones.h" #include "Zones.h"
#include "Bike.h" #include "Bike.h"
#include "Wanted.h"
#ifdef FIX_BUGS #ifdef FIX_BUGS
static bool IsSlideObjectUsedWrongByScript(const CVector& posTarget, const CVector& slideBy) static bool IsSlideObjectUsedWrongByScript(const CVector& posTarget, const CVector& slideBy)

View file

@ -1,11 +1,7 @@
#if defined RW_D3D9 || defined RWLIBS #define WITHDINPUT
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
#endif
#include "common.h" #include "common.h"
#include "platform.h" #include "platform.h"
#include "crossplatform.h" // for Windows version #include "crossplatform.h"
#include "ControllerConfig.h" #include "ControllerConfig.h"
#include "Pad.h" #include "Pad.h"
#include "FileMgr.h" #include "FileMgr.h"

View file

@ -1,10 +1,6 @@
#if defined RW_D3D9 || defined RWLIBS
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
#endif
#define FORCE_PC_SCALING #define FORCE_PC_SCALING
#define WITHWINDOWS #define WITHWINDOWS
#define WITHDINPUT
#include "common.h" #include "common.h"
#ifndef PS2_MENU #ifndef PS2_MENU
#include "crossplatform.h" #include "crossplatform.h"

View file

@ -1,6 +1,3 @@
#pragma warning( push )
#pragma warning( disable : 4005)
#pragma warning( pop )
#include "common.h" #include "common.h"
#include "platform.h" #include "platform.h"
@ -10,7 +7,6 @@
#include "Accident.h" #include "Accident.h"
#include "Antennas.h" #include "Antennas.h"
#include "Bridge.h" #include "Bridge.h"
#include "Camera.h"
#include "CarCtrl.h" #include "CarCtrl.h"
#include "CarGen.h" #include "CarGen.h"
#include "CdStream.h" #include "CdStream.h"
@ -69,7 +65,6 @@
#include "Skidmarks.h" #include "Skidmarks.h"
#include "SetPieces.h" #include "SetPieces.h"
#include "SpecialFX.h" #include "SpecialFX.h"
#include "Sprite2d.h"
#include "Stats.h" #include "Stats.h"
#include "Streaming.h" #include "Streaming.h"
#include "SurfaceTable.h" #include "SurfaceTable.h"

View file

@ -1,7 +1,5 @@
#pragma once #pragma once
#include "common.h"
class CPtrNode class CPtrNode
{ {
public: public:

View file

@ -1,11 +1,4 @@
#pragma warning( push ) #define WITHDINPUT
#pragma warning( disable : 4005)
#if defined RW_D3D9 || defined RWLIBS
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
#endif
#pragma warning( pop )
#include "common.h" #include "common.h"
#include "crossplatform.h" #include "crossplatform.h"
#include "platform.h" #include "platform.h"

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Collision.h" #include "ColModel.h"
enum eWastedBustedState enum eWastedBustedState
{ {

View file

@ -4,7 +4,6 @@
#include "CopPed.h" #include "CopPed.h"
#include "CutsceneMgr.h" #include "CutsceneMgr.h"
#include "DMAudio.h" #include "DMAudio.h"
#include "Entity.h"
#include "EventList.h" #include "EventList.h"
#include "Explosion.h" #include "Explosion.h"
#include "Fire.h" #include "Fire.h"
@ -12,11 +11,8 @@
#include "Glass.h" #include "Glass.h"
#include "Messages.h" #include "Messages.h"
#include "ModelIndices.h" #include "ModelIndices.h"
#include "Object.h"
#include "ParticleObject.h" #include "ParticleObject.h"
#include "Ped.h"
#include "Pickups.h" #include "Pickups.h"
#include "PlayerPed.h"
#include "Population.h" #include "Population.h"
#include "ProjectileInfo.h" #include "ProjectileInfo.h"
#include "Record.h" #include "Record.h"
@ -25,7 +21,6 @@
#include "RpAnimBlend.h" #include "RpAnimBlend.h"
#include "Shadows.h" #include "Shadows.h"
#include "TempColModels.h" #include "TempColModels.h"
#include "Vehicle.h"
#include "WaterLevel.h" #include "WaterLevel.h"
#include "World.h" #include "World.h"

View file

@ -3,6 +3,7 @@
#include "Game.h" #include "Game.h"
#include "Lists.h" #include "Lists.h"
#include "PlayerInfo.h" #include "PlayerInfo.h"
#include "Collision.h"
/* Sectors span from -2400 to 1600 in x and -2000 to 2000 y. /* Sectors span from -2400 to 1600 in x and -2000 to 2000 y.
* With 80x80 sectors, each is 50x50 units. */ * With 80x80 sectors, each is 50x50 units. */
@ -48,11 +49,6 @@ public:
VALIDATE_SIZE(CSector, 0x28); VALIDATE_SIZE(CSector, 0x28);
class CEntity;
struct CColPoint;
struct CColLine;
struct CStoredCollPoly;
class CWorld class CWorld
{ {
static CPtrList ms_bigBuildingsList[NUM_LEVELS]; static CPtrList ms_bigBuildingsList[NUM_LEVELS];

View file

@ -103,8 +103,8 @@ public:
static void SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity); static void SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity);
static void SetPedGroup(uint16 zoneid, uint8 day, uint16 pedgroup); static void SetPedGroup(uint16 zoneid, uint8 day, uint16 pedgroup);
static int16 FindAudioZone(CVector *pos); static int16 FindAudioZone(CVector *pos);
static CZone *GetPointerForZoneIndex(int32 i) { return i == -1 ? nil : &NavigationZoneArray[i]; } static CZone *GetPointerForZoneIndex(ssize_t i) { return i == -1 ? nil : &NavigationZoneArray[i]; }
static int32 GetIndexForZonePointer(CZone *zone) { return zone == nil ? -1 : zone - NavigationZoneArray; } static ssize_t GetIndexForZonePointer(CZone *zone) { return zone == nil ? -1 : zone - NavigationZoneArray; }
static void AddZoneToAudioZoneArray(CZone *zone); static void AddZoneToAudioZoneArray(CZone *zone);
static void InitialiseAudioZoneArray(void); static void InitialiseAudioZoneArray(void);
static void SaveAllZones(uint8 *buffer, uint32 *length); static void SaveAllZones(uint8 *buffer, uint32 *length);

View file

@ -11,18 +11,35 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#if defined _WIN32 && defined WITHWINDOWS #if !defined RW_D3D9 && defined LIBRW
#undef WITHD3D
#undef WITHDINPUT
#endif
#if (defined WITHD3D && !defined LIBRW)
#define WITHWINDOWS
#endif
#if defined _WIN32 && defined WITHWINDOWS && !defined _INC_WINDOWS
#include <windows.h> #include <windows.h>
#endif #endif
#if defined _WIN32 && defined WITHD3D #ifdef WITHD3D
#include <windows.h> #ifdef LIBRW
#define WITH_D3D // librw includes d3d9 itself via this right now
#else
#ifndef USE_D3D9 #ifndef USE_D3D9
#include <d3d8types.h> #include <d3d8types.h>
#else #else
#include <d3d9types.h> #include <d3d9types.h>
#endif #endif
#endif #endif
#endif
#ifdef WITHDINPUT
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
#endif
#include <rwcore.h> #include <rwcore.h>
#include <rpworld.h> #include <rpworld.h>
@ -52,14 +69,6 @@
#define rwVENDORID_ROCKSTAR 0x0253F2 #define rwVENDORID_ROCKSTAR 0x0253F2
// Get rid of bullshit windows definitions, we're not running on an 8086
#ifdef far
#undef far
#endif
#ifdef near
#undef near
#endif
#define Max(a,b) ((a) > (b) ? (a) : (b)) #define Max(a,b) ((a) > (b) ? (a) : (b))
#define Min(a,b) ((a) < (b) ? (a) : (b)) #define Min(a,b) ((a) < (b) ? (a) : (b))

View file

@ -1,7 +1,6 @@
#include <csignal> #include <csignal>
#define WITHWINDOWS #define WITHWINDOWS
#include "common.h" #include "common.h"
#include "crossplatform.h"
#include "Renderer.h" #include "Renderer.h"
#include "Occlusion.h" #include "Occlusion.h"
#include "Credits.h" #include "Credits.h"
@ -39,6 +38,10 @@
#include "ControllerConfig.h" #include "ControllerConfig.h"
#endif #endif
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
#include "crossplatform.h"
#endif
#ifndef _WIN32 #ifndef _WIN32
#include "assert.h" #include "assert.h"
#include <stdarg.h> #include <stdarg.h>

View file

@ -1,4 +1,4 @@
#define WITH_D3D #define WITHD3D
#include "common.h" #include "common.h"
#ifdef EXTENDED_PIPELINES #ifdef EXTENDED_PIPELINES

View file

@ -1,4 +1,4 @@
#define WITH_D3D #define WITHD3D
#include "common.h" #include "common.h"
#ifdef RW_D3D9 #ifdef RW_D3D9

View file

@ -1,5 +1,4 @@
#define WITHWINDOWS #define WITHD3D
#define WITH_D3D
#include "common.h" #include "common.h"
#ifdef EXTENDED_COLOURFILTER #ifdef EXTENDED_COLOURFILTER

View file

@ -1,4 +1,4 @@
#define WITH_D3D #define WITHD3D
#include "common.h" #include "common.h"
#ifdef SCREEN_DROPLETS #ifdef SCREEN_DROPLETS

View file

@ -1,5 +1,5 @@
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#define WITH_D3D #define WITH_D3D // not WITHD3D, so it's librw define
#include <rwcore.h> #include <rwcore.h>
#include <rpworld.h> #include <rpworld.h>
#include <rpmatfx.h> #include <rpmatfx.h>

View file

@ -5,6 +5,7 @@
#include "2dEffect.h" #include "2dEffect.h"
#include "BaseModelInfo.h" #include "BaseModelInfo.h"
#include "ModelInfo.h" #include "ModelInfo.h"
#include "ColModel.h"
CBaseModelInfo::CBaseModelInfo(ModelInfoType type) CBaseModelInfo::CBaseModelInfo(ModelInfoType type)
{ {

View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Collision.h" struct CColModel;
#define MAX_MODEL_NAME (21) #define MAX_MODEL_NAME (21)

View file

@ -1,14 +1,13 @@
#pragma once #pragma once
#include "2dEffect.h" #include "2dEffect.h"
#include "BaseModelInfo.h"
#include "SimpleModelInfo.h" #include "SimpleModelInfo.h"
#include "TimeModelInfo.h" #include "TimeModelInfo.h"
#include "WeaponModelInfo.h" #include "WeaponModelInfo.h"
#include "ClumpModelInfo.h" #include "ClumpModelInfo.h"
#include "PedModelInfo.h" #include "PedModelInfo.h"
#include "VehicleModelInfo.h" #include "VehicleModelInfo.h"
#include "Instance.h" #include "templates.h"
class CModelInfo class CModelInfo
{ {

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "ClumpModelInfo.h" #include "ClumpModelInfo.h"
#include "ColModel.h"
#include "PedType.h" #include "PedType.h"
enum PedNode { enum PedNode {

View file

@ -38,6 +38,7 @@
#include "WindModifiers.h" #include "WindModifiers.h"
#include "CutsceneShadow.h" #include "CutsceneShadow.h"
#include "Clock.h" #include "Clock.h"
#include "Wanted.h"
CPed *gapTempPedList[50]; CPed *gapTempPedList[50];
uint16 gnNumTempPedList; uint16 gnNumTempPedList;

View file

@ -9,8 +9,8 @@
#include "Physical.h" #include "Physical.h"
#include "Weapon.h" #include "Weapon.h"
#include "WeaponInfo.h" #include "WeaponInfo.h"
#include "AnimationId.h"
#include "PathFind.h" #include "PathFind.h"
#include "Collision.h"
#define FEET_OFFSET 1.04f #define FEET_OFFSET 1.04f
#define CHECK_NEARBY_THINGS_MAX_DIST 15.0f #define CHECK_NEARBY_THINGS_MAX_DIST 15.0f

View file

@ -1,4 +1,3 @@
#define WITHWINDOWS
#ifndef LIBRW #ifndef LIBRW
#define WITHD3D #define WITHD3D
#endif #endif

View file

@ -1,4 +1,4 @@
#define WITH_D3D #define WITHD3D
#include "common.h" #include "common.h"
#include "main.h" #include "main.h"

View file

@ -1,10 +1,10 @@
#include "common.h"
#include "WaterCreatures.h" #include "WaterCreatures.h"
#include "ModelIndices.h" #include "ModelIndices.h"
#include "World.h" #include "World.h"
#include "WaterLevel.h" #include "WaterLevel.h"
#include "Camera.h" #include "Camera.h"
#include "PlayerPed.h" #include "PlayerPed.h"
#include "config.h"
#include "General.h" #include "General.h"
int CWaterCreatures::nNumActiveSeaLifeForms; int CWaterCreatures::nNumActiveSeaLifeForms;

View file

@ -1,6 +1,4 @@
#if defined RW_D3D9 || defined RWLIBS
#define WITHD3D #define WITHD3D
#endif
#include "common.h" #include "common.h"
#include "Timecycle.h" #include "Timecycle.h"

View file

@ -1,6 +1,7 @@
#define WITHWINDOWS #define WITHWINDOWS
#include "common.h" #include "common.h"
#ifdef PS2_MENU #ifdef PS2_MENU
#include "crossplatform.h"
#include "MemoryCard.h" #include "MemoryCard.h"
#include "main.h" #include "main.h"
#include "DMAudio.h" #include "DMAudio.h"

View file

@ -1,22 +1,30 @@
#if defined RW_GL3 && !defined LIBRW_SDL2 #if defined RW_GL3 && !defined LIBRW_SDL2
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <shlobj.h>
#include <basetsd.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <regstr.h>
#include <shellapi.h> #include <shellapi.h>
#include <windowsx.h> #include <windowsx.h>
#include <basetsd.h>
#include <regstr.h> DWORD _dwOperatingSystemVersion;
#include <shlobj.h> #include "resource.h"
#else
long _dwOperatingSystemVersion;
#ifndef __APPLE__
#include <sys/sysinfo.h>
#else
#include <mach/mach_host.h>
#include <sys/sysctl.h>
#endif
#include <errno.h>
#include <locale.h>
#include <signal.h>
#include <stddef.h>
#endif #endif
#define WITHWINDOWS
#include "common.h" #include "common.h"
#pragma warning( push )
#pragma warning( disable : 4005)
#pragma warning( pop )
#if (defined(_MSC_VER)) #if (defined(_MSC_VER))
#include <tchar.h> #include <tchar.h>
#endif /* (defined(_MSC_VER)) */ #endif /* (defined(_MSC_VER)) */
@ -72,23 +80,6 @@ static psGlobalType PsGlobal;
size_t _dwMemAvailPhys; size_t _dwMemAvailPhys;
RwUInt32 gGameState; RwUInt32 gGameState;
#ifdef _WIN32
DWORD _dwOperatingSystemVersion;
#include "resource.h"
#else
long _dwOperatingSystemVersion;
#ifndef __APPLE__
#include <sys/sysinfo.h>
#else
#include <mach/mach_host.h>
#include <sys/sysctl.h>
#endif
#include <stddef.h>
#include <locale.h>
#include <signal.h>
#include <errno.h>
#endif
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS #ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
char gSelectedJoystickName[128] = ""; char gSelectedJoystickName[128] = "";
#endif #endif

View file

@ -2,7 +2,6 @@
#define _WIN32_WINDOWS 0x0500 #define _WIN32_WINDOWS 0x0500
#define WINVER 0x0500 #define WINVER 0x0500
#define DIRECTINPUT_VERSION 0x0800
#include <winerror.h> #include <winerror.h>
#include <windows.h> #include <windows.h>
@ -20,13 +19,7 @@
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4005) #pragma warning( disable : 4005)
#ifdef USE_D3D9
#include <d3d9.h>
#else
#include <d3d8.h>
#endif
#include <ddraw.h> #include <ddraw.h>
#include <dinput.h>
#include <DShow.h> #include <DShow.h>
#pragma warning( pop ) #pragma warning( pop )
@ -41,6 +34,9 @@
#pragma comment( lib, "strmiids.lib" ) #pragma comment( lib, "strmiids.lib" )
#pragma comment( lib, "dinput8.lib" ) #pragma comment( lib, "dinput8.lib" )
#define WITHD3D
#define WITHDINPUT
#include "common.h"
#if (defined(_MSC_VER)) #if (defined(_MSC_VER))
#include <tchar.h> #include <tchar.h>
#endif /* (defined(_MSC_VER)) */ #endif /* (defined(_MSC_VER)) */
@ -81,7 +77,6 @@ static psGlobalType PsGlobal;
#define JIF(x) if (FAILED(hr=(x))) \ #define JIF(x) if (FAILED(hr=(x))) \
{debug(TEXT("FAILED(hr=0x%x) in ") TEXT(#x) TEXT("\n"), hr); return;} {debug(TEXT("FAILED(hr=0x%x) in ") TEXT(#x) TEXT("\n"), hr); return;}
#include "common.h"
#include "main.h" #include "main.h"
#include "FileMgr.h" #include "FileMgr.h"
#include "Text.h" #include "Text.h"
@ -92,12 +87,14 @@ static psGlobalType PsGlobal;
#include "Frontend.h" #include "Frontend.h"
#include "Game.h" #include "Game.h"
#include "PCSave.h" #include "PCSave.h"
#include "MemoryCard.h"
#include "Sprite2d.h"
#include "AnimViewer.h" #include "AnimViewer.h"
#include "Font.h"
#include "MemoryMgr.h" #include "MemoryMgr.h"
#ifdef PS2_MENU
#include "MemoryCard.h"
#include "Font.h"
#endif
VALIDATE_SIZE(psGlobalType, 0x28); VALIDATE_SIZE(psGlobalType, 0x28);
// DirectShow interfaces // DirectShow interfaces

View file

@ -49,6 +49,7 @@
#include "Object.h" #include "Object.h"
#include "Automobile.h" #include "Automobile.h"
#include "Bike.h" #include "Bike.h"
#include "Wanted.h"
bool bAllCarCheat; bool bAllCarCheat;

View file

@ -2,6 +2,7 @@
#include "Vehicle.h" #include "Vehicle.h"
#include "Skidmarks.h" #include "Skidmarks.h"
#include "AnimManager.h"
enum eBikeNodes { enum eBikeNodes {
BIKE_NODE_NONE, BIKE_NODE_NONE,

View file

@ -27,6 +27,7 @@
#include "RpAnimBlend.h" #include "RpAnimBlend.h"
#include "Record.h" #include "Record.h"
#include "Shadows.h" #include "Shadows.h"
#include "Wanted.h"
#define INVALID_ORIENTATION (-9999.99f) #define INVALID_ORIENTATION (-9999.99f)

View file

@ -3,15 +3,15 @@
#include "Physical.h" #include "Physical.h"
#include "AutoPilot.h" #include "AutoPilot.h"
#include "ModelIndices.h" #include "ModelIndices.h"
#include "AnimManager.h" #include "AnimationId.h"
#include "Weapon.h" #include "WeaponType.h"
#include "Collision.h"
#include "HandlingMgr.h" #include "HandlingMgr.h"
class CPed; class CPed;
class CPlayerPed; class CPlayerPed;
class CCopPed; class CCopPed;
class CFire; class CFire;
struct tHandlingData;
enum { enum {
RANDOM_VEHICLE = 1, RANDOM_VEHICLE = 1,