Commit 0e4a1995 authored by Steven Fuller's avatar Steven Fuller

Started now on -Wall

parent 2ad5b46d
CC = gcc
#CFLAGS = -Wall -O6 -fomit-frame-pointer -mpentiumpro -mcpu=pentiumpro -march=pentiumpro -DUSEVGA
CFLAGS = -g -DUSEVGA
CFLAGS = -g -Wall
#CFLAGS = -Os -fwritable-strings
#CFLAGS = -g -Wall -DUSEVGA -DDEBUG
#CFLAGS = -g -DUSEVGA -DDEBUG
......
......@@ -55,3 +55,4 @@ just call a different function (most are left from the update block code)
remove them
* implement fizzlefade, and get that last pixel!
* remove the time verification code (in wl_inter.c)
* fix wl_debug.c, lots of junk code..
......@@ -173,6 +173,7 @@ static void INL_GetMouseDelta(int *x,int *y)
///////////////////////////////////////////////////////////////////////////
static word INL_GetMouseButtons(void)
{
return 0;
}
///////////////////////////////////////////////////////////////////////////
......@@ -247,13 +248,6 @@ static void INL_ShutMouse(void)
{
}
//
// INL_SetJoyScale() - Sets up scaling values for the specified joystick
//
static void INL_SetJoyScale(word joy)
{
}
///////////////////////////////////////////////////////////////////////////
//
// IN_SetupJoy() - Sets up thresholding values and calls INL_SetJoyScale()
......@@ -350,8 +344,6 @@ void IN_Shutdown(void)
///////////////////////////////////////////////////////////////////////////
void IN_ClearKeysDown(void)
{
int i;
LastScan = sc_None;
LastASCII = key_None;
memset(Keyboard, 0, sizeof(Keyboard));
......@@ -366,7 +358,6 @@ void IN_ClearKeysDown(void)
void IN_ReadControl(int player,ControlInfo *info)
{
boolean realdelta;
byte dbyte;
word buttons;
int dx,dy;
Motion mx,my;
......
......@@ -20,7 +20,7 @@ unsigned latchpics[NUMLATCHPICS];
void VW_DrawPropString(char *string)
{
fontstruct *font;
int width, step, height, i;
int width, step, height;
byte *source, *dest, *ptrs, *ptrd;
byte ch;
......@@ -113,11 +113,6 @@ void VWB_Vlin(int y1, int y2, int x, int color)
VW_Vlin(y1,y2,x,color);
}
void VW_UpdateScreen(void)
{
VL_UpdateScreen();
}
/*
=====================
=
......
......@@ -13,7 +13,7 @@ void VL_WaitVBL(int vbls)
vga_waitretrace();
}
void VL_UpdateScreen()
void VW_UpdateScreen()
{
memcpy(graph_mem, gfxbuf, 64000);
}
......
......@@ -15,6 +15,7 @@ void VL_Shutdown (void);
void VL_ClearVideo (byte color);
void VL_WaitVBL (int vbls);
void VW_UpdateScreen();
void VL_FillPalette(int red, int green, int blue);
void VL_SetColor(int color, int red, int green, int blue);
......
......@@ -3,6 +3,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <sys/time.h>
#include "misc.h"
......
......@@ -725,7 +725,7 @@ void ThreeDRefresh (void)
}
VL_UpdateScreen ();
VW_UpdateScreen ();
frameon++;
}
......
......@@ -24,13 +24,11 @@ t_scaledata scaledata [MAXSCALEHEIGHT+1];
int maxscale,maxscaleshl2;
unsigned BuildCompScale(int height)
void BuildCompScale(int height)
{
int i;
long fix,step;
unsigned src,totalscaled,totalsize;
int startpix,endpix,toppix;
unsigned src;
int startpix,endpix,toppix;
step = ((long)height<<16) / 64;
......@@ -67,10 +65,9 @@ unsigned BuildCompScale(int height)
==========================
*/
void SetupScaling (int maxscaleheight)
void SetupScaling(int maxscaleheight)
{
int i,x,y;
byte *dest;
int i;
maxscale = maxscaleheight-1;
maxscaleshl2 = maxscale<<2;
......@@ -107,7 +104,7 @@ void SetupScaling (int maxscaleheight)
========================
*/
unsigned xBuildCompScale (int height, byte *source, int x)
void xBuildCompScale(int height, byte *source, int x)
{
int i;
......@@ -158,16 +155,16 @@ unsigned xBuildCompScale (int height, byte *source, int x)
=======================
*/
int slinex,slinewidth;
short *linecmds;
int slinex, slinewidth;
short *linecmds;
int linescale;
unsigned maskword;
t_compshape *shapeptr;
/* linecmds - points to line segment data
/*
linecmds - points to line segment data
slinewidth - pixels across
slinex - screen coord of first column
*/
*/
void ScaleLine (void)
{
......@@ -228,24 +225,18 @@ void ScaleLine (void)
=======================
*/
static long longtemp;
void ScaleShape (int xcenter, int shapenum, unsigned height)
void ScaleShape(int xcenter, int shapenum, unsigned height)
{
t_compshape *shape;
unsigned scale,srcx,stopx,tempx;
int t;
unsigned scale,srcx,stopx;
word *cmdptr;
boolean leftvis,rightvis;
//printf ("ScaleShape (xcenter=%d, shapenum=%d, height=%d)\n",
// xcenter, shapenum, height);
shape = PM_GetSpritePage (shapenum);
scale = height>>2; // low three bits are fractional
scale = height>>2; // low three bits are fractional
if (!scale || scale>maxscale)
return; // too close or far away
return; // too close or far away
linescale = scale;
......@@ -434,22 +425,16 @@ void ScaleShape (int xcenter, int shapenum, unsigned height)
=======================
*/
void SimpleScaleShape (int xcenter, int shapenum, unsigned height)
void SimpleScaleShape(int xcenter, int shapenum, unsigned height)
{
t_compshape *shape;
unsigned scale,srcx,stopx,tempx;
int t;
unsigned scale,srcx,stopx;
unsigned short *cmdptr;
boolean leftvis,rightvis;
//printf ("SimpleScaleShape (xcenter=%d, shapenum=%d, height=%d)\n",
// xcenter, shapenum, height);
shape = PM_GetSpritePage (shapenum);
scale = height;
/* *(((unsigned *)&linescale)+1)=(unsigned)comptable; // seg of far call */
linescale = scale;
shapeptr = shape;
//
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment