August patch integration: Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection

This commit is contained in:
Justin Marshall
2020-08-06 15:35:00 -07:00
33 changed files with 473 additions and 93 deletions
+8
View File
@@ -632,6 +632,14 @@ COORDINATE ObjectClass::Sort_Y(void) const
* HISTORY: *
* 09/21/1995 JLB : Created. *
*=============================================================================================*/
FireDataType ObjectClass::Fire_Data(int which) const
{
assert(this != 0);
assert(IsActive);
return{Fire_Coord(which),0};
}
COORDINATE ObjectClass::Fire_Coord(int ) const
{
assert(this != 0);