mirror of
https://github.com/GTAmodding/re3.git
synced 2021-02-19 17:49:54 +01:00
Merge remote-tracking branch 'origin/miami' into lcs
This commit is contained in:
commit
037c332158
12
.github/workflows/reLCS_msvc_amd64.yml
vendored
12
.github/workflows/reLCS_msvc_amd64.yml
vendored
@ -6,13 +6,9 @@ on:
|
|||||||
release:
|
release:
|
||||||
types: published
|
types: published
|
||||||
env:
|
env:
|
||||||
GLEW_VER: "2.1.0"
|
|
||||||
GLFW_VER: "3.3.2"
|
GLFW_VER: "3.3.2"
|
||||||
GLEW_BASE: "glew-2.1.0"
|
|
||||||
GLFW_BASE: "glfw-3.3.2.bin.WIN64"
|
GLFW_BASE: "glfw-3.3.2.bin.WIN64"
|
||||||
GLEW_FILE: "glew-2.1.0-win32.zip"
|
|
||||||
GLFW_FILE: "glfw-3.3.2.bin.WIN64.zip"
|
GLFW_FILE: "glfw-3.3.2.bin.WIN64.zip"
|
||||||
GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
|
|
||||||
GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
|
GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@ -27,11 +23,6 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
submodules: 'true'
|
submodules: 'true'
|
||||||
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
|
|
||||||
name: Download glew
|
|
||||||
uses: carlosperate/download-file-action@v1.0.3
|
|
||||||
with:
|
|
||||||
file-url: ${{env.GLEW_URL}}
|
|
||||||
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
|
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
|
||||||
name: Download glfw
|
name: Download glfw
|
||||||
uses: carlosperate/download-file-action@v1.0.3
|
uses: carlosperate/download-file-action@v1.0.3
|
||||||
@ -40,11 +31,10 @@ jobs:
|
|||||||
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
|
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
|
||||||
name: Unpack archives
|
name: Unpack archives
|
||||||
run: |
|
run: |
|
||||||
7z x ${{env.GLEW_FILE}}
|
|
||||||
7z x ${{env.GLFW_FILE}}
|
7z x ${{env.GLFW_FILE}}
|
||||||
- name: Configure build
|
- name: Configure build
|
||||||
run: |
|
run: |
|
||||||
./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir64=${{env.GLFW_BASE}}
|
./premake5 vs2019 --with-librw --glfwdir64=${{env.GLFW_BASE}}
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
msbuild -m build/reLCS.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
|
msbuild -m build/reLCS.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
|
||||||
|
12
.github/workflows/reLCS_msvc_x86.yml
vendored
12
.github/workflows/reLCS_msvc_x86.yml
vendored
@ -6,13 +6,9 @@ on:
|
|||||||
release:
|
release:
|
||||||
types: published
|
types: published
|
||||||
env:
|
env:
|
||||||
GLEW_VER: "2.1.0"
|
|
||||||
GLFW_VER: "3.3.2"
|
GLFW_VER: "3.3.2"
|
||||||
GLEW_BASE: "glew-2.1.0"
|
|
||||||
GLFW_BASE: "glfw-3.3.2.bin.WIN32"
|
GLFW_BASE: "glfw-3.3.2.bin.WIN32"
|
||||||
GLEW_FILE: "glew-2.1.0-win32.zip"
|
|
||||||
GLFW_FILE: "glfw-3.3.2.bin.WIN32.zip"
|
GLFW_FILE: "glfw-3.3.2.bin.WIN32.zip"
|
||||||
GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
|
|
||||||
GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
|
GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@ -27,11 +23,6 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
submodules: 'true'
|
submodules: 'true'
|
||||||
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
|
|
||||||
name: Download glew
|
|
||||||
uses: carlosperate/download-file-action@v1.0.3
|
|
||||||
with:
|
|
||||||
file-url: ${{env.GLEW_URL}}
|
|
||||||
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
|
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
|
||||||
name: Download glfw
|
name: Download glfw
|
||||||
uses: carlosperate/download-file-action@v1.0.3
|
uses: carlosperate/download-file-action@v1.0.3
|
||||||
@ -40,11 +31,10 @@ jobs:
|
|||||||
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
|
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
|
||||||
name: Unpack archives
|
name: Unpack archives
|
||||||
run: |
|
run: |
|
||||||
7z x ${{env.GLEW_FILE}}
|
|
||||||
7z x ${{env.GLFW_FILE}}
|
7z x ${{env.GLFW_FILE}}
|
||||||
- name: Configure build
|
- name: Configure build
|
||||||
run: |
|
run: |
|
||||||
./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir32=${{env.GLFW_BASE}}
|
./premake5 vs2019 --with-librw --glfwdir32=${{env.GLFW_BASE}}
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
msbuild -m build/reLCS.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
|
msbuild -m build/reLCS.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
|
||||||
|
24
premake5.lua
24
premake5.lua
@ -1,10 +1,3 @@
|
|||||||
newoption {
|
|
||||||
trigger = "glewdir",
|
|
||||||
value = "PATH",
|
|
||||||
description = "Directory of GLEW",
|
|
||||||
default = "vendor/glew-2.1.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
newoption {
|
newoption {
|
||||||
trigger = "glfwdir64",
|
trigger = "glfwdir64",
|
||||||
value = "PATH",
|
value = "PATH",
|
||||||
@ -165,7 +158,6 @@ workspace "reLCS"
|
|||||||
|
|
||||||
filter "platforms:*librw_gl3_glfw*"
|
filter "platforms:*librw_gl3_glfw*"
|
||||||
defines { "RW_GL3" }
|
defines { "RW_GL3" }
|
||||||
includedirs { path.join(_OPTIONS["glewdir"], "include") }
|
|
||||||
if(not _OPTIONS["with-librw"]) then
|
if(not _OPTIONS["with-librw"]) then
|
||||||
libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
|
libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
|
||||||
end
|
end
|
||||||
@ -176,9 +168,6 @@ workspace "reLCS"
|
|||||||
filter "platforms:*amd64-librw_gl3_glfw*"
|
filter "platforms:*amd64-librw_gl3_glfw*"
|
||||||
includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
|
includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
|
||||||
|
|
||||||
filter "platforms:win*librw_gl3_glfw*"
|
|
||||||
defines { "GLEW_STATIC" }
|
|
||||||
|
|
||||||
filter {}
|
filter {}
|
||||||
|
|
||||||
function setpaths (gamepath, exepath)
|
function setpaths (gamepath, exepath)
|
||||||
@ -203,6 +192,7 @@ project "librw"
|
|||||||
targetdir(path.join(Librw, "lib/%{cfg.platform}/%{cfg.buildcfg}"))
|
targetdir(path.join(Librw, "lib/%{cfg.platform}/%{cfg.buildcfg}"))
|
||||||
files { path.join(Librw, "src/*.*") }
|
files { path.join(Librw, "src/*.*") }
|
||||||
files { path.join(Librw, "src/*/*.*") }
|
files { path.join(Librw, "src/*/*.*") }
|
||||||
|
files { path.join(Librw, "src/gl/*/*.*") }
|
||||||
|
|
||||||
filter { "platforms:*x86*" }
|
filter { "platforms:*x86*" }
|
||||||
architecture "x86"
|
architecture "x86"
|
||||||
@ -406,25 +396,23 @@ project "reLCS"
|
|||||||
libdirs { "sdk/dx8sdk/lib" }
|
libdirs { "sdk/dx8sdk/lib" }
|
||||||
|
|
||||||
filter "platforms:win-x86*gl3_glfw*"
|
filter "platforms:win-x86*gl3_glfw*"
|
||||||
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
|
|
||||||
libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
|
libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
|
||||||
links { "opengl32", "glew32s", "glfw3" }
|
links { "opengl32", "glfw3" }
|
||||||
|
|
||||||
filter "platforms:win-amd64*gl3_glfw*"
|
filter "platforms:win-amd64*gl3_glfw*"
|
||||||
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }
|
|
||||||
libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
|
libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
|
||||||
links { "opengl32", "glew32s", "glfw3" }
|
links { "opengl32", "glfw3" }
|
||||||
|
|
||||||
filter "platforms:linux*gl3_glfw*"
|
filter "platforms:linux*gl3_glfw*"
|
||||||
links { "GL", "GLEW", "glfw" }
|
links { "GL", "glfw" }
|
||||||
|
|
||||||
filter "platforms:bsd*gl3_glfw*"
|
filter "platforms:bsd*gl3_glfw*"
|
||||||
links { "GL", "GLEW", "glfw", "sysinfo" }
|
links { "GL", "glfw", "sysinfo" }
|
||||||
includedirs { "/usr/local/include" }
|
includedirs { "/usr/local/include" }
|
||||||
libdirs { "/usr/local/lib" }
|
libdirs { "/usr/local/lib" }
|
||||||
|
|
||||||
filter "platforms:macosx*gl3_glfw*"
|
filter "platforms:macosx*gl3_glfw*"
|
||||||
links { "GLEW", "glfw" }
|
links { "glfw" }
|
||||||
linkoptions { "-framework OpenGL" }
|
linkoptions { "-framework OpenGL" }
|
||||||
includedirs { "/opt/local/include" }
|
includedirs { "/opt/local/include" }
|
||||||
includedirs { "/usr/local/include" }
|
includedirs { "/usr/local/include" }
|
||||||
|
@ -1265,7 +1265,11 @@ cMusicManager::DisplayRadioStationName()
|
|||||||
|
|
||||||
if (vehicle)
|
if (vehicle)
|
||||||
{
|
{
|
||||||
int8 track;
|
#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS // Because m_nFrontendTrack can have NO_TRACK
|
||||||
|
int track;
|
||||||
|
#else
|
||||||
|
uint8 track;
|
||||||
|
#endif
|
||||||
gStreamedSound = vehicle->m_nRadioStation;
|
gStreamedSound = vehicle->m_nRadioStation;
|
||||||
if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT)
|
if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT)
|
||||||
gStreamedSound = RADIO_OFF;
|
gStreamedSound = RADIO_OFF;
|
||||||
@ -1282,11 +1286,7 @@ cMusicManager::DisplayRadioStationName()
|
|||||||
gNumRetunePresses++;
|
gNumRetunePresses++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#ifdef FIX_BUGS
|
|
||||||
track = GetCarTuning(); // gStreamedSound or veh->m_nRadioStation would also work, but these don't cover police/taxi radios
|
|
||||||
#else
|
|
||||||
track = m_nFrontendTrack;
|
track = m_nFrontendTrack;
|
||||||
#endif
|
|
||||||
|
|
||||||
wchar* string = nil;
|
wchar* string = nil;
|
||||||
switch (track) {
|
switch (track) {
|
||||||
|
@ -464,7 +464,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef AUDIO_OAL_USE_MPG123
|
#ifdef AUDIO_OAL_USE_MPG123
|
||||||
// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
|
// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (and breaks radio sometimes)
|
||||||
//#define MP3_USE_FUZZY_SEEK
|
//#define MP3_USE_FUZZY_SEEK
|
||||||
|
|
||||||
class CMP3File : public IDecoder
|
class CMP3File : public IDecoder
|
||||||
@ -492,6 +492,8 @@ public:
|
|||||||
{
|
{
|
||||||
#ifdef MP3_USE_FUZZY_SEEK
|
#ifdef MP3_USE_FUZZY_SEEK
|
||||||
mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
|
mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
|
||||||
|
#else
|
||||||
|
mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
|
||||||
#endif
|
#endif
|
||||||
long rate = 0;
|
long rate = 0;
|
||||||
int channels = 0;
|
int channels = 0;
|
||||||
@ -602,6 +604,8 @@ public:
|
|||||||
{
|
{
|
||||||
#ifdef MP3_USE_FUZZY_SEEK
|
#ifdef MP3_USE_FUZZY_SEEK
|
||||||
mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
|
mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
|
||||||
|
#else
|
||||||
|
mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
|
||||||
#endif
|
#endif
|
||||||
long rate = 0;
|
long rate = 0;
|
||||||
int channels = 0;
|
int channels = 0;
|
||||||
|
@ -1881,8 +1881,13 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Print bindings, including seperator (-) between them
|
// Print bindings, including seperator (-) between them
|
||||||
|
|
||||||
CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_Y_SCALE));
|
CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_Y_SCALE));
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
for (; contSetOrder < MAX_SETORDERS && controllerAction >= 0; contSetOrder++) {
|
||||||
|
#else
|
||||||
for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) {
|
for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) {
|
||||||
|
#endif
|
||||||
wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder);
|
wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder);
|
||||||
if (settingText) {
|
if (settingText) {
|
||||||
++bindingsForThisOpt;
|
++bindingsForThisOpt;
|
||||||
@ -5503,6 +5508,9 @@ CMenuManager::SwitchMenuOnAndOff()
|
|||||||
}
|
}
|
||||||
Initialise();
|
Initialise();
|
||||||
LoadAllTextures();
|
LoadAllTextures();
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
CPad::StopPadsShaking();
|
||||||
|
#endif
|
||||||
} else {
|
} else {
|
||||||
#ifdef EXTENDED_COLOURFILTER
|
#ifdef EXTENDED_COLOURFILTER
|
||||||
// we always expect CPostFX to be open
|
// we always expect CPostFX to be open
|
||||||
|
Loading…
Reference in New Issue
Block a user