From cc6537bd4fc17cd017deae490033542f04b6aaa8 Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Sat, 12 Aug 2006 16:27:58 +0000
Subject: [PATCH] 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
---
 lib/ivis_opengl/piematrix.c | 8 ++++----
 src/intdisplay.c            | 3 ---
 src/loop.c                  | 1 -
 src/mission.c               | 4 ++--
 src/stats.c                 | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/ivis_opengl/piematrix.c b/lib/ivis_opengl/piematrix.c
index 8673d35c4..20a5e1708 100644
--- a/lib/ivis_opengl/piematrix.c
+++ b/lib/ivis_opengl/piematrix.c
@@ -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
 	{
diff --git a/src/intdisplay.c b/src/intdisplay.c
index e7c4ed757..6571275c5 100644
--- a/src/intdisplay.c
+++ b/src/intdisplay.c
@@ -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) {
diff --git a/src/loop.c b/src/loop.c
index ad3790e77..d4710d86e 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -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
diff --git a/src/mission.c b/src/mission.c
index 07371b0e6..18bf71cba 100644
--- a/src/mission.c
+++ b/src/mission.c
@@ -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);
 }
diff --git a/src/stats.c b/src/stats.c
index 4d45b00c6..eddefe783 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -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;
 }