skip trying to be clever and just report the variable name being checked directly

This commit is contained in:
AzaezelX 2025-03-18 03:13:37 -05:00
parent 55ac453ab9
commit 011a8906ff
14 changed files with 29 additions and 33 deletions

View file

@ -35,7 +35,7 @@
// When an effect is added using "addEffect", this validator intercepts the value
// and adds it to the dynamic effects list.
//
void afxEffectGroupData::egValidator::validateType(SimObject* object, void* typePtr)
void afxEffectGroupData::egValidator::validateType(SimObject* object, StringTableEntry varname, void* typePtr)
{
afxEffectGroupData* eff_data = dynamic_cast<afxEffectGroupData*>(object);
afxEffectBaseData** ew = (afxEffectBaseData**)(typePtr);

View file

@ -60,7 +60,7 @@ class afxEffectGroupData : public afxEffectBaseData
U32 id;
public:
egValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
};
bool do_id_convert;

View file

@ -39,7 +39,7 @@
// When an effect is added using "addEffect", this validator intercepts the value
// and adds it to the dynamic effects list.
//
void afxEffectronData::ewValidator::validateType(SimObject* object, void* typePtr)
void afxEffectronData::ewValidator::validateType(SimObject* object, StringTableEntry varname, void* typePtr)
{
afxEffectronData* eff_data = dynamic_cast<afxEffectronData*>(object);
afxEffectBaseData** ew = (afxEffectBaseData**)(typePtr);

View file

@ -46,7 +46,7 @@ class afxEffectronData : public afxChoreographerData
U32 id;
public:
ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
};
bool do_id_convert;

View file

@ -43,7 +43,7 @@
// created for each effect list and an id is used to identify which list to add the effect
// to.
//
void afxMagicSpellData::ewValidator::validateType(SimObject* object, void* typePtr)
void afxMagicSpellData::ewValidator::validateType(SimObject* object, StringTableEntry varname, void* typePtr)
{
afxMagicSpellData* spelldata = dynamic_cast<afxMagicSpellData*>(object);
afxEffectBaseData** ew = (afxEffectBaseData**)(typePtr);

View file

@ -65,7 +65,7 @@ class afxMagicSpellData : public afxChoreographerData, public afxMagicSpellDefs
U32 id;
public:
ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
};
bool mDo_id_convert;

View file

@ -38,7 +38,7 @@
// When an effect is added using "addEffect", this validator intercepts the value
// and adds it to the dynamic effects list.
//
void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePtr)
void afxSelectronData::ewValidator::validateType(SimObject* object, StringTableEntry varname, void* typePtr)
{
afxSelectronData* sele_data = dynamic_cast<afxSelectronData*>(object);
afxEffectBaseData** ew = (afxEffectBaseData**)(typePtr);

View file

@ -57,7 +57,7 @@ class afxSelectronData : public afxChoreographerData, public afxSelectronDefs
U32 id;
public:
ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
};
bool do_id_convert;

View file

@ -36,7 +36,7 @@
// When an effect is added using "addEffect", this validator intercepts the value
// and adds it to the dynamic effects list.
//
void afxPhraseEffectData::ewValidator::validateType(SimObject* object, void* typePtr)
void afxPhraseEffectData::ewValidator::validateType(SimObject* object, StringTableEntry varname, void* typePtr)
{
afxPhraseEffectData* eff_data = dynamic_cast<afxPhraseEffectData*>(object);
afxEffectBaseData** ew = (afxEffectBaseData**)(typePtr);

View file

@ -42,7 +42,7 @@ class afxPhraseEffectData : public GameBaseData, public afxEffectDefs, public af
U32 id;
public:
ewValidator(U32 id) { this->id = id; }
void validateType(SimObject *object, void *typePtr) override;
void validateType(SimObject *object, StringTableEntry varname, void *typePtr) override;
};
bool do_id_convert;