Commit 047dc7aa authored by Florian Oetke's avatar Florian Oetke
Browse files

Merge branch 'develop' into feature/16-sound-effects

parents 6daba510 a133fd43
......@@ -12,7 +12,7 @@ namespace mirrage::asset {
std::string tileset_name;
in >> tileset_name;
in.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
auto tileset = in.manager().load<phase_shifter::level::Tileset>(AID("tiles:" + tileset_name));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment