tiberium/CnC_Remastered_Collection
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added and wired event hook for Resurgence::on_kill_event()

Browse source
This commit is contained in:
sigmaseven 2020-06-29 11:49:28 -05:00
parent 7dbaab36b9
commit 6375852bbb
10 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
REDALERT/ABSTRACT.H
View file

@ -32,6 +32,8 @@
* Functions: * * Functions: *
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#ifndef ABSTRACT_H #ifndef ABSTRACT_H
#define ABSTRACT_H #define ABSTRACT_H

2
REDALERT/DEFINES.H
View file

@ -30,6 +30,8 @@
* * * *
*---------------------------------------------------------------------------------------------* *---------------------------------------------------------------------------------------------*
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#ifndef DEFINES_H #ifndef DEFINES_H
#define DEFINES_H #define DEFINES_H

2
REDALERT/OBJECT.H
View file

@ -35,7 +35,7 @@
#ifndef OBJECT_H #ifndef OBJECT_H
#define OBJECT_H #define OBJECT_H
#include "abstract.h" #include "ABSTRACT.H"
class ObjectClass; class ObjectClass;
class TechnoClass; class TechnoClass;

16
REDALERT/RedAlert.vcxproj
View file

@ -22,7 +22,7 @@
<VCProjectVersion>15.0</VCProjectVersion> <VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{DA948ED9-EF67-4813-94B7-995BE956786E}</ProjectGuid> <ProjectGuid>{DA948ED9-EF67-4813-94B7-995BE956786E}</ProjectGuid>
<RootNamespace>RedAlert</RootNamespace> <RootNamespace>RedAlert</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<SccProjectName>SAK</SccProjectName> <SccProjectName>SAK</SccProjectName>
<SccAuxPath>SAK</SccAuxPath> <SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath> <SccLocalPath>SAK</SccLocalPath>
@ -32,26 +32,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
@ -95,7 +95,7 @@
<AdditionalIncludeDirectories>./win32lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>./win32lib</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<PreprocessorDefinitions>TRUE_FALSE_DEFINED;ENGLISH;WIN32;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TRUE_FALSE_DEFINED;ENGLISH;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StructMemberAlignment>1Byte</StructMemberAlignment> <StructMemberAlignment>1Byte</StructMemberAlignment>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -123,7 +123,7 @@
<SDLCheck>false</SDLCheck> <SDLCheck>false</SDLCheck>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>TRUE_FALSE_DEFINED;ENGLISH;WIN32;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TRUE_FALSE_DEFINED;ENGLISH;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<StructMemberAlignment>1Byte</StructMemberAlignment> <StructMemberAlignment>1Byte</StructMemberAlignment>
@ -348,6 +348,7 @@
<ClCompile Include="READLINE.CPP" /> <ClCompile Include="READLINE.CPP" />
<ClCompile Include="RECT.CPP" /> <ClCompile Include="RECT.CPP" />
<ClCompile Include="REINF.CPP" /> <ClCompile Include="REINF.CPP" />
<ClCompile Include="Resurgence.cpp" />
<ClCompile Include="RGB.CPP" /> <ClCompile Include="RGB.CPP" />
<ClCompile Include="RNDSTRAW.CPP" /> <ClCompile Include="RNDSTRAW.CPP" />
<ClCompile Include="ROTBMP.CPP" /> <ClCompile Include="ROTBMP.CPP" />
@ -622,6 +623,7 @@
<ClInclude Include="RECT.H" /> <ClInclude Include="RECT.H" />
<ClInclude Include="REGION.H" /> <ClInclude Include="REGION.H" />
<ClInclude Include="Resource\resource.h" /> <ClInclude Include="Resource\resource.h" />
<ClInclude Include="Resurgence.h" />
<ClInclude Include="RGB.H" /> <ClInclude Include="RGB.H" />
<ClInclude Include="RNDSTRAW.H" /> <ClInclude Include="RNDSTRAW.H" />
<ClInclude Include="RNG.H" /> <ClInclude Include="RNG.H" />

6
REDALERT/RedAlert.vcxproj.filters
View file

@ -900,6 +900,9 @@
<ClCompile Include="DLLInterfaceEditor.cpp"> <ClCompile Include="DLLInterfaceEditor.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Resurgence.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="ABSTRACT.H"> <ClInclude Include="ABSTRACT.H">
@ -1766,6 +1769,9 @@
<ClInclude Include="Resource\resource.h"> <ClInclude Include="Resource\resource.h">
<Filter>Source Files\Resource</Filter> <Filter>Source Files\Resource</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Resurgence.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="COORDA.ASM"> <None Include="COORDA.ASM">

2
REDALERT/TECHNO.CPP
View file

@ -131,6 +131,7 @@
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#include "function.h" #include "function.h"
#include "Resurgence.h"
/*************************************************************************** /***************************************************************************
@ -3971,6 +3972,7 @@ ResultType TechnoClass::Take_Damage(int & damage, int distance, WarheadType warh
switch (result) { switch (result) {
case RESULT_DESTROYED: case RESULT_DESTROYED:
Resurgence::on_kill_event(source, this);
Transmit_Message(RADIO_OVER_OUT); Transmit_Message(RADIO_OVER_OUT);
Stun(); Stun();

5
REDALERT/TECHNO.H
View file

@ -248,6 +248,11 @@ class TechnoClass : public RadioClass,
*/ */
unsigned char SaveLoadPadding[16]; unsigned char SaveLoadPadding[16];
// Added for Resurgence
unsigned int Experience;
// Added for Resurgence
unsigned int Level;
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
** Constructors, Destructors, and overloaded operators. ** Constructors, Destructors, and overloaded operators.

1
REDALERT/UNIT.CPP
View file

@ -99,6 +99,7 @@
#include "function.h" #include "function.h"
#include "COORDA.h" #include "COORDA.h"
#include "Resurgence.h"
/*********************************************************************************************** /***********************************************************************************************
* Recoil_Adjust -- Adjust pixel values in direction specified. * * Recoil_Adjust -- Adjust pixel values in direction specified. *

10
TIBERIANDAWN/TiberianDawn.vcxproj
View file

@ -18,21 +18,21 @@
<SccAuxPath>SAK</SccAuxPath> <SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath> <SccLocalPath>SAK</SccLocalPath>
<SccProvider>SAK</SccProvider> <SccProvider>SAK</SccProvider>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
@ -62,7 +62,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TRUE_FALSE_DEFINED;WIN32;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TRUE_FALSE_DEFINED;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>./win32lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>./win32lib</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
@ -96,7 +96,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>TRUE_FALSE_DEFINED;WIN32;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>TRUE_FALSE_DEFINED;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>./win32lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>./win32lib</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800;4244;4996</DisableSpecificWarnings> <DisableSpecificWarnings>4800;4244;4996</DisableSpecificWarnings>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>

3
TIBERIANDAWN/UNIT.CPP
View file

@ -93,7 +93,8 @@
* UnitClass::~UnitClass -- Destructor for unit objects. * * UnitClass::~UnitClass -- Destructor for unit objects. *
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#include "function.h"
#include "FUNCTION.H"
/* /*
** This contains the value of the Virtual Function Table Pointer ** This contains the value of the Virtual Function Table Pointer