Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor bugs and remove some unused code. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@561 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2006-08-12 16:27:58 +00:00
parent 5d94e4b2e4
commit cc6537bd4f
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ivis_opengl/piematrix.c
View File

@ -362,13 +362,13 @@ int32 pie_RotateProject(SDWORD x, SDWORD y, SDWORD z, SDWORD* xs, SDWORD* ys)
if ((zfx<=0) || (zfy<=0))
{
xs = LONG_WAY;//just along way off screen
ys = LONG_WAY;
*xs = LONG_WAY; //just along way off screen
*ys = LONG_WAY;
}
else if (zz < MIN_STRETCHED_Z)
{
xs = LONG_WAY;//just along way off screen
ys = LONG_WAY;
*xs = LONG_WAY; //just along way off screen
*ys = LONG_WAY;
}
else
{

3
src/intdisplay.c
View File

@ -2897,8 +2897,6 @@ void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffe
{
UDWORD ox,oy;
BUTTON_SURFACE *ButSurf = Buffer->ButSurf;
ox = oy = 0;
/*if(Down)
{
@ -2916,7 +2914,6 @@ void CreateImageButton(IMAGEFILE *ImageFile,UWORD ImageID,RENDERED_BUTTON *Buffe
//
void CreateBlankButton(RENDERED_BUTTON *Buffer,BOOL Down, UDWORD buttonType)
{
BUTTON_SURFACE *ButSurf = Buffer->ButSurf;
UDWORD ox,oy;
if(Down) {

1
src/loop.c
View File

@ -92,7 +92,6 @@ static BOOL paused=FALSE;
static BOOL video=FALSE;
static BOOL bQuitVideo=FALSE;
static SDWORD clearCount = 0;
static BOOL bSoftVideoPalette = FALSE;
//holds which pause is valid at any one time
typedef struct _pause_state

4
src/mission.c
View File

@ -4053,7 +4053,7 @@ BOOL withinLandingZone(UDWORD x, UDWORD y)
//returns the x coord for where the Transporter can land (for player 0)
UWORD getLandingX( SDWORD iPlayer )
{
ASSERT( (iPlayer<MAX_NOGO_AREAS, "getLandingX: player %i out of range") );
ASSERT( (iPlayer<MAX_NOGO_AREAS, "getLandingX: player %d out of range", iPlayer) );
return (UWORD)((sLandingZone[iPlayer].x1 + (sLandingZone[iPlayer].x2 -
sLandingZone[iPlayer].x1)/2) << TILE_SHIFT);
}
@ -4061,7 +4061,7 @@ UWORD getLandingX( SDWORD iPlayer )
//returns the y coord for where the Transporter can land
UWORD getLandingY( SDWORD iPlayer )
{
ASSERT( (iPlayer<MAX_NOGO_AREAS, "getLandingY: player %i out of range") );
ASSERT( (iPlayer<MAX_NOGO_AREAS, "getLandingY: player %d out of range", iPlayer) );
return (UWORD)((sLandingZone[iPlayer].y1 + (sLandingZone[iPlayer].y2 -
sLandingZone[iPlayer].y1)/2) << TILE_SHIFT);
}

2
src/stats.c
View File

@ -3729,7 +3729,7 @@ SDWORD getMovementModel(STRING *pMovement)
return MM_SWEEP;
}
//problem if we've got to here
ASSERT((FALSE, "Invalid movement model - ", pMovement));
ASSERT((FALSE, "Invalid movement model %s", pMovement));
return INVALID_MOVEMENT;
}