Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'master' of tohjo.ez.lv:vcspc/vcspc
- Loading branch information
Showing
with
17 additions
and
5 deletions.
-
+10
−1
VCS PC/Frontend.cpp
-
+4
−4
VCS PC/VCS PC.vcxproj
-
+3
−0
VCS PC/VCSPC.cpp
There are no files selected for viewing
|
|
@@ -977,9 +977,18 @@ void CMenuManager::DrawStandardMenus(bool bDrawMenu) |
|
|
pTextToShow_RightColumn = TheText.Get(CVehicle::m_bEnableMouseFlying ? "FEM_ON" : "FEM_OFF"); |
|
|
break; |
|
|
case 56: |
|
|
strncpy(cReservedSpace, ((const char**(*)())0x745AF0)()[m_dwResolution], sizeof(cReservedSpace)); |
|
|
{ |
|
|
const char* pszResolution = ((const char**(*)())0x745AF0)()[m_dwResolution]; |
|
|
|
|
|
if (!pszResolution) |
|
|
{ |
|
|
pszResolution = ""; |
|
|
} |
|
|
|
|
|
strncpy(cReservedSpace, pszResolution, sizeof(cReservedSpace)); |
|
|
pTextToShow_RightColumn = cReservedSpace; |
|
|
break; |
|
|
} |
|
|
case 44: |
|
|
if ( m_dwAntiAliasingLevel <= 1 ) |
|
|
pTextToShow_RightColumn = TheText.Get("FEM_OFF"); |
|
|
|
|
|
@@ -106,7 +106,7 @@ |
|
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
|
|
<BufferSecurityCheck>true</BufferSecurityCheck> |
|
|
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |
|
|
<AdditionalIncludeDirectories>$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<AdditionalIncludeDirectories>$(BOOST_ROOT);$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<ExceptionHandling>Sync</ExceptionHandling> |
|
|
</ClCompile> |
|
|
<Link> |
|
|
@@ -160,7 +160,7 @@ popd</Command> |
|
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
|
|
<BufferSecurityCheck>true</BufferSecurityCheck> |
|
|
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |
|
|
<AdditionalIncludeDirectories>$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<AdditionalIncludeDirectories>$(BOOST_ROOT);$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<ExceptionHandling>Sync</ExceptionHandling> |
|
|
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> |
|
|
</ClCompile> |
|
|
@@ -216,7 +216,7 @@ popd</Command> |
|
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
|
|
<BufferSecurityCheck>true</BufferSecurityCheck> |
|
|
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |
|
|
<AdditionalIncludeDirectories>$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<AdditionalIncludeDirectories>$(BOOST_ROOT);$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<PreprocessorDefinitions>_NDEBUG;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
|
<ExceptionHandling>Sync</ExceptionHandling> |
|
|
</ClCompile> |
|
|
@@ -271,7 +271,7 @@ popd</Command> |
|
|
<BufferSecurityCheck>true</BufferSecurityCheck> |
|
|
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |
|
|
<PreprocessorDefinitions>NDEBUG;COMPILE_RC;_INCLUDE_BETA_CODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
|
<AdditionalIncludeDirectories>$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<AdditionalIncludeDirectories>$(BOOST_ROOT);$(SolutionDir)dependencies\include;$(SolutionDir)dependencies\include\rwsdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
|
|
<ExceptionHandling>Sync</ExceptionHandling> |
|
|
</ClCompile> |
|
|
<Link> |
|
|
|
|
|
@@ -7209,5 +7209,8 @@ void LogToFile(const char* str, ...) |
|
|
fputc('\n', LogFile); |
|
|
fclose(LogFile); |
|
|
va_end(arguments); |
|
|
|
|
|
OutputDebugString(TempString); |
|
|
OutputDebugString("\n"); |
|
|
} |
|
|
}
|
