The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-22 00:59:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes after merge, update librw

Browse Source
This commit is contained in:
GaryOderNichts 2021-08-21 19:51:56 +02:00
parent fc5bc0cb18
commit b2f47c926e
5 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,7 +38,7 @@ SOURCES := src \
src/modelinfo \ src/modelinfo \
src/objects \ src/objects \
src/peds \ src/peds \
src/render \ src/renderer \
src/rw \ src/rw \
src/save \ src/save \
src/skel \ src/skel \

19
src/audio/oal/stream.cpp
View File

@ -2,6 +2,8 @@
#ifdef AUDIO_OAL #ifdef AUDIO_OAL
#include <malloc.h>
#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK #if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
#ifdef AUDIO_OAL_USE_SNDFILE #ifdef AUDIO_OAL_USE_SNDFILE
#pragma comment( lib, "libsndfile-1.lib" ) #pragma comment( lib, "libsndfile-1.lib" )
@ -679,6 +681,21 @@ public:
#endif #endif
#ifdef AUDIO_OAL_USE_MPG123 #ifdef AUDIO_OAL_USE_MPG123
static ssize_t mpg123_read_replacement(void* handle, void* data, size_t size)
{
return fread(data, 1, size, (FILE*)handle);
}
static off_t mpg123_seek_replacement(void* handle, off_t offset, int whence)
{
fseek((FILE*)handle, offset, whence);
return ftell((FILE*)handle);
}
static void mpg123_close_replacement(void* handle)
{
fclose((FILE*)handle);
}
class CMP3File : public IDecoder class CMP3File : public IDecoder
{ {
@ -1383,7 +1400,7 @@ bool CStream::Open(const char* filename, uint32 overrideSampleRate)
// Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/) // Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
#if !defined(_WIN32) #if !defined(_WIN32)
char *real = casepath(filename); char *real = casepath(filename, false);
if (real) { if (real) {
strcpy(m_aFilename, real); strcpy(m_aFilename, real);
free(real); free(real);

10
src/audio/sampman_oal.cpp
View File

@ -18,6 +18,8 @@
#include <direct.h> #include <direct.h>
#include <shlobj.h> #include <shlobj.h>
#include <shlguid.h> #include <shlguid.h>
#elif defined(__WIIU__)
extern "C" char *_getcwd (char *__buf, size_t __size);
#else #else
#define _getcwd getcwd #define _getcwd getcwd
#endif #endif
@ -53,12 +55,6 @@
//TODO: fix eax3 reverb //TODO: fix eax3 reverb
#ifdef __WIIU__
extern "C" char *_getcwd (char *__buf, size_t __size);
#else
#define _getcwd getcwd
#endif
cSampleManager SampleManager; cSampleManager SampleManager;
bool8 _bSampmanInitialised = FALSE; bool8 _bSampmanInitialised = FALSE;
@ -481,7 +477,7 @@ _FindMP3s(void)
strcat(path, "\\MP3\\"); strcat(path, "\\MP3\\");
#if !defined(_WIN32) #if !defined(_WIN32)
char *actualPath = casepath(path); char *actualPath = casepath(path, false);
if (actualPath) { if (actualPath) {
strcpy(path, actualPath); strcpy(path, actualPath);
free(actualPath); free(actualPath);

10
src/skel/wiiu/wiiu.cpp
View File

@ -951,10 +951,12 @@ main(int argc, char *argv[])
#ifdef LOAD_INI_SETTINGS #ifdef LOAD_INI_SETTINGS
LoadINIControllerSettings(); LoadINIControllerSettings();
if (connectedPadButtons != 0) { if (connectedPadButtons != 0)
ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons); ControlsManager.InitDefaultControlConfigJoyPad(connectedPadButtons); // add (connected-saved) amount of new button assignments on top of ours
SaveINIControllerSettings();
} // these have 2 purposes: creating .ini at the start, and adding newly introduced settings to old .ini at the start
SaveINISettings();
SaveINIControllerSettings();
#endif #endif
} }

2
vendor/librw vendored

@ -1 +1 @@
Subproject commit 2e731f8d94013662ed62b4689e5873cc1189ac1d Subproject commit 4d094c41d2f19dae2a6efc082a77256d01584414