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

Fixed bug #651992: Wrong picture for destroyed orc wall

Browse source
This commit is contained in:
jsalmon3 2002-12-18 20:37:34 +00:00
parent 5265f4bf97
commit a6bdee4b1f
3 changed files with 99 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ChangeLog.html
View file

@ -1002,6 +1002,8 @@
<LI>New include file "fc_types.h" for type forward references.
<LI>Viewport code cleanup, viewport numbers changed to pointers.
<LI>Minimap cursor color in C sources configurable.
<LI>Fixed bug #651992: Wrong picture for destroyed orc wall (from
Jimmy Salmon).
<LI>+++
</UL>
</UL>

128
src/map/map_wall.cpp
View file

@ -72,7 +72,7 @@
** @param y Map Y tile-position.
** @param walltype Walltype to check. (-1 any kind)
*/
global int MapIsSeenTileWall(int x, int y,int walltype)
global int MapIsSeenTileWall(int x, int y, int walltype)
{
int t;
@ -123,27 +123,35 @@ global void MapFixSeenWallTile(int x, int y)
tile |= 1 << 3;
}
if( t==TileTypeHumanWall ) {
if (t == TileTypeHumanWall) {
tile = TheMap.Tileset->HumanWallTable[tile];
if( mf->Value<=UnitTypeHumanWall->_HitPoints/2 ) {
while( TheMap.Tileset->Table[tile] ) { // Skip good tiles
if (mf->Value <= UnitTypeHumanWall->_HitPoints / 2) {
while (TheMap.Tileset->Table[tile]){ // Skip good tiles
++tile;
}
while( !TheMap.Tileset->Table[tile] ) { // Skip separator
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
}
}
} else {
tile = TheMap.Tileset->OrcWallTable[tile];
if( mf->Value<=UnitTypeOrcWall->_HitPoints/2 ) {
while( TheMap.Tileset->Table[tile] ) { // Skip good tiles
if (mf->Value <= UnitTypeOrcWall->_HitPoints / 2) {
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
}
while( !TheMap.Tileset->Table[tile] ) { // Skip separator
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
}
}
}
if (mf->Value == 0) {
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
}
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
}
}
tile = TheMap.Tileset->Table[tile];
if (mf->SeenTile != tile) { // Already there!
@ -151,9 +159,9 @@ global void MapFixSeenWallTile(int x, int y)
// FIXME: can this only happen if seen?
#ifdef NEW_FOW
if (mf->Visible[ThisPlayer->Player]>1) {
if (mf->Visible[ThisPlayer->Player] > 1) {
#else
if ( IsMapFieldVisible(x,y) ) {
if (IsMapFieldVisible(x, y)) {
#endif
UpdateMinimapSeenXY(x, y);
MarkDrawPosMap(x, y);
@ -197,7 +205,7 @@ global void MapFixWallTile(int x, int y)
return;
}
t=mf->Flags & (MapFieldHuman|MapFieldWall);
t = mf->Flags & (MapFieldHuman | MapFieldWall);
//
// Calculate the correct tile. Depends on the surrounding.
//
@ -219,36 +227,44 @@ global void MapFixWallTile(int x, int y)
tile |= 1 << 3;
}
if( t&MapFieldHuman ) {
if (t & MapFieldHuman) {
tile = TheMap.Tileset->HumanWallTable[tile];
if( mf->Value<=UnitTypeHumanWall->_HitPoints/2 ) {
while( TheMap.Tileset->Table[tile] ) { // Skip good tiles
if (mf->Value <= UnitTypeHumanWall->_HitPoints / 2) {
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
}
while( !TheMap.Tileset->Table[tile] ) { // Skip separator
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
}
}
} else {
tile = TheMap.Tileset->OrcWallTable[tile];
if( mf->Value<=UnitTypeOrcWall->_HitPoints/2 ) {
while( TheMap.Tileset->Table[tile] ) { // Skip good tiles
if (mf->Value <= UnitTypeOrcWall->_HitPoints / 2) {
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
}
while( !TheMap.Tileset->Table[tile] ) { // Skip separator
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
}
}
}
if (mf->Value == 0) {
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
}
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
}
}
tile = TheMap.Tileset->Table[tile];
if( mf->Tile != tile ) {
mf->Tile = tile;
UpdateMinimapXY(x, y);
#ifdef NEW_FOW
if (mf->Visible[ThisPlayer->Player]>1) {
if (mf->Visible[ThisPlayer->Player] > 1) {
#else
if ( IsMapFieldVisible(x,y) ) {
if (IsMapFieldVisible(x, y)) {
#endif
UpdateMinimapSeenXY(x, y);
MapMarkSeenTile(x, y);
@ -278,34 +294,27 @@ local void MapFixWallNeighbors(int x, int y)
** @param x Map X position.
** @param y Map Y position.
*/
global void MapRemoveWall(unsigned x,unsigned y)
global void MapRemoveWall(unsigned x, unsigned y)
{
MapField* mf;
mf=TheMap.Fields+x+y*TheMap.Width;
mf = TheMap.Fields + x + y * TheMap.Width;
// FIXME: support more walls of different races.
if( mf->Flags&MapFieldHuman ) {
// FIXME: must search the correct tile
mf->Tile=TheMap.Tileset->Table[TheMap.Tileset->HumanWallTable[0]+4];
} else {
// FIXME: must search the correct tile
mf->Tile=TheMap.Tileset->Table[TheMap.Tileset->OrcWallTable[0]+4];
}
mf->Flags &= ~(MapFieldHuman|MapFieldWall|MapFieldUnpassable);
mf->Flags &= ~(MapFieldHuman | MapFieldWall | MapFieldUnpassable);
UpdateMinimapXY(x,y);
UpdateMinimapXY(x, y);
MapFixWallTile(x, y);
MapFixWallNeighbors(x, y);
#ifdef NEW_FOW
if (mf->Visible[ThisPlayer->Player]>1) {
if (mf->Visible[ThisPlayer->Player] > 1) {
#else
if ( IsMapFieldVisible(x,y) ) {
if (IsMapFieldVisible(x,y)) {
#endif
UpdateMinimapSeenXY(x,y);
MapMarkSeenTile(x,y);
MarkDrawPosMap(x,y);
MustRedraw|=RedrawMinimap;
UpdateMinimapSeenXY(x, y);
MapMarkSeenTile(x, y);
MarkDrawPosMap(x, y);
MustRedraw |= RedrawMinimap;
}
}
@ -318,38 +327,38 @@ global void MapRemoveWall(unsigned x,unsigned y)
**
** @todo FIXME: support for more races.
*/
global void MapSetWall(unsigned x,unsigned y,int humanwall)
global void MapSetWall(unsigned x, unsigned y, int humanwall)
{
MapField* mf;
mf=TheMap.Fields+x+y*TheMap.Width;
mf = TheMap.Fields + x + y * TheMap.Width;
// FIXME: support more walls of different races.
if( humanwall ) {
if (humanwall) {
// FIXME: Set random walls
mf->Tile=TheMap.Tileset->Table[TheMap.Tileset->HumanWallTable[0]];
mf->Flags|=MapFieldWall|MapFieldUnpassable|MapFieldHuman;
mf->Value=UnitTypeHumanWall->_HitPoints;
mf->Tile = TheMap.Tileset->Table[TheMap.Tileset->HumanWallTable[0]];
mf->Flags |= MapFieldWall | MapFieldUnpassable | MapFieldHuman;
mf->Value = UnitTypeHumanWall->_HitPoints;
} else {
// FIXME: Set random walls
mf->Tile=TheMap.Tileset->Table[TheMap.Tileset->OrcWallTable[0]];
mf->Flags|=MapFieldWall|MapFieldUnpassable;
mf->Value=UnitTypeOrcWall->_HitPoints;
mf->Tile = TheMap.Tileset->Table[TheMap.Tileset->OrcWallTable[0]];
mf->Flags |= MapFieldWall | MapFieldUnpassable;
mf->Value = UnitTypeOrcWall->_HitPoints;
}
UpdateMinimapXY(x,y);
UpdateMinimapXY(x, y);
MapFixWallTile(x, y);
MapFixWallNeighbors(x, y);
#ifdef NEW_FOW
if (mf->Visible[ThisPlayer->Player]>1) {
if (mf->Visible[ThisPlayer->Player] > 1) {
#else
if ( IsMapFieldVisible(x,y) ) {
if (IsMapFieldVisible(x, y)) {
#endif
UpdateMinimapSeenXY(x,y);
MapMarkSeenTile(x,y);
MarkDrawPosMap(x,y);
MustRedraw|=RedrawMinimap;
UpdateMinimapSeenXY(x, y);
MapMarkSeenTile(x, y);
MarkDrawPosMap(x, y);
MustRedraw |= RedrawMinimap;
}
}
@ -360,19 +369,20 @@ global void MapSetWall(unsigned x,unsigned y,int humanwall)
** @param y Map Y tile-position of wall.
** @param damage Damage done to wall.
*/
global void HitWall(unsigned x,unsigned y,unsigned damage)
global void HitWall(unsigned x, unsigned y, unsigned damage)
{
unsigned v;
v=TheMap.Fields[x+y*TheMap.Width].Value;
if( v<damage ) {
MapRemoveWall(x,y);
v = TheMap.Fields[x + y * TheMap.Width].Value;
if( v <= damage ) {
TheMap.Fields[x + y * TheMap.Width].Value = 0;
MapRemoveWall(x, y);
#ifdef HIERARCHIC_PATHFINDER
PfHierMapChangedCallback (x, y, x, y);
#endif
} else {
TheMap.Fields[x+y*TheMap.Width].Value=v-damage;
MapFixWallTile(x,y);
TheMap.Fields[x + y * TheMap.Width].Value = v - damage;
MapFixWallTile(x, y);
}
}

28
src/map/tileset.cpp
View file

@ -361,6 +361,34 @@ global void LoadTileset(void)
TheMap.Tileset->OrcWallTable[13] = 0x9C0;
TheMap.Tileset->OrcWallTable[14] = 0x9A0;
TheMap.Tileset->OrcWallTable[15] = 0x0C0;
// Set destroyed walls to TileTypeUnknown
for (i=0; i<16; ++i) {
n = 0;
tile = TheMap.Tileset->HumanWallTable[i];
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
++n;
}
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
++n;
}
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
++tile;
++n;
}
while (!TheMap.Tileset->Table[tile]) { // Skip separator
++tile;
++n;
}
while (n<16 && TheMap.Tileset->Table[tile]) {
TheMap.Tileset->TileTypeTable[
TheMap.Tileset->Table[tile]] = TileTypeUnknown;
++tile;
++n;
}
}
};
/**