mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 12:10:00 +00:00
Merge branch 'master' into miami
# Conflicts: # premake5.lua # src/control/Script.cpp # src/core/SurfaceTable.cpp # src/core/config.h # src/entities/Physical.cpp # src/entities/Physical.h # src/objects/Object.h # src/skel/skeleton.h # src/vehicles/Vehicle.h
This commit is contained in:
commit
88b6168f1c
|
@ -12,7 +12,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
|
||||||
#ifndef OPENAL
|
#ifndef AUDIO_OAL
|
||||||
#include <dsound.h>
|
#include <dsound.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -49,13 +49,9 @@ extern "C" {
|
||||||
typedef void (CDECL *LPGETCURRENTVERSION)(LPDWORD major, LPDWORD minor);
|
typedef void (CDECL *LPGETCURRENTVERSION)(LPDWORD major, LPDWORD minor);
|
||||||
|
|
||||||
|
|
||||||
#else // OPENAL
|
#else // AUDIO_OAL
|
||||||
#ifndef _WIN32
|
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#else
|
|
||||||
#include <al.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef GUID_DEFINED
|
#ifndef GUID_DEFINED
|
||||||
#define GUID_DEFINED
|
#define GUID_DEFINED
|
||||||
|
|
26
premake5.lua
26
premake5.lua
|
@ -51,6 +51,9 @@ workspace "reVC"
|
||||||
"win-x86-RW33_d3d8-mss",
|
"win-x86-RW33_d3d8-mss",
|
||||||
"win-x86-librw_d3d9-mss",
|
"win-x86-librw_d3d9-mss",
|
||||||
"win-x86-librw_gl3_glfw-mss",
|
"win-x86-librw_gl3_glfw-mss",
|
||||||
|
"win-x86-RW33_d3d8-oal",
|
||||||
|
"win-x86-librw_d3d9-oal",
|
||||||
|
"win-x86-librw_gl3_glfw-oal",
|
||||||
}
|
}
|
||||||
|
|
||||||
filter { "system:linux" }
|
filter { "system:linux" }
|
||||||
|
@ -184,11 +187,17 @@ project "reVC"
|
||||||
includedirs { "src/extras" }
|
includedirs { "src/extras" }
|
||||||
includedirs { "eax" }
|
includedirs { "eax" }
|
||||||
|
|
||||||
includedirs { "milessdk/include" }
|
|
||||||
includedirs { "eax" }
|
includedirs { "eax" }
|
||||||
|
|
||||||
libdirs { "milessdk/lib" }
|
|
||||||
|
|
||||||
|
filter "platforms:*mss"
|
||||||
|
defines { "AUDIO_MSS" }
|
||||||
|
includedirs { "milessdk/include" }
|
||||||
|
libdirs { "milessdk/lib" }
|
||||||
|
|
||||||
|
filter "platforms:*oal"
|
||||||
|
defines { "AUDIO_OAL" }
|
||||||
|
|
||||||
|
filter {}
|
||||||
if(os.getenv("GTA_VC_RE_DIR")) then
|
if(os.getenv("GTA_VC_RE_DIR")) then
|
||||||
setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "")
|
setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "")
|
||||||
end
|
end
|
||||||
|
@ -200,8 +209,15 @@ project "reVC"
|
||||||
characterset ("MBCS")
|
characterset ("MBCS")
|
||||||
targetextension ".exe"
|
targetextension ".exe"
|
||||||
|
|
||||||
filter "platforms:linux*"
|
filter "platforms:win*oal"
|
||||||
defines { "OPENAL" }
|
includedirs { "openal-soft/include" }
|
||||||
|
includedirs { "libsndfile/include" }
|
||||||
|
includedirs { "mpg123/include" }
|
||||||
|
libdirs { "openal-soft/libs/Win32" }
|
||||||
|
libdirs { "libsndfile/lib" }
|
||||||
|
libdirs { "mpg123/lib" }
|
||||||
|
|
||||||
|
filter "platforms:linux*oal"
|
||||||
links { "openal", "mpg123", "sndfile", "pthread" }
|
links { "openal", "mpg123", "sndfile", "pthread" }
|
||||||
|
|
||||||
filter "platforms:*RW33*"
|
filter "platforms:*RW33*"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "channel.h"
|
#include "common.h"
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
#include "common.h"
|
#include "channel.h"
|
||||||
#include "sampman.h"
|
#include "sampman.h"
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
#include "oal/oal_utils.h"
|
#include "oal/oal_utils.h"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include "common.h"
|
||||||
#include "oal_utils.h"
|
#include "oal_utils.h"
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
#include "eax.h"
|
#include "eax.h"
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
#include "stream.h"
|
#include "common.h"
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
#include "common.h"
|
#include "stream.h"
|
||||||
#include "sampman.h"
|
#include "sampman.h"
|
||||||
|
|
||||||
#include <sndfile.h>
|
|
||||||
#include <mpg123.h>
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
typedef long ssize_t;
|
typedef long ssize_t;
|
||||||
#pragma comment( lib, "libsndfile-1.lib" )
|
#pragma comment( lib, "libsndfile-1.lib" )
|
||||||
|
@ -13,6 +11,8 @@ typedef long ssize_t;
|
||||||
#else
|
#else
|
||||||
#include "crossplatform.h"
|
#include "crossplatform.h"
|
||||||
#endif
|
#endif
|
||||||
|
#include <sndfile.h>
|
||||||
|
#include <mpg123.h>
|
||||||
|
|
||||||
class CSndFile : public IDecoder
|
class CSndFile : public IDecoder
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
|
|
|
@ -1445,7 +1445,7 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank)
|
||||||
bool
|
bool
|
||||||
cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||||
{
|
{
|
||||||
uint8 slot;
|
int8 slot;
|
||||||
|
|
||||||
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
||||||
{
|
{
|
||||||
|
@ -1464,7 +1464,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||||
int32
|
int32
|
||||||
cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
||||||
{
|
{
|
||||||
uint8 slot;
|
int8 slot;
|
||||||
|
|
||||||
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
||||||
{
|
{
|
||||||
|
|
|
@ -775,7 +775,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||||
{
|
{
|
||||||
ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
|
ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
|
||||||
|
|
||||||
uint8 slot;
|
int8 slot;
|
||||||
|
|
||||||
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
||||||
{
|
{
|
||||||
|
@ -795,7 +795,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||||
int32
|
int32
|
||||||
cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
cSampleManager::_GetPedCommentSlot(uint32 nComment)
|
||||||
{
|
{
|
||||||
uint8 slot;
|
int8 slot;
|
||||||
|
|
||||||
for (int32 i = 0; i < _TODOCONST(3); i++)
|
for (int32 i = 0; i < _TODOCONST(3); i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -58,7 +58,7 @@ public:
|
||||||
friend bool GenericSave(int file);
|
friend bool GenericSave(int file);
|
||||||
|
|
||||||
#ifdef FIX_BUGS
|
#ifdef FIX_BUGS
|
||||||
static float GetDefaultTimeStep(void) { return 5.0f / 3.0f; }
|
static float GetDefaultTimeStep(void) { return 50.0f / 30.0f; }
|
||||||
static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
|
static float GetTimeStepFix(void) { return GetTimeStep() / GetDefaultTimeStep(); }
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -199,11 +199,6 @@ enum Config {
|
||||||
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
|
#define USE_TXD_CDIMAGE // generate and load textures from txd.img
|
||||||
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
|
#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number
|
||||||
//#define USE_TEXTURE_POOL
|
//#define USE_TEXTURE_POOL
|
||||||
#ifdef _WIN32
|
|
||||||
#define AUDIO_MSS
|
|
||||||
#else
|
|
||||||
#define AUDIO_OAL
|
|
||||||
#endif
|
|
||||||
#ifdef DEBUGMENU
|
#ifdef DEBUGMENU
|
||||||
#define RELOADABLES // some debug menu options to reload TXD files
|
#define RELOADABLES // some debug menu options to reload TXD files
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param);
|
||||||
extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
|
extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
|
||||||
extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
|
extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
|
||||||
|
|
||||||
extern RwBool
|
extern RwBool
|
||||||
RsInitialize(void);
|
RsInitialize(void);
|
||||||
|
|
||||||
extern RwBool
|
extern RwBool
|
||||||
RsRegisterImageLoader(void);
|
RsRegisterImageLoader(void);
|
||||||
|
|
||||||
extern RwBool
|
extern RwBool
|
||||||
RsRwInitialize(void *param);
|
RsRwInitialize(void *param);
|
||||||
|
|
||||||
extern RwBool
|
extern RwBool
|
||||||
RsSelectDevice(void);
|
RsSelectDevice(void);
|
||||||
|
|
||||||
extern RwBool
|
extern RwBool
|
||||||
RsInputDeviceAttach(RsInputDeviceType inputDevice,
|
RsInputDeviceAttach(RsInputDeviceType inputDevice,
|
||||||
RsInputEventHandler inputEventHandler);
|
RsInputEventHandler inputEventHandler);
|
||||||
|
|
||||||
|
|
|
@ -187,7 +187,7 @@ bool CCranes::IsThisCarPickedUp(float X, float Y, CVehicle* pVehicle)
|
||||||
result = true;
|
result = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCranes::UpdateCranes(void)
|
void CCranes::UpdateCranes(void)
|
||||||
|
|
Loading…
Reference in a new issue