various type fixes to enable x86 mingw compilation
This commit is contained in:
parent
a7f829e17b
commit
c1263265ee
|
@ -40,9 +40,9 @@ gitem_armor_t jacketarmor_info = { 25, 50, .30, .00, ARMOR_JACKET};
|
|||
gitem_armor_t combatarmor_info = { 50, 100, .60, .30, ARMOR_COMBAT};
|
||||
gitem_armor_t bodyarmor_info = {100, 200, .80, .60, ARMOR_BODY};
|
||||
|
||||
static int jacket_armor_index;
|
||||
static int combat_armor_index;
|
||||
static int body_armor_index;
|
||||
int jacket_armor_index;
|
||||
int combat_armor_index;
|
||||
int body_armor_index;
|
||||
static int power_screen_index;
|
||||
static int power_shield_index;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include "m_player.h"
|
||||
|
||||
|
||||
static qboolean is_quad;
|
||||
qboolean is_quad;
|
||||
static byte is_silenced;
|
||||
|
||||
|
||||
|
|
|
@ -40,9 +40,9 @@ gitem_armor_t jacketarmor_info = { 25, 50, .30, .00, ARMOR_JACKET};
|
|||
gitem_armor_t combatarmor_info = { 50, 100, .60, .30, ARMOR_COMBAT};
|
||||
gitem_armor_t bodyarmor_info = {100, 200, .80, .60, ARMOR_BODY};
|
||||
|
||||
static int jacket_armor_index;
|
||||
static int combat_armor_index;
|
||||
static int body_armor_index;
|
||||
int jacket_armor_index;
|
||||
int combat_armor_index;
|
||||
int body_armor_index;
|
||||
static int power_screen_index;
|
||||
static int power_shield_index;
|
||||
|
||||
|
|
|
@ -449,9 +449,9 @@ IMPLEMENTATION SPECIFIC FUNCTIONS
|
|||
|
||||
void GLimp_BeginFrame( float camera_separation );
|
||||
void GLimp_EndFrame( void );
|
||||
int GLimp_Init( void *hinstance, void *hWnd );
|
||||
qboolean GLimp_Init( void *hinstance, void *hWnd );
|
||||
void GLimp_Shutdown( void );
|
||||
int GLimp_SetMode( int *pwidth, int *pheight, int mode, qboolean fullscreen );
|
||||
rserr_t GLimp_SetMode( int *pwidth, int *pheight, int mode, qboolean fullscreen );
|
||||
void GLimp_AppActivate( qboolean active );
|
||||
void GLimp_EnableLogging( qboolean enable );
|
||||
void GLimp_LogNewFrame( void );
|
||||
|
|
|
@ -72,7 +72,7 @@ LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf;
|
|||
|
||||
HINSTANCE hInstDS;
|
||||
|
||||
qboolean SNDDMA_InitDirect (void);
|
||||
sndinitstat SNDDMA_InitDirect (void);
|
||||
qboolean SNDDMA_InitWav (void);
|
||||
|
||||
void FreeSound( void );
|
||||
|
@ -590,7 +590,7 @@ Try to find a sound device to mix for.
|
|||
Returns false if nothing is found.
|
||||
==================
|
||||
*/
|
||||
int SNDDMA_Init(void)
|
||||
qboolean SNDDMA_Init(void)
|
||||
{
|
||||
sndinitstat stat;
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
qboolean s_win95;
|
||||
|
||||
int starttime;
|
||||
int ActiveApp;
|
||||
qboolean ActiveApp;
|
||||
qboolean Minimized;
|
||||
|
||||
static HANDLE hinput, houtput;
|
||||
|
|
Loading…
Reference in New Issue