mirror of https://github.com/ZDoom/qzdoom.git
- Reverted updaterevision.vcproj to r385 and added a note as a build event
explaining the need to use mt.exe 6.0 or newer. Here is the note: VERY IMPORTANT: You must copy the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin on top of the version in %VSINSTALLDIR%\VC\bin or your computer may restart while building. - Changed the ASecretTrigger::Activate() fix: There's no reason open scripts shouldn't be able to activate secret triggers; players just won't get credit for it in coop. - Added a NULL actor check to R_SetupFrame(). - Fixed: The player sounds in DEHSUPP were defined incorrectly. SVN r390 (trunk)
This commit is contained in:
Randy Heit
parent
beca482a68
commit
04b80f8de5
|
|
@ -1,3 +1,15 @@
|
|||
November 25, 2006
|
||||
- Reverted updaterevision.vcproj to r385 and added a note as a build event
|
||||
explaining the need to use mt.exe 6.0 or newer. Here is the note:
|
||||
VERY IMPORTANT: You must copy the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin
|
||||
on top of the version in %VSINSTALLDIR%\VC\bin or your computer may restart
|
||||
while building.
|
||||
- Changed the ASecretTrigger::Activate() fix: There's no reason open scripts
|
||||
shouldn't be able to activate secret triggers; players just won't get
|
||||
credit for it in coop.
|
||||
- Added a NULL actor check to R_SetupFrame().
|
||||
- Fixed: The player sounds in DEHSUPP were defined incorrectly.
|
||||
|
||||
November 25, 2006 (Changes by Graf Zahl)
|
||||
- Fixed: SecretTriggers that were activated in an OPEN script caused a crash.
|
||||
- Converted Heretic's Clink (Sabreclaw) to DECORATE.
|
||||
|
|
|
|||
|
|
@ -75,9 +75,9 @@ void ASecretTrigger::Activate (AActor *activator)
|
|||
S_Sound (activator, CHAN_AUTO, "misc/secret", 1, ATTN_NORM);
|
||||
}
|
||||
}
|
||||
level.found_secrets++;
|
||||
if (activator->player) activator->player->secretcount++;
|
||||
Destroy ();
|
||||
}
|
||||
level.found_secrets++;
|
||||
Destroy ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -975,6 +975,11 @@ void R_CopyStackedViewParameters()
|
|||
|
||||
void R_SetupFrame (AActor *actor)
|
||||
{
|
||||
if (actor == NULL)
|
||||
{
|
||||
I_Error ("Tried to render from a NULL actor.");
|
||||
}
|
||||
|
||||
player_t *player = actor->player;
|
||||
unsigned int newblend;
|
||||
InterpolationViewer *iview;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,23 @@
|
|||
* Public domain. This program uses the svnversion command to get the
|
||||
* repository revision for a particular directory and writes it into
|
||||
* a header file so that it can be used as a project's build number.
|
||||
*
|
||||
* VERY IMPORTANT:
|
||||
*
|
||||
* When building with Visual Studio 2005, you must copy
|
||||
* the mt.exe from %VSINSTALLDIR%\Common7\Tools\bin on top of the version
|
||||
* in %VSINSTALLDIR%\VC\bin or your computer may restart while building.
|
||||
* This is due to the interaction of two separate bugs in both the old
|
||||
* mt.exe installed in the VC\bin directory and the loader in XP SP2.
|
||||
* Microsoft has a hotfix for XP SP2 but has yet to release it to the
|
||||
* general public, but fortunately they already have a fixed mt.exe
|
||||
* available.
|
||||
*
|
||||
* To check that you have done this correctly, the project is now set to
|
||||
* have the manifest tool output its version when it executes. The buggy
|
||||
* version is 5.2.3790.2014, and the fixed version is 6.0.4071.0.
|
||||
*
|
||||
* Ignore any warnings about Unrecognized Element "trustInfo".
|
||||
*/
|
||||
|
||||
#define _CRT_SECURE_NO_DEPRECATE
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="updaterevision"
|
||||
ProjectGUID="{6077B7D6-349F-4077-B552-3BC302EF5859}"
|
||||
RootNamespace="updaterevision"
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
CommandLine="echo ------------------- VERY IMPORTANT: --------------------
echo You must copy the mt.exe from
echo $(VSINSTALLDIR)\Common7\Tools\bin
echo on top of the version in
echo $(VSINSTALLDIR)\VC\bin
echo or your computer may restart while building."
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
|
|
@ -73,81 +74,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="1"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
AdditionalManifestFiles="$(InputDir)trustinfo.txt"
|
||||
SuppressStartupBanner="false"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
|
|
@ -244,6 +172,83 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="1"
|
||||
WholeProgramOptimization="1"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
CommandLine="echo ------------------- VERY IMPORTANT: --------------------
echo You must copy the mt.exe from
echo $(VSINSTALLDIR)\Common7\Tools\bin
echo on top of the version in
echo $(VSINSTALLDIR)\VC\bin
echo or your computer may restart while building."
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
AdditionalManifestFiles="$(InputDir)trustinfo.txt"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -492,7 +492,7 @@ SoundMap
|
|||
"plats/pt1_mid",
|
||||
"switches/normbutn",
|
||||
"switches/exitbutn",
|
||||
"*pain100_1",
|
||||
"*pain100",
|
||||
"demon/pain",
|
||||
"grunt/pain",
|
||||
"vile/pain",
|
||||
|
|
@ -501,7 +501,7 @@ SoundMap
|
|||
"misc/gibbed",
|
||||
"misc/i_pkup",
|
||||
"misc/w_pkup",
|
||||
"*land1",
|
||||
"*land",
|
||||
"misc/teleport",
|
||||
"grunt/sight",
|
||||
"grunt/sight",
|
||||
|
|
@ -524,8 +524,8 @@ SoundMap
|
|||
"vile/start",
|
||||
"imp/melee",
|
||||
"skeleton/swing",
|
||||
"*death1",
|
||||
"*xdeath1",
|
||||
"*death",
|
||||
"*xdeath",
|
||||
"grunt/death",
|
||||
"grunt/death",
|
||||
"grunt/death",
|
||||
|
|
@ -548,7 +548,7 @@ SoundMap
|
|||
"baby/active",
|
||||
"baby/walk",
|
||||
"vile/active",
|
||||
"*grunt1",
|
||||
"*grunt",
|
||||
"world/barrelx",
|
||||
"*fist",
|
||||
"cyber/hoof",
|
||||
|
|
|
|||
Loading…
Reference in New Issue