From 3df19c00376090b7622c0030d3f3180bb9f11002 Mon Sep 17 00:00:00 2001 From: reityerukohaku2 Date: Sat, 9 Mar 2024 03:24:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20code=20page=20to=20UTF?= =?UTF-8?q?-8=20while=20compiling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_all.cmd b/build_all.cmd index abb26bf38..a4278c98a 100644 --- a/build_all.cmd +++ b/build_all.cmd @@ -1,3 +1,5 @@ +set CL=/utf-8 + pushd prog\tools call build_dagor3_cdk_mini.cmd if errorlevel 1 ( From 4169ebc7824c28a8162af5860686d5c2f63fa982 Mon Sep 17 00:00:00 2001 From: reityerukohaku2 Date: Sat, 9 Mar 2024 03:26:06 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20Replace=20characters=20that?= =?UTF-8?q?=20don't=20support=20UTF-8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h | 2 +- prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h | 2 +- prog/3rdPartyLibs/binPack2D/include/Rect.h | 2 +- prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h | 2 +- prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp | 2 +- prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp | 2 +- prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp | 2 +- prog/tools/converters/t3d2dag/t3dLoader.cpp | 4 ++-- prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h b/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h index 1aa66c700..d1ba9289e 100644 --- a/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h +++ b/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h @@ -1,5 +1,5 @@ /** @file GuillotineBinPack.h - @author Jukka Jylдnki + @author Jukka Jylanki @brief Implements different bin packer algorithms that use the GUILLOTINE data structure. diff --git a/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h b/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h index c4e7f0d9d..03abbfba9 100644 --- a/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h +++ b/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h @@ -1,5 +1,5 @@ /** @file MaxRectsBinPack.h - @author Jukka Jylдnki + @author Jukka Jylanki @brief Implements different bin packer algorithms that use the MAXRECTS data structure. diff --git a/prog/3rdPartyLibs/binPack2D/include/Rect.h b/prog/3rdPartyLibs/binPack2D/include/Rect.h index ba4cf5c35..e64a41bf7 100644 --- a/prog/3rdPartyLibs/binPack2D/include/Rect.h +++ b/prog/3rdPartyLibs/binPack2D/include/Rect.h @@ -1,5 +1,5 @@ /** @file Rect.h - @author Jukka Jylдnki + @author Jukka Jylanki This work is released to Public Domain, do whatever you want with it. */ diff --git a/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h b/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h index 03b10157f..73fb45c76 100644 --- a/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h +++ b/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h @@ -1,5 +1,5 @@ /** @file SkylineBinPack.h - @author Jukka Jylдnki + @author Jukka Jylanki @brief Implements different bin packer algorithms that use the SKYLINE data structure. diff --git a/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp b/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp index d33644f0d..f8abfae16 100644 --- a/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp +++ b/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp @@ -1,5 +1,5 @@ /** @file GuillotineBinPack.cpp - @author Jukka Jylдnki + @author Jukka Jylanki @brief Implements different bin packer algorithms that use the GUILLOTINE data structure. diff --git a/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp b/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp index 4eaba0e84..6397b35f7 100644 --- a/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp +++ b/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp @@ -1,5 +1,5 @@ /** @file MaxRectsBinPack.cpp - @author Jukka Jylдnki + @author Jukka Jylanki @brief Implements different bin packer algorithms that use the MAXRECTS data structure. diff --git a/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp b/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp index 534a63568..6933c71f6 100644 --- a/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp +++ b/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp @@ -1,5 +1,5 @@ /** @file SkylineBinPack.cpp - @author Jukka Jylдnki + @author Jukka Jylanki @brief Implements different bin packer algorithms that use the SKYLINE data structure. diff --git a/prog/tools/converters/t3d2dag/t3dLoader.cpp b/prog/tools/converters/t3d2dag/t3dLoader.cpp index 634a45aa5..18f7a5531 100644 --- a/prog/tools/converters/t3d2dag/t3dLoader.cpp +++ b/prog/tools/converters/t3d2dag/t3dLoader.cpp @@ -165,7 +165,7 @@ void CreateBmp24(char *fname, RGBTRIPLE *color, int u_size, int v_size) BITMAPINFOHEADER bih; BYTE Palette[1024]; // Палитра - // Пусть у нас будет картинка размером 35 x 50 пикселей + // Пусть у нас буaет картинка размером 35 x 50 пикселей int Width = u_size; int Height = v_size; memset(Palette, 0, 1024); // В палитре у нас нули @@ -173,7 +173,7 @@ void CreateBmp24(char *fname, RGBTRIPLE *color, int u_size, int v_size) // Заполним их memset(&bfh, 0, sizeof(bfh)); bfh.bfType = 0x4D42; // Обозначим, что это bmp 'BM' - bfh.bfOffBits = sizeof(bfh) + sizeof(bih) + 1024; // Палитра занимает 1Kb, но мы его испоьзовать не будем + bfh.bfOffBits = sizeof(bfh) + sizeof(bih) + 1024; // Палитра занимает 1Kb, но мы его испоьзовать не буaем bfh.bfSize = bfh.bfOffBits + sizeof(color[0]) * Width * Height + Height * (Width % 4); // Посчитаем размер конечного файла memset(&bih, 0, sizeof(bih)); diff --git a/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp b/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp index 6a0d14bdc..beb26ff1e 100644 --- a/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp +++ b/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp @@ -11,7 +11,7 @@ CToolbar::CToolbar(ControlEventHandler *event_handler, PropertyContainerControlB const char *caption) : PropertyContainerControlBase(id, event_handler, parent, x, y, w, _pxScaled(DEFAULT_TOOLBAR_HEIGHT)), mContainer(this, parent->getWindow(), x, y, _px(w), _pxS(DEFAULT_TOOLBAR_HEIGHT)), - mToolbar(this, &mContainer, 0, -_pxS(2) /* -2 для скрытия линии над тулбаром */, _px(w), _pxS(DEFAULT_TOOLBAR_BUTTON_HEIGHT), + mToolbar(this, &mContainer, 0, -_pxS(2) /* -2 aля скрытия линии наa тулбаром */, _px(w), _pxS(DEFAULT_TOOLBAR_BUTTON_HEIGHT), caption) {} From 58b78817709d8a85b785bc014aac8c079eff2688 Mon Sep 17 00:00:00 2001 From: reityerukohaku2 Date: Tue, 12 Mar 2024 10:48:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20Replace=20characte?= =?UTF-8?q?rs=20that=20don't=20support=20UTF-8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4169ebc7824c28a8162af5860686d5c2f63fa982. --- prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h | 2 +- prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h | 2 +- prog/3rdPartyLibs/binPack2D/include/Rect.h | 2 +- prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h | 2 +- prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp | 2 +- prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp | 2 +- prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp | 2 +- prog/tools/converters/t3d2dag/t3dLoader.cpp | 4 ++-- prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h b/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h index d1ba9289e..1aa66c700 100644 --- a/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h +++ b/prog/3rdPartyLibs/binPack2D/include/GuillotineBinPack.h @@ -1,5 +1,5 @@ /** @file GuillotineBinPack.h - @author Jukka Jylanki + @author Jukka Jylдnki @brief Implements different bin packer algorithms that use the GUILLOTINE data structure. diff --git a/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h b/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h index 03abbfba9..c4e7f0d9d 100644 --- a/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h +++ b/prog/3rdPartyLibs/binPack2D/include/MaxRectsBinPack.h @@ -1,5 +1,5 @@ /** @file MaxRectsBinPack.h - @author Jukka Jylanki + @author Jukka Jylдnki @brief Implements different bin packer algorithms that use the MAXRECTS data structure. diff --git a/prog/3rdPartyLibs/binPack2D/include/Rect.h b/prog/3rdPartyLibs/binPack2D/include/Rect.h index e64a41bf7..ba4cf5c35 100644 --- a/prog/3rdPartyLibs/binPack2D/include/Rect.h +++ b/prog/3rdPartyLibs/binPack2D/include/Rect.h @@ -1,5 +1,5 @@ /** @file Rect.h - @author Jukka Jylanki + @author Jukka Jylдnki This work is released to Public Domain, do whatever you want with it. */ diff --git a/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h b/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h index 73fb45c76..03b10157f 100644 --- a/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h +++ b/prog/3rdPartyLibs/binPack2D/include/SkylineBinPack.h @@ -1,5 +1,5 @@ /** @file SkylineBinPack.h - @author Jukka Jylanki + @author Jukka Jylдnki @brief Implements different bin packer algorithms that use the SKYLINE data structure. diff --git a/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp b/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp index f8abfae16..d33644f0d 100644 --- a/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp +++ b/prog/3rdPartyLibs/binPack2D/src/GuillotineBinPack.cpp @@ -1,5 +1,5 @@ /** @file GuillotineBinPack.cpp - @author Jukka Jylanki + @author Jukka Jylдnki @brief Implements different bin packer algorithms that use the GUILLOTINE data structure. diff --git a/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp b/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp index 6397b35f7..4eaba0e84 100644 --- a/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp +++ b/prog/3rdPartyLibs/binPack2D/src/MaxRectsBinPack.cpp @@ -1,5 +1,5 @@ /** @file MaxRectsBinPack.cpp - @author Jukka Jylanki + @author Jukka Jylдnki @brief Implements different bin packer algorithms that use the MAXRECTS data structure. diff --git a/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp b/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp index 6933c71f6..534a63568 100644 --- a/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp +++ b/prog/3rdPartyLibs/binPack2D/src/SkylineBinPack.cpp @@ -1,5 +1,5 @@ /** @file SkylineBinPack.cpp - @author Jukka Jylanki + @author Jukka Jylдnki @brief Implements different bin packer algorithms that use the SKYLINE data structure. diff --git a/prog/tools/converters/t3d2dag/t3dLoader.cpp b/prog/tools/converters/t3d2dag/t3dLoader.cpp index 18f7a5531..634a45aa5 100644 --- a/prog/tools/converters/t3d2dag/t3dLoader.cpp +++ b/prog/tools/converters/t3d2dag/t3dLoader.cpp @@ -165,7 +165,7 @@ void CreateBmp24(char *fname, RGBTRIPLE *color, int u_size, int v_size) BITMAPINFOHEADER bih; BYTE Palette[1024]; // Палитра - // Пусть у нас буaет картинка размером 35 x 50 пикселей + // Пусть у нас будет картинка размером 35 x 50 пикселей int Width = u_size; int Height = v_size; memset(Palette, 0, 1024); // В палитре у нас нули @@ -173,7 +173,7 @@ void CreateBmp24(char *fname, RGBTRIPLE *color, int u_size, int v_size) // Заполним их memset(&bfh, 0, sizeof(bfh)); bfh.bfType = 0x4D42; // Обозначим, что это bmp 'BM' - bfh.bfOffBits = sizeof(bfh) + sizeof(bih) + 1024; // Палитра занимает 1Kb, но мы его испоьзовать не буaем + bfh.bfOffBits = sizeof(bfh) + sizeof(bih) + 1024; // Палитра занимает 1Kb, но мы его испоьзовать не будем bfh.bfSize = bfh.bfOffBits + sizeof(color[0]) * Width * Height + Height * (Width % 4); // Посчитаем размер конечного файла memset(&bih, 0, sizeof(bih)); diff --git a/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp b/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp index beb26ff1e..6a0d14bdc 100644 --- a/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp +++ b/prog/tools/libTools/propPanel2/panelControls/p_toolbar.cpp @@ -11,7 +11,7 @@ CToolbar::CToolbar(ControlEventHandler *event_handler, PropertyContainerControlB const char *caption) : PropertyContainerControlBase(id, event_handler, parent, x, y, w, _pxScaled(DEFAULT_TOOLBAR_HEIGHT)), mContainer(this, parent->getWindow(), x, y, _px(w), _pxS(DEFAULT_TOOLBAR_HEIGHT)), - mToolbar(this, &mContainer, 0, -_pxS(2) /* -2 aля скрытия линии наa тулбаром */, _px(w), _pxS(DEFAULT_TOOLBAR_BUTTON_HEIGHT), + mToolbar(this, &mContainer, 0, -_pxS(2) /* -2 для скрытия линии над тулбаром */, _px(w), _pxS(DEFAULT_TOOLBAR_BUTTON_HEIGHT), caption) {}