eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fix up msvc/win32 a bit.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3733 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2011-02-02 00:41:01 +00:00
parent e909fdbf8c
commit 456e13bf81
9 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
engine/client/merged.h
View file

@ -219,6 +219,7 @@ typedef struct rendererinfo_s {
void (*R_LessenStains) (void); void (*R_LessenStains) (void);
void (*Mod_Init) (void); void (*Mod_Init) (void);
void (*Mod_Shutdown) (void);
void (*Mod_ClearAll) (void); void (*Mod_ClearAll) (void);
struct model_s *(*Mod_ForName) (char *name, qboolean crash); struct model_s *(*Mod_ForName) (char *name, qboolean crash);
struct model_s *(*Mod_FindName) (char *name); struct model_s *(*Mod_FindName) (char *name);

1
engine/client/render.h
View file

@ -313,6 +313,7 @@ extern texid_t ptritexture;
#if defined(GLQUAKE) || defined(D3DQUAKE) #if defined(GLQUAKE) || defined(D3DQUAKE)
void RMod_Init (void); void RMod_Init (void);
void RMod_Shutdown (void);
int Mod_TagNumForName(struct model_s *model, char *name); int Mod_TagNumForName(struct model_s *model, char *name);
int Mod_SkinNumForName(struct model_s *model, char *name); int Mod_SkinNumForName(struct model_s *model, char *name);
int Mod_FrameNumForName(struct model_s *model, char *name); int Mod_FrameNumForName(struct model_s *model, char *name);

6
engine/client/renderer.c
View file

@ -717,6 +717,7 @@ void (*R_AddStain) (vec3_t org, float red, float green, float blue, float rad
void (*R_LessenStains) (void); void (*R_LessenStains) (void);
void (*Mod_Init) (void); void (*Mod_Init) (void);
void (*Mod_Shutdown) (void);
void (*Mod_ClearAll) (void); void (*Mod_ClearAll) (void);
struct model_s *(*Mod_ForName) (char *name, qboolean crash); struct model_s *(*Mod_ForName) (char *name, qboolean crash);
struct model_s *(*Mod_FindName) (char *name); struct model_s *(*Mod_FindName) (char *name);
@ -799,6 +800,7 @@ rendererinfo_t dedicatedrendererinfo = {
#if defined(GLQUAKE) || defined(D3DQUAKE) #if defined(GLQUAKE) || defined(D3DQUAKE)
RMod_Init, RMod_Init,
RMod_Shutdown,
RMod_ClearAll, RMod_ClearAll,
RMod_ForName, RMod_ForName,
RMod_FindName, RMod_FindName,
@ -1354,6 +1356,7 @@ void R_SetRenderer(rendererinfo_t *ri)
VID_SetWindowCaption = ri->VID_SetWindowCaption; VID_SetWindowCaption = ri->VID_SetWindowCaption;
Mod_Init = ri->Mod_Init; Mod_Init = ri->Mod_Init;
Mod_Shutdown = ri->Mod_Shutdown;
Mod_Think = ri->Mod_Think; Mod_Think = ri->Mod_Think;
Mod_ClearAll = ri->Mod_ClearAll; Mod_ClearAll = ri->Mod_ClearAll;
Mod_ForName = ri->Mod_ForName; Mod_ForName = ri->Mod_ForName;
@ -1401,7 +1404,8 @@ void R_ShutdownRenderer(void)
CL_AllowIndependantSendCmd(false); //FIXME: figure out exactly which parts are going to affect the model loading. CL_AllowIndependantSendCmd(false); //FIXME: figure out exactly which parts are going to affect the model loading.
P_Shutdown(); P_Shutdown();
RMod_Shutdown(); if (Mod_Shutdown)
Mod_Shutdown();
IN_Shutdown(); IN_Shutdown();

2
engine/client/snd_al.c
View file

@ -599,7 +599,7 @@ static void OpenAL_SetUnderWater (soundcardinfo_t *sc, qboolean underwater)
} }
/*stub should not be called*/ /*stub should not be called*/
static void OpenAL_Submit (soundcardinfo_t *sc) static void OpenAL_Submit (soundcardinfo_t *sc, int start, int end)
{ {
//Con_Printf("OpenAL: Submit\n"); //Con_Printf("OpenAL: Submit\n");
} }

2
engine/client/snd_directx.c
View file

@ -512,7 +512,7 @@ SNDDMA_Submit
Send sound to device if buffer isn't really the dma buffer Send sound to device if buffer isn't really the dma buffer
=============== ===============
*/ */
static void DSOUND_Submit(soundcardinfo_t *sc) static void DSOUND_Submit(soundcardinfo_t *sc, int start, int end)
{ {
} }

4
engine/client/snd_win.c
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define WAV_BUFFER_SIZE 0x0400 #define WAV_BUFFER_SIZE 0x0400
#define SECONDARY_BUFFER_SIZE 0x10000 #define SECONDARY_BUFFER_SIZE 0x10000
static void WAV_Submit(soundcardinfo_t *sc); static void WAV_Submit(soundcardinfo_t *sc, int start, int end);
typedef struct { typedef struct {
HWAVEOUT hWaveOut; HWAVEOUT hWaveOut;
@ -166,7 +166,7 @@ WAV_Submit
Send sound to device if buffer isn't really the dma buffer Send sound to device if buffer isn't really the dma buffer
=============== ===============
*/ */
static void WAV_Submit(soundcardinfo_t *sc) static void WAV_Submit(soundcardinfo_t *sc, int start, int end)
{ {
LPWAVEHDR h; LPWAVEHDR h;
int wResult; int wResult;

3
engine/common/vm.h
View file

@ -84,9 +84,10 @@ qboolean Plugin_ExecuteString(void);
#ifdef VM_UI #ifdef VM_UI
qboolean UI_Command(void); qboolean UI_Command(void);
void UI_Init (void); void UI_Init (void);
void UI_Start (void);
void UI_Stop (void);
qboolean UI_OpenMenu(void); qboolean UI_OpenMenu(void);
void UI_Restart_f(void); void UI_Restart_f(void);
void UI_Stop (void);
qboolean UI_Q2LayoutChanged(void); qboolean UI_Q2LayoutChanged(void);
void UI_StringChanged(int num); void UI_StringChanged(int num);
qboolean UI_MousePosition(int xpos, int ypos); qboolean UI_MousePosition(int xpos, int ypos);

1
engine/d3d/vid_d3d.c
View file

@ -1207,6 +1207,7 @@ rendererinfo_t d3drendererinfo =
Surf_LessenStains, Surf_LessenStains,
RMod_Init, RMod_Init,
RMod_Shutdown,
RMod_ClearAll, RMod_ClearAll,
RMod_ForName, RMod_ForName,
RMod_FindName, RMod_FindName,

1
engine/gl/gl_vidcommon.c
View file

@ -1105,6 +1105,7 @@ rendererinfo_t openglrendererinfo = {
Surf_LessenStains, Surf_LessenStains,
RMod_Init, RMod_Init,
RMod_Shutdown,
RMod_ClearAll, RMod_ClearAll,
RMod_ForName, RMod_ForName,
RMod_FindName, RMod_FindName,