mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-03-21 09:51:41 +00:00
header dep cleanup and IN_LL_Commands is /gone/
This commit is contained in:
parent
822e637e11
commit
7aa5ab75de
11 changed files with 37 additions and 70 deletions
|
@ -67,7 +67,6 @@ extern float in_mouse_x, in_mouse_y;
|
|||
void IN_LL_Init_Cvars (void);
|
||||
void IN_LL_Init (void);
|
||||
void IN_LL_Shutdown (void);
|
||||
void IN_LL_Commands (void);
|
||||
void IN_LL_Grab_Input (void);
|
||||
void IN_LL_Ungrab_Input (void);
|
||||
void IN_LL_SendKeyEvents (void);
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#ifndef __QF_plugin_cd_h_
|
||||
#define __QF_plugin_cd_h_
|
||||
|
||||
#include <QF/cdaudio.h>
|
||||
#include <QF/qtypes.h>
|
||||
#include <QF/plugin.h>
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#define __QF_plugin_input_h_
|
||||
|
||||
#include <QF/qtypes.h>
|
||||
#include <QF/input.h>
|
||||
#include <QF/plugin.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
#define __QF_plugin_snd_output_h_
|
||||
|
||||
#include <QF/qtypes.h>
|
||||
#include <QF/sound.h>
|
||||
#include <QF/plugin.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -29,22 +29,24 @@
|
|||
#define __QF_plugin_snd_render_h_
|
||||
|
||||
#include <QF/qtypes.h>
|
||||
#include <QF/sound.h>
|
||||
#include <QF/plugin.h>
|
||||
|
||||
/*
|
||||
All sound plugins must export these functions
|
||||
*/
|
||||
|
||||
struct sfx_s;
|
||||
|
||||
typedef void (QFPLUGIN *P_S_Init) (void);
|
||||
typedef void (QFPLUGIN *P_S_Shutdown) (void);
|
||||
typedef void (QFPLUGIN *P_S_AmbientOff) (void);
|
||||
typedef void (QFPLUGIN *P_S_AmbientOn) (void);
|
||||
typedef void (QFPLUGIN *P_S_TouchSound) (const char *sample);
|
||||
typedef void (QFPLUGIN *P_S_ClearBuffer) (void);
|
||||
typedef void (QFPLUGIN *P_S_StartSound) (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation);
|
||||
typedef void (QFPLUGIN *P_S_StaticSound) (sfx_t *sfx, vec3_t origin, float vol, float attenuation);
|
||||
typedef void (QFPLUGIN *P_S_StartSound) (int entnum, int entchannel, struct sfx_s *sfx, vec3_t origin, float fvol, float attenuation);
|
||||
typedef void (QFPLUGIN *P_S_StaticSound) (struct sfx_s *sfx, vec3_t origin, float vol, float attenuation);
|
||||
typedef void (QFPLUGIN *P_S_StopSound) (int entnum, int entchannel);
|
||||
typedef sfx_t * (QFPLUGIN *P_S_PrecacheSound) (const char *sample);
|
||||
typedef struct sfx_s * (QFPLUGIN *P_S_PrecacheSound) (const char *sample);
|
||||
typedef void (QFPLUGIN *P_S_ClearPrecache) (void);
|
||||
typedef void (QFPLUGIN *P_S_Update) (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up);
|
||||
typedef void (QFPLUGIN *P_S_StopAllSounds) (qboolean clear);
|
||||
|
|
|
@ -95,8 +95,6 @@ void
|
|||
IN_Commands (void)
|
||||
{
|
||||
JOY_Command ();
|
||||
|
||||
IN_LL_Commands ();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -130,11 +130,6 @@ IN_LL_SendKeyEvents (void)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Commands (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Grab_Input (void)
|
||||
{
|
||||
|
|
|
@ -819,11 +819,6 @@ IN_LL_SendKeyEvents (void)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Commands (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Grab_Input (void)
|
||||
{
|
||||
|
|
|
@ -417,11 +417,7 @@ IN_LL_SendKeyEvents (void)
|
|||
if (UseKeyboard) {
|
||||
while ((keyboard_update ()));
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Commands (void)
|
||||
{
|
||||
if (UseMouse) {
|
||||
/* Poll mouse values */
|
||||
while (mouse_update ());
|
||||
|
|
|
@ -401,16 +401,44 @@ IN_MouseEvent (int mstate)
|
|||
}
|
||||
|
||||
void
|
||||
IN_LL_Commands (void)
|
||||
IN_LL_Grab_Input (void)
|
||||
{
|
||||
int mx, my;
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Ungrab_Input (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_ClearStates (void)
|
||||
{
|
||||
|
||||
if (in_mouse_avail) {
|
||||
mx_accum = 0;
|
||||
my_accum = 0;
|
||||
mouse_oldbuttonstate = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_SendKeyEvents (void)
|
||||
{
|
||||
MSG msg;
|
||||
int mx, my;
|
||||
// HDC hdc;
|
||||
int i;
|
||||
DIDEVICEOBJECTDATA od;
|
||||
DWORD dwElements;
|
||||
HRESULT hr;
|
||||
|
||||
while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) {
|
||||
if (!GetMessage (&msg, NULL, 0, 0))
|
||||
Sys_Quit ();
|
||||
TranslateMessage (&msg);
|
||||
DispatchMessage (&msg);
|
||||
}
|
||||
|
||||
if (!in_mouse_avail)
|
||||
return;
|
||||
|
||||
|
@ -497,37 +525,3 @@ IN_LL_Commands (void)
|
|||
SetCursorPos (window_center_x, window_center_y);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Grab_Input (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Ungrab_Input (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_ClearStates (void)
|
||||
{
|
||||
|
||||
if (in_mouse_avail) {
|
||||
mx_accum = 0;
|
||||
my_accum = 0;
|
||||
mouse_oldbuttonstate = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_SendKeyEvents (void)
|
||||
{
|
||||
MSG msg;
|
||||
|
||||
while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) {
|
||||
if (!GetMessage (&msg, NULL, 0, 0))
|
||||
Sys_Quit ();
|
||||
TranslateMessage (&msg);
|
||||
DispatchMessage (&msg);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -473,11 +473,6 @@ event_motion (XEvent * event)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Commands (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
IN_LL_Grab_Input (void)
|
||||
{
|
||||
|
@ -512,11 +507,7 @@ IN_LL_Shutdown (void)
|
|||
in_mouse_avail = 0;
|
||||
if (x_disp) {
|
||||
XAutoRepeatOn (x_disp);
|
||||
|
||||
#ifdef HAVE_DGA
|
||||
if (dga_avail)
|
||||
XF86DGADirectVideo (x_disp, DefaultScreen (x_disp), 0);
|
||||
#endif
|
||||
dga_off ();
|
||||
}
|
||||
X11_CloseDisplay ();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue