diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp index d8d2f23a..c01f966c 100644 --- a/Crawler/Crawler.cpp +++ b/Crawler/Crawler.cpp @@ -22,6 +22,7 @@ INCLUDE_EMITTER_LIST //360x240 vi2d WINDOW_SIZE={24*15,24*10}; safemap<std::string,Animate2D::FrameSequence>ANIMATION_DATA; +std::map<int,std::vector<std::pair<int,float>>>TILE_ANIMATION_DATA; std::vector<Monster>MONSTER_LIST; std::vector<MonsterSpawner>SPAWNER_LIST; std::vector<std::shared_ptr<DamageNumber>>DAMAGENUMBER_LIST; diff --git a/Crawler/DEFINES.h b/Crawler/DEFINES.h index 085f18f4..575a4146 100644 --- a/Crawler/DEFINES.h +++ b/Crawler/DEFINES.h @@ -11,6 +11,7 @@ #define INCLUDE_DATA extern utils::datafile DATA; #define INCLUDE_STRATEGY_DATA extern safemap<std::string,int>STRATEGY_DATA; #define INCLUDE_STRATEGY_ID_DATA extern safemap<std::string,int>STRATEGY_ID_DATA; +#define INCLUDE_TILE_ANIMATION_DATA extern std::map<int,std::vector<std::pair<int,float>>>TILE_ANIMATION_DATA; #define ACCESS_PLAYER Player*p=game->GetPlayer(); diff --git a/Crawler/assets/maps/Tilesheet_No_Shadow24x24.tsx b/Crawler/assets/maps/Tilesheet_No_Shadow24x24.tsx index 499fb7dd..583b2a1a 100644 --- a/Crawler/assets/maps/Tilesheet_No_Shadow24x24.tsx +++ b/Crawler/assets/maps/Tilesheet_No_Shadow24x24.tsx @@ -6,6 +6,16 @@ <object id="1" x="0" y="0" width="24" height="24"/> </objectgroup> </tile> + <tile id="491"> + <animation> + <frame tileid="491" duration="200"/> + <frame tileid="492" duration="200"/> + <frame tileid="543" duration="200"/> + <frame tileid="544" duration="200"/> + <frame tileid="595" duration="200"/> + <frame tileid="596" duration="200"/> + </animation> + </tile> <tile id="781"> <objectgroup draworder="index" id="2"> <object id="1" x="0" y="0" width="24" height="24"/>