diff --git a/Crawler/C++/scripts/build.sh b/Crawler/C++/scripts/build.sh index e3c03747..17ade89d 100755 --- a/Crawler/C++/scripts/build.sh +++ b/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 diff --git a/Crawler/C++/scripts/md5 b/Crawler/C++/scripts/md5 index 8d5b6246..4e06ad7f 100644 --- a/Crawler/C++/scripts/md5 +++ b/Crawler/C++/scripts/md5 @@ -1,4 +1,4 @@ -build.sh:c073187e65d0e23aa77aa94af4ec6382 - +build.sh:e307e0388d5f0d16c7f9a39e0177fc47 - commit.sh:1af81bf417dfb932284d8a14fdd10657 - debug.sh:8125f303032b6cbc137223df63d10096 - lines.sh:3b907786f7fc9204025993016c9080de - diff --git a/Crawler/Crawler b/Crawler/Crawler index 00b741eb..4b0de35a 100755 Binary files a/Crawler/Crawler and b/Crawler/Crawler differ diff --git a/Crawler/EquipSlotButton.h b/Crawler/EquipSlotButton.h index d9a66f0a..12355ad8 100644 --- a/Crawler/EquipSlotButton.h +++ b/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 � 2023 The FreeType Project (www.freetype.org). Please see LICENSE_FT.txt for more information. All rights reserved. */ diff --git a/Crawler/Item.cpp b/Crawler/Item.cpp index 829ab11d..9603a2c7 100644 --- a/Crawler/Item.cpp +++ b/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&Item::ItemSet()const const const{ //I was bored, okay? +const std::optionalItem::ItemSet()const{ return it->ItemSet(); }; diff --git a/Crawler/Item.h b/Crawler/Item.h index 666c3d02..7d0034b7 100644 --- a/Crawler/Item.h +++ b/Crawler/Item.h @@ -43,6 +43,7 @@ All rights reserved. #include "olcUTIL_DataFile.h" #include "AttributableStat.h" #include "BitwiseEnum.h" +#include 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&ItemSet()const; + const std::optionalItemSet()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::optionalItemSet()const; + const std::optionalItemSet()const; }; class ItemOverlay{ diff --git a/Crawler/TMXParser.h b/Crawler/TMXParser.h index 289b1855..1e7be1ed 100644 --- a/Crawler/TMXParser.h +++ b/Crawler/TMXParser.h @@ -96,7 +96,7 @@ struct Map{ std::string mapType=""; std::setspawns; std::map SpawnerData; //Spawn groups have IDs, mobs associate which spawner they are tied to via this ID. - std::map> ZoneData; + std::map> ZoneData; std::string FormatLayerData(std::ostream& os, std::vectortiles); std::string FormatSpawnerData(std::ostream& os, std::maptiles); friend std::ostream& operator << (std::ostream& os, Map& rhs); diff --git a/Crawler/assets/characters/greg.png b/Crawler/assets/characters/Greg.png similarity index 100% rename from Crawler/assets/characters/greg.png rename to Crawler/assets/characters/Greg.png diff --git a/Crawler/assets/characters/player_f.png b/Crawler/assets/characters/Player_F.png similarity index 100% rename from Crawler/assets/characters/player_f.png rename to Crawler/assets/characters/Player_F.png diff --git a/Crawler/assets/characters/player_m.png b/Crawler/assets/characters/Player_M.png similarity index 100% rename from Crawler/assets/characters/player_m.png rename to Crawler/assets/characters/Player_M.png diff --git a/Crawler/assets/characters/sherman.png b/Crawler/assets/characters/Sherman.png similarity index 100% rename from Crawler/assets/characters/sherman.png rename to Crawler/assets/characters/Sherman.png diff --git a/Crawler/olcPGEX_TTF.h b/Crawler/olcPGEX_TTF.h index 4ad3be7d..374a49a3 100644 --- a/Crawler/olcPGEX_TTF.h +++ b/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 � 2023 The FreeType Project (www.freetype.org). Please see LICENSE_FT.txt for more information. All rights reserved. */ diff --git a/Crawler/sig b/Crawler/sig index 0c9e7637..b2587723 100755 --- a/Crawler/sig +++ b/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++"