mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-05-31 16:51:08 +00:00
and extern fixes for the windows side
This commit is contained in:
parent
b5341f0d13
commit
6a5e3edcf7
4 changed files with 17 additions and 24 deletions
|
@ -132,24 +132,19 @@ void DSOUND_Restore(void);
|
||||||
|
|
||||||
void VID_SetDefaultMode (void);
|
void VID_SetDefaultMode (void);
|
||||||
|
|
||||||
int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
|
extern int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
|
||||||
int (PASCAL FAR *pWSACleanup)(void);
|
extern int (PASCAL FAR *pWSACleanup)(void);
|
||||||
int (PASCAL FAR *pWSAGetLastError)(void);
|
extern int (PASCAL FAR *pWSAGetLastError)(void);
|
||||||
SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
|
extern SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
|
||||||
int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
|
extern int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
|
||||||
int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname,
|
extern int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname, const char FAR * optval, int optlen);
|
||||||
const char FAR * optval, int optlen);
|
extern int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags, struct sockaddr FAR *from, int FAR * fromlen);
|
||||||
int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags,
|
extern int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags, const struct sockaddr FAR *to, int tolen);
|
||||||
struct sockaddr FAR *from, int FAR * fromlen);
|
extern int (PASCAL FAR *pclosesocket)(SOCKET s);
|
||||||
int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags,
|
extern int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
|
||||||
const struct sockaddr FAR *to, int tolen);
|
extern struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
|
||||||
int (PASCAL FAR *pclosesocket)(SOCKET s);
|
extern struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr, int len, int type);
|
||||||
int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
|
extern int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name, int FAR * namelen);
|
||||||
struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
|
|
||||||
struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr,
|
|
||||||
int len, int type);
|
|
||||||
int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name,
|
|
||||||
int FAR * namelen);
|
|
||||||
#endif /* _WIN32 */
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
#endif /* _WINQUAKE_H */
|
#endif /* _WINQUAKE_H */
|
||||||
|
|
|
@ -50,8 +50,6 @@ static const char rcsid[] =
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
|
|
||||||
// Joystick variables and structures
|
// Joystick variables and structures
|
||||||
cvar_t *joy_device; // Joystick device name
|
|
||||||
cvar_t *joy_enable; // Joystick enabling flag
|
|
||||||
cvar_t *joy_sensitivity; // Joystick sensitivity
|
cvar_t *joy_sensitivity; // Joystick sensitivity
|
||||||
|
|
||||||
// joystick defines and variables
|
// joystick defines and variables
|
||||||
|
|
|
@ -110,12 +110,13 @@ cvar_t *vid_nopageflip;
|
||||||
cvar_t *vid_config_x;
|
cvar_t *vid_config_x;
|
||||||
cvar_t *vid_config_y;
|
cvar_t *vid_config_y;
|
||||||
cvar_t *vid_stretch_by_2;
|
cvar_t *vid_stretch_by_2;
|
||||||
cvar_t *in_grab;
|
|
||||||
cvar_t *vid_windowed_mode;
|
cvar_t *vid_windowed_mode;
|
||||||
cvar_t *block_switch;
|
cvar_t *block_switch;
|
||||||
cvar_t *vid_window_x;
|
cvar_t *vid_window_x;
|
||||||
cvar_t *vid_window_y;
|
cvar_t *vid_window_y;
|
||||||
|
|
||||||
|
extern cvar_t *in_grab;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int width;
|
int width;
|
||||||
int height;
|
int height;
|
||||||
|
|
|
@ -146,7 +146,7 @@ LONG CDAudio_MessageHandler (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
extern viddef_t vid; // global video state
|
extern viddef_t vid; // global video state
|
||||||
|
|
||||||
float gldepthmin, gldepthmax;
|
extern float gldepthmin, gldepthmax;
|
||||||
|
|
||||||
modestate_t modestate = MS_UNINIT;
|
modestate_t modestate = MS_UNINIT;
|
||||||
|
|
||||||
|
@ -159,8 +159,7 @@ void GL_Init (void);
|
||||||
|
|
||||||
//====================================
|
//====================================
|
||||||
|
|
||||||
cvar_t *in_grab;
|
extern cvar_t *in_grab;
|
||||||
cvar_t *vid_use8bit;
|
|
||||||
|
|
||||||
int window_center_x, window_center_y, window_x, window_y, window_width,
|
int window_center_x, window_center_y, window_x, window_y, window_width,
|
||||||
window_height;
|
window_height;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue