Push demo fixes into master branch.
This commit is contained in:
commit
2fe0991920
@ -167,9 +167,10 @@ public:
|
||||
double levelTime=0.;
|
||||
Camera2D camera;
|
||||
std::map<MapName,Map>MAP_DATA;
|
||||
|
||||
ResourcePack gamepack;
|
||||
private:
|
||||
std::vector<std::unique_ptr<Effect>>foregroundEffects,backgroundEffects,foregroundEffectsToBeInserted,backgroundEffectsToBeInserted;
|
||||
std::vector<std::unique_ptr<Effect>>foregroundEffects,backgroundEffects,foregroundEffectsToBeInserted,backgroundEffectsToBeInserted;
|
||||
std::vector<TileRenderData*>tilesWithCollision,tilesWithoutCollision;
|
||||
std::vector<int>dropsBeforeLower,dropsAfterLower,dropsBeforeUpper,dropsAfterUpper;
|
||||
std::vector<ZoneData>endZones,upperEndZones;
|
||||
|
@ -807,7 +807,7 @@ const std::string&ItemInfo::Description()const{
|
||||
const ITCategory ItemInfo::Category()const{
|
||||
return category;
|
||||
}
|
||||
const::Renderable&const ItemInfo::Icon()const{
|
||||
const::Renderable&ItemInfo::Icon()const{
|
||||
return img.value().get();
|
||||
}
|
||||
const ItemScript&ItemInfo::OnUseAction()const{
|
||||
|
@ -388,7 +388,7 @@ public:
|
||||
const std::string&Name()const;
|
||||
const std::string&Description()const;
|
||||
const ITCategory Category()const;
|
||||
const::Renderable&const Icon()const;
|
||||
const::Renderable& Icon()const;
|
||||
static const EquipSlot StringToEquipSlot(std::string_view slotName);
|
||||
/*
|
||||
For the useFunc, return true if the item can be used, false otherwise.
|
||||
|
2
debugGame.sh
Executable file → Normal file
2
debugGame.sh
Executable file → Normal file
@ -1,5 +1,5 @@
|
||||
cd "Adventures in Lestoria"
|
||||
mkdir "Adventures in Lestoria"
|
||||
cp "discord_game_sdk.so" "Adventures in Lestoria"
|
||||
cp "Adventures in Lestoria/"*.so "release/Adventures in Lestoria"
|
||||
cp "libsteam_api.so" "Adventures in Lestoria"
|
||||
gdb ../bin/AdventuresInLestoria
|
||||
|
@ -19,7 +19,7 @@ cp -R "Adventures in Lestoria/assets/themes" release/assets
|
||||
cp -R "Adventures in Lestoria/assets/gamepack.pak" release/assets
|
||||
cp -R "Adventures in Lestoria/assets/"*.ttf release/assets
|
||||
cp -R "Adventures in Lestoria/controller_config" release
|
||||
cp "Adventures in Lestoria/Adventures in Lestoria/"*.so "release/Adventures in Lestoria"
|
||||
cp "Adventures in Lestoria/"*.so "release/Adventures in Lestoria"
|
||||
cp -R bin release
|
||||
|
||||
rm release/*.pdb
|
||||
|
Loading…
x
Reference in New Issue
Block a user