Merge branch 'develop'

CHANGELOG.md

@@ -1,7 +1,18 @@
 # FINALALERT2 - SP  CHANGELOG
 
-## RELEASE 1.6.0 (2023-XX-XX)
+## RELEASE 1.6.0 (2023-04-30)
+- **ONLY YURI's REVENGE WILL BE SUPPORTED SINCE FA2SP 1.6.0**
 - Reimplemented file reading system
+- Support Ares Custom Foundation
+- Map validator now checks overlapping structures, raise an error instead of warning for now. String can be modified by `MV_OverlapStructures`
+    - **You should manually add buildings that need to be ignored in `FADATA.INI` section `[StructureOverlappingCheckIgnores]`, as it is raising an error, and you probably want some lightposts to be ignored.**
+    - The Ignorance list might be removed in the future, when I can finally figure out what is that stupid problem
+- Map validator now checks missing logic params, raise an error instead of warning for now. String can be modified by `MV_LogicMissingParams`
+- Fixed the bug that lighting is not reset correctly when loading/creating a map
+- Fixed the bug that smudges and basenodes drifting away when resizing the map
+- Multiselection now supports copy & paste
+- Multiselection operations(raise or lower cells) now supports undo & redo
+- New ***ExtConfig*** : `ExtendedValidationNoError` = **BOOLEAN**, defaults to false
 
 ## RELEASE 1.5.2 (2023-03-03)
 - Fixed the bug that money calculation is incorrect

DOCUMENT.md

@@ -9,8 +9,7 @@
 - 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.
-Now this feature supports RaiseSingleTile/LowerSingleTile (though they are not "Single" anymore) and calucate selected area ore value.
-NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!
+Now this feature supports RaiseSingleTile/LowerSingleTile (though they are not "Single" anymore), copy paste, and calucating selected area ore value.
 
 ## BASIC TYPES
 - **INTEGER** 
@@ -65,10 +64,11 @@ 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
-        - `EnableMultiSelection` = **BOOLEAN** ; Determines if FA2sp will enable expermental multi-selection features, 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**
+        - `EnableMultiSelection` = **BOOLEAN** ; Determines if FA2sp will enable expermental multi-selection features, defaults to **false**
+        - `ExtendedValidationNoError` = **BOOLEAN** ; If this value is true, then extended map validation won't be shown as error but warning, 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
@@ -360,13 +360,22 @@ NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!
         70=70 - Disable Weapons (Ares 3.0 Only),20,0,1,Disables the ability of all team members to fire for a number of FRAMES.
         ```
     - `[VehicleVoxelBarrelsRA2]`
+    - `[StructureOverlappingCheckIgnores]`
+        - id = BuildingRegName
+    ```ini
+    [StructureOverlappingCheckIgnorance]
+    Index = RegName
+    ; Like 0=INORANLAMP, value must be a valid building regname
+    ```
 - `FALanguage.ini`
     ```ini
     [CURRENTLANGUAGE-StringsRA2]
     [CURRENTLANGUAGE-Strings]
     [CURRENTLANGUAGE-TranslationsRA2]
     [CURRENTLANGUAGE-Translations]
     ; Those four are all acceptable, just write under one of them is okey
+    MV_OverlapStructures = TEXT(%1 for count, %2 for X, %3 for Y)
+    MV_LogicMissingParams = TEXT(%1 for section, %2 for key)
     TabPages.TilePlacement = TEXT
     TabPages.TriggerSort = TEXT
     Menu.File = TEXT
@@ -658,4 +667,4 @@ NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!
 
 - thomassneddon provided me with vxl drawing lib and drawing stuff assistence, without I cannot draw the VXL stuffs.
 
-- btw the code of FinalAlert 2 is really in a MESSY! Full of unnecessary constructors. I HATE IT!
+- btw the code of FinalAlert 2 is really in a MESSY! Full of unnecessary constructors. I HATE IT!

FA2sp.vcxproj

@@ -77,6 +77,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <EnableModules>false</EnableModules>
       <Optimization>MaxSpeed</Optimization>
+      <BuildStlModules>false</BuildStlModules>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -112,6 +113,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <EnableModules>false</EnableModules>
       <Optimization>Disabled</Optimization>
+      <BuildStlModules>false</BuildStlModules>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -135,6 +137,7 @@
     <ClCompile Include="FA2sp\Algorithms\lzo1x_c.cpp" />
     <ClCompile Include="FA2sp\Algorithms\lzo1x_d.cpp" />
     <ClCompile Include="FA2sp\Algorithms\sha1.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\sha1impl.cpp" />
     <ClCompile Include="FA2sp\ExtraWindow\CAllieEditor\CAllieEditor.cpp" />
     <ClCompile Include="FA2sp\Ext\CAITriggerTypes\Body.cpp" />
     <ClCompile Include="FA2sp\Ext\CChangeMapSize\Hooks.cpp" />
@@ -154,13 +157,17 @@
     <ClCompile Include="FA2sp\Ext\CLighting\Hooks.cpp" />
     <ClCompile Include="FA2sp\Ext\CLoading\Body.cpp" />
     <ClCompile Include="FA2sp\Ext\CLoading\Body.LoadObjects.cpp" />
+    <ClCompile Include="FA2sp\Ext\CLoading\Hooks.cpp" />
     <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.BuildingTypeDatas.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\CMapValidator\Body.cpp" />
+    <ClCompile Include="FA2sp\Ext\CMapValidator\Hooks.cpp" />
     <ClCompile Include="FA2sp\Ext\CMinimap\Hooks.cpp" />
     <ClCompile Include="FA2sp\Ext\CPropertyAircraft\Body.cpp" />
     <ClCompile Include="FA2sp\Ext\CPropertyAircraft\Hooks.cpp" />
@@ -188,10 +195,14 @@
     <ClCompile Include="FA2sp\Ext\CTriggerOption\Hooks.cpp" />
     <ClCompile Include="FA2sp\Ext\FA2Expand.cpp" />
     <ClCompile Include="FA2sp\Helpers\ControlHelpers.cpp" />
+    <ClCompile Include="FA2sp\Helpers\InstructionSet.cpp" />
     <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\Hooks.ShpLoad.cpp" />
+    <ClCompile Include="FA2sp\Miscs\Hooks.Memory.cpp" />
+    <ClCompile Include="FA2sp\Miscs\PlaceHolder.cpp" />
     <ClCompile Include="FA2sp\Miscs\VoxelDrawer.cpp" />
     <ClCompile Include="FA2sp\Miscs\Exception.cpp" />
     <ClCompile Include="FA2sp\Miscs\Hooks.PreviewFix.cpp" />
@@ -207,6 +218,7 @@
     <ClCompile Include="FA2sp\Ext\CTriggerFrame\Body.cpp" />
     <ClCompile Include="FA2sp\Ext\CTriggerOption\Body.cpp" />
     <ClCompile Include="FA2sp\FA2sp.cpp" />
+    <ClCompile Include="FA2sp\Algorithms\sha1x86.cpp" />
     <ClCompile Include="FA2sp\Source\CIsoView.cpp" />
     <ClCompile Include="FA2sp\UI\Hooks.cpp" />
     <ClCompile Include="FA2sp\Logger.cpp" />
@@ -231,6 +243,7 @@
     <ClInclude Include="FA2sp\Algorithms\lzoconf.h" />
     <ClInclude Include="FA2sp\Algorithms\lzo_conf.h" />
     <ClInclude Include="FA2sp\Algorithms\sha1.h" />
+    <ClInclude Include="FA2sp\Algorithms\sha1impl.h" />
     <ClInclude Include="FA2sp\ExtraWindow\CAllieEditor\CAllieEditor.h" />
     <ClInclude Include="FA2sp\Ext\CAITriggerTypes\Body.h" />
     <ClInclude Include="FA2sp\Ext\CFinalSunApp\Body.h" />
@@ -240,6 +253,7 @@
     <ClInclude Include="FA2sp\Ext\CLighting\Body.h" />
     <ClInclude Include="FA2sp\Ext\CLoading\Body.h" />
     <ClInclude Include="FA2sp\Ext\CMapData\Body.h" />
+    <ClInclude Include="FA2sp\Ext\CMapValidator\Body.h" />
     <ClInclude Include="FA2sp\Ext\CPropertyAircraft\Body.h" />
     <ClInclude Include="FA2sp\Ext\CPropertyBuilding\Body.h" />
     <ClInclude Include="FA2sp\Ext\CPropertyInfantry\Body.h" />
@@ -261,6 +275,7 @@
     <ClInclude Include="FA2sp\FA2sp.Constants.h" />
     <ClInclude Include="FA2sp\Helpers\ControlHelpers.h" />
     <ClInclude Include="FA2sp\Helpers\Helper.h" />
+    <ClInclude Include="FA2sp\Helpers\InstructionSet.h" />
     <ClInclude Include="FA2sp\Helpers\MultimapHelper.h" />
     <ClInclude Include="FA2sp\Helpers\Parser.h" />
     <ClInclude Include="FA2sp\Helpers\STDHelpers.h" />
@@ -278,6 +293,7 @@
     <ClInclude Include="FA2sp\Helpers\MutexHelper.h" />
     <ClInclude Include="FA2sp\Helpers\Translations.h" />
     <ClInclude Include="FA2sp\ExtraWindow\CTileManager\CTileManager.h" />
+    <ClInclude Include="FA2sp\Algorithms\sha1x86.h" />
     <ClInclude Include="FA2sp\Source\CIsoView.h" />
     <ClInclude Include="FA2sp\CncVxlRenderText.h" />
   </ItemGroup>
@@ -289,6 +305,7 @@
     <ResourceCompile Include="FA2sp\UI\CInfantryDialog.rc" />
     <ResourceCompile Include="FA2sp\UI\CLighting.rc" />
     <ResourceCompile Include="FA2sp\UI\CLoading.rc" />
+    <ResourceCompile Include="FA2sp\UI\CMapValidator.rc" />
     <ResourceCompile Include="FA2sp\UI\CMenu.rc" />
     <ResourceCompile Include="FA2sp\UI\CScriptTypes.rc" />
     <ResourceCompile Include="FA2sp\UI\CSingleplayerSettings.rc" />

FA2sp.vcxproj.filters

@@ -165,7 +165,7 @@
     <ClInclude Include="FA2sp\Algorithms\base64.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="FA2sp\Algorithms\sha1.h">
+    <ClInclude Include="FA2sp\Algorithms\sha1impl.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="FA2sp\Algorithms\lzo1x.h">
@@ -183,6 +183,18 @@
     <ClInclude Include="FA2sp\Algorithms\lcw.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="FA2sp\Ext\CMapValidator\Body.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Helpers\InstructionSet.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\sha1.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="FA2sp\Algorithms\sha1x86.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FA2sp\FA2sp.cpp">
@@ -449,7 +461,7 @@
     <ClCompile Include="FA2sp\Miscs\Hooks.DirectDraw.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="FA2sp\Algorithms\sha1.cpp">
+    <ClCompile Include="FA2sp\Algorithms\sha1impl.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="FA2sp\Algorithms\lzo1x_c.cpp">
@@ -473,6 +485,36 @@
     <ClCompile Include="FA2sp\Algorithms\lcw_c.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="FA2sp\Miscs\Hooks.Memory.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Ext\CLoading\Hooks.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Ext\CMapData\Hooks.BuildingTypeDatas.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Miscs\PlaceHolder.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Ext\CMapValidator\Body.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Ext\CMapValidator\Hooks.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Miscs\Hooks.ShpLoad.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\sha1x86.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Algorithms\sha1.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="FA2sp\Helpers\InstructionSet.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="FA2sp\FA2sp.rc">
@@ -541,6 +583,9 @@
     <ResourceCompile Include="FA2sp\UI\CCreateMap2.rc">
       <Filter>资源文件</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="FA2sp\UI\CMapValidator.rc">
+      <Filter>资源文件</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="FA2sp\FA2sp.manifest">

FA2sp/Algorithms/lcw.cpp

@@ -33,8 +33,8 @@ std::string lcw::decompress(const void* src, int slen)
 	while (slen > 0)
 	{
 		auto blocksize = reinterpret_cast<unsigned short*>(ptr)[0];
-		LCW_Uncompress(ptr + 4, buffer);
-		ret.append(buffer, buffer);
+		auto count = LCW_Uncompress(ptr + 4, buffer);
+		ret.append(buffer, count);
 		ptr += blocksize;
 		slen -= blocksize;
 	}