Rtch/LibD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Some stones to the tileset made by Moosader.

Browse Source 
[Fix] Empty tiles causing game to crash.
This commit is contained in:
Tamir Atias 2012-04-12 20:36:13 +03:00
parent 84bfde227a
commit ac0b5785a3
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/Img/AwesomeTileset.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

7
Data/Map/Ugly.tmx
View File

@ -4,11 +4,16 @@
<property name="BGM" value="../Data/Music/journey_to_the_east_rocks.ogg"/> <property name="BGM" value="../Data/Music/journey_to_the_east_rocks.ogg"/>
</properties> </properties>
<tileset firstgid="1" name="AwesomeTileset" tilewidth="64" tileheight="64"> <tileset firstgid="1" name="AwesomeTileset" tilewidth="64" tileheight="64">
<image source="../Img/AwesomeTileset.png" width="256" height="64"/> <image source="../Img/AwesomeTileset.png" width="256" height="128"/>
</tileset> </tileset>
<layer name="Tile Layer 1" width="20" height="20"> <layer name="Tile Layer 1" width="20" height="20">
<data encoding="base64" compression="zlib"> <data encoding="base64" compression="zlib">
eJxjYWBgYMSCmdAwTJwFh3oQZsYjz4SDPRDmIWNi/ItNPcw8XHaRg2lhHjOa2aTS2NxHLTOHQviNmjdq3nAyj9oYABbJAjU= eJxjYWBgYMSCmdAwTJwFh3oQZsYjz4SDPRDmIWNi/ItNPcw8XHaRg2lhHjOa2aTS2NxHLTOHQviNmjdq3nAyj9oYABbJAjU=
</data> </data>
</layer> </layer>
<layer name="Tile Layer 2" width="20" height="20">
<data encoding="base64" compression="zlib">
eJxjYKAdYEXjs5FpDrn6KDGfHDth/mXDIobOJtY9xOqhBFAjfOnhzlEwCkbB4AIAbfMASQ==
</data>
</layer>
</map> </map>

4
src/Level/Layer.cpp
View File

@ -33,7 +33,9 @@ void Layer::Draw(int xOffset, int yOffset) {
for(int x = 0; x < _width; x++) { for(int x = 0; x < _width; x++) {
for(int y = 0; y < _height; y++) { for(int y = 0; y < _height; y++) {
MapTile& tile = GetTile(x, y); MapTile& tile = GetTile(x, y);
tile.tileset->DrawTile(tile.id, Vec2((float)x * _tileWidth, (float)y * _tileHeight)); if(tile.tileset != NULL) {
tile.tileset->DrawTile(tile.id, Vec2((float)x * _tileWidth, (float)y * _tileHeight));
}
} }
} }
} }

10
src/Level/Level.cpp
View File

@ -73,9 +73,13 @@ bool Level::Load(const std::string& filename) {
const Tmx::Tileset* tmxTileset = map.FindTileset(tmxTile.gid); const Tmx::Tileset* tmxTileset = map.FindTileset(tmxTile.gid);
MapTile tile; MapTile tile;
tile.id = tmxTile.gid - tmxTileset->GetFirstGid(); if(tmxTile.gid != 0) {
tile.tileset = tilesetMap.find(tmxTileset)->second; tile.id = tmxTile.gid - tmxTileset->GetFirstGid();
tile.tileset = tilesetMap.find(tmxTileset)->second;
} else {
tile.id = 0;
tile.tileset = NULL;
}
layer->SetTile(x, y, tile); layer->SetTile(x, y, tile);
} }
} }