zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-30 16:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed the patches for the Doom/Heretic E1 intermission screens from

Browse source 
R_InitPatches. This isn't needed anymore because all these are loaded through
  an intermission script.
- Fixed: A_SpawnDebris read the third and fourth arguments from the first one's
  address.


SVN r664 (trunk)
This commit is contained in:
Christoph Oelckers 2008-01-04 08:51:51 +00:00
parent 5cbb2bd472
commit aa90336765
4 changed files with 86 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/rh-log.txt
View file

@ -1,3 +1,10 @@
January 4, 2008 (Changes by Graf Zahl)
- Removed the patches for the Doom/Heretic E1 intermission screens from
R_InitPatches. This isn't needed anymore because all these are loaded through
an intermission script.
- Fixed: A_SpawnDebris read the third and fourth arguments from the first one's
address.
January 3, 2008 January 3, 2008
- Moved the pixel shaders' color information out of the constant registers - Moved the pixel shaders' color information out of the constant registers
and into the vertex data. and into the vertex data.

37
src/r_data.cpp
View file

@ -1106,15 +1106,6 @@ static void R_InitPatches ()
"M_EPI2", "M_EPI2",
"M_EPI3", "M_EPI3",
"M_EPI4", "M_EPI4",
"MAPE1",
"MAPE2",
"MAPE3",
"WIMAP0",
"WIURH0",
"WIURH1",
"WISPLAT",
"WIMAP1",
"WIMAP2",
"INTERPIC", "INTERPIC",
"WIOSTK", "WIOSTK",
"WIOSTI", "WIOSTI",
@ -1234,34 +1225,6 @@ static void R_InitPatches ()
} }
} }
// Animating overlays for the Doom E1 map
for (i = 9; i >= 0; --i)
{
for (j = (i == 6) ? 3 : 2; j >= 0; --j)
{
sprintf (name, "WIA0%.2d%.2d", i, j);
TexMan.AddPatch (name);
}
}
// Animating overlays for the Doom E2 map
for (i = 7; i >= 0; --i)
{
for (j = (i == 7) ? 2 : 0; j >= 0; --j)
{
sprintf (name, "WIA1%.2d%.2d", i, j);
TexMan.AddPatch (name);
}
}
// Animating overlays for the Doom E3 map
for (i = 5; i >= 0; --i)
{
for (j = 2; j >= 0; --j)
{
sprintf (name, "WIA2%.2d%.2d", i, j);
TexMan.AddPatch (name);
}
}
// Player class animations for the Hexen new game menu // Player class animations for the Hexen new game menu
for (i = 2; i >= 0; --i) for (i = 2; i >= 0; --i)
{ {

4
src/thingdef_codeptr.cpp
View file

@ -1769,8 +1769,8 @@ void A_SpawnDebris(AActor * self)
if (debris == NULL) return; if (debris == NULL) return;
INTBOOL transfer_translation = EvalExpressionI (StateParameters[index+1], self); INTBOOL transfer_translation = EvalExpressionI (StateParameters[index+1], self);
fixed_t mult_h = fixed_t(EvalExpressionF (StateParameters[index], self) * FRACUNIT); fixed_t mult_h = fixed_t(EvalExpressionF (StateParameters[index+2], self) * FRACUNIT);
fixed_t mult_v = fixed_t(EvalExpressionF (StateParameters[index], self) * FRACUNIT); fixed_t mult_v = fixed_t(EvalExpressionF (StateParameters[index+3], self) * FRACUNIT);
// only positive values make sense here // only positive values make sense here
if (mult_v<=0) mult_v=FRACUNIT; if (mult_v<=0) mult_v=FRACUNIT;

154
tools/updaterevision/updaterevision.vcproj
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="updaterevision" Name="updaterevision"
ProjectGUID="{6077B7D6-349F-4077-B552-3BC302EF5859}" ProjectGUID="{6077B7D6-349F-4077-B552-3BC302EF5859}"
RootNamespace="updaterevision" RootNamespace="updaterevision"
@ -95,82 +95,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -248,6 +172,82 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"