Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Sommersemester 2019
Cpp
PhaseShifter
Commits
042663dc
Commit
042663dc
authored
Sep 20, 2019
by
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
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/level/level.cpp
View file @
042663dc
...
...
@@ -12,7 +12,7 @@ namespace mirrage::asset {
{
std
::
string
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
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment