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

warning fixes, change favorites color to cyan

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2139 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-04-02 03:47:06 +00:00
parent 9df6333486
commit 6330ce6046
9 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
engine/client/cd_win.c
View file

@ -23,6 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h" #include "quakedef.h"
#include "winquake.h" #include "winquake.h"
#if (_MSC_VER < 1200)
#define DWORD_PTR DWORD
#endif
extern HWND mainwindow; extern HWND mainwindow;
extern cvar_t bgmvolume; extern cvar_t bgmvolume;
@ -44,7 +48,8 @@ static void CDAudio_Eject(void)
{ {
DWORD dwReturn; DWORD dwReturn;
if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD)NULL))) dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD_PTR)NULL);
if (dwReturn)
Con_DPrintf("MCI_SET_DOOR_OPEN failed (%i)\n", dwReturn); Con_DPrintf("MCI_SET_DOOR_OPEN failed (%i)\n", dwReturn);
} }
@ -53,7 +58,8 @@ static void CDAudio_CloseDoor(void)
{ {
DWORD dwReturn; DWORD dwReturn;
if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD)NULL))) dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD_PTR)NULL);
if (dwReturn)
Con_DPrintf("MCI_SET_DOOR_CLOSED failed (%i)\n", dwReturn); Con_DPrintf("MCI_SET_DOOR_CLOSED failed (%i)\n", dwReturn);
} }
@ -67,7 +73,7 @@ static int CDAudio_GetAudioDiskInfo(void)
cdValid = false; cdValid = false;
mciStatusParms.dwItem = MCI_STATUS_READY; mciStatusParms.dwItem = MCI_STATUS_READY;
dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms); dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
if (dwReturn) if (dwReturn)
{ {
Con_DPrintf("CDAudio: drive ready test - get status failed\n"); Con_DPrintf("CDAudio: drive ready test - get status failed\n");
@ -80,7 +86,7 @@ static int CDAudio_GetAudioDiskInfo(void)
} }
mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS; mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms); dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
if (dwReturn) if (dwReturn)
{ {
Con_DPrintf("CDAudio: get tracks - status failed\n"); Con_DPrintf("CDAudio: get tracks - status failed\n");
@ -140,7 +146,7 @@ void CDAudio_Play(int track, qboolean looping)
// don't try to play a non-audio track // don't try to play a non-audio track
mciStatusParms.dwItem = MCI_CDA_STATUS_TYPE_TRACK; mciStatusParms.dwItem = MCI_CDA_STATUS_TYPE_TRACK;
mciStatusParms.dwTrack = track; mciStatusParms.dwTrack = track;
dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms); dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
if (dwReturn) if (dwReturn)
{ {
Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn); Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn);
@ -155,7 +161,7 @@ void CDAudio_Play(int track, qboolean looping)
// get the length of the track to be played // get the length of the track to be played
mciStatusParms.dwItem = MCI_STATUS_LENGTH; mciStatusParms.dwItem = MCI_STATUS_LENGTH;
mciStatusParms.dwTrack = track; mciStatusParms.dwTrack = track;
dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms); dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD_PTR) (LPVOID) &mciStatusParms);
if (dwReturn) if (dwReturn)
{ {
Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn); Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn);
@ -171,8 +177,8 @@ void CDAudio_Play(int track, qboolean looping)
mciPlayParms.dwFrom = MCI_MAKE_TMSF(track, 0, 0, 0); mciPlayParms.dwFrom = MCI_MAKE_TMSF(track, 0, 0, 0);
mciPlayParms.dwTo = (mciStatusParms.dwReturn << 8) | track; mciPlayParms.dwTo = (mciStatusParms.dwReturn << 8) | track;
mciPlayParms.dwCallback = (DWORD)mainwindow; mciPlayParms.dwCallback = (DWORD_PTR)mainwindow;
dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD)(LPVOID) &mciPlayParms); dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)(LPVOID) &mciPlayParms);
if (dwReturn) if (dwReturn)
{ {
Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn); Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
@ -200,7 +206,8 @@ void CDAudio_Stop(void)
if (!playing) if (!playing)
return; return;
if ((dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD)NULL))) dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD_PTR)NULL);
if (dwReturn)
Con_DPrintf("MCI_STOP failed (%i)", dwReturn); Con_DPrintf("MCI_STOP failed (%i)", dwReturn);
wasPlaying = false; wasPlaying = false;
@ -219,8 +226,9 @@ void CDAudio_Pause(void)
if (!playing) if (!playing)
return; return;
mciGenericParms.dwCallback = (DWORD)mainwindow; mciGenericParms.dwCallback = (DWORD_PTR)mainwindow;
if ((dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD)(LPVOID) &mciGenericParms))) dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD_PTR)(LPVOID) &mciGenericParms);
if (dwReturn)
Con_DPrintf("MCI_PAUSE failed (%i)", dwReturn); Con_DPrintf("MCI_PAUSE failed (%i)", dwReturn);
wasPlaying = playing; wasPlaying = playing;
@ -247,8 +255,8 @@ void CDAudio_Resume(void)
mciPlayParms.dwFrom = MCI_MAKE_TMSF(playTrack, 0, 0, 0); mciPlayParms.dwFrom = MCI_MAKE_TMSF(playTrack, 0, 0, 0);
mciPlayParms.dwTo = MCI_MAKE_TMSF(playTrack + 1, 0, 0, 0); mciPlayParms.dwTo = MCI_MAKE_TMSF(playTrack + 1, 0, 0, 0);
mciPlayParms.dwCallback = (DWORD)mainwindow; mciPlayParms.dwCallback = (DWORD_PTR)mainwindow;
dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD)(LPVOID) &mciPlayParms); dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD_PTR)(LPVOID) &mciPlayParms);
if (dwReturn) if (dwReturn)
{ {
Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn); Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
@ -449,7 +457,8 @@ int CDAudio_Init(void)
return -1; return -1;
mciOpenParms.lpstrDeviceType = "cdaudio"; mciOpenParms.lpstrDeviceType = "cdaudio";
if ((dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD) (LPVOID) &mciOpenParms))) dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD_PTR) (LPVOID) &mciOpenParms);
if (dwReturn)
{ {
Con_Printf("CDAudio_Init: MCI_OPEN failed (%i)\n", dwReturn); Con_Printf("CDAudio_Init: MCI_OPEN failed (%i)\n", dwReturn);
return -1; return -1;
@ -458,10 +467,11 @@ int CDAudio_Init(void)
// Set the time format to track/minute/second/frame (TMSF). // Set the time format to track/minute/second/frame (TMSF).
mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF; mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF;
if ((dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD)(LPVOID) &mciSetParms))) dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR)(LPVOID) &mciSetParms);
if (dwReturn)
{ {
Con_Printf("MCI_SET_TIME_FORMAT failed (%i)\n", dwReturn); Con_Printf("MCI_SET_TIME_FORMAT failed (%i)\n", dwReturn);
mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD)NULL); mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD_PTR)NULL);
return -1; return -1;
} }
@ -490,6 +500,6 @@ void CDAudio_Shutdown(void)
if (!initialized) if (!initialized)
return; return;
CDAudio_Stop(); CDAudio_Stop();
if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD)NULL)) if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)NULL))
Con_DPrintf("CDAudio_Shutdown: MCI_CLOSE failed\n"); Con_DPrintf("CDAudio_Shutdown: MCI_CLOSE failed\n");
} }

5
engine/client/cl_main.c
View file

@ -2484,6 +2484,11 @@ void CL_Download_f (void)
} }
#ifdef _WINDOWS #ifdef _WINDOWS
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
/* /*
================= =================

4
engine/client/m_master.c
View file

@ -1001,8 +1001,8 @@ float serverbackcolor[MAX_SERVERTYPES * 2][3] =
{0.24, 0.16, 0.04}, {0.24, 0.16, 0.04},
{0.10, 0.05, 0.10}, // FTEQTV {0.10, 0.05, 0.10}, // FTEQTV
{0.20, 0.10, 0.20}, {0.20, 0.10, 0.20},
{0.01, 0.16, 0.01}, // Favorite {0.01, 0.13, 0.13}, // Favorite
{0.02, 0.32, 0.02} {0.02, 0.26, 0.26}
}; };
float serverhighlight[MAX_SERVERTYPES][3] = float serverhighlight[MAX_SERVERTYPES][3] =

1
engine/client/quakedef.h
View file

@ -198,7 +198,6 @@ int VARGS linuxlike_snprintf(char *buffer, int size, const char *format, ...);
int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr); int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr);
#endif #endif
#define _vsnprintf unsafe_vsnprintf #define _vsnprintf unsafe_vsnprintf
#define _snprintf unsafe_snprintf #define _snprintf unsafe_snprintf
#endif #endif

5
engine/client/snd_ov.c
View file

@ -8,7 +8,12 @@
#if defined(_WIN32) #if defined(_WIN32)
#define WINDOWSDYNAMICLINK #define WINDOWSDYNAMICLINK
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
HINSTANCE oggvorbislibrary; HINSTANCE oggvorbislibrary;
#else #else
#include <dlfcn.h> #include <dlfcn.h>

4
engine/client/sys_sdl.c
View file

@ -205,6 +205,10 @@ void Sys_CloseTerminal (void)
} }
#ifdef _WIN32 #ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
#endif #endif
int main(int argc, char **argv) int main(int argc, char **argv)

4
engine/client/valid.c
View file

@ -2,6 +2,10 @@
#include <ctype.h> #include <ctype.h>
#ifdef _WIN32 #ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
#endif #endif

4
engine/server/svq3_game.c
View file

@ -31,6 +31,10 @@ float RadiusFromBounds (vec3_t mins, vec3_t maxs);
#pragma comment (lib, "botlib.lib") #pragma comment (lib, "botlib.lib")
#define FTE_GetBotLibAPI GetBotLibAPI #define FTE_GetBotLibAPI GetBotLibAPI
#else #else
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h> #include <windows.h>
botlib_export_t *FTE_GetBotLibAPI( int apiVersion, botlib_import_t *import ) botlib_export_t *FTE_GetBotLibAPI( int apiVersion, botlib_import_t *import )
{ {

2
engine/server/world.c
View file

@ -393,7 +393,7 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
#if 1 #if 1
int i; int i;
float v; float v;
float max, min; float max;
//q2 method //q2 method
max = 0; max = 0;
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)