Merge branch 'master' of http://sig.projectdivar.com/sigonasr2/Crawler

Crawler/C++/scripts/build.sh

@@ -9,7 +9,7 @@ fi
 if [ ! -f "pixelGameEngine.o" ]
 then
     printf "Pixel Game Engine compile object missing. Compiling for the first time..."
-    g++ -c pixelGameEngine.cpp
+    g++ ${CUSTOM_PARAMS} -c pixelGameEngine.cpp
 fi
 if [ "$1" = "test" ]
 then
@@ -21,7 +21,7 @@ then
 elif [ "$1" = "full" ]
 then
     echo "" > ./test/test.h
-    g++ -c pixelGameEngine.cpp
+    g++ ${CUSTOM_PARAMS} -c pixelGameEngine.cpp
     if g++ $(find . -type f -name "*.cpp" -not -path "./test/*" -not -name "pixelGameEngine.cpp") pixelGameEngine.o ${CUSTOM_PARAMS} -o ${PROJECT_NAME}; then
         ./${PROJECT_NAME} "$@"
     fi

Crawler/C++/scripts/md5

@@ -1,4 +1,4 @@
-build.sh:c073187e65d0e23aa77aa94af4ec6382  -
+build.sh:e307e0388d5f0d16c7f9a39e0177fc47  -
 commit.sh:1af81bf417dfb932284d8a14fdd10657  -
 debug.sh:8125f303032b6cbc137223df63d10096  -
 lines.sh:3b907786f7fc9204025993016c9080de  -

Crawler/EquipSlotButton.h

@@ -30,7 +30,7 @@ CONTRACT, STRICT LIABILITY, OR TORT	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-Portions of this software are copyright © 2023 The FreeType
+Portions of this software are copyright <EFBFBD> 2023 The FreeType
 Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
 All rights reserved.
 */

Crawler/Item.cpp

@@ -417,7 +417,7 @@ std::string Item::Description(CompactText compact){
 const ITCategory Item::Category()const{
 	return it->Category();
 };
-Decal*Item::Decal(){
+::Decal*Item::Decal(){
 	return it->Decal();
 };
 ItemScript&Item::OnUseAction(){
@@ -433,7 +433,7 @@ std::string ItemInfo::Description(){
 ITCategory ItemInfo::Category(){
 	return category;	
 };
-Decal*ItemInfo::Decal(){
+::Decal*ItemInfo::Decal(){
 	return img;
 };
 ItemScript&ItemInfo::OnUseAction(){
@@ -607,7 +607,7 @@ const size_t EnhancementInfo::size()const{
 	return enhancementStats.size();	
 };
 
-const const const std::optional<const const const ItemSet const const const*const const const>&Item::ItemSet()const const const{ //I was bored, okay?
+const std::optional<const ItemSet*const>Item::ItemSet()const{
 	return it->ItemSet();
 };
 

Crawler/Item.h

@@ -43,6 +43,7 @@ All rights reserved.
 #include "olcUTIL_DataFile.h"
 #include "AttributableStat.h"
 #include "BitwiseEnum.h"
+#include <optional>
 
 class Crawler;
 class ItemInfo;
@@ -142,7 +143,7 @@ public:
 	std::string Description(CompactText compact=COMPACT);
 	const ITCategory Category()const;
 	EquipSlot GetEquipSlot();
-	Decal*Decal();
+	::Decal*Decal();
 	const Stats GetStats()const;
 	ItemScript&OnUseAction();
 	float CastTime();
@@ -152,7 +153,7 @@ public:
 	void EnhanceItem();
 	static Item BLANK;
 	bool operator==(const Item&rhs)const;
-	const std::optional<const ItemSet *const>&ItemSet()const;
+	const std::optional<const ::ItemSet *const>ItemSet()const;
 };
 
 class Inventory{
@@ -212,7 +213,7 @@ class ItemInfo{
 	float cooldownTime=0;
 	EquipSlot slot;
 	EnhancementInfo enhancement;
-	Decal*img;
+	::Decal*img;
 	std::string set="";
 	//Returns true if the item can be used, false otherwise
 	std::string useFunc="";
@@ -230,7 +231,7 @@ public:
 	std::string Name();
 	std::string Description();
 	ITCategory Category();
-	Decal*Decal();
+	::Decal*Decal();
 	/*
 	For the useFunc, return true if the item can be used, false otherwise.
 	*/
@@ -239,7 +240,7 @@ public:
 	float CastTime();
 	float CooldownTime();
 	EquipSlot Slot();
-	const std::optional<const ItemSet *const>ItemSet()const;
+	const std::optional<const ::ItemSet *const>ItemSet()const;
 };
 
 class ItemOverlay{

Crawler/TMXParser.h

@@ -96,7 +96,7 @@ struct Map{
     std::string mapType="";
     std::set<int>spawns;
     std::map<int,SpawnerTag> SpawnerData; //Spawn groups have IDs, mobs associate which spawner they are tied to via this ID.
-    std::map<std::string,std::vector<ZoneData>> ZoneData;
+    std::map<std::string,std::vector<::ZoneData>> ZoneData;
     std::string FormatLayerData(std::ostream& os, std::vector<LayerTag>tiles);
     std::string FormatSpawnerData(std::ostream& os, std::map<int,SpawnerTag>tiles);
     friend std::ostream& operator << (std::ostream& os, Map& rhs);

Crawler/olcPGEX_TTF.h

@@ -30,7 +30,7 @@ CONTRACT, STRICT LIABILITY, OR TORT	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-Portions of this software are copyright © 2023 The FreeType
+Portions of this software are copyright <EFBFBD> 2023 The FreeType
 Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
 All rights reserved.
 */

Crawler/sig

@@ -3,7 +3,7 @@ export AUTO_UPDATE=true
 source utils/define.sh
 
 define PROJECT_NAME "Crawler"
-define CUSTOM_PARAMS "-std=c++20 -lX11 -lpthread -lpng -lstdc++fs -I/usr/include/lua5.3"
+define CUSTOM_PARAMS "-I/usr/include/freetype2 -I/usr/include/libpng16 -std=c++20 -lGL -lX11 -lpthread -lpng -lstdc++fs -lfreetype -I/usr/include/lua5.3"
 define EMSCRIPTEN_CUSTOM_PARAMS "-s MAXIMUM_MEMORY=4GB"
 define LANGUAGE "C++"