Skip to content

Commit

Permalink
#42 mainMap skizziert
Browse files Browse the repository at this point in the history
  • Loading branch information
romman8 committed Jan 16, 2018
1 parent 38400b7 commit 2b58ae5
Show file tree
Hide file tree
Showing 4 changed files with 538 additions and 300 deletions.
18 changes: 8 additions & 10 deletions Koramu/Map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,23 @@ void Environment::Map::render()
if (m_layerMap.count("Backgroundlayer"))
m_layerMap["Backgroundlayer"]->render();

if (m_layerMap.count("Roadlayer"))
m_layerMap["Roadlayer"]->render();

if (m_layerMap.count("Collisionlayer"))
m_layerMap["Collisionlayer"]->render();

if (m_layerMap.count("Windowlayer"))
m_layerMap["Windowlayer"]->render();

if (m_layerMap.count("Bridgelayer"))
m_layerMap["Bridgelayer"]->render();

if (m_layerMap.count("Interactionlayer"))
m_layerMap["Interactionlayer"]->render();

if (m_layerMap.count("Decorationlayer"))
m_layerMap["Decorationlayer"]->render();

if (m_layerMap.count("Objectlayer"))
m_layerMap["Objectlayer"]->render();


if (m_layerMap.count("Foregroundlayer"))
m_layerMap["Foregroundlayer"]->render();

if (m_layerMap.count("Windowlayer"))
m_layerMap["Windowlayer"]->render();
}

void Environment::Map::addLayer(std::string name, Layer* pNewLayer)
Expand Down
2 changes: 1 addition & 1 deletion Koramu/Page.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void Page::addText(std::string text)
ObjectRectangle lineRect;
lineRect.width = m_rect.getWidth();
lineRect.height = TheFontManager::Instance()->getCharHeight() + 10; // "+ 10" --> 10px Zeilenabstand
// Seitenrand hinzufügen (inks: 20px)
// Seitenrand hinzufügen (links: 20px)
lineRect.positionVector.setX(m_rect.getX() + 20);
if (m_lineRects.size())
// Rechteck genau unter der letzten beschríebenen Zeile platzieren
Expand Down
1 change: 1 addition & 0 deletions Koramu/xmlFiles/states.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<texture id="player" path="../assets/Objects/Player.png"/>
<texture id="test" path="../assets/Objects/test.png"/>
<texture id="littleGirl" path="../assets/Objects/LittleGirl.png"/>
<texture id="tree" path="../assets/TreeNew.png"/>

<!--Miscellaneous-->
<texture id="koramu" path="../assets/Koramu.png"/>
Expand Down
Loading

0 comments on commit 2b58ae5

Please sign in to comment.