1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

**********************************************************

Browse Source 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/lighting.cpp
+13 -18
View File
@@ -495,12 +495,12 @@ UINT16 usTileNo, usSrcTileNo;
usTileNo=MAPROWCOLTOPOS(iY, iX);
usSrcTileNo=MAPROWCOLTOPOS(iSrcY, iSrcX);
if ( usTileNo >= NOWHERE )
if (TileIsOutOfBounds(usTileNo))
{
return( FALSE );
}
if ( usSrcTileNo >= NOWHERE )
if (TileIsOutOfBounds(usSrcTileNo))
{
return( FALSE );
}
@@ -553,18 +553,13 @@ UINT8 ubTravelCost;
{
return( FALSE );
}
//if ( usTileNo == 10125 || usTileNo == 10126 )
//{
// int i = 0;
//}
if ( usTileNo >= NOWHERE )
if ( TileIsOutOfBounds(usTileNo))
{
return( FALSE );
}
if ( usSrcTileNo >= NOWHERE )
if ( TileIsOutOfBounds(usSrcTileNo))
{
return( FALSE );
}
@@ -744,7 +739,7 @@ INT32 iDx, iDy;
Returns the light level at a particular level without fake lights
***************************************************************************************/
UINT8 LightTrueLevel( INT16 sGridNo, INT16 bLevel )
UINT8 LightTrueLevel( INT32 sGridNo, INT16 bLevel )
{
LEVELNODE * pNode;
INT32 iSum;
@@ -860,8 +855,8 @@ BOOLEAN fFake;
Assert(gpWorldLevelData!=NULL);
uiTile= MAPROWCOLTOPOS( iY, iX );
if ( uiTile >= NOWHERE )
if ( TileIsOutOfBounds( uiTile ) )
{
return( FALSE );
}
@@ -1002,8 +997,8 @@ BOOLEAN fFake; // only passed in to land and roof layers; others get fed FALSE
Assert(gpWorldLevelData!=NULL);
uiTile= MAPROWCOLTOPOS( iY, iX );
if ( uiTile >= NOWHERE )
if ( TileIsOutOfBounds( uiTile ) )
{
return( FALSE );
}
@@ -1164,7 +1159,7 @@ UINT32 uiIndex;
uiIndex = MAPROWCOLTOPOS( iY, iX );
Assert(uiIndex!=0xffff);
Assert(uiIndex!=0xffffffff);
ubShade=__max(SHADE_MAX, ubShade);
ubShade=__min(SHADE_MIN, ubShade);
@@ -1253,7 +1248,7 @@ UINT32 uiTile;
uiTile = MAPROWCOLTOPOS( iY, iX );
CHECKF(uiTile!=0xffff);
CHECKF(uiTile!=0xffffffff);
pLand = gpWorldLevelData[uiTile].pLandHead;
@@ -2320,7 +2315,7 @@ BOOLEAN LightRevealWall(INT16 sX, INT16 sY, INT16 sSrcX, INT16 sSrcY)
fDoLeftWalls=FALSE;
// IF A FENCE, RETURN FALSE
if ( IsFencePresentAtGridno( (INT16)uiTile ) )
if ( IsFencePresentAtGridNo( uiTile ) )
{
return( FALSE );
}