diff --git a/mp/game/momentum/gameinfo.txt b/mp/game/momentum/gameinfo.txt index 98fd623c8..b7cdeb3e8 100644 --- a/mp/game/momentum/gameinfo.txt +++ b/mp/game/momentum/gameinfo.txt @@ -15,7 +15,7 @@ FileSystem { - SteamAppId 244310 // This sets the app ID in Steam. This is the Source SDK Base 2013 Singleplayer + SteamAppId 243750 // This sets the app ID in Steam. This is the Source SDK Base 2013 Multiplayer // // The code that loads this file automatically does a few things here: diff --git a/mp/src/creategameprojects.ps1 b/mp/src/creategameprojects.ps1 index effbafd35..e8ba270d1 100644 --- a/mp/src/creategameprojects.ps1 +++ b/mp/src/creategameprojects.ps1 @@ -5,11 +5,11 @@ if (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent exit } -$path = (Get-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 243730" -Name InstallLocation).InstallLocation +$path = (Get-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 243750" -Name InstallLocation).InstallLocation if (!$path) { - Write-Warning "You should install Source SDK Base 2013 Singleplayer." + Write-Warning "You should install Source SDK Base 2013 Multiplayer." pause exit } diff --git a/mp/src/game/client/c_baseplayer.h b/mp/src/game/client/c_baseplayer.h index 5e4372bc0..89485649d 100644 --- a/mp/src/game/client/c_baseplayer.h +++ b/mp/src/game/client/c_baseplayer.h @@ -571,6 +571,7 @@ private: friend class CHL2GameMovement; friend class CDODGameMovement; friend class CPortalGameMovement; + friend class CMomentumGameMovement; // Accessors for gamemovement float GetStepSize( void ) const { return m_Local.m_flStepSize; } diff --git a/mp/src/game/client/c_te_legacytempents.h b/mp/src/game/client/c_te_legacytempents.h index 038eeccd3..4c57ace87 100644 --- a/mp/src/game/client/c_te_legacytempents.h +++ b/mp/src/game/client/c_te_legacytempents.h @@ -19,7 +19,7 @@ struct model_t; #include "mempool.h" #include "utllinkedlist.h" -#if defined( CSTRIKE_DLL ) || defined( SDK_DLL ) + enum { CS_SHELL_9MM = 0, @@ -29,7 +29,7 @@ enum CS_SHELL_762NATO, CS_SHELL_338MAG }; -#endif + //----------------------------------------------------------------------------- // Purpose: Interface for lecacy temp entities diff --git a/mp/src/game/server/player.h b/mp/src/game/server/player.h index e87af06d8..38dbc56e6 100644 --- a/mp/src/game/server/player.h +++ b/mp/src/game/server/player.h @@ -1148,6 +1148,7 @@ protected: friend class CHL2GameMovement; friend class CDODGameMovement; friend class CPortalGameMovement; + friend class CMomentumGameMovement; // Accessors for gamemovement bool IsDucked( void ) const { return m_Local.m_bDucked; } diff --git a/mp/src/game/shared/igamemovement.h b/mp/src/game/shared/igamemovement.h index ae248397b..6c42e5118 100644 --- a/mp/src/game/shared/igamemovement.h +++ b/mp/src/game/shared/igamemovement.h @@ -75,8 +75,9 @@ public: void SetAbsOrigin( const Vector &vec ); const Vector &GetAbsOrigin() const; -private: - Vector m_vecAbsOrigin; // edict::origin + //no longer private so we can have late reflect :) + Vector m_vecAbsOrigin; // edict::origin + }; inline const Vector &CMoveData::GetAbsOrigin() const