diff options
| author | Nakidai <nakidai@disroot.org> | 2025-06-26 21:35:07 +0300 |
|---|---|---|
| committer | Nakidai <nakidai@disroot.org> | 2025-06-26 21:35:07 +0300 |
| commit | 426d73bf550d24a24b0820968e4af01c466280a7 (patch) | |
| tree | 00707bc4c557085d5e28f708256146eb95d5429e | |
| parent | 5edca2a937e40ac77e565adc4ccbf224c4967b00 (diff) | |
| download | zcatch-master.tar.gz zcatch-master.zip | |
| -rw-r--r-- | bam.lua | 1 | ||||
| -rw-r--r-- | other/freetype/include/freetype/config/ftoption.h | 8 | ||||
| -rw-r--r-- | readme.txt | 11 | ||||
| -rw-r--r-- | src/engine/client/client.cpp | 2 | ||||
| -rw-r--r-- | src/game/editor/layer_tiles.cpp | 2 |
5 files changed, 18 insertions, 6 deletions
diff --git a/bam.lua b/bam.lua index e68fd262..13131f9f 100644 --- a/bam.lua +++ b/bam.lua @@ -206,6 +206,7 @@ function build(settings) settings.link.flags:Add("-lsocket") settings.link.flags:Add("-lnsl") end + settings.link.libs:Add("freetype") elseif family == "windows" then settings.link.libs:Add("gdi32") settings.link.libs:Add("user32") diff --git a/other/freetype/include/freetype/config/ftoption.h b/other/freetype/include/freetype/config/ftoption.h index 1565533f..65527d4e 100644 --- a/other/freetype/include/freetype/config/ftoption.h +++ b/other/freetype/include/freetype/config/ftoption.h @@ -252,10 +252,10 @@ FT_BEGIN_HEADER /* Do not #undef these macros here since the build system might define */ /* them for certain configurations only. */ /* */ -/* #define FT_EXPORT(x) extern x */ -/* #define FT_EXPORT_DEF(x) x */ -#define FT_EXPORT(x) __declspec(dllexport) x -#define FT_EXPORT_DEF(x) __declspec(dllexport) x +#define FT_EXPORT(x) extern x +#define FT_EXPORT_DEF(x) x +/* #define FT_EXPORT(x) __declspec(dllexport) x*/ +/* #define FT_EXPORT_DEF(x) __declspec(dllexport) x*/ /*************************************************************************/ diff --git a/readme.txt b/readme.txt index 1fb67373..cf3e9b62 100644 --- a/readme.txt +++ b/readme.txt @@ -1,3 +1,14 @@ +This is slightly patched version of ddnet zcatch to it compile on my system +(6.14.7-arch2-1 #1 SMP PREEMPT_DYNAMIC Thu, 22 May 2025 05:37:49 +0000 x86_64 GNU/Linux) + +scripts/build.py uses outdaded python features but you you still can build the +code manually. Simply download and build bam of version 0.4[0], run it in this +directory and it'll build code for you. + +[0] bam-v0.4.0 https://github.com/matricks/bam/archive/refs/tags/v0.4.0.tar.gz + +The following text is the original one: + This software called "zCatch/TeeVi" is a modification of "zCatch" which is a modification of "Teeworlds". DDNet version, with global ranking. Made by Savander and Deen. Teewebs.net supported (by Eeeee). diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 46907946..c43fcc2a 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -936,7 +936,7 @@ void CClient::ProcessConnlessPacket(CNetChunk *pPacket) { NETADDR Addr; - static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF }; + static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -128, -128 }; // copy address if(!mem_comp(IPV4Mapping, pAddrs[i].m_aIp, sizeof(IPV4Mapping))) diff --git a/src/game/editor/layer_tiles.cpp b/src/game/editor/layer_tiles.cpp index 032f391f..b692c1f0 100644 --- a/src/game/editor/layer_tiles.cpp +++ b/src/game/editor/layer_tiles.cpp @@ -248,7 +248,7 @@ void CLayerTiles::BrushFlipY() void CLayerTiles::BrushRotate(float Amount) { - int Rotation = (round(360.0f*Amount/(pi*2))/90)%4; // 0=0°, 1=90°, 2=180°, 3=270° + int Rotation = ((int)round(360.0f*Amount/(pi*2))/90)%4; // 0=0°, 1=90°, 2=180°, 3=270° if(Rotation < 0) Rotation +=4; |