Merge branch 'master' into 230724_Add_getLoadedFiles

TracerDS · web-flow · commit 979d2aec1b90 · 2024-08-24T20:47:35.000+02:00
diff --git a/.github/workflows/dockerimage.yaml b/.github/workflows/dockerimage.yaml
@@ -12,8 +12,6 @@ on:
     - 'Dockerfile.i386'
     - 'Dockerfile.armhf'
     - 'Dockerfile.arm64'
-    - 'Dockerfile.osx-x64'
-    - 'Dockerfile.osx-arm64'
 
 jobs:
   build:
@@ -28,10 +26,6 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
-        - tag: osx-x64
-          dockerfile: Dockerfile.osx-x64
-        - tag: osx-arm64
-          dockerfile: Dockerfile.osx-arm64
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ ENV AS_BUILDAGENT=0 \
 RUN apt-get update && \
     apt-get install -y software-properties-common wget ca-certificates git build-essential \
         gcc-10 g++-10 curl subversion ncftp \
-        libncurses-dev libncursesw5 libmysqlclient-dev
+        libncurses-dev libncursesw6 libmysqlclient-dev
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -21,7 +21,7 @@ RUN sed -i 's/deb http/deb \[arch=amd64,i386\] http/' /etc/apt/sources.list && \
     apt-get update && \
     apt-get install -y make git ncftp \
         gcc-10-aarch64-linux-gnu g++-10-aarch64-linux-gnu \
-        libncursesw5:arm64 libncursesw5-dev:arm64 libmysqlclient-dev:arm64
+        libncurses-dev:arm64 libncursesw6:arm64 libmysqlclient-dev:arm64
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -21,7 +21,7 @@ RUN sed -i 's/deb http/deb \[arch=amd64,i386\] http/' /etc/apt/sources.list && \
     apt-get update && \
     apt-get install -y make git ncftp \
         gcc-10-arm-linux-gnueabihf g++-10-arm-linux-gnueabihf \
-        libncursesw5:armhf libncursesw5-dev:armhf libmysqlclient-dev:armhf
+        libncurses-dev:armhf libncursesw6:armhf libmysqlclient-dev:armhf
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.i386 b/Dockerfile.i386
@@ -15,7 +15,7 @@ ENV AS_BUILDAGENT=0 \
 RUN dpkg --add-architecture i386 && apt-get update && \
     apt-get install -y software-properties-common wget ca-certificates git build-essential \
         gcc-10-multilib g++-10-multilib curl subversion ncftp \
-        libncurses-dev:i386 libncursesw5:i386 libmysqlclient-dev:i386
+        libncurses-dev:i386 libncursesw6:i386 libmysqlclient-dev:i386
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.osx-arm64 b/Dockerfile.osx-arm64
diff --git a/Dockerfile.osx-x64 b/Dockerfile.osx-x64
diff --git a/README.md b/README.md
@@ -64,8 +64,8 @@ You can build the MTA:SA server on GNU/Linux distributions only for x86, x86_64,
 - git
 - make
 - GNU GCC compiler (version 10 or newer)
-- libncursesw5
-- libncursesw5-dev
+- libncursesw6
+- libncurses-dev
 - libmysqlclient-dev
 
 **Build instructions: Script**
diff --git a/Server/core/premake5.lua b/Server/core/premake5.lua
@@ -44,7 +44,7 @@ project "Core"
 		links { "breakpad", "rt" }
 		buildoptions { "-pthread" }
 		linkoptions { "-pthread" }
-		linkoptions { "-l:libncursesw.so.5" }
+		linkoptions { "-l:libncursesw.so.6" }
 
 	filter "system:macosx"
 		links { "ncurses", "breakpad", "CoreFoundation.framework" }
diff --git a/Shared/mods/deathmatch/logic/lua/CLuaTimer.cpp b/Shared/mods/deathmatch/logic/lua/CLuaTimer.cpp
@@ -68,5 +68,5 @@ CTickCount CLuaTimer::GetTimeLeft()
 {
     CTickCount llCurrentTime = CTickCount::Now();
     CTickCount llTimeLeft = m_llStartTime + m_llDelay - llCurrentTime;
-    return llTimeLeft;
+    return llTimeLeft.ToLongLong() < 0LL ? CTickCount(0LL) : llTimeLeft;
 }
diff --git a/utils/docker-entrypoint-osx.sh b/utils/docker-entrypoint-osx.sh
diff --git a/vendor/google-breakpad/src/client/linux/handler/minidump_descriptor.h b/vendor/google-breakpad/src/client/linux/handler/minidump_descriptor.h
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 
 #include <string>
+#include <cstdint>
 
 #include "client/linux/handler/microdump_extra_info.h"
 #include "common/using_std_string.h"

Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,5 @@ CTickCount CLuaTimer::GetTimeLeft()`
`68`	`68`	`{`
`69`	`69`	`CTickCount llCurrentTime = CTickCount::Now();`
`70`	`70`	`CTickCount llTimeLeft = m_llStartTime + m_llDelay - llCurrentTime;`
`71`		`- return llTimeLeft;`
	`71`	`+ return llTimeLeft.ToLongLong() < 0LL ? CTickCount(0LL) : llTimeLeft;`
`72`	`72`	`}`