Merge branch 'master' into SQC19_Booster

This commit is contained in:
Frederic Leger
2023-11-20 15:43:01 -05:00
12 changed files with 69 additions and 19 deletions

View File

@@ -72,6 +72,7 @@ private:
BlockInfo* m_blockinfo[BTYPE_LAST];
BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
World m_world = World();
Renderer m_renderer = Renderer();