diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 23:19:25 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 23:19:25 +0200 |
commit | 6a7bd0e3304caa331e6b095efdb7ddbeceb08293 (patch) | |
tree | df812c11da162c563c3484e0dfe1851dd1a61e82 /src | |
parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
parent | Merge branch 'master' into miami (diff) | |
download | re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.gz re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.bz2 re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.lz re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.xz re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.tar.zst re3-6a7bd0e3304caa331e6b095efdb7ddbeceb08293.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/audio/oal/channel.cpp | 4 | ||||
-rw-r--r-- | src/audio/oal/channel.h | 1 | ||||
-rw-r--r-- | src/audio/oal/oal_utils.cpp | 1 | ||||
-rw-r--r-- | src/audio/oal/oal_utils.h | 1 | ||||
-rw-r--r-- | src/audio/oal/stream.cpp | 8 | ||||
-rw-r--r-- | src/audio/oal/stream.h | 1 | ||||
-rw-r--r-- | src/audio/sampman_miles.cpp | 4 | ||||
-rw-r--r-- | src/audio/sampman_oal.cpp | 4 | ||||
-rw-r--r-- | src/core/Timer.h | 2 | ||||
-rw-r--r-- | src/core/config.h | 5 | ||||
-rw-r--r-- | src/skel/skeleton.h | 10 | ||||
-rw-r--r-- | src/vehicles/Cranes.cpp | 2 |
12 files changed, 18 insertions, 25 deletions
diff --git a/src/audio/oal/channel.cpp b/src/audio/oal/channel.cpp index 6fe1d856..731e3581 100644 --- a/src/audio/oal/channel.cpp +++ b/src/audio/oal/channel.cpp @@ -1,7 +1,7 @@ -#include "channel.h" +#include "common.h" #ifdef AUDIO_OAL -#include "common.h" +#include "channel.h" #include "sampman.h" #ifndef _WIN32 diff --git a/src/audio/oal/channel.h b/src/audio/oal/channel.h index 4dd09ca1..0c86bdc6 100644 --- a/src/audio/oal/channel.h +++ b/src/audio/oal/channel.h @@ -1,5 +1,4 @@ #pragma once -#include "common.h" #ifdef AUDIO_OAL #include "oal/oal_utils.h" diff --git a/src/audio/oal/oal_utils.cpp b/src/audio/oal/oal_utils.cpp index 4119672f..e16de572 100644 --- a/src/audio/oal/oal_utils.cpp +++ b/src/audio/oal/oal_utils.cpp @@ -1,3 +1,4 @@ +#include "common.h" #include "oal_utils.h" #ifdef AUDIO_OAL diff --git a/src/audio/oal/oal_utils.h b/src/audio/oal/oal_utils.h index af45a944..b89ccf36 100644 --- a/src/audio/oal/oal_utils.h +++ b/src/audio/oal/oal_utils.h @@ -1,5 +1,4 @@ #pragma once -#include "common.h" #ifdef AUDIO_OAL #include "eax.h" diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp index 5a9c7d7d..34518f54 100644 --- a/src/audio/oal/stream.cpp +++ b/src/audio/oal/stream.cpp @@ -1,11 +1,9 @@ -#include "stream.h" +#include "common.h" #ifdef AUDIO_OAL -#include "common.h" +#include "stream.h" #include "sampman.h" -#include <sndfile.h> -#include <mpg123.h> #ifdef _WIN32 typedef long ssize_t; #pragma comment( lib, "libsndfile-1.lib" ) @@ -13,6 +11,8 @@ typedef long ssize_t; #else #include "crossplatform.h" #endif +#include <sndfile.h> +#include <mpg123.h> class CSndFile : public IDecoder { diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h index f1e5f458..456c080a 100644 --- a/src/audio/oal/stream.h +++ b/src/audio/oal/stream.h @@ -1,5 +1,4 @@ #pragma once -#include "common.h" #ifdef AUDIO_OAL #include <AL/al.h> diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index ad2c512f..d625ac35 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1445,7 +1445,7 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank) bool cSampleManager::IsPedCommentLoaded(uint32 nComment) { - uint8 slot; + int8 slot; for ( int32 i = 0; i < _TODOCONST(3); i++ ) { @@ -1464,7 +1464,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment) int32 cSampleManager::_GetPedCommentSlot(uint32 nComment) { - uint8 slot; + int8 slot; for ( int32 i = 0; i < _TODOCONST(3); i++ ) { diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index f16afbba..f6f3a393 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -775,7 +775,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment) { ASSERT( nComment < TOTAL_AUDIO_SAMPLES ); - uint8 slot; + int8 slot; for ( int32 i = 0; i < _TODOCONST(3); i++ ) { @@ -795,7 +795,7 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment) int32 cSampleManager::_GetPedCommentSlot(uint32 nComment) { - uint8 slot; + int8 slot; for (int32 i = 0; i < _TODOCONST(3); i++) { diff --git a/src/core/Timer.h b/src/core/Timer.h index 004cda4d..e7b6fec8 100644 --- a/src/core/Timer.h +++ b/src/core/Timer.h @@ -58,7 +58,7 @@ public: friend bool GenericSave(int file); #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(); } #endif }; diff --git a/src/core/config.h b/src/core/config.h index 4d1a5996..ea31a3c8 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -201,11 +201,6 @@ enum Config { #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 USE_TEXTURE_POOL -#ifdef _WIN32 -#define AUDIO_MSS -#else -#define AUDIO_OAL -#endif #ifdef DEBUGMENU #define RELOADABLES // some debug menu options to reload TXD files #endif diff --git a/src/skel/skeleton.h b/src/skel/skeleton.h index 9826f919..b5ea5abf 100644 --- a/src/skel/skeleton.h +++ b/src/skel/skeleton.h @@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param); extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param); extern RsEventStatus RsPadEventHandler(RsEvent event, void *param); -extern RwBool +extern RwBool RsInitialize(void); -extern RwBool +extern RwBool RsRegisterImageLoader(void); -extern RwBool +extern RwBool RsRwInitialize(void *param); -extern RwBool +extern RwBool RsSelectDevice(void); -extern RwBool +extern RwBool RsInputDeviceAttach(RsInputDeviceType inputDevice, RsInputEventHandler inputEventHandler); diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index 5a165c00..dbe4fd2e 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -187,7 +187,7 @@ bool CCranes::IsThisCarPickedUp(float X, float Y, CVehicle* pVehicle) result = true; } } - return true; + return result; } void CCranes::UpdateCranes(void) |