Merge branch 'develop'

Author: secsome

CHANGELOG.md

@@ -1,5 +1,11 @@
 # FINALALERT2 - SP  CHANGELOG
 
+## RELEASE 1.5.0 (2023-01-03)
+- Implement Auto Property Brush
+- New ***ExtConfig*** : `DDrawInVideoMem` = **BOOLEAN**, defaults to true
+- New ***ExtConfig*** : `DDrawEmulation` = **BOOLEAN**, defaults to false
+- New ***ExtConfig*** : `NoHouseNameTranslation` = **BOOLEAN**, defaults to false
+
 ## RELEASE 1.4.2 (2022-10-27)
 - Split `CncVxlRenderText`
 - New ***ExtConfig*** : `RandomTerrainObjects` = **BOOLEAN**, enable it so `random trees` will show all `TerrainTypes`.

DOCUMENT.md

@@ -5,7 +5,7 @@
 - What you need to know is that FA2sp requires Vanilla FinalAlert 2 1.02, any modified version may lead to unexpected errors!
 - Before you launch it for the first time, write the ini files below properly, especially for essential ones (marked by **x**).
 - If you still have any problem about it or something wrong occured while using it, please contact me directly or mail me at [email protected].
-- Now you can also join Discord server https://discord.gg/k4SVuMm, and found `map-editor-patches` under `DEDICATED PROJECTS`.
+- Now you can also join Discord server https://discord.gg/k4SVuMm, and found `map-editors` under `DEDICATED PROJECTS`.
 - For now, I cannot ensure the stability of it, so save your maps frequently before heavy loss! XD
 
 ~~The multiple selection function is now available. Press Ctrl key to select tiles and press Ctrl+Shift key to deselect them. Ctrl+D can clear all selected tiles.
@@ -55,7 +55,7 @@ NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!~~
             - `SaveMap.AutoSave.Interval` = **INTEGER** ; Should be greater than or equal to $30$, defaults to $300$, determines how many seconds should we wait during the two auto saving
             - `SaveMap.AutoSave.MaxCount` = **INTEGER** ; How many saving should FA2 keep, set to $-1$ will disable the auto cleanning, defaults to $10$
         - `SaveMap.OnlySaveMAP` = **BOOLEAN** ; Determines if FA2 will only save map with *.map* file extension
-        - `SaveMap.DefaultPreviewOptionMP` = **INTEGER** ; Default radio option button for preview generation when saving multiplayer maps. 
+        - `SaveMap.DefaultPreviewOptionMP` = **INTEGER** ; Default radio option button for preview generation when saving multiplayer maps 
           - $0$ = Always generate new preview
           - $1$ = Do no generate new preview
           - $2$ = Always generate hidden preview
@@ -65,6 +65,9 @@ NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!~~
         - `RecentFileLimit` = **INTEGER** ; How many recent files should I keep? ranges from $4$ to $9$
         - `MultiSelectionColor` = **COLORREF** ; Determines the back color of selected tiles
         - `RandomTerrainObjects` = **BOOLEAN** ; Determines if FA2 will display all terrain objects in random tree dialog, defaults to **false**
+        - `DDrawInVideoMem` = **BOOLEAN** ; Determines if FA2 will allocate DirectDraw surface in the video memory, defaults to true
+        - `DDrawEmulation` = **BOOLEAN** ; Determines if FA2 will use emulation mode for DirectDrawCreate, defaults to false
+        - `NoHouseNameTranslation` = **BOOLEAN** ; Determines if FA2 will translate house to their UIName, defaults to false
     - **`[Sides]`** (**x** means this item is **essensial**, fa2sp need this section to work properly)
         - Contains a list of sides registered in rules
         ```ini
@@ -450,6 +453,11 @@ NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!~~
     Menu.Lighting.Normal = TEXT
     Menu.Lighting.Lightning = TEXT
     Menu.Lighting.Dominator = TEXT
+    Menu.PropertyBrush = TEXT
+    Menu.PropertyBrush.AutoAircraft = TEXT
+    Menu.PropertyBrush.AutoBuilding = TEXT
+    Menu.PropertyBrush.AutoInfantry = TEXT
+    Menu.PropertyBrush.AutoVehicle = TEXT
     DialogBar.TileManager = TEXT
     DialogBar.TerrainOrGround = TEXT
     DialogBar.OverlayAndSpecial = TEXT

FA2pp

@@ -128,6 +128,13 @@
   <ItemGroup>
     <ClCompile Include="FA2pp\FunctionInit.cpp" />
     <ClCompile Include="FA2sp\Algorithms\base64.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\lcw.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\lcw_c.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\lcw_d.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\lzo.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\lzo1x_c.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\lzo1x_d.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\sha1.cpp" />
     <ClCompile Include="FA2sp\ExtraWindow\CAllieEditor\CAllieEditor.cpp" />
     <ClCompile Include="FA2sp\Ext\CAITriggerTypes\Body.cpp" />
     <ClCompile Include="FA2sp\Ext\CChangeMapSize\Hooks.cpp" />
@@ -150,7 +157,9 @@
     <ClCompile Include="FA2sp\Ext\CLoading\Hooks.InitPalettes.cpp" />
     <ClCompile Include="FA2sp\Ext\CLoading\Hooks.LoadObjects.cpp" />
     <ClCompile Include="FA2sp\Ext\CMapData\Body.cpp" />
+    <ClCompile Include="FA2sp\Ext\CMapData\Hooks.AutoPropertyBrush.cpp" />
     <ClCompile Include="FA2sp\Ext\CMapData\Hooks.cpp" />
+    <ClCompile Include="FA2sp\Ext\CMapData\Body.Pack.cpp" />
     <ClCompile Include="FA2sp\Ext\CMapD\Hooks.cpp" />
     <ClCompile Include="FA2sp\Ext\CMinimap\Hooks.cpp" />
     <ClCompile Include="FA2sp\Ext\CPropertyAircraft\Body.cpp" />
@@ -182,6 +191,7 @@
     <ClCompile Include="FA2sp\Helpers\MultimapHelper.cpp" />
     <ClCompile Include="FA2sp\Hooks.Debug.cpp" />
     <ClCompile Include="FA2sp\MFCWindow\Hooks.cpp" />
+    <ClCompile Include="FA2sp\Miscs\Hooks.DirectDraw.cpp" />
     <ClCompile Include="FA2sp\Miscs\VoxelDrawer.cpp" />
     <ClCompile Include="FA2sp\Miscs\Exception.cpp" />
     <ClCompile Include="FA2sp\Miscs\Hooks.PreviewFix.cpp" />
@@ -215,6 +225,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FA2sp\Algorithms\base64.h" />
+    <ClInclude Include="FA2sp\Algorithms\lcw.h" />
+    <ClInclude Include="FA2sp\Algorithms\lzo.h" />
+    <ClInclude Include="FA2sp\Algorithms\lzo1x.h" />
+    <ClInclude Include="FA2sp\Algorithms\lzoconf.h" />
+    <ClInclude Include="FA2sp\Algorithms\lzo_conf.h" />
+    <ClInclude Include="FA2sp\Algorithms\sha1.h" />
     <ClInclude Include="FA2sp\ExtraWindow\CAllieEditor\CAllieEditor.h" />
     <ClInclude Include="FA2sp\Ext\CAITriggerTypes\Body.h" />
     <ClInclude Include="FA2sp\Ext\CFinalSunApp\Body.h" />

FA2sp.vcxproj

@@ -165,6 +165,24 @@
     <ClInclude Include="FA2sp\Algorithms\base64.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\sha1.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\lzo1x.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\lzoconf.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\lzo_conf.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\lzo.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\lcw.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FA2sp\FA2sp.cpp">
@@ -425,6 +443,36 @@
     <ClCompile Include="FA2sp\Algorithms\base64.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="FA2sp\Ext\CMapData\Hooks.AutoPropertyBrush.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Miscs\Hooks.DirectDraw.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\sha1.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\lzo1x_c.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\lzo1x_d.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\lzo.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Ext\CMapData\Body.Pack.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\lcw.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\lcw_d.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\lcw_c.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="FA2sp\FA2sp.rc">

FA2sp.vcxproj.filters

@@ -1,5 +1,13 @@
 #include "base64.h"
 
+std::string base64::encode(const void* buffer, size_t length)
+{
+    std::string s;
+    s.resize(length);
+    memcpy(s.data(), buffer, length);
+    return encode(s);
+}
+
 std::string base64::encode(std::string_view s)
 {
 	std::string ret;
@@ -35,6 +43,14 @@ std::string base64::encode(std::string_view s)
     return ret;
 }
 
+std::string base64::decode(const void* buffer, size_t length)
+{
+    std::string s;
+    s.resize(length);
+    memcpy(s.data(), buffer, length);
+    return decode(s);
+}
+
 std::string base64::decode(std::string_view s)
 {
     std::string ret;

FA2sp/Algorithms/base64.cpp

@@ -5,7 +5,9 @@
 class base64
 {
 public:
+	static std::string encode(const void* buffer, size_t length);
 	static std::string encode(std::string_view s);
+	static std::string decode(const void* buffer, size_t length);
 	static std::string decode(std::string_view s);
 private:
 	static constexpr char encoder[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

FA2sp/Algorithms/base64.h

@@ -0,0 +1,45 @@
+#include "lcw.h"
+
+std::string lcw::compress(const void* src, int slen)
+{
+	std::string ret;
+
+	unsigned char* ptr = (unsigned char*)src;
+	char* buffer = new char[BufferSize];
+
+	while (slen > 0)
+	{
+		const int blocksize = std::min(slen, BlockSize);
+		const int count = LCW_Compress(ptr, buffer + 4, blocksize);
+		reinterpret_cast<unsigned short*>(buffer)[0] = count;
+		reinterpret_cast<unsigned short*>(buffer)[1] = blocksize;
+		ret.append(buffer, count + 4);
+		ptr += blocksize;
+		slen -= blocksize;
+	}
+
+	delete[] buffer;
+
+	return ret;
+}
+
+std::string lcw::decompress(const void* src, int slen)
+{
+	std::string ret;
+
+	unsigned char* ptr = (unsigned char*)src;
+	char* buffer = new char[BufferSize];
+
+	while (slen > 0)
+	{
+		auto blocksize = reinterpret_cast<unsigned short*>(ptr)[0];
+		LCW_Uncompress(ptr + 4, buffer);
+		ret.append(buffer, buffer);
+		ptr += blocksize;
+		slen -= blocksize;
+	}
+
+	delete[] buffer;
+
+	return ret;
+}

FA2sp/Algorithms/lcw.cpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <string>
+
+class lcw
+{
+public:
+	static std::string compress(const void* src, int slen);
+	static std::string decompress(const void* src, int slen);
+
+private:
+	static constexpr int LCW_Worst_Case(int datasize) 
+	{
+		return datasize + (datasize / 63) + 1;
+	}
+
+	static constexpr int BlockSize = 1024 * 8;
+	static constexpr int SafetyMargin = BlockSize / 128 + 1;
+	static constexpr int BufferSize = BlockSize + SafetyMargin;
+
+	static unsigned int __cdecl LCW_Uncompress(void* source, void* dest, unsigned int length = 0);
+	static int __cdecl LCW_Compress(void const* source, void* dest, unsigned int length);
+};