Skip to content

Increase TileNo to UINT32 #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Asdow merged 1 commit into from
Apr 5, 2025
Merged

Increase TileNo to UINT32 #427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions TileEngine/lighting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#pragma optimize("", off)
#include "builddefines.h"

/****************************************************************************************
Expand Down Expand Up @@ -460,36 +461,36 @@ UINT16 usNumNodes;
***************************************************************************************/
BOOLEAN LightTileBlocked(INT16 iSrcX, INT16 iSrcY, INT16 iX, INT16 iY)
{
UINT16 usTileNo, usSrcTileNo;
UINT32 uiTileNo, uiSrcTileNo;

Assert(gpWorldLevelData!=NULL);

usTileNo=MAPROWCOLTOPOS(iY, iX);
usSrcTileNo=MAPROWCOLTOPOS(iSrcY, iSrcX);
uiTileNo=MAPROWCOLTOPOS(iY, iX);
uiSrcTileNo=MAPROWCOLTOPOS(iSrcY, iSrcX);

if (TileIsOutOfBounds(usTileNo))
if (TileIsOutOfBounds(uiTileNo))
{
return( FALSE );
}

if (TileIsOutOfBounds(usSrcTileNo))
if (TileIsOutOfBounds(uiSrcTileNo))
{
return( FALSE );
}

if(gpWorldLevelData[ usTileNo ].sHeight > gpWorldLevelData[ usSrcTileNo ].sHeight)
if(gpWorldLevelData[ uiTileNo ].sHeight > gpWorldLevelData[ uiSrcTileNo ].sHeight)
return(TRUE);
{
UINT16 usTileNo;
UINT32 uiTileNo;
LEVELNODE *pStruct;

usTileNo=MAPROWCOLTOPOS(iY, iX);
uiTileNo=MAPROWCOLTOPOS(iY, iX);

pStruct = gpWorldLevelData[ usTileNo ].pStructHead;
pStruct = gpWorldLevelData[ uiTileNo ].pStructHead;
if ( pStruct != NULL )
{
// IF WE ARE A WINDOW, DO NOT BLOCK!
if ( FindStructure( usTileNo, STRUCTURE_WALLNWINDOW ) != NULL )
if ( FindStructure( uiTileNo, STRUCTURE_WALLNWINDOW ) != NULL )
{
return( FALSE );
}
Expand All @@ -509,29 +510,29 @@ BOOLEAN LightTileHasWall( INT16 iSrcX, INT16 iSrcY, INT16 iX, INT16 iY)
{
//LEVELNODE *pStruct;
//UINT32 uiType;
UINT16 usTileNo;
UINT16 usSrcTileNo;
UINT32 uiTileNo;
UINT32 uiSrcTileNo;
INT8 bDirection;
UINT8 ubTravelCost;
//INT8 bWallCount = 0;
//UINT16 usWallOrientation;

Assert(gpWorldLevelData!=NULL);

usTileNo=MAPROWCOLTOPOS(iY, iX);
usSrcTileNo=MAPROWCOLTOPOS(iSrcY, iSrcX);
uiTileNo=MAPROWCOLTOPOS(iY, iX);
uiSrcTileNo=MAPROWCOLTOPOS(iSrcY, iSrcX);

if ( usTileNo == usSrcTileNo )
if ( uiTileNo == uiSrcTileNo )
{
return( FALSE );
}

if ( TileIsOutOfBounds(usTileNo))
if ( TileIsOutOfBounds(uiTileNo))
{
return( FALSE );
}

if ( TileIsOutOfBounds(usSrcTileNo))
if ( TileIsOutOfBounds(uiSrcTileNo))
{
return( FALSE );
}
Expand All @@ -541,7 +542,7 @@ UINT8 ubTravelCost;
bDirection = atan8( iSrcX, iSrcY, iX, iY );


ubTravelCost = gubWorldMovementCosts[ usTileNo ][ bDirection ][ 0 ];
ubTravelCost = gubWorldMovementCosts[ uiTileNo ][ bDirection ][ 0 ];

if ( ubTravelCost == TRAVELCOST_WALL )
{
Expand All @@ -550,7 +551,7 @@ UINT8 ubTravelCost;

if ( IS_TRAVELCOST_DOOR( ubTravelCost ) )
{
ubTravelCost = DoorTravelCost( NULL, usTileNo, ubTravelCost, TRUE, NULL );
ubTravelCost = DoorTravelCost( NULL, uiTileNo, ubTravelCost, TRUE, NULL );

if ( ubTravelCost == TRAVELCOST_OBSTACLE || ubTravelCost == TRAVELCOST_DOOR )
{
Expand Down