mirror of
https://github.com/nzp-team/dquakeplus.git
synced 2025-02-22 03:11:22 +00:00
CTR/PSP: Fix build error imposed by previous commit (#36)
This commit is contained in:
parent
f4b80121ff
commit
6910b753bc
6 changed files with 9 additions and 11 deletions
|
@ -78,7 +78,8 @@ SinCos
|
|||
void SinCos( float radians, float *sine, float *cosine )
|
||||
{
|
||||
#ifndef __PSP__
|
||||
sincos(radians, sine, cosine);
|
||||
*sine = sin(radians);
|
||||
*cosine = cos(radians);
|
||||
#else
|
||||
|
||||
#ifdef PSP_VFPU
|
||||
|
|
|
@ -179,13 +179,13 @@ void WAD3_LoadTextureWadFile (char *filename) {
|
|||
lumpinfo_t *lumps, *lump_p;
|
||||
wadinfo_t header;
|
||||
int i, j, infotableofs, numlumps, lowmark;
|
||||
FILE *file;
|
||||
FILE *file = NULL;
|
||||
|
||||
if (COM_FOpenFile (va("textures/halflife/%s", filename), &file) != -1)
|
||||
if (COM_FOpenFile (va("textures/halflife/%s", filename), (int *)file) != -1)
|
||||
goto loaded;
|
||||
if (COM_FOpenFile (va("textures/%s", filename), &file) != -1)
|
||||
if (COM_FOpenFile (va("textures/%s", filename), (int *)file) != -1)
|
||||
goto loaded;
|
||||
if (COM_FOpenFile (filename, &file) != -1)
|
||||
if (COM_FOpenFile (filename, (int *)file) != -1)
|
||||
goto loaded;
|
||||
|
||||
Host_Error ("Couldn't load halflife wad \"%s\"\n", filename);
|
||||
|
|
|
@ -868,7 +868,6 @@ void R_DrawBrushModel (entity_t *e)
|
|||
|
||||
currententity = e;
|
||||
currenttexture0 = -1;
|
||||
//currenttexture1 = -1;
|
||||
|
||||
clmodel = e->model;
|
||||
|
||||
|
@ -1204,7 +1203,6 @@ void R_DrawWorld (void)
|
|||
|
||||
currententity = &ent;
|
||||
currenttexture0 = -1;
|
||||
//currenttexture1 = -1;
|
||||
|
||||
//GX_Color4u8(255, 255, 255, 255);
|
||||
memset (lightmap_polys, 0, sizeof(lightmap_polys));
|
||||
|
|
|
@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
*/
|
||||
|
||||
#include <ogc/gx.h>
|
||||
#include <ogc/video.h>
|
||||
|
||||
#define QUAKE_WII_BASEDIR "/apps/nzportable"
|
||||
|
||||
void GL_BeginRendering (int *x, int *y, int *width, int *height);
|
||||
void GL_EndRendering (void);
|
||||
|
@ -174,7 +177,6 @@ extern int d_lightstylevalue[256]; // 8.8 fraction of base light value
|
|||
|
||||
extern qboolean envmap;
|
||||
extern int currenttexture0;
|
||||
extern int currenttexture1;
|
||||
extern int cnttextures[2];
|
||||
extern int particletexture;
|
||||
extern int playertextures[MAX_SCOREBOARD];
|
||||
|
|
|
@ -134,8 +134,6 @@ static void init()
|
|||
console_init(framebuffer[fb & 1], 20, 20, rmode->fbWidth, rmode->xfbHeight, rmode->fbWidth * 2);
|
||||
|
||||
GL_Init();
|
||||
|
||||
//VIDEO_SetBlack(false);
|
||||
|
||||
// Initialise the controller library.
|
||||
PAD_Init();
|
||||
|
|
|
@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include <ogc/gx_struct.h>
|
||||
#include <ogc/pad.h>
|
||||
#include <ogc/system.h>
|
||||
#include <ogc/video.h>
|
||||
#include <ogc/lwp_watchdog.h>
|
||||
#include <sys/stat.h>
|
||||
#include <wiiuse/wpad.h>
|
||||
|
|
Loading…
Reference in a new issue