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

September 16th patch update

Browse source 
DLL version incremented
Beacon functionality added
Support for loading screen match preview display
Placeholder handling of new key-bindable mod commands
This commit is contained in:
PG-SteveT 2020-09-16 10:03:04 -07:00
parent e37e174be1
commit fd05be35c1
68 changed files with 1313 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

11
REDALERT/TECHNO.CPP
View file

@ -1647,7 +1647,7 @@ bool TechnoClass::Evaluate_Object(ThreatType method, int mask, int range, Techno
** If the scan is limited to capturable buildings only, then bail if the examined
** object isn't a capturable building.
*/
if ((method & THREAT_CAPTURE) && (otype != RTTI_BUILDING || !((BuildingTypeClass const *)tclass)->IsCaptureable)) {
if ((method & THREAT_CAPTURE) && (otype != RTTI_BUILDING || !object->Can_Capture())) {
BEnd(BENCH_EVAL_OBJECT);
return(false);
}
@ -3378,6 +3378,13 @@ BulletClass * TechnoClass::Fire_At(TARGET target, int which)
}
}
/*
** For electric zaps, immediately perform bullet logic.
*/
if (weapon->IsElectric) {
bullet->AI();
}
#endif
}
@ -3560,7 +3567,7 @@ ActionType TechnoClass::What_Action(ObjectClass const * object) const
((weapon != NULL) && weapon->Bullet->IsAntiAircraft) ||
(object->Is_Techno() && (((TechnoClass *)object)->Height == 0))) {
if (Can_Player_Move() || In_Range(object, primary)) {
if (In_Range(object, primary) || (What_Am_I() == RTTI_INFANTRY && ((InfantryClass *)this)->Class->IsCapture && object->What_Am_I() == RTTI_BUILDING && ((BuildingClass *)object)->Class->IsCaptureable)) {
if (In_Range(object, primary) || (What_Am_I() == RTTI_INFANTRY && ((InfantryClass *)this)->Class->IsCapture && object->What_Am_I() == RTTI_BUILDING && object->Can_Capture())) {
return(ACTION_ATTACK);
} else {
if (!Can_Player_Move()) {