From d949bc94109fad793d881d1b6865e3ff213e2168 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 2 Dec 2012 22:37:32 +0100 Subject: [PATCH] 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) --- doomclassic/doom/Precompiled.h | 4 +- doomclassic/doom/d_main.cpp | 2 +- doomclassic/doom/p_inter.cpp | 2 +- doomclassic/doom/p_spec.cpp | 2 +- doomclassic/doom/wi_stuff.cpp | 2 +- neo/d3xp/Achievements.cpp | 2 +- neo/d3xp/AimAssist.h | 2 +- neo/d3xp/Game_network.cpp | 2 +- neo/d3xp/Player.cpp | 2 +- neo/d3xp/Weapon.cpp | 4 +- neo/d3xp/menus/MenuHandler.cpp | 2 +- neo/d3xp/menus/MenuHandler.h | 17 +-- neo/d3xp/menus/MenuHandler_HUD.cpp | 2 +- neo/d3xp/menus/MenuHandler_PDA.cpp | 2 +- neo/d3xp/menus/MenuHandler_Scoreboard.cpp | 2 +- neo/d3xp/menus/MenuHandler_Shell.cpp | 2 +- neo/d3xp/menus/MenuScreen.cpp | 2 +- neo/d3xp/menus/MenuScreen.h | 134 +++++++++--------- neo/d3xp/menus/MenuScreen_HUD.cpp | 2 +- neo/d3xp/menus/MenuScreen_PDA_Inventory.cpp | 2 +- neo/d3xp/menus/MenuScreen_PDA_UserData.cpp | 2 +- neo/d3xp/menus/MenuScreen_PDA_UserEmails.cpp | 4 +- neo/d3xp/menus/MenuScreen_PDA_VideoDisks.cpp | 4 +- neo/d3xp/menus/MenuScreen_Scoreboard.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Bindings.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Browser.cpp | 2 +- .../MenuScreen_Shell_ControllerLayout.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Controls.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Credits.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Dev.cpp | 2 +- .../menus/MenuScreen_Shell_Difficulty.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_GameLobby.cpp | 2 +- .../menus/MenuScreen_Shell_GameOptions.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Gamepad.cpp | 2 +- .../menus/MenuScreen_Shell_Leaderboards.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Load.cpp | 2 +- .../menus/MenuScreen_Shell_MatchSettings.cpp | 2 +- .../menus/MenuScreen_Shell_ModeSelect.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_NewGame.cpp | 2 +- .../menus/MenuScreen_Shell_PartyLobby.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Pause.cpp | 2 +- .../menus/MenuScreen_Shell_Playstation.cpp | 2 +- .../menus/MenuScreen_Shell_PressStart.cpp | 2 +- .../menus/MenuScreen_Shell_Resolution.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Root.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Save.cpp | 2 +- neo/d3xp/menus/MenuScreen_Shell_Settings.cpp | 2 +- .../menus/MenuScreen_Shell_Singleplayer.cpp | 2 +- .../menus/MenuScreen_Shell_Stereoscopics.cpp | 2 +- .../menus/MenuScreen_Shell_SystemOptions.cpp | 2 +- neo/d3xp/menus/MenuWidget.cpp | 2 +- neo/d3xp/menus/MenuWidget.h | 10 +- neo/d3xp/menus/MenuWidget_Button.cpp | 2 +- neo/d3xp/menus/MenuWidget_Carousel.cpp | 2 +- neo/d3xp/menus/MenuWidget_CommandBar.cpp | 2 +- neo/d3xp/menus/MenuWidget_DynamicList.cpp | 2 +- neo/d3xp/menus/MenuWidget_Help.cpp | 2 +- neo/d3xp/menus/MenuWidget_InfoBox.cpp | 2 +- neo/d3xp/menus/MenuWidget_ItemAssignment.cpp | 2 +- neo/d3xp/menus/MenuWidget_List.cpp | 2 +- neo/d3xp/menus/MenuWidget_LobbyList.cpp | 2 +- neo/d3xp/menus/MenuWidget_MenuBar.cpp | 2 +- neo/d3xp/menus/MenuWidget_NavBar.cpp | 2 +- neo/d3xp/menus/MenuWidget_NavButton.cpp | 2 +- neo/d3xp/menus/MenuWidget_PDA_AudioFiles.cpp | 2 +- neo/d3xp/menus/MenuWidget_PDA_EmailInbox.cpp | 2 +- neo/d3xp/menus/MenuWidget_PDA_Objective.cpp | 2 +- neo/d3xp/menus/MenuWidget_PDA_UserData.cpp | 2 +- neo/d3xp/menus/MenuWidget_PDA_VideoInfo.cpp | 2 +- neo/d3xp/menus/MenuWidget_Scrollbar.cpp | 2 +- neo/d3xp/menus/MenuWidget_Shell_SaveInfo.cpp | 2 +- neo/framework/Serializer.h | 2 +- neo/framework/UsercmdGen.h | 4 +- neo/idlib/SoftwareCache.h | 3 +- neo/idlib/Str.h | 3 + neo/idlib/sys/sys_defines.h | 8 ++ neo/libs/jpeg-6/jload.cpp | 2 +- neo/libs/mingw-hacks/wine-dsound.h | 3 + neo/renderer/AutoRenderBink.cpp | 2 +- neo/renderer/BinaryImage.cpp | 4 +- neo/renderer/DXT/DXTEncoder.cpp | 2 +- neo/renderer/OpenGL/qgl.h | 2 +- neo/renderer/tr_trace.cpp | 4 +- neo/sound/snd_local.h | 2 +- neo/sound/stub/SoundSample.cpp | 5 +- neo/sound/stub/SoundStub.h | 42 +++++- neo/swf/SWF_Bitstream.cpp | 6 +- neo/swf/SWF_Main.cpp | 2 +- neo/swf/SWF_ScriptFunction.h | 2 +- neo/swf/SWF_Sprites.cpp | 2 +- neo/swf/SWF_Types.h | 4 +- neo/sys/LightweightCompression.cpp | 2 +- neo/sys/PacketProcessor.cpp | 2 +- neo/sys/Snapshot.h | 7 +- neo/sys/sys_lobby_backend.h | 4 +- neo/sys/sys_savegame.h | 2 +- neo/sys/win32/win_input.cpp | 3 +- neo/sys/win32/win_main.cpp | 4 +- neo/sys/win32/win_wndproc.cpp | 2 +- 99 files changed, 242 insertions(+), 193 deletions(-) diff --git a/doomclassic/doom/Precompiled.h b/doomclassic/doom/Precompiled.h index 523cf708..41801464 100644 --- a/doomclassic/doom/Precompiled.h +++ b/doomclassic/doom/Precompiled.h @@ -44,8 +44,8 @@ typedef unsigned char byte; typedef unsigned int dword; -#include -#include +#include +#include #define ACTUALTEXTUREWIDTH 1024 // should always be equal to or larger #define ACTUALTEXTUREHEIGHT 1024 diff --git a/doomclassic/doom/d_main.cpp b/doomclassic/doom/d_main.cpp index dce8f1a4..d208d5fa 100644 --- a/doomclassic/doom/d_main.cpp +++ b/doomclassic/doom/d_main.cpp @@ -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" diff --git a/doomclassic/doom/p_inter.cpp b/doomclassic/doom/p_inter.cpp index a6aa68eb..ebf8a3b9 100644 --- a/doomclassic/doom/p_inter.cpp +++ b/doomclassic/doom/p_inter.cpp @@ -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 diff --git a/doomclassic/doom/p_spec.cpp b/doomclassic/doom/p_spec.cpp index cc048115..74170fb7 100644 --- a/doomclassic/doom/p_spec.cpp +++ b/doomclassic/doom/p_spec.cpp @@ -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 diff --git a/doomclassic/doom/wi_stuff.cpp b/doomclassic/doom/wi_stuff.cpp index 660bb8e5..47837cf3 100644 --- a/doomclassic/doom/wi_stuff.cpp +++ b/doomclassic/doom/wi_stuff.cpp @@ -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 diff --git a/neo/d3xp/Achievements.cpp b/neo/d3xp/Achievements.cpp index 3606d782..0922f3b0 100644 --- a/neo/d3xp/Achievements.cpp +++ b/neo/d3xp/Achievements.cpp @@ -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" ); diff --git a/neo/d3xp/AimAssist.h b/neo/d3xp/AimAssist.h index 2b4a30bb..5e625756 100644 --- a/neo/d3xp/AimAssist.h +++ b/neo/d3xp/AimAssist.h @@ -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(); diff --git a/neo/d3xp/Game_network.cpp b/neo/d3xp/Game_network.cpp index 371852a2..e89f8ed7 100644 --- a/neo/d3xp/Game_network.cpp +++ b/neo/d3xp/Game_network.cpp @@ -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; diff --git a/neo/d3xp/Player.cpp b/neo/d3xp/Player.cpp index 880fdcb8..2c664190 100644 --- a/neo/d3xp/Player.cpp +++ b/neo/d3xp/Player.cpp @@ -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(); diff --git a/neo/d3xp/Weapon.cpp b/neo/d3xp/Weapon.cpp index f28d6c35..0b8d3264 100644 --- a/neo/d3xp/Weapon.cpp +++ b/neo/d3xp/Weapon.cpp @@ -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; -} \ No newline at end of file +} diff --git a/neo/d3xp/menus/MenuHandler.cpp b/neo/d3xp/menus/MenuHandler.cpp index 16efb1a6..ba8133d3 100644 --- a/neo/d3xp/menus/MenuHandler.cpp +++ b/neo/d3xp/menus/MenuHandler.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuHandler.h b/neo/d3xp/menus/MenuHandler.h index 5c4c49f4..0ead896b 100644 --- a/neo/d3xp/menus/MenuHandler.h +++ b/neo/d3xp/menus/MenuHandler.h @@ -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__ \ No newline at end of file +#endif //__MENUDATA_H__ diff --git a/neo/d3xp/menus/MenuHandler_HUD.cpp b/neo/d3xp/menus/MenuHandler_HUD.cpp index cf337ef8..469ba316 100644 --- a/neo/d3xp/menus/MenuHandler_HUD.cpp +++ b/neo/d3xp/menus/MenuHandler_HUD.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuHandler_PDA.cpp b/neo/d3xp/menus/MenuHandler_PDA.cpp index b6381d76..deb7370b 100644 --- a/neo/d3xp/menus/MenuHandler_PDA.cpp +++ b/neo/d3xp/menus/MenuHandler_PDA.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuHandler_Scoreboard.cpp b/neo/d3xp/menus/MenuHandler_Scoreboard.cpp index e9789243..f952d1be 100644 --- a/neo/d3xp/menus/MenuHandler_Scoreboard.cpp +++ b/neo/d3xp/menus/MenuHandler_Scoreboard.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuHandler_Shell.cpp b/neo/d3xp/menus/MenuHandler_Shell.cpp index 72340e45..fe49108b 100644 --- a/neo/d3xp/menus/MenuHandler_Shell.cpp +++ b/neo/d3xp/menus/MenuHandler_Shell.cpp @@ -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" diff --git a/neo/d3xp/menus/MenuScreen.cpp b/neo/d3xp/menus/MenuScreen.cpp index 4fdd2c27..8012a478 100644 --- a/neo/d3xp/menus/MenuScreen.cpp +++ b/neo/d3xp/menus/MenuScreen.cpp @@ -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() diff --git a/neo/d3xp/menus/MenuScreen.h b/neo/d3xp/menus/MenuScreen.h index 4c3ea3aa..698c2dd7 100644 --- a/neo/d3xp/menus/MenuScreen.h +++ b/neo/d3xp/menus/MenuScreen.h @@ -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 ) { } diff --git a/neo/d3xp/menus/MenuScreen_HUD.cpp b/neo/d3xp/menus/MenuScreen_HUD.cpp index b3145c22..7d7e9de3 100644 --- a/neo/d3xp/menus/MenuScreen_HUD.cpp +++ b/neo/d3xp/menus/MenuScreen_HUD.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_PDA_Inventory.cpp b/neo/d3xp/menus/MenuScreen_PDA_Inventory.cpp index 063c8891..25e8ee99 100644 --- a/neo/d3xp/menus/MenuScreen_PDA_Inventory.cpp +++ b/neo/d3xp/menus/MenuScreen_PDA_Inventory.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_PDA_UserData.cpp b/neo/d3xp/menus/MenuScreen_PDA_UserData.cpp index 01c17df8..91ed81e8 100644 --- a/neo/d3xp/menus/MenuScreen_PDA_UserData.cpp +++ b/neo/d3xp/menus/MenuScreen_PDA_UserData.cpp @@ -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" diff --git a/neo/d3xp/menus/MenuScreen_PDA_UserEmails.cpp b/neo/d3xp/menus/MenuScreen_PDA_UserEmails.cpp index afe02b7e..3d34fcb1 100644 --- a/neo/d3xp/menus/MenuScreen_PDA_UserEmails.cpp +++ b/neo/d3xp/menus/MenuScreen_PDA_UserEmails.cpp @@ -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; } } -} \ No newline at end of file +} diff --git a/neo/d3xp/menus/MenuScreen_PDA_VideoDisks.cpp b/neo/d3xp/menus/MenuScreen_PDA_VideoDisks.cpp index cd83bb37..0471c923 100644 --- a/neo/d3xp/menus/MenuScreen_PDA_VideoDisks.cpp +++ b/neo/d3xp/menus/MenuScreen_PDA_VideoDisks.cpp @@ -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 ); -} \ No newline at end of file +} diff --git a/neo/d3xp/menus/MenuScreen_Scoreboard.cpp b/neo/d3xp/menus/MenuScreen_Scoreboard.cpp index 7d39ab42..a1a5975b 100644 --- a/neo/d3xp/menus/MenuScreen_Scoreboard.cpp +++ b/neo/d3xp/menus/MenuScreen_Scoreboard.cpp @@ -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" //*************************************************************** diff --git a/neo/d3xp/menus/MenuScreen_Shell_Bindings.cpp b/neo/d3xp/menus/MenuScreen_Shell_Bindings.cpp index cefd2ddb..bf7937e9 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Bindings.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Bindings.cpp @@ -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 diff --git a/neo/d3xp/menus/MenuScreen_Shell_Browser.cpp b/neo/d3xp/menus/MenuScreen_Shell_Browser.cpp index 113a1f73..c288c60e 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Browser.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Browser.cpp @@ -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 diff --git a/neo/d3xp/menus/MenuScreen_Shell_ControllerLayout.cpp b/neo/d3xp/menus/MenuScreen_Shell_ControllerLayout.cpp index f35987dc..0b831f0f 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_ControllerLayout.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_ControllerLayout.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Controls.cpp b/neo/d3xp/menus/MenuScreen_Shell_Controls.cpp index fce2592f..c2e0875b 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Controls.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Controls.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Credits.cpp b/neo/d3xp/menus/MenuScreen_Shell_Credits.cpp index 65ad7367..3a4ceada 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Credits.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Credits.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Dev.cpp b/neo/d3xp/menus/MenuScreen_Shell_Dev.cpp index 61cb6030..54d1bb97 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Dev.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Dev.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Difficulty.cpp b/neo/d3xp/menus/MenuScreen_Shell_Difficulty.cpp index 24733995..9f0745a8 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Difficulty.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Difficulty.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_GameLobby.cpp b/neo/d3xp/menus/MenuScreen_Shell_GameLobby.cpp index 8af6d557..be741e51 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_GameLobby.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_GameLobby.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp b/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp index 4dddb0b2..6a6218c7 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Gamepad.cpp b/neo/d3xp/menus/MenuScreen_Shell_Gamepad.cpp index c753b804..14878497 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Gamepad.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Gamepad.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Leaderboards.cpp b/neo/d3xp/menus/MenuScreen_Shell_Leaderboards.cpp index 9183830e..a04bedda 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Leaderboards.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Leaderboards.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Load.cpp b/neo/d3xp/menus/MenuScreen_Shell_Load.cpp index ac0cf4b3..9b01b12a 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Load.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Load.cpp @@ -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" diff --git a/neo/d3xp/menus/MenuScreen_Shell_MatchSettings.cpp b/neo/d3xp/menus/MenuScreen_Shell_MatchSettings.cpp index 3ca1d3c6..71d5d4bc 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_MatchSettings.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_MatchSettings.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_ModeSelect.cpp b/neo/d3xp/menus/MenuScreen_Shell_ModeSelect.cpp index d0e472a0..0d78d280 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_ModeSelect.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_ModeSelect.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_NewGame.cpp b/neo/d3xp/menus/MenuScreen_Shell_NewGame.cpp index 04e4f178..152f708d 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_NewGame.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_NewGame.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_PartyLobby.cpp b/neo/d3xp/menus/MenuScreen_Shell_PartyLobby.cpp index 1a425b7f..20f44f66 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_PartyLobby.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_PartyLobby.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Pause.cpp b/neo/d3xp/menus/MenuScreen_Shell_Pause.cpp index 9a9fdf9a..071124cd 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Pause.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Pause.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Playstation.cpp b/neo/d3xp/menus/MenuScreen_Shell_Playstation.cpp index b3ed068b..1609ee10 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Playstation.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Playstation.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_PressStart.cpp b/neo/d3xp/menus/MenuScreen_Shell_PressStart.cpp index 4258ec59..9ec8901b 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_PressStart.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_PressStart.cpp @@ -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" diff --git a/neo/d3xp/menus/MenuScreen_Shell_Resolution.cpp b/neo/d3xp/menus/MenuScreen_Shell_Resolution.cpp index 8808780c..a234338f 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Resolution.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Resolution.cpp @@ -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" diff --git a/neo/d3xp/menus/MenuScreen_Shell_Root.cpp b/neo/d3xp/menus/MenuScreen_Shell_Root.cpp index 46a8d1b8..c93fecc3 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Root.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Root.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Save.cpp b/neo/d3xp/menus/MenuScreen_Shell_Save.cpp index 86bc9277..d83b568b 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Save.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Save.cpp @@ -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" diff --git a/neo/d3xp/menus/MenuScreen_Shell_Settings.cpp b/neo/d3xp/menus/MenuScreen_Shell_Settings.cpp index 6cb4308e..274e5c86 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Settings.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Settings.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Singleplayer.cpp b/neo/d3xp/menus/MenuScreen_Shell_Singleplayer.cpp index c4a6689c..3db41207 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Singleplayer.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Singleplayer.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_Stereoscopics.cpp b/neo/d3xp/menus/MenuScreen_Shell_Stereoscopics.cpp index 086c6477..97d77267 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_Stereoscopics.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_Stereoscopics.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp b/neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp index 564cb3fe..c020b14e 100644 --- a/neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp +++ b/neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuWidget.cpp b/neo/d3xp/menus/MenuWidget.cpp index db81b525..89d20a79 100644 --- a/neo/d3xp/menus/MenuWidget.cpp +++ b/neo/d3xp/menus/MenuWidget.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget.h b/neo/d3xp/menus/MenuWidget.h index 480c196d..20b20dfe 100644 --- a/neo/d3xp/menus/MenuWidget.h +++ b/neo/d3xp/menus/MenuWidget.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(); diff --git a/neo/d3xp/menus/MenuWidget_Button.cpp b/neo/d3xp/menus/MenuWidget_Button.cpp index f6a3c479..74ef2485 100644 --- a/neo/d3xp/menus/MenuWidget_Button.cpp +++ b/neo/d3xp/menus/MenuWidget_Button.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_Carousel.cpp b/neo/d3xp/menus/MenuWidget_Carousel.cpp index 1cfb82e9..c7e7b0bf 100644 --- a/neo/d3xp/menus/MenuWidget_Carousel.cpp +++ b/neo/d3xp/menus/MenuWidget_Carousel.cpp @@ -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 ) diff --git a/neo/d3xp/menus/MenuWidget_CommandBar.cpp b/neo/d3xp/menus/MenuWidget_CommandBar.cpp index 935a27aa..e3ab42e0 100644 --- a/neo/d3xp/menus/MenuWidget_CommandBar.cpp +++ b/neo/d3xp/menus/MenuWidget_CommandBar.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_DynamicList.cpp b/neo/d3xp/menus/MenuWidget_DynamicList.cpp index db477a32..a09d8b70 100644 --- a/neo/d3xp/menus/MenuWidget_DynamicList.cpp +++ b/neo/d3xp/menus/MenuWidget_DynamicList.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_Help.cpp b/neo/d3xp/menus/MenuWidget_Help.cpp index 175d14a5..8b84417a 100644 --- a/neo/d3xp/menus/MenuWidget_Help.cpp +++ b/neo/d3xp/menus/MenuWidget_Help.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_InfoBox.cpp b/neo/d3xp/menus/MenuWidget_InfoBox.cpp index 107da869..1ec2b8cb 100644 --- a/neo/d3xp/menus/MenuWidget_InfoBox.cpp +++ b/neo/d3xp/menus/MenuWidget_InfoBox.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_ItemAssignment.cpp b/neo/d3xp/menus/MenuWidget_ItemAssignment.cpp index b8a5f365..522d1f4b 100644 --- a/neo/d3xp/menus/MenuWidget_ItemAssignment.cpp +++ b/neo/d3xp/menus/MenuWidget_ItemAssignment.cpp @@ -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 ) diff --git a/neo/d3xp/menus/MenuWidget_List.cpp b/neo/d3xp/menus/MenuWidget_List.cpp index 2ff4f34d..3800ae99 100644 --- a/neo/d3xp/menus/MenuWidget_List.cpp +++ b/neo/d3xp/menus/MenuWidget_List.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_LobbyList.cpp b/neo/d3xp/menus/MenuWidget_LobbyList.cpp index 4beed9ee..21be0411 100644 --- a/neo/d3xp/menus/MenuWidget_LobbyList.cpp +++ b/neo/d3xp/menus/MenuWidget_LobbyList.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_MenuBar.cpp b/neo/d3xp/menus/MenuWidget_MenuBar.cpp index 1f569acb..9fe252b6 100644 --- a/neo/d3xp/menus/MenuWidget_MenuBar.cpp +++ b/neo/d3xp/menus/MenuWidget_MenuBar.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_NavBar.cpp b/neo/d3xp/menus/MenuWidget_NavBar.cpp index 5cfecacd..dfba6740 100644 --- a/neo/d3xp/menus/MenuWidget_NavBar.cpp +++ b/neo/d3xp/menus/MenuWidget_NavBar.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_NavButton.cpp b/neo/d3xp/menus/MenuWidget_NavButton.cpp index f8f4fa27..4168c08a 100644 --- a/neo/d3xp/menus/MenuWidget_NavButton.cpp +++ b/neo/d3xp/menus/MenuWidget_NavButton.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_PDA_AudioFiles.cpp b/neo/d3xp/menus/MenuWidget_PDA_AudioFiles.cpp index 22894177..73882998 100644 --- a/neo/d3xp/menus/MenuWidget_PDA_AudioFiles.cpp +++ b/neo/d3xp/menus/MenuWidget_PDA_AudioFiles.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuWidget_PDA_EmailInbox.cpp b/neo/d3xp/menus/MenuWidget_PDA_EmailInbox.cpp index 9874e8b9..2cc3debe 100644 --- a/neo/d3xp/menus/MenuWidget_PDA_EmailInbox.cpp +++ b/neo/d3xp/menus/MenuWidget_PDA_EmailInbox.cpp @@ -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; diff --git a/neo/d3xp/menus/MenuWidget_PDA_Objective.cpp b/neo/d3xp/menus/MenuWidget_PDA_Objective.cpp index 638bd39c..6fd352e0 100644 --- a/neo/d3xp/menus/MenuWidget_PDA_Objective.cpp +++ b/neo/d3xp/menus/MenuWidget_PDA_Objective.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_PDA_UserData.cpp b/neo/d3xp/menus/MenuWidget_PDA_UserData.cpp index 0e442a55..013ba2d6 100644 --- a/neo/d3xp/menus/MenuWidget_PDA_UserData.cpp +++ b/neo/d3xp/menus/MenuWidget_PDA_UserData.cpp @@ -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" /* diff --git a/neo/d3xp/menus/MenuWidget_PDA_VideoInfo.cpp b/neo/d3xp/menus/MenuWidget_PDA_VideoInfo.cpp index 01797c68..6165c2f6 100644 --- a/neo/d3xp/menus/MenuWidget_PDA_VideoInfo.cpp +++ b/neo/d3xp/menus/MenuWidget_PDA_VideoInfo.cpp @@ -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() diff --git a/neo/d3xp/menus/MenuWidget_Scrollbar.cpp b/neo/d3xp/menus/MenuWidget_Scrollbar.cpp index a99508b1..346e3314 100644 --- a/neo/d3xp/menus/MenuWidget_Scrollbar.cpp +++ b/neo/d3xp/menus/MenuWidget_Scrollbar.cpp @@ -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 ) diff --git a/neo/d3xp/menus/MenuWidget_Shell_SaveInfo.cpp b/neo/d3xp/menus/MenuWidget_Shell_SaveInfo.cpp index 55f37d9f..f16394af 100644 --- a/neo/d3xp/menus/MenuWidget_Shell_SaveInfo.cpp +++ b/neo/d3xp/menus/MenuWidget_Shell_SaveInfo.cpp @@ -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" /* diff --git a/neo/framework/Serializer.h b/neo/framework/Serializer.h index c51f6c8e..306406fb 100644 --- a/neo/framework/Serializer.h +++ b/neo/framework/Serializer.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 diff --git a/neo/framework/UsercmdGen.h b/neo/framework/UsercmdGen.h index 7c2e7a6b..23f32616 100644 --- a/neo/framework/UsercmdGen.h +++ b/neo/framework/UsercmdGen.h @@ -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 ) { diff --git a/neo/idlib/SoftwareCache.h b/neo/idlib/SoftwareCache.h index 377b0533..7847700d 100644 --- a/neo/idlib/SoftwareCache.h +++ b/neo/idlib/SoftwareCache.h @@ -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 /* ================================================================================================ diff --git a/neo/idlib/Str.h b/neo/idlib/Str.h index 7416e94b..f2de0623 100644 --- a/neo/idlib/Str.h +++ b/neo/idlib/Str.h @@ -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 diff --git a/neo/idlib/sys/sys_defines.h b/neo/idlib/sys/sys_defines.h index 440cef2f..641797c9 100644 --- a/neo/idlib/sys/sys_defines.h +++ b/neo/idlib/sys/sys_defines.h @@ -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 diff --git a/neo/libs/jpeg-6/jload.cpp b/neo/libs/jpeg-6/jload.cpp index 12aea4f4..e0f74b0a 100644 --- a/neo/libs/jpeg-6/jload.cpp +++ b/neo/libs/jpeg-6/jload.cpp @@ -1,6 +1,6 @@ #include "../Shared/Shared.h" -#include "..\Common\Common.h" +#include "../Common/Common.h" /* * Include file for users of JPEG library. diff --git a/neo/libs/mingw-hacks/wine-dsound.h b/neo/libs/mingw-hacks/wine-dsound.h index c87507fe..faf7ad86 100644 --- a/neo/libs/mingw-hacks/wine-dsound.h +++ b/neo/libs/mingw-hacks/wine-dsound.h @@ -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 diff --git a/neo/renderer/AutoRenderBink.cpp b/neo/renderer/AutoRenderBink.cpp index ecc659ad..048fa8ff 100644 --- a/neo/renderer/AutoRenderBink.cpp +++ b/neo/renderer/AutoRenderBink.cpp @@ -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" diff --git a/neo/renderer/BinaryImage.cpp b/neo/renderer/BinaryImage.cpp index 4fe16169..4808656f 100644 --- a/neo/renderer/BinaryImage.cpp +++ b/neo/renderer/BinaryImage.cpp @@ -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" ); diff --git a/neo/renderer/DXT/DXTEncoder.cpp b/neo/renderer/DXT/DXTEncoder.cpp index eb7dd0a1..275bff1a 100644 --- a/neo/renderer/DXT/DXTEncoder.cpp +++ b/neo/renderer/DXT/DXTEncoder.cpp @@ -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 { diff --git a/neo/renderer/OpenGL/qgl.h b/neo/renderer/OpenGL/qgl.h index 9a927fe4..634561c4 100644 --- a/neo/renderer/OpenGL/qgl.h +++ b/neo/renderer/OpenGL/qgl.h @@ -33,7 +33,7 @@ If you have questions concerning this license or the applicable additional terms #define __QGL_H__ -#include +#include #ifndef APIENTRY diff --git a/neo/renderer/tr_trace.cpp b/neo/renderer/tr_trace.cpp index 81e9fbbb..007efc9d 100644 --- a/neo/renderer/tr_trace.cpp +++ b/neo/renderer/tr_trace.cpp @@ -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; ) { diff --git a/neo/sound/snd_local.h b/neo/sound/snd_local.h index 33ff2a02..deee480d 100644 --- a/neo/sound/snd_local.h +++ b/neo/sound/snd_local.h @@ -534,8 +534,8 @@ public: //------------------------- idSoundSystemLocal() : - soundTime( 0 ), currentSoundWorld( NULL ), + soundTime( 0 ), muted( false ), musicMuted( false ), needsRestart( false ) diff --git a/neo/sound/stub/SoundSample.cpp b/neo/sound/stub/SoundSample.cpp index d4d53965..8c5ba599 100644 --- a/neo/sound/stub/SoundSample.cpp +++ b/neo/sound/stub/SoundSample.cpp @@ -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; diff --git a/neo/sound/stub/SoundStub.h b/neo/sound/stub/SoundStub.h index 4278082b..3580fa6e 100644 --- a/neo/sound/stub/SoundStub.h +++ b/neo/sound/stub/SoundStub.h @@ -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 ); diff --git a/neo/swf/SWF_Bitstream.cpp b/neo/swf/SWF_Bitstream.cpp index a9355773..5ea5dcd0 100644 --- a/neo/swf/SWF_Bitstream.cpp +++ b/neo/swf/SWF_Bitstream.cpp @@ -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 ); diff --git a/neo/swf/SWF_Main.cpp b/neo/swf/SWF_Main.cpp index 1479ec7b..2c871824 100644 --- a/neo/swf/SWF_Main.cpp +++ b/neo/swf/SWF_Main.cpp @@ -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 diff --git a/neo/swf/SWF_ScriptFunction.h b/neo/swf/SWF_ScriptFunction.h index 9b078b73..778179c2 100644 --- a/neo/swf/SWF_ScriptFunction.h +++ b/neo/swf/SWF_ScriptFunction.h @@ -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 ); } diff --git a/neo/swf/SWF_Sprites.cpp b/neo/swf/SWF_Sprites.cpp index 31c4d11d..9b2af62b 100644 --- a/neo/swf/SWF_Sprites.cpp +++ b/neo/swf/SWF_Sprites.cpp @@ -34,8 +34,8 @@ idSWFSprite::idSWFSprite ======================== */ idSWFSprite::idSWFSprite( idSWF* _swf ) : - frameCount( 0 ), swf( _swf ), + frameCount( 0 ), commandBuffer( NULL ) { } diff --git a/neo/swf/SWF_Types.h b/neo/swf/SWF_Types.h index 2e4cb004..228bcd10 100644 --- a/neo/swf/SWF_Types.h +++ b/neo/swf/SWF_Types.h @@ -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 ) { diff --git a/neo/sys/LightweightCompression.cpp b/neo/sys/LightweightCompression.cpp index 5314b696..b799b5cd 100644 --- a/neo/sys/LightweightCompression.cpp +++ b/neo/sys/LightweightCompression.cpp @@ -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" /* diff --git a/neo/sys/PacketProcessor.cpp b/neo/sys/PacketProcessor.cpp index d50b4cf7..c2c243d5 100644 --- a/neo/sys/PacketProcessor.cpp +++ b/neo/sys/PacketProcessor.cpp @@ -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" ); diff --git a/neo/sys/Snapshot.h b/neo/sys/Snapshot.h index 61f610f6..f4913f7d 100644 --- a/neo/sys/Snapshot.h +++ b/neo/sys/Snapshot.h @@ -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 ); diff --git a/neo/sys/sys_lobby_backend.h b/neo/sys/sys_lobby_backend.h index 5c4d15c9..b6b8bc54 100644 --- a/neo/sys/sys_lobby_backend.h +++ b/neo/sys/sys_lobby_backend.h @@ -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; diff --git a/neo/sys/sys_savegame.h b/neo/sys/sys_savegame.h index 8de9ca60..e32b81f5 100644 --- a/neo/sys/sys_savegame.h +++ b/neo/sys/sys_savegame.h @@ -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; } diff --git a/neo/sys/win32/win_input.cpp b/neo/sys/win32/win_input.cpp index 20ff898f..6373f496 100644 --- a/neo/sys/win32/win_input.cpp +++ b/neo/sys/win32/win_input.cpp @@ -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 ); } -} \ No newline at end of file +} diff --git a/neo/sys/win32/win_main.cpp b/neo/sys/win32/win_main.cpp index b184ef57..b79f56c1 100644 --- a/neo/sys/win32/win_main.cpp +++ b/neo/sys/win32/win_main.cpp @@ -36,8 +36,8 @@ If you have questions concerning this license or the applicable additional terms #include #include #include -#include -#include +#include +#include #ifndef __MRC__ #include diff --git a/neo/sys/win32/win_wndproc.cpp b/neo/sys/win32/win_wndproc.cpp index 02551d96..663a9c27 100644 --- a/neo/sys/win32/win_wndproc.cpp +++ b/neo/sys/win32/win_wndproc.cpp @@ -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 +#include LONG WINAPI MainWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );