From 26dd0302fd1631c7571d1fed71649d8d21069dc5 Mon Sep 17 00:00:00 2001 From: CCHyper <73803386+CCHyper@users.noreply.github.com> Date: Tue, 7 Mar 2023 18:52:50 +0000 Subject: [PATCH] x --- src/extensions/techno/technoext.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/extensions/techno/technoext.cpp b/src/extensions/techno/technoext.cpp index 471428d74..ad056f400 100644 --- a/src/extensions/techno/technoext.cpp +++ b/src/extensions/techno/technoext.cpp @@ -164,7 +164,7 @@ void TechnoClassExtension::Response_Capture() VocType response = VOC_NONE; const TechnoTypeClass *technotype = Techno_Type_Class(); - const TechnoTypeClassExtension *technotypeext = Extension::Fetch(technotype); + const TechnoTypeClassExtension *technotypeext = Techno_Type_Class_Ext(); if (technotypeext->VoiceCapture.Count() > 0) { response = technotypeext->VoiceCapture[Sim_Random_Pick(0, technotypeext->VoiceCapture.Count()-1)]; @@ -199,7 +199,7 @@ void TechnoClassExtension::Response_Enter() VocType response = VOC_NONE; const TechnoTypeClass *technotype = Techno_Type_Class(); - const TechnoTypeClassExtension *technotypeext = Extension::Fetch(technotype); + const TechnoTypeClassExtension *technotypeext = Techno_Type_Class_Ext(); if (technotypeext->VoiceEnter.Count() > 0) { response = technotypeext->VoiceEnter[Sim_Random_Pick(0, technotypeext->VoiceEnter.Count()-1)]; @@ -234,7 +234,7 @@ void TechnoClassExtension::Response_Deploy() VocType response = VOC_NONE; const TechnoTypeClass *technotype = Techno_Type_Class(); - const TechnoTypeClassExtension *technotypeext = Extension::Fetch(technotype); + const TechnoTypeClassExtension *technotypeext = Techno_Type_Class_Ext(); if (technotypeext->VoiceDeploy.Count() > 0) { response = technotypeext->VoiceDeploy[Sim_Random_Pick(0, technotypeext->VoiceDeploy.Count()-1)]; @@ -269,7 +269,7 @@ void TechnoClassExtension::Response_Harvest() VocType response = VOC_NONE; const TechnoTypeClass *technotype = Techno_Type_Class(); - const TechnoTypeClassExtension *technotypeext = Extension::Fetch(technotype); + const TechnoTypeClassExtension *technotypeext = Techno_Type_Class_Ext(); if (technotypeext->VoiceHarvest.Count() > 0) { response = technotypeext->VoiceHarvest[Sim_Random_Pick(0, technotypeext->VoiceHarvest.Count()-1)]; @@ -292,14 +292,11 @@ void TechnoClassExtension::Response_Harvest() bool TechnoClassExtension::Can_Passive_Acquire() const { //EXT_DEBUG_TRACE("TechnoClassExtension::Can_Passive_Acquire - Name: %s (0x%08X)\n", Name(), (uintptr_t)(This())); - - const TechnoTypeClass *technotype = Techno_Type_Class(); - const TechnoTypeClassExtension *technotypeext = Extension::Fetch(technotype); /** * IsCanPassiveAcquire defaults to true to copy original behaviour, so all units can passive acquire unless told otherwise. */ - return technotypeext->IsCanPassiveAcquire; + return Techno_Type_Class_Ext()->IsCanPassiveAcquire; }