1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes from Overhaul:

Browse Source 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/lighting.cpp
+9 -9
View File
@@ -212,7 +212,7 @@ void LoadShadeTablesFromTextFile()
FILE *fp;
INT32 i, j;
INT32 num;
UINT8 str[10];
CHAR8 str[10];
if( gfLoadShadeTablesFromTextFile )
{
fp = fopen( "ShadeTables.txt", "r" );
@@ -224,7 +224,7 @@ void LoadShadeTablesFromTextFile()
for( j = 0; j < 3; j++ )
{
fscanf( fp, "%s", str );
sscanf( (const char *)str, "%d", &num );
sscanf( str, "%d", &num );
gusShadeLevels[i][j] = (UINT16)num;
}
}
@@ -2088,7 +2088,7 @@ INT16 iCountY, iCountX;
INT32 LightCreateOmni(UINT8 ubIntensity, INT16 iRadius)
{
INT32 iLight;
UINT8 usName[14];
CHAR8 usName[14];
iLight=LightGetFree();
if(iLight!=(-1))
@@ -2096,7 +2096,7 @@ UINT8 usName[14];
LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius*DISTANCE_SCALE), (INT16)(iRadius*DISTANCE_SCALE));
}
sprintf((char *)usName, "LTO%d.LHT", iRadius);
sprintf(usName, "LTO%d.LHT", iRadius);
pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
strcpy(pLightNames[iLight], usName);
@@ -2112,7 +2112,7 @@ UINT8 usName[14];
INT32 LightCreateSquare(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2)
{
INT32 iLight;
UINT8 usName[14];
CHAR8 usName[14];
iLight=LightGetFree();
if(iLight!=(-1))
@@ -2120,7 +2120,7 @@ UINT8 usName[14];
LightGenerateSquare(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE));
}
sprintf((char *)usName, "LTS%d-%d.LHT", iRadius1, iRadius2);
sprintf(usName, "LTS%d-%d.LHT", iRadius1, iRadius2);
pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
strcpy(pLightNames[iLight], usName);
@@ -2136,13 +2136,13 @@ UINT8 usName[14];
INT32 LightCreateElliptical(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2)
{
INT32 iLight;
UINT8 usName[14];
CHAR8 usName[14];
iLight=LightGetFree();
if(iLight!=(-1))
LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE));
sprintf((char *) usName, "LTE%d-%d.LHT", iRadius1, iRadius2);
sprintf(usName, "LTE%d-%d.LHT", iRadius1, iRadius2);
pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
strcpy(pLightNames[iLight], usName);
@@ -3226,7 +3226,7 @@ INT32 iSprite;
LightSprites[iSprite].iOldY=WORLD_ROWS+1;
LightSprites[iSprite].uiLightType=uiLightType;
if((LightSprites[iSprite].iTemplate=LightLoadCachedTemplate((STR) pName))==(-1))
if((LightSprites[iSprite].iTemplate=LightLoadCachedTemplate( pName))==(-1))
return(-1);
LightSprites[iSprite].uiFlags|=LIGHT_SPR_ACTIVE;