Commit 042663dc authored by Tim Scheiber's avatar Tim Scheiber
Browse files

Merge branch 'develop' into feature/7-enemy-attack

parents 8a387761 a133fd43
Pipeline #3335 failed with stage
in 3 minutes and 5 seconds
...@@ -12,7 +12,7 @@ namespace mirrage::asset { ...@@ -12,7 +12,7 @@ namespace mirrage::asset {
{ {
std::string tileset_name; std::string tileset_name;
in >> tileset_name; in >> tileset_name;
in.ignore(); in.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
auto tileset = in.manager().load<phase_shifter::level::Tileset>(AID("tiles:" + tileset_name)); 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