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

Fixed Segmentation fault caused by Tile collision being out of bounds.

Browse Source
This commit is contained in:
Rtch90 2011-12-17 14:05:50 +00:00
parent 389eac4ee7
commit 3c10632e78
4 changed files with 3 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Data/Media/Maps/map2
View File

@ -1,61 +0,0 @@
<map>
<line>
<tile>
<tileTexture>grass</tileTexture>
<solidTile>false</solidTile>
<entityTexture>null</entityTexture>
<solidEntity>false</solidEntity>
<zLevel>100</zLevel>
<mapTransition>null</mapTransition>
<mapTransX>0</mapTransX>
<mapTransY>0</mapTransY>
</tile>
<tile>
<tileTexture>grass</tileTexture>
<solidTile>false</solidTile>
<entityTexture>null</entityTexture>
<solidEntity>false</solidEntity>
<zLevel>100</zLevel>
<mapTransition>null</mapTransition>
<mapTransX>0</mapTransX>
<mapTransY>0</mapTransY>
</tile>
</line>
<line>
<tile>
<tileTexture>rock</tileTexture>
<solidTile>false</solidTile>
<entityTexture>null</entityTexture>
<solidEntity>false</solidEntity>
<zLevel>100</zLevel>
<mapTransition>null</mapTransition>
<mapTransX>0</mapTransX>
<mapTransY>0</mapTransY>
</tile>
<tile>
<tileTexture>snow</tileTexture>
<solidTile>true</solidTile>
<entityTexture>null</entityTexture>
<solidEntity>false</solidEntity>
<zLevel>100</zLevel>
<mapTransition>null</mapTransition>
<mapTransX>0</mapTransX>
<mapTransY>0</mapTransY>
</tile>
</line>
</map>

2
src/Unuk/Game.cpp
View File

@ -161,8 +161,8 @@ void Game::Render(void) {
} else { } else {
m_ingameMenu.Render(); m_ingameMenu.Render();
} }
SDL_Flip(screen); SDL_Flip(screen);
//SDL_Flip(screen);
} }
void Game::LoadSavegame(const string savegameIDArg) { void Game::LoadSavegame(const string savegameIDArg) {

4
src/libUnuk/Character.cpp
View File

@ -169,8 +169,8 @@ bool Character::CheckTileCollisions(void) {
} }
bool Character::CheckEntityCollisions(void) { bool Character::CheckEntityCollisions(void) {
for(int i = -2; i < 3; i++) { for(int i = -1; i < 2; i++) {
for(int j = -2; j < 3; j++) { for(int j = -1; j < 2; j++) {
if(map->GetEntitySolidity(tileX + i, tileY + j)) { if(map->GetEntitySolidity(tileX + i, tileY + j)) {
if(CheckCollisionXY(x, y, w, h, map->GetEntityX(tileX + i, tileY + j), if(CheckCollisionXY(x, y, w, h, map->GetEntityX(tileX + i, tileY + j),
map->GetEntityY(tileX + i, tileY + j), map->GetEntityY(tileX + i, tileY + j),

2
src/libUnuk/Map.cpp
View File

@ -23,8 +23,6 @@ void Map::Load(const string filename) {
TiXmlElement* tileElem = NULL; TiXmlElement* tileElem = NULL;
TiXmlElement* dataElem = NULL; TiXmlElement* dataElem = NULL;
// We will set x and y positions to zero for now, as we
// are going to set them withing the XML file.
x = -1; x = -1;
y = -1; y = -1;