mirror of
https://github.com/UberGames/EF2GameSource.git
synced 2024-11-10 06:31:42 +00:00
Now compile with Visual Studio 2012 ...
... produced dll not tested yet.
This commit is contained in:
parent
cebfea0101
commit
a18c19c2bd
11 changed files with 31 additions and 31 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -176,3 +176,4 @@ pip-log.txt
|
|||
# Mac crap
|
||||
.DS_Store
|
||||
|
||||
*.idb
|
|
@ -364,21 +364,12 @@ class SafePtr : public SafePtrBase
|
|||
SafePtr& operator=( const SafePtr& obj );
|
||||
SafePtr& operator=( T * const obj );
|
||||
|
||||
#ifdef LINUX
|
||||
friend int operator==<>( SafePtr<T> a, T *b );
|
||||
friend int operator!=<>( SafePtr<T> a, T *b );
|
||||
friend int operator==<>( T *a, SafePtr<T> b );
|
||||
friend int operator!=<>( T *a, SafePtr<T> b );
|
||||
friend int operator==<>( SafePtr<T> a, SafePtr<T> b );
|
||||
friend int operator!=<>( SafePtr<T> a, SafePtr<T> b );
|
||||
#else
|
||||
friend int operator==( SafePtr<T> a, T *b );
|
||||
friend int operator!=( SafePtr<T> a, T *b );
|
||||
friend int operator==( T *a, SafePtr<T> b );
|
||||
friend int operator!=( T *a, SafePtr<T> b );
|
||||
friend int operator==( SafePtr<T> a, SafePtr<T> b );
|
||||
friend int operator!=( SafePtr<T> a, SafePtr<T> b );
|
||||
#endif
|
||||
template <class F> friend int operator==( SafePtr<F> a, F *b );
|
||||
template <class F> friend int operator!=( SafePtr<F> a, F *b );
|
||||
template <class F> friend int operator==( F *a, SafePtr<F> b );
|
||||
template <class F> friend int operator!=( F *a, SafePtr<F> b );
|
||||
template <class F> friend int operator==( SafePtr<F> a, SafePtr<F> b );
|
||||
template <class F> friend int operator!=( SafePtr<F> a, SafePtr<F> b );
|
||||
|
||||
operator T*() const;
|
||||
T* operator->() const;
|
||||
|
|
|
@ -103,7 +103,7 @@ Container<Type>::Container()
|
|||
}
|
||||
|
||||
template< class Type >
|
||||
Container<Type>::~Container<Type>()
|
||||
Container<Type>::~Container()
|
||||
{
|
||||
FreeObjectList();
|
||||
}
|
||||
|
|
|
@ -112,9 +112,10 @@
|
|||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>.\../Debug\</OutDir>
|
||||
<IntDir>.\./Debug\</IntDir>
|
||||
<OutDir>$(ProjectDir)Debug\</OutDir>
|
||||
<IntDir>$(ProjectDir)Debug\</IntDir>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<TargetName>gamex86</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release CDROM|Win32'">
|
||||
<OutDir>.\Release\</OutDir>
|
||||
|
@ -268,11 +269,11 @@
|
|||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<AdditionalIncludeDirectories>..\..\Shared;..\..\DLLs;..\..\Executable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;FGAME_EXPORTS;GAME_DLL;MISSIONPACK;ENABLE_ALTROUTING;MSVC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>.\./Debug\</AssemblerListingLocation>
|
||||
<AssemblerListingLocation>$(ProjectDir)Debug\</AssemblerListingLocation>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<PrecompiledHeaderOutputFile>.\./Debug\game.pch</PrecompiledHeaderOutputFile>
|
||||
<ObjectFileName>.\./Debug\</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\./Debug\</ProgramDataBaseFileName>
|
||||
<PrecompiledHeaderOutputFile>$(ProjectDir)Debug\game.pch</PrecompiledHeaderOutputFile>
|
||||
<ObjectFileName>$(ProjectDir)Debug\</ObjectFileName>
|
||||
<ProgramDataBaseFileName>$(ProjectDir)Debug\</ProgramDataBaseFileName>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
</ClCompile>
|
||||
<Midl>
|
||||
|
@ -295,8 +296,8 @@
|
|||
<LinkDLL>true</LinkDLL>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OutputFile>../../Executable/Debug/gamex86.dll</OutputFile>
|
||||
<ImportLibrary>.\../Debug\gamex86.lib</ImportLibrary>
|
||||
<OutputFile>$(ProjectDir)Debug/gamex86.dll</OutputFile>
|
||||
<ImportLibrary>$(ProjectDir)Debug\gamex86.lib</ImportLibrary>
|
||||
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ModuleDefinitionFile>.\game.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
|
|
|
@ -498,7 +498,7 @@ void Level::setSkill( int value )
|
|||
{
|
||||
int skill_level;
|
||||
|
||||
skill_level = (int) floor( value );
|
||||
skill_level = (int) floor( (float)value );
|
||||
skill_level = bound( skill_level, 0, 3 );
|
||||
|
||||
gi.cvar_set( "skill", va( "%d", skill_level ) );
|
||||
|
@ -541,7 +541,7 @@ void Level::SpawnEntities( const char *themapname, const char *entities, int lev
|
|||
// Init the level variables
|
||||
Init();
|
||||
|
||||
spawnpos = strchr( themapname, '$' );
|
||||
spawnpos = (char *)strchr( themapname, '$' );
|
||||
if ( spawnpos )
|
||||
{
|
||||
mapname = str( themapname, 0, spawnpos - themapname );
|
||||
|
|
|
@ -615,7 +615,7 @@ void EventArgDef::Setup( const char *eventName, const char *argName, const char
|
|||
while( 1 )
|
||||
{
|
||||
// find opening '['
|
||||
tokptr = strchr( ptr, '[' );
|
||||
tokptr = (char *)strchr( ptr, '[' );
|
||||
if ( !tokptr )
|
||||
{
|
||||
break;
|
||||
|
|
|
@ -5674,7 +5674,7 @@ void Player::GetViewTrace( trace_t& trace, int contents, float maxDistance )
|
|||
|
||||
fov_x = client->ps.fov;
|
||||
x = 640.0f / (float)tan( fov_x / 360.0 * M_PI );
|
||||
fov_y = (float)atan2( 480.0, x );
|
||||
fov_y = (float)atan2( 480.0f, x );
|
||||
fov_y *= 360.0f / M_PI;
|
||||
|
||||
ymax = 4.0f * (float)tan( fov_y * M_PI / 360.0 );
|
||||
|
|
|
@ -1149,7 +1149,11 @@ class Player : public Sentient
|
|||
|
||||
inline bool Player::IsNewActiveWeapon()
|
||||
{
|
||||
return ( newActiveWeapon.weapon != NULL );
|
||||
if(newActiveWeapon.weapon != NULL) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
inline weaponhand_t Player::GetNewActiveWeaponHand()
|
||||
|
|
|
@ -49,11 +49,13 @@
|
|||
#pragma warning(disable : 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
|
||||
#pragma warning(disable : 4305) // truncation from const double to float
|
||||
//#pragma warning(disable : 4310) // cast truncates constant value
|
||||
#pragma warning(disable : 4389)
|
||||
#pragma warning(disable : 4512) // 'Class' : assignment operator could not be generated
|
||||
#pragma warning(disable : 4514) // unreferenced inline/local function has been removed
|
||||
//#pragma warning(disable : 4611) // interaction between '_setjmp' and C++ object destruction is non-portable
|
||||
#pragma warning(disable : 4710) // did not inline this function
|
||||
#pragma warning(disable : 4711) // selected for automatic inline expansion
|
||||
#pragma warning(disable : 4996)
|
||||
|
||||
|
||||
// shut up warnings with Intel Compiler
|
||||
|
|
|
@ -60,7 +60,7 @@ inline Stack<Type>::Stack()
|
|||
}
|
||||
|
||||
template <class Type>
|
||||
inline Stack<Type>::~Stack<Type>()
|
||||
inline Stack<Type>::~Stack()
|
||||
{
|
||||
Clear();
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
#pragma warning(disable : 4710) // function 'blah' not inlined
|
||||
#pragma warning(disable : 4996)
|
||||
#endif
|
||||
|
||||
#define STRING_PREALLOC_SIZE 16
|
||||
|
|
Loading…
Reference in a new issue