mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-01-31 05:30:52 +00:00
Fix compiler warnings and errors in MinGW
many of the warnings -Wreorder and #includes with invalid path because of case-errors (windows may not care, but linux does)
This commit is contained in:
parent
948b3777eb
commit
d949bc9410
99 changed files with 242 additions and 193 deletions
|
@ -44,8 +44,8 @@ typedef unsigned char byte;
|
|||
typedef unsigned int dword;
|
||||
|
||||
|
||||
#include <Math.h>
|
||||
#include <Assert.h>
|
||||
#include <math.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define ACTUALTEXTUREWIDTH 1024 // should always be equal to or larger
|
||||
#define ACTUALTEXTUREHEIGHT 1024
|
||||
|
|
|
@ -73,7 +73,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
|
||||
#include "d_main.h"
|
||||
|
||||
//#include "../idLib/precompiled.h"
|
||||
//#include "../idlib/precompiled.h"
|
||||
//#include "../Main/PlayerProfile.h"
|
||||
//#include "../Main/PSN/PS3_Session.h"
|
||||
#include "d3xp/Game_local.h"
|
||||
|
|
|
@ -55,7 +55,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
|
||||
#include "sys/sys_signin.h"
|
||||
|
||||
#include "../../neo/d3xp/Game_Local.h"
|
||||
#include "../../neo/d3xp/Game_local.h"
|
||||
|
||||
// a weapon is found with two clip loads,
|
||||
// a big item has five clip loads
|
||||
|
|
|
@ -54,7 +54,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
// Data.
|
||||
#include "sounds.h"
|
||||
|
||||
#include "../../neo/d3xp/Game_Local.h"
|
||||
#include "../../neo/d3xp/Game_local.h"
|
||||
|
||||
//
|
||||
// Animating textures and planes
|
||||
|
|
|
@ -32,7 +32,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#include "sys/sys_session.h"
|
||||
#include "sys/sys_signin.h"
|
||||
//#include "DoomLeaderboards.h"
|
||||
#include "d3xp/Game_Local.h"
|
||||
#include "d3xp/Game_local.h"
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
|
@ -29,7 +29,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#pragma hdrstop
|
||||
|
||||
#include "Game_local.h"
|
||||
#include "..\..\doomclassic\doom\doomdef.h"
|
||||
#include "../../doomclassic/doom/doomdef.h"
|
||||
|
||||
idCVar achievements_Verbose( "achievements_Verbose", "1", CVAR_BOOL, "debug spam" );
|
||||
idCVar g_demoMode( "g_demoMode", "0", CVAR_INTEGER, "this is a demo" );
|
||||
|
|
|
@ -48,7 +48,7 @@ class idAimAssist
|
|||
{
|
||||
public:
|
||||
|
||||
idAimAssist() : angleCorrection( ang_zero ), frictionScalar( 1.0f ), lastTargetPos( vec3_zero ), player( NULL ) {}
|
||||
idAimAssist() : player( NULL ), angleCorrection( ang_zero ), frictionScalar( 1.0f ), lastTargetPos( vec3_zero ) {}
|
||||
|
||||
void Init( idPlayer* player );
|
||||
void Update();
|
||||
|
|
|
@ -30,7 +30,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#pragma hdrstop
|
||||
|
||||
#include "Game_local.h"
|
||||
#include "..\framework\Common_local.h"
|
||||
#include "../framework/Common_local.h"
|
||||
|
||||
static const int SNAP_GAMESTATE = 0;
|
||||
static const int SNAP_SHADERPARMS = 1;
|
||||
|
|
|
@ -8477,7 +8477,7 @@ void idPlayer::RunPhysics_RemoteClientCorrection()
|
|||
const float serverSpeedSquared = physicsObj.GetLinearVelocity().LengthSqr();
|
||||
const float clientSpeedSquared = usercmd.speedSquared;
|
||||
|
||||
if( std::abs( serverSpeedSquared - clientSpeedSquared ) > pm_clientAuthoritative_minSpeedSquared.GetFloat() )
|
||||
if( fabsf( serverSpeedSquared - clientSpeedSquared ) > pm_clientAuthoritative_minSpeedSquared.GetFloat() )
|
||||
{
|
||||
idVec3 normalizedVelocity = physicsObj.GetLinearVelocity();
|
||||
|
||||
|
|
|
@ -3092,7 +3092,7 @@ const char* idWeapon::GetAmmoPickupNameForNum( ammo_t ammonum )
|
|||
|
||||
const char* name = GetAmmoNameForNum( ammonum );
|
||||
|
||||
if( name != NULL && *name != NULL )
|
||||
if( name != NULL && *name != '\0' )
|
||||
{
|
||||
num = ammoDict->GetNumKeyVals();
|
||||
for( i = 0; i < num; i++ )
|
||||
|
@ -4778,4 +4778,4 @@ void idWeapon::ClientPredictionThink()
|
|||
void idWeapon::ForceAmmoInClip()
|
||||
{
|
||||
ammoClip = clipSize;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
*/
|
||||
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
extern idCVar in_useJoystick;
|
||||
|
|
|
@ -142,8 +142,8 @@ struct actionRepeater_t
|
|||
widget( NULL ),
|
||||
numRepetitions( 0 ),
|
||||
nextRepeatTime( 0 ),
|
||||
screenIndex( -1 ),
|
||||
repeatDelay( DEFAULT_REPEAT_TIME ),
|
||||
screenIndex( -1 ),
|
||||
isActive( false )
|
||||
{
|
||||
}
|
||||
|
@ -343,21 +343,22 @@ public:
|
|||
smallFrameShowing( false ),
|
||||
largeFrameShowing( false ),
|
||||
bgShowing( true ),
|
||||
nextPeerUpdateMs( 0 ),
|
||||
inGame( false ),
|
||||
waitForBinding( false ),
|
||||
waitBind( NULL ),
|
||||
newGameType( 0 ),
|
||||
menuBar( NULL ),
|
||||
pacifier( NULL ),
|
||||
timeRemaining( 0 ),
|
||||
nextPeerUpdateMs( 0 ),
|
||||
newGameType( 0 ),
|
||||
inGame( false ),
|
||||
showingIntro( false ),
|
||||
continueWaitForEnumerate( false ),
|
||||
gameComplete( false ),
|
||||
introGui( NULL ),
|
||||
typeSoundShader( NULL ),
|
||||
doom3Intro( NULL ),
|
||||
roeIntro( NULL ),
|
||||
lmIntro( NULL ),
|
||||
typeSoundShader( NULL ),
|
||||
continueWaitForEnumerate( false ),
|
||||
gameComplete( false ),
|
||||
marsRotation( NULL )
|
||||
{
|
||||
}
|
||||
|
@ -619,4 +620,4 @@ protected:
|
|||
};
|
||||
|
||||
|
||||
#endif //__MENUDATA_H__
|
||||
#endif //__MENUDATA_H__
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int TIP_DISPLAY_TIME = 5000;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int MAX_PDA_ITEMS = 15;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
idMenuScreen::idMenuScreen()
|
||||
|
|
|
@ -486,9 +486,9 @@ class idMenuScreen_Shell_Singleplayer : public idMenuScreen
|
|||
{
|
||||
public:
|
||||
idMenuScreen_Shell_Singleplayer() :
|
||||
canContinue( false ),
|
||||
options( NULL ),
|
||||
btnBack( NULL ),
|
||||
canContinue( false )
|
||||
btnBack( NULL )
|
||||
{
|
||||
}
|
||||
virtual void Initialize( idMenuHandler* data );
|
||||
|
@ -645,9 +645,9 @@ class idMenuScreen_Shell_Difficulty : public idMenuScreen
|
|||
{
|
||||
public:
|
||||
idMenuScreen_Shell_Difficulty() :
|
||||
nightmareUnlocked( false ),
|
||||
options( NULL ),
|
||||
btnBack( NULL ),
|
||||
nightmareUnlocked( false )
|
||||
btnBack( NULL )
|
||||
{
|
||||
}
|
||||
virtual void Initialize( idMenuHandler* data );
|
||||
|
@ -658,7 +658,7 @@ public:
|
|||
private:
|
||||
bool nightmareUnlocked;
|
||||
idMenuWidget_DynamicList* options;
|
||||
idMenuWidget_Button* btnBack;
|
||||
idMenuWidget_Button* btnBack;
|
||||
};
|
||||
|
||||
//*
|
||||
|
@ -746,14 +746,15 @@ public:
|
|||
idMenuScreen_Shell_Leaderboards() :
|
||||
options( NULL ),
|
||||
btnBack( NULL ),
|
||||
refreshLeaderboard( false ),
|
||||
refreshWhenMasterIsOnline( false ),
|
||||
lbIndex( 0 ),
|
||||
btnPrev( NULL ),
|
||||
btnNext( NULL ),
|
||||
lbHeading( NULL ),
|
||||
btnPageDwn( NULL ),
|
||||
btnPageUp( NULL )
|
||||
btnPageUp( NULL ),
|
||||
lbCache( NULL ),
|
||||
lbHeading( NULL ),
|
||||
lbIndex( 0 ),
|
||||
refreshLeaderboard( false ),
|
||||
refreshWhenMasterIsOnline( false )
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -811,10 +812,10 @@ class idMenuScreen_Shell_Bindings : public idMenuScreen
|
|||
public:
|
||||
idMenuScreen_Shell_Bindings() :
|
||||
options( NULL ),
|
||||
btnBack( NULL ),
|
||||
blinder( NULL ),
|
||||
restoreDefault( NULL ),
|
||||
blinder( NULL ),
|
||||
txtBlinder( NULL ),
|
||||
btnBack( NULL ),
|
||||
bindingsChanged( false )
|
||||
{
|
||||
}
|
||||
|
@ -839,7 +840,7 @@ protected:
|
|||
idMenuWidget_Button* restoreDefault;
|
||||
idSWFSpriteInstance* blinder;
|
||||
idSWFSpriteInstance* txtBlinder;
|
||||
idMenuWidget_Button* btnBack;
|
||||
idMenuWidget_Button* btnBack;
|
||||
bool bindingsChanged;
|
||||
};
|
||||
|
||||
|
@ -922,9 +923,9 @@ class idMenuScreen_Shell_Load : public idMenuScreen
|
|||
public:
|
||||
idMenuScreen_Shell_Load() :
|
||||
options( NULL ),
|
||||
saveInfo( NULL ),
|
||||
btnBack( NULL ),
|
||||
btnDelete( NULL ),
|
||||
saveInfo( NULL )
|
||||
btnDelete( NULL )
|
||||
{
|
||||
}
|
||||
virtual void Initialize( idMenuHandler* data );
|
||||
|
@ -959,10 +960,10 @@ class idMenuScreen_Shell_Save : public idMenuScreen
|
|||
{
|
||||
public:
|
||||
idMenuScreen_Shell_Save() :
|
||||
options( NULL ),
|
||||
btnBack( NULL ),
|
||||
btnDelete( NULL ),
|
||||
saveInfo( NULL )
|
||||
options( NULL ),
|
||||
saveInfo( NULL ),
|
||||
btnDelete( NULL )
|
||||
{
|
||||
}
|
||||
virtual void Initialize( idMenuHandler* data );
|
||||
|
@ -981,10 +982,10 @@ public:
|
|||
|
||||
private:
|
||||
idMenuWidget_Button* btnBack;
|
||||
idMenuWidget_DynamicList* options;
|
||||
idMenuWidget_Shell_SaveInfo* saveInfo;
|
||||
idMenuWidget_Button* btnDelete;
|
||||
saveGameDetailsList_t sortedSaves;
|
||||
idMenuWidget_DynamicList* options;
|
||||
idMenuWidget_Shell_SaveInfo* saveInfo;
|
||||
idMenuWidget_Button* btnDelete;
|
||||
saveGameDetailsList_t sortedSaves;
|
||||
};
|
||||
|
||||
//*
|
||||
|
@ -1318,8 +1319,8 @@ public:
|
|||
};
|
||||
|
||||
idMenuScreen_Shell_ControllerLayout() :
|
||||
btnBack( NULL ),
|
||||
options( NULL )
|
||||
options( NULL ),
|
||||
btnBack( NULL )
|
||||
{
|
||||
}
|
||||
virtual void Initialize( idMenuHandler* data );
|
||||
|
@ -1491,12 +1492,12 @@ class idMenuScreen_Shell_PartyLobby : public idMenuScreen
|
|||
{
|
||||
public:
|
||||
idMenuScreen_Shell_PartyLobby() :
|
||||
options( NULL ),
|
||||
lobby( NULL ),
|
||||
isHost( false ),
|
||||
isPeer( false ),
|
||||
btnBack( NULL ),
|
||||
inParty( false )
|
||||
inParty( false ),
|
||||
options( NULL ),
|
||||
lobby( NULL ),
|
||||
btnBack( NULL )
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1531,14 +1532,14 @@ class idMenuScreen_Shell_GameLobby : public idMenuScreen
|
|||
{
|
||||
public:
|
||||
idMenuScreen_Shell_GameLobby() :
|
||||
longCountdown( 0 ),
|
||||
longCountRemaining( 0 ),
|
||||
shortCountdown( 0 ),
|
||||
isHost( false ),
|
||||
isPeer( false ),
|
||||
privateGameLobby( true ),
|
||||
options( NULL ),
|
||||
lobby( NULL ),
|
||||
longCountdown( 0 ),
|
||||
shortCountdown( 0 ),
|
||||
longCountRemaining( 0 ),
|
||||
isPeer( false ),
|
||||
isHost( false ),
|
||||
privateGameLobby( true ),
|
||||
btnBack( NULL )
|
||||
{
|
||||
}
|
||||
|
@ -1579,61 +1580,62 @@ public:
|
|||
idMenuScreen_HUD() :
|
||||
weaponInfo( NULL ),
|
||||
playerInfo( NULL ),
|
||||
audioLog( NULL ),
|
||||
communication( NULL ),
|
||||
oxygen( NULL ),
|
||||
stamina( NULL ),
|
||||
weaponName( NULL ),
|
||||
weaponImg( NULL ),
|
||||
weaponPills( NULL ),
|
||||
locationName( NULL ),
|
||||
downloadPda( NULL ),
|
||||
downloadVideo( NULL ),
|
||||
newPDA( NULL ),
|
||||
newVideo( NULL ),
|
||||
objective( NULL ),
|
||||
objectiveComplete( NULL ),
|
||||
tipInfo( NULL ),
|
||||
mpChat( NULL ),
|
||||
mpWeapons( NULL ),
|
||||
healthBorder( NULL ),
|
||||
healthPulse( NULL ),
|
||||
armorFrame( NULL ),
|
||||
security( NULL ),
|
||||
securityText( NULL ),
|
||||
newPDADownload( NULL ),
|
||||
newPDAHeading( NULL ),
|
||||
newPDAName( NULL ),
|
||||
newVideoDownload( NULL ),
|
||||
newPDA( NULL ),
|
||||
newVideo( NULL ),
|
||||
audioLog( NULL ),
|
||||
communication( NULL ),
|
||||
oxygen( NULL ),
|
||||
objective( NULL ),
|
||||
objectiveComplete( NULL ),
|
||||
ammoInfo( NULL ),
|
||||
weaponImg( NULL ),
|
||||
newWeapon( NULL ),
|
||||
pickupInfo( NULL ),
|
||||
talkCursor( NULL ),
|
||||
combatCursor( NULL ),
|
||||
grabberCursor( NULL ),
|
||||
bsInfo( NULL ),
|
||||
soulcubeInfo( NULL ),
|
||||
newItem( NULL ),
|
||||
respawnMessage( NULL ),
|
||||
flashlight( NULL ),
|
||||
mpChatObject( NULL ),
|
||||
mpConnection( NULL ),
|
||||
mpInfo( NULL ),
|
||||
mpHitInfo( NULL ),
|
||||
locationName( NULL ),
|
||||
securityText( NULL ),
|
||||
newPDAName( NULL ),
|
||||
newPDAHeading( NULL ),
|
||||
newVideoHeading( NULL ),
|
||||
mpMessage( NULL ),
|
||||
mpTime( NULL ),
|
||||
audioLogPrevTime( 0 ),
|
||||
commPrevTime( 0 ),
|
||||
oxygenComm( false ),
|
||||
inVaccuum( false ),
|
||||
ammoInfo( NULL ),
|
||||
newWeapon( NULL ),
|
||||
pickupInfo( NULL ),
|
||||
objScreenshot( NULL ),
|
||||
cursorState( CURSOR_NONE ),
|
||||
cursorInCombat( 0 ),
|
||||
cursorTalking( 0 ),
|
||||
cursorItem( 0 ),
|
||||
cursorGrabber( 0 ),
|
||||
cursorNone( 0 ),
|
||||
talkCursor( NULL ),
|
||||
combatCursor( NULL ),
|
||||
grabberCursor( NULL ),
|
||||
bsInfo( NULL ),
|
||||
soulcubeInfo( NULL ),
|
||||
mpInfo( NULL ),
|
||||
mpHitInfo( NULL ),
|
||||
mpTime( NULL ),
|
||||
mpMessage( NULL ),
|
||||
mpChat( NULL ),
|
||||
mpWeapons( NULL ),
|
||||
newItem( NULL ),
|
||||
respawnMessage( NULL ),
|
||||
flashlight( NULL ),
|
||||
mpChatObject( NULL ),
|
||||
showSoulCubeInfoOnLoad( false ),
|
||||
mpConnection( NULL )
|
||||
showSoulCubeInfoOnLoad( false )
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
extern idCVar pm_stamina;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int NUM_INVENTORY_ITEMS_VISIBLE = 9;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
@ -567,4 +567,4 @@ void idMenuScreen_PDA_UserEmails::ObserveEvent( const idMenuWidget& widget, cons
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int MAX_VIDEO_ITEMS = 5;
|
||||
|
@ -367,4 +367,4 @@ bool idMenuScreen_PDA_VideoDisks::HandleAction( idWidgetAction& action, const id
|
|||
}
|
||||
|
||||
return idMenuWidget::HandleAction( action, event, widget, forceHandled );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
//***************************************************************
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
typedef struct
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
enum browserCommand_t
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_LAYOUT_OPTIONS = 1;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_CONTROLS_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int NUM_CREDIT_LINES = 16;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_DEV_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SETTING_OPTIONS = 8;
|
||||
|
|
|
@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_LOBBY_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_GAME_OPTIONS_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_CONTROLS_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_LEADERBOARD_ITEMS = 16;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_GAME_OPTIONS_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SETTING_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_NEW_GAME_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_LOBBY_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
extern idCVar g_demoMode;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SETTING_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
#include "../../framework/Common_local.h"
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
#include "../../renderer/tr_local.h"
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
extern idCVar g_demoMode;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SETTING_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SINGLEPLAYER_OPTIONS = 8;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SYSTEM_OPTIONS_OPTIONS = 4;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
const static int NUM_SYSTEM_OPTIONS_OPTIONS = 8;
|
||||
|
|
|
@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
*/
|
||||
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -814,8 +814,8 @@ class idMenuWidget_ServerButton : public idMenuWidget_Button
|
|||
public:
|
||||
|
||||
idMenuWidget_ServerButton() :
|
||||
players( 0 ),
|
||||
index( 0 ),
|
||||
players( 0 ),
|
||||
maxPlayers( 0 ),
|
||||
joinable( false ),
|
||||
validMap( false )
|
||||
|
@ -1037,9 +1037,9 @@ public:
|
|||
numVisibleOptions( 0 ),
|
||||
viewIndex( 0 ),
|
||||
moveToIndex( 0 ),
|
||||
scrollLeft( false ),
|
||||
moveDiff( 0 ),
|
||||
fastScroll( false ),
|
||||
moveDiff( 0 )
|
||||
scrollLeft( false )
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1516,9 +1516,9 @@ class idMenuWidget_PDA_EmailInbox: public idMenuWidget
|
|||
{
|
||||
public:
|
||||
idMenuWidget_PDA_EmailInbox() :
|
||||
pdaIndex( 0 ),
|
||||
emailList( NULL ),
|
||||
scrollbar( NULL )
|
||||
scrollbar( NULL ),
|
||||
pdaIndex( 0 )
|
||||
{
|
||||
}
|
||||
virtual void Update();
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
void idMenuWidget_Carousel::Initialize( idMenuHandler* data )
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
void idMenuWidget_ItemAssignment::SetIcon( int index, const idMaterial* icon )
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int MAX_AUDIO_ITEMS = 3;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
static const int MAX_EMAIL_ITEMS = 7;
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
void idMenuWidget_PDA_VideoInfo::Update()
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
void idMenuWidget_ScrollBar::Initialize( idMenuHandler* data )
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../../idLib/precompiled.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../Game_local.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -84,7 +84,7 @@ idSerializer
|
|||
class idSerializer
|
||||
{
|
||||
public:
|
||||
idSerializer( idBitMsg& msg_, bool writing_ ) : msg( &msg_ ), writing( writing_ )
|
||||
idSerializer( idBitMsg& msg_, bool writing_ ) : writing( writing_ ), msg( &msg_ )
|
||||
#ifdef SERIALIZE_SANITYCHECK
|
||||
, magic( 0 )
|
||||
#endif
|
||||
|
|
|
@ -87,10 +87,10 @@ public:
|
|||
clientGameMilliseconds( 0 ),
|
||||
serverGameMilliseconds( 0 ),
|
||||
fireCount( 0 ),
|
||||
mx(),
|
||||
my(),
|
||||
impulse(),
|
||||
impulseSequence(),
|
||||
mx(),
|
||||
my(),
|
||||
pos( 0.0f, 0.0f, 0.0f ),
|
||||
speedSquared( 0.0f )
|
||||
{
|
||||
|
|
|
@ -28,8 +28,9 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#ifndef __SOFTWARECACHE_H__
|
||||
#define __SOFTWARECACHE_H__
|
||||
|
||||
#ifdef _MSC_VER // DG: #pragma warning is MSVC specific
|
||||
#pragma warning( disable : 4324 ) // structure was padded due to __declspec(align())
|
||||
|
||||
#endif
|
||||
/*
|
||||
================================================================================================
|
||||
|
||||
|
|
|
@ -73,6 +73,9 @@ enum utf8Encoding_t
|
|||
#define StrCmpNI use_idStr_Icmpn
|
||||
|
||||
#define stricmp idStr::Icmp // use_idStr_Icmp
|
||||
|
||||
#undef strcasecmp // DG: redefining this without undefining it causes tons of compiler warnings
|
||||
|
||||
#define _stricmp use_idStr_Icmp
|
||||
#define strcasecmp use_idStr_Icmp
|
||||
#define strnicmp use_idStr_Icmpn
|
||||
|
|
|
@ -86,6 +86,14 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#endif
|
||||
#endif
|
||||
|
||||
// DG: #pragma hdrstop is only available on MSVC, so make sure it doesn't cause compiler warnings on other compilers..
|
||||
#ifdef _MSC_VER
|
||||
// afaik __pragma is a MSVC specific alternative to #pragma that can be used in macros
|
||||
#define ID_HDRSTOP __pragma(hdrstop)
|
||||
#else
|
||||
#define ID_HDRSTOP
|
||||
#endif // DG end
|
||||
|
||||
// we should never rely on this define in our code. this is here so dodgy external libraries don't get confused
|
||||
#ifndef WIN32
|
||||
#define WIN32
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#include "../Shared/Shared.h"
|
||||
#include "..\Common\Common.h"
|
||||
#include "../Common/Common.h"
|
||||
|
||||
/*
|
||||
* Include file for users of JPEG library.
|
||||
|
|
|
@ -21,6 +21,9 @@
|
|||
#ifndef __DSOUND_INCLUDED__
|
||||
#define __DSOUND_INCLUDED__
|
||||
|
||||
// DG: this is redefined here all the time..
|
||||
#undef INTERFACE // FIXME: use pragma push/pop_macro instead?
|
||||
|
||||
#ifndef DIRECTSOUND_VERSION
|
||||
#define DIRECTSOUND_VERSION 0x0900
|
||||
#endif
|
||||
|
|
|
@ -28,5 +28,5 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#pragma hdrstop
|
||||
#include "../idlib/precompiled.h"
|
||||
#include "tr_local.h"
|
||||
#include "..\sound\snd_local.h"
|
||||
#include "../sound/snd_local.h"
|
||||
|
||||
|
|
|
@ -37,8 +37,8 @@ If you have questions concerning this license or the applicable additional terms
|
|||
*/
|
||||
|
||||
#include "tr_local.h"
|
||||
#include "dxt/DXTCodec.h"
|
||||
#include "color/ColorSpace.h"
|
||||
#include "DXT/DXTCodec.h"
|
||||
#include "Color/ColorSpace.h"
|
||||
|
||||
idCVar image_highQualityCompression( "image_highQualityCompression", "0", CVAR_BOOL, "Use high quality (slow) compression" );
|
||||
|
||||
|
|
|
@ -1165,7 +1165,7 @@ NormalDistanceDXT5
|
|||
*/
|
||||
int NormalDistanceDXT5( const int* vector, const int* normalized )
|
||||
{
|
||||
#ifdef _MSC_VER && defined(_M_IX86)
|
||||
#if _MSC_VER && defined(_M_IX86)
|
||||
int result;
|
||||
__asm
|
||||
{
|
||||
|
|
|
@ -33,7 +33,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#define __QGL_H__
|
||||
|
||||
|
||||
#include <gl/gl.h>
|
||||
#include <GL/gl.h>
|
||||
|
||||
|
||||
#ifndef APIENTRY
|
||||
|
|
|
@ -83,7 +83,7 @@ static void R_TracePointCullStatic( byte* cullBits, byte& totalOr, const float r
|
|||
const __m128 p3Z = _mm_splat_ps( p3, 2 );
|
||||
const __m128 p3W = _mm_splat_ps( p3, 3 );
|
||||
|
||||
__m128i vecTotalOrInt = { 0, 0, 0, 0 };
|
||||
__m128i vecTotalOrInt = _mm_set_epi32(0, 0, 0, 0);
|
||||
|
||||
for( int i = 0; i < numVerts; )
|
||||
{
|
||||
|
@ -218,7 +218,7 @@ static void R_TracePointCullSkinned( byte* cullBits, byte& totalOr, const float
|
|||
const __m128 p3Z = _mm_splat_ps( p3, 2 );
|
||||
const __m128 p3W = _mm_splat_ps( p3, 3 );
|
||||
|
||||
__m128i vecTotalOrInt = { 0, 0, 0, 0 };
|
||||
__m128i vecTotalOrInt = _mm_set_epi32(0, 0, 0, 0);
|
||||
|
||||
for( int i = 0; i < numVerts; )
|
||||
{
|
||||
|
|
|
@ -534,8 +534,8 @@ public:
|
|||
//-------------------------
|
||||
|
||||
idSoundSystemLocal() :
|
||||
soundTime( 0 ),
|
||||
currentSoundWorld( NULL ),
|
||||
soundTime( 0 ),
|
||||
muted( false ),
|
||||
musicMuted( false ),
|
||||
needsRestart( false )
|
||||
|
|
|
@ -28,9 +28,8 @@ If you have questions concerning this license or the applicable additional terms
|
|||
|
||||
// DG: SoundSample seems to be XAudio-independent, so this is just a copy of idSoundSample_XAudio2
|
||||
|
||||
//#include "../../idlib/precompiled.h"
|
||||
//#include "../snd_local.h"
|
||||
#include "SoundStub.h"
|
||||
#include "../../idlib/precompiled.h"
|
||||
#include "../snd_local.h"
|
||||
|
||||
extern idCVar s_useCompression;
|
||||
extern idCVar s_noSound;
|
||||
|
|
|
@ -37,14 +37,47 @@ If you have questions concerning this license or the applicable additional terms
|
|||
* cleaner and may be feasible)
|
||||
*/
|
||||
|
||||
#include "../SoundVoice.h"
|
||||
#include "idlib/precompiled.h" // TIME_T
|
||||
|
||||
#ifndef SOUNDSTUB_H_
|
||||
#define SOUNDSTUB_H_
|
||||
|
||||
#include "idlib/precompiled.h" // TIME_T
|
||||
#include "../WaveFile.h"
|
||||
|
||||
class idSoundVoice : public idSoundVoice_Base
|
||||
{
|
||||
public:
|
||||
void Create( const idSoundSample* leadinSample, const idSoundSample* loopingSample ) {}
|
||||
|
||||
// Start playing at a particular point in the buffer. Does an Update() too
|
||||
void Start( int offsetMS, int ssFlags ){}
|
||||
|
||||
// Stop playing.
|
||||
void Stop(){}
|
||||
|
||||
// Stop consuming buffers
|
||||
void Pause(){}
|
||||
// Start consuming buffers again
|
||||
void UnPause(){}
|
||||
|
||||
// Sends new position/volume/pitch information to the hardware
|
||||
bool Update()
|
||||
{ return false; }
|
||||
|
||||
// returns the RMS levels of the most recently processed block of audio, SSF_FLICKER must have been passed to Start
|
||||
float GetAmplitude()
|
||||
{ return 0.0f; }
|
||||
|
||||
// returns true if we can re-use this voice
|
||||
bool CompatibleFormat( idSoundSample* s )
|
||||
{ return false; }
|
||||
|
||||
uint32 GetSampleRate() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
// callback function
|
||||
void OnBufferStart( idSoundSample* sample, int bufferNumber ) {}
|
||||
};
|
||||
|
||||
class idSoundHardware
|
||||
|
@ -81,6 +114,8 @@ class idSoundSample
|
|||
public:
|
||||
idSoundSample();
|
||||
|
||||
~idSoundSample(); // destructor should be public so lists of soundsamples can be destroyed etc
|
||||
|
||||
// Loads and initializes the resource based on the name.
|
||||
virtual void LoadResource();
|
||||
|
||||
|
@ -177,7 +212,6 @@ protected:
|
|||
friend class idSoundHardware_XAudio2;
|
||||
friend class idSoundVoice_XAudio2;
|
||||
*/
|
||||
~idSoundSample();
|
||||
|
||||
bool LoadWav( const idStr& name );
|
||||
bool LoadAmplitude( const idStr& name );
|
||||
|
|
|
@ -50,8 +50,6 @@ int signForNumBits[33] = { NBS( 0x01 ), NBS( 0x01 ), NBS( 0x02 ), NBS( 0x03 ),
|
|||
NBS( 0x1C ), NBS( 0x1D ), NBS( 0x1E ), NBS( 0x1F ), NBS( 0x20 )
|
||||
};
|
||||
|
||||
#define ID_FORCEINLINE __forceinline
|
||||
|
||||
/*
|
||||
========================
|
||||
idSWFBitStream::idSWFBitStream
|
||||
|
@ -177,7 +175,7 @@ const byte* idSWFBitStream::ReadData( int size )
|
|||
idSWFBitStream::ReadInternalU
|
||||
========================
|
||||
*/
|
||||
ID_FORCEINLINE unsigned int idSWFBitStream::ReadInternalU( uint64& regCurrentBit, uint64& regCurrentByte, unsigned int numBits )
|
||||
ID_FORCE_INLINE unsigned int idSWFBitStream::ReadInternalU( uint64& regCurrentBit, uint64& regCurrentByte, unsigned int numBits )
|
||||
{
|
||||
assert( numBits <= 32 );
|
||||
|
||||
|
@ -199,7 +197,7 @@ ID_FORCEINLINE unsigned int idSWFBitStream::ReadInternalU( uint64& regCurrentBit
|
|||
idSWFBitStream::ReadInternalS
|
||||
========================
|
||||
*/
|
||||
ID_FORCEINLINE int idSWFBitStream::ReadInternalS( uint64& regCurrentBit, uint64& regCurrentByte, unsigned int numBits )
|
||||
ID_FORCE_INLINE int idSWFBitStream::ReadInternalS( uint64& regCurrentBit, uint64& regCurrentByte, unsigned int numBits )
|
||||
{
|
||||
int i = ( int )ReadInternalU( regCurrentBit, regCurrentByte, numBits );
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
*/
|
||||
#pragma hdrstop
|
||||
#include "../idlib/precompiled.h"
|
||||
#include "../renderer/image.h"
|
||||
#include "../renderer/Image.h"
|
||||
|
||||
#pragma warning(disable: 4355) // 'this' : used in base member initializer list
|
||||
|
||||
|
|
|
@ -184,7 +184,7 @@ idSWFScriptFunction_Script is a script function that's implemented in action scr
|
|||
class idSWFScriptFunction_Script : public idSWFScriptFunction
|
||||
{
|
||||
public:
|
||||
idSWFScriptFunction_Script() : refCount( 1 ), flags( 0 ), prototype( NULL ), data( NULL ), length( 0 ), defaultSprite( NULL )
|
||||
idSWFScriptFunction_Script() : refCount( 1 ), flags( 0 ), data( NULL ), length( 0 ), prototype( NULL ), defaultSprite( NULL )
|
||||
{
|
||||
registers.SetNum( 4 );
|
||||
}
|
||||
|
|
|
@ -34,8 +34,8 @@ idSWFSprite::idSWFSprite
|
|||
========================
|
||||
*/
|
||||
idSWFSprite::idSWFSprite( idSWF* _swf ) :
|
||||
frameCount( 0 ),
|
||||
swf( _swf ),
|
||||
frameCount( 0 ),
|
||||
commandBuffer( NULL )
|
||||
{
|
||||
}
|
||||
|
|
|
@ -292,7 +292,7 @@ ID_INLINE swfRect_t::swfRect_t() :
|
|||
|
||||
ID_INLINE swfMatrix_t::swfMatrix_t() :
|
||||
xx( 1.0f ), yy( 1.0f ),
|
||||
yx( 0.0f ), xy( 0.0f ),
|
||||
xy( 0.0f ), yx( 0.0f ),
|
||||
tx( 0.0f ), ty( 0.0f )
|
||||
{
|
||||
}
|
||||
|
@ -400,10 +400,10 @@ ID_INLINE swfColorXform_t swfColorXform_t::Multiply( const swfColorXform_t& a )
|
|||
|
||||
ID_INLINE swfDisplayEntry_t::swfDisplayEntry_t() :
|
||||
characterID( 0 ),
|
||||
ratio( 0.0f ),
|
||||
depth( 0 ),
|
||||
clipDepth( 0 ),
|
||||
blendMode( 0 ),
|
||||
ratio( 0.0f ),
|
||||
spriteInstance( NULL ),
|
||||
textInstance( NULL )
|
||||
{
|
||||
|
|
|
@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
===========================================================================
|
||||
*/
|
||||
#pragma hdrstop
|
||||
#include "../idLib/precompiled.h"
|
||||
#include "../idlib/precompiled.h"
|
||||
#include "LightweightCompression.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
*/
|
||||
|
||||
#pragma hdrstop
|
||||
#include "../idLib/precompiled.h"
|
||||
#include "../idlib/precompiled.h"
|
||||
|
||||
idCVar net_maxRate( "net_maxRate", "50", CVAR_INTEGER, "max send rate in kilobytes per second" );
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#ifndef __SNAPSHOT_H__
|
||||
#define __SNAPSHOT_H__
|
||||
|
||||
#include "snapshot_jobs.h"
|
||||
#include "Snapshot_Jobs.h"
|
||||
|
||||
extern idCVar net_verboseSnapshot;
|
||||
#define NET_VERBOSESNAPSHOT_PRINT if ( net_verboseSnapshot.GetInteger() > 0 ) idLib::Printf
|
||||
|
@ -125,9 +125,8 @@ public:
|
|||
stale( false ),
|
||||
deleted( false ),
|
||||
changedCount( 0 ),
|
||||
createdFromTemplate( false ),
|
||||
|
||||
expectedSequence( 0 )
|
||||
expectedSequence( 0 ),
|
||||
createdFromTemplate( false )
|
||||
{ }
|
||||
void Print( const char* name );
|
||||
|
||||
|
|
|
@ -233,8 +233,8 @@ public:
|
|||
TYPE_INVALID = 0xff,
|
||||
};
|
||||
|
||||
idLobbyBackend() : type( TYPE_INVALID ), isHost( false ), isLocal( false ) {}
|
||||
idLobbyBackend( lobbyBackendType_t lobbyType ) : type( lobbyType ), isHost( false ), isLocal( false ) {}
|
||||
idLobbyBackend() : type( TYPE_INVALID ), isLocal( false ), isHost( false ) {}
|
||||
idLobbyBackend( lobbyBackendType_t lobbyType ) : type( lobbyType ), isLocal( false ), isHost( false ) {}
|
||||
|
||||
virtual void StartHosting( const idMatchParameters& p, float skillLevel, lobbyBackendType_t type ) = 0;
|
||||
virtual void StartFinding( const idMatchParameters& p, int numPartyUsers, float skillLevel ) = 0;
|
||||
|
|
|
@ -166,7 +166,7 @@ public:
|
|||
return *this;
|
||||
}
|
||||
// for std::sort, sort newer (larger date) towards start of list
|
||||
bool operator<( const idSaveGameDetails& other )
|
||||
bool operator<( const idSaveGameDetails& other ) const
|
||||
{
|
||||
return date > other.date;
|
||||
}
|
||||
|
|
|
@ -683,6 +683,7 @@ int Sys_PollMouseInputEvents( int mouseEvents[MAX_MOUSE_EVENTS][2] )
|
|||
}
|
||||
else
|
||||
{
|
||||
// DG: FIXME: mingw doesn't like using the (rather ugly) DIMOFS_* macros in switch/case..
|
||||
switch( polled_didod[i].dwOfs )
|
||||
{
|
||||
case DIMOFS_X:
|
||||
|
@ -1101,4 +1102,4 @@ void idJoystickWin32::PushButton( int inputDeviceNum, int key, bool value )
|
|||
buttonStates[inputDeviceNum][key] = value;
|
||||
Sys_QueEvent( SE_KEY, key, value, 0, NULL, inputDeviceNum );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,8 +36,8 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#include <io.h>
|
||||
#include <conio.h>
|
||||
#include <mapi.h>
|
||||
#include <ShellAPI.h>
|
||||
#include <Shlobj.h>
|
||||
#include <shellAPI.h>
|
||||
#include <shlobj.h>
|
||||
|
||||
#ifndef __MRC__
|
||||
#include <sys/types.h>
|
||||
|
|
|
@ -32,7 +32,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#include "win_local.h"
|
||||
#include "../../renderer/tr_local.h"
|
||||
|
||||
#include <Windowsx.h>
|
||||
#include <windowsx.h>
|
||||
|
||||
LONG WINAPI MainWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
||||
|
||||
|
|
Loading…
Reference in a new issue