Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Segfault when Trees or Rocks were on the edge of the map.

Browse source
This commit is contained in:
mr-russ 2003-01-05 16:59:10 +00:00
parent 39bd63906c
commit 34bbb0b013
2 changed files with 96 additions and 35 deletions

66
src/map/map_rock.cpp
View file

@ -95,15 +95,30 @@ global void MapFixSeenRockTile(int x, int y)
// Find out what each tile has with respect to wood, or grass.
//
tile = 0;
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].SeenTile];
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].SeenTile];
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].SeenTile];
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].SeenTile];
if (y - 1 < 0) {
ttup = 15; //Assign trees in all directions
} else {
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].SeenTile];
}
if (x + 1 >= TheMap.Width) {
ttright = 15; //Assign trees in all directions
} else {
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].SeenTile];
}
if (y + 1 >= TheMap.Height) {
ttdown = 15; //Assign trees in all directions
} else {
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].SeenTile];
}
if (x - 1 < 0) {
ttleft = 15; //Assign trees in all directions
} else {
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].SeenTile];
}
//
// Check each of the corners to ensure it has both connecting
// ?**?
@ -228,15 +243,30 @@ global void MapFixRockTile(int x, int y)
// Find out what each tile has with respect to wood, or grass.
//
tile = 0;
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].Tile];
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].Tile];
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].Tile];
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].Tile];
if (y - 1 < 0) {
ttup = 15; //Assign trees in all directions
} else {
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].Tile];
}
if (x + 1 >= TheMap.Width) {
ttright = 15; //Assign trees in all directions
} else {
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].Tile];
}
if (y + 1 >= TheMap.Height) {
ttdown = 15; //Assign trees in all directions
} else {
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].Tile];
}
if (x - 1 < 0) {
ttleft = 15; //Assign trees in all directions
} else {
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].Tile];
}
//
// Check each of the corners to ensure it has both connecting
// ?**?

65
src/map/map_wood.cpp
View file

@ -96,14 +96,30 @@ global void MapFixSeenWoodTile(int x, int y)
// Find out what each tile has with respect to wood, or grass.
//
tile = 0;
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].SeenTile];
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].SeenTile];
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].SeenTile];
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].SeenTile];
if (y - 1 < 0) {
ttup = 15; //Assign trees in all directions
} else {
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].SeenTile];
}
if (x + 1 >= TheMap.Width) {
ttright = 15; //Assign trees in all directions
} else {
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].SeenTile];
}
if (y + 1 >= TheMap.Height) {
ttdown = 15; //Assign trees in all directions
} else {
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].SeenTile];
}
if (x - 1 < 0) {
ttleft = 15; //Assign trees in all directions
} else {
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].SeenTile];
}
//
// Check each of the corners to ensure it has both connecting
@ -228,15 +244,30 @@ global void MapFixWoodTile(int x, int y)
// Find out what each tile has with respect to wood, or grass.
//
tile = 0;
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].Tile];
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].Tile];
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].Tile];
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].Tile];
if (y - 1 < 0) {
ttup = 15; //Assign trees in all directions
} else {
ttup = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y - 1) * TheMap.Width].Tile];
}
if (x + 1 >= TheMap.Width) {
ttright = 15; //Assign trees in all directions
} else {
ttright = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + 1 + y * TheMap.Width].Tile];
}
if (y + 1 >= TheMap.Height) {
ttdown = 15; //Assign trees in all directions
} else {
ttdown = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x + (y + 1) * TheMap.Width].Tile];
}
if (x - 1 < 0) {
ttleft = 15; //Assign trees in all directions
} else {
ttleft = TheMap.Tileset->MixedLookupTable[
TheMap.Fields[x -1 + y * TheMap.Width].Tile];
}
//
// Check each of the corners to ensure it has both connecting
// ?**?