diff --git a/REDALERT/ABSTRACT.H b/REDALERT/ABSTRACT.H index b85162f..3e6267d 100644 --- a/REDALERT/ABSTRACT.H +++ b/REDALERT/ABSTRACT.H @@ -32,6 +32,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + + #ifndef ABSTRACT_H #define ABSTRACT_H diff --git a/REDALERT/DEFINES.H b/REDALERT/DEFINES.H index 6dcc9ba..740e3f3 100644 --- a/REDALERT/DEFINES.H +++ b/REDALERT/DEFINES.H @@ -30,6 +30,8 @@ * * *---------------------------------------------------------------------------------------------* * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + + #ifndef DEFINES_H #define DEFINES_H diff --git a/REDALERT/OBJECT.H b/REDALERT/OBJECT.H index 289f04c..a9fb58e 100644 --- a/REDALERT/OBJECT.H +++ b/REDALERT/OBJECT.H @@ -35,7 +35,7 @@ #ifndef OBJECT_H #define OBJECT_H -#include "abstract.h" +#include "ABSTRACT.H" class ObjectClass; class TechnoClass; diff --git a/REDALERT/RedAlert.vcxproj b/REDALERT/RedAlert.vcxproj index 7161a6d..1e2be15 100644 --- a/REDALERT/RedAlert.vcxproj +++ b/REDALERT/RedAlert.vcxproj @@ -22,7 +22,7 @@ 15.0 {DA948ED9-EF67-4813-94B7-995BE956786E} RedAlert - 8.1 + 10.0 SAK SAK SAK @@ -32,26 +32,26 @@ DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte @@ -95,7 +95,7 @@ ./win32lib true false - TRUE_FALSE_DEFINED;ENGLISH;WIN32;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) + TRUE_FALSE_DEFINED;ENGLISH;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) 1Byte false MultiThreaded @@ -123,7 +123,7 @@ false true ProgramDatabase - TRUE_FALSE_DEFINED;ENGLISH;WIN32;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) + TRUE_FALSE_DEFINED;ENGLISH;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;_DEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions) false MultiThreadedDebug 1Byte @@ -348,6 +348,7 @@ + @@ -622,6 +623,7 @@ + diff --git a/REDALERT/RedAlert.vcxproj.filters b/REDALERT/RedAlert.vcxproj.filters index 39e5841..b49e7e5 100644 --- a/REDALERT/RedAlert.vcxproj.filters +++ b/REDALERT/RedAlert.vcxproj.filters @@ -900,6 +900,9 @@ Source Files + + Source Files + @@ -1766,6 +1769,9 @@ Source Files\Resource + + Header Files + diff --git a/REDALERT/TECHNO.CPP b/REDALERT/TECHNO.CPP index ea720c4..bb6ab81 100644 --- a/REDALERT/TECHNO.CPP +++ b/REDALERT/TECHNO.CPP @@ -131,6 +131,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "function.h" +#include "Resurgence.h" /*************************************************************************** @@ -3971,6 +3972,7 @@ ResultType TechnoClass::Take_Damage(int & damage, int distance, WarheadType warh switch (result) { case RESULT_DESTROYED: + Resurgence::on_kill_event(source, this); Transmit_Message(RADIO_OVER_OUT); Stun(); diff --git a/REDALERT/TECHNO.H b/REDALERT/TECHNO.H index 689fe2a..ba675f0 100644 --- a/REDALERT/TECHNO.H +++ b/REDALERT/TECHNO.H @@ -248,6 +248,11 @@ class TechnoClass : public RadioClass, */ unsigned char SaveLoadPadding[16]; + // Added for Resurgence + unsigned int Experience; + + // Added for Resurgence + unsigned int Level; /*--------------------------------------------------------------------- ** Constructors, Destructors, and overloaded operators. diff --git a/REDALERT/UNIT.CPP b/REDALERT/UNIT.CPP index 712f0b1..d871686 100644 --- a/REDALERT/UNIT.CPP +++ b/REDALERT/UNIT.CPP @@ -99,6 +99,7 @@ #include "function.h" #include "COORDA.h" +#include "Resurgence.h" /*********************************************************************************************** * Recoil_Adjust -- Adjust pixel values in direction specified. * diff --git a/TIBERIANDAWN/TiberianDawn.vcxproj b/TIBERIANDAWN/TiberianDawn.vcxproj index 0896ad2..658f588 100644 --- a/TIBERIANDAWN/TiberianDawn.vcxproj +++ b/TIBERIANDAWN/TiberianDawn.vcxproj @@ -18,21 +18,21 @@ SAK SAK SAK - 8.1 + 10.0 DynamicLibrary true MultiByte - v141 + v142 DynamicLibrary false false MultiByte - v141 + v142 @@ -62,7 +62,7 @@ Level3 Disabled - TRUE_FALSE_DEFINED;WIN32;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) + TRUE_FALSE_DEFINED;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;_DEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) ./win32lib ProgramDatabase false @@ -96,7 +96,7 @@ MaxSpeed true true - TRUE_FALSE_DEFINED;WIN32;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) + TRUE_FALSE_DEFINED;WIN32;WINDOWS_IGNORE_PACKING_MISMATCH;NDEBUG;_WINDOWS;_USRDLL;TIBERIANDAWN_EXPORTS;%(PreprocessorDefinitions) ./win32lib 4800;4244;4996 false diff --git a/TIBERIANDAWN/UNIT.CPP b/TIBERIANDAWN/UNIT.CPP index 8cf678d..153bf70 100644 --- a/TIBERIANDAWN/UNIT.CPP +++ b/TIBERIANDAWN/UNIT.CPP @@ -93,7 +93,8 @@ * UnitClass::~UnitClass -- Destructor for unit objects. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "function.h" + +#include "FUNCTION.H" /* ** This contains the value of the Virtual Function Table Pointer