1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Changes were reviewed manually
This commit is contained in:
Alexander Wilms
2024-06-24 03:23:26 +02:00
parent 820b1b446e
commit 02e429e973
277 changed files with 815 additions and 815 deletions

View File

@@ -1452,37 +1452,37 @@ bool ERMInterpreter::isATrigger( const ERM::TLine & line )
return false;
}
ERM::EVOtions ERMInterpreter::getExpType(const ERM::TVOption & opt)
ERM::EVOptions ERMInterpreter::getExpType(const ERM::TVOption & opt)
{
struct Visitor
{
ERM::EVOtions operator()(const boost::recursive_wrapper<ERM::TVExp>&) const
ERM::EVOptions operator()(const boost::recursive_wrapper<ERM::TVExp>&) const
{
return ERM::EVOtions::VEXP;
return ERM::EVOptions::VEXP;
}
ERM::EVOtions operator()(const ERM::TSymbol&) const
ERM::EVOptions operator()(const ERM::TSymbol&) const
{
return ERM::EVOtions::SYMBOL;
return ERM::EVOptions::SYMBOL;
}
ERM::EVOtions operator()(char) const
ERM::EVOptions operator()(char) const
{
return ERM::EVOtions::CHAR;
return ERM::EVOptions::CHAR;
}
ERM::EVOtions operator()(double) const
ERM::EVOptions operator()(double) const
{
return ERM::EVOtions::DOUBLE;
return ERM::EVOptions::DOUBLE;
}
ERM::EVOtions operator()(int) const
ERM::EVOptions operator()(int) const
{
return ERM::EVOtions::INT;
return ERM::EVOptions::INT;
}
ERM::EVOtions operator()(const ERM::Tcommand&) const
ERM::EVOptions operator()(const ERM::Tcommand&) const
{
return ERM::EVOtions::TCMD;
return ERM::EVOptions::TCMD;
}
ERM::EVOtions operator()(const ERM::TStringConstant&) const
ERM::EVOptions operator()(const ERM::TStringConstant&) const
{
return ERM::EVOtions::STRINGC;
return ERM::EVOptions::STRINGC;
}
};
const Visitor v;

View File

@@ -305,7 +305,7 @@ class ERMInterpreter
static bool isCMDATrigger(const ERM::Tcommand & cmd);
static bool isATrigger(const ERM::TLine & line);
static ERM::EVOtions getExpType(const ERM::TVOption & opt);
static ERM::EVOptions getExpType(const ERM::TVOption & opt);
ERM::TLine & retrieveLine(const VERMInterpreter::LinePointer & linePtr);
static ERM::TTriggerBase & retrieveTrigger(ERM::TLine & line);
public:

View File

@@ -241,7 +241,7 @@ namespace ERM
//for #'symbol expression
enum EVOtions{VEXP, SYMBOL, CHAR, DOUBLE, INT, TCMD, STRINGC};
enum EVOptions{VEXP, SYMBOL, CHAR, DOUBLE, INT, TCMD, STRINGC};
struct TVExp;
typedef std::variant<boost::recursive_wrapper<TVExp>, TSymbol, char, double, int, Tcommand, TStringConstant > TVOption; //options in v-expression
//v-expression

View File

@@ -42,8 +42,8 @@ const std::vector<ApplyDamageProxy::CustomRegType> ApplyDamageProxy::REGISTER_CU
true
},
{
"getInitalDamage",
LuaMethodWrapper<ApplyDamage, decltype(&ApplyDamage::getInitalDamage), &ApplyDamage::getInitalDamage>::invoke,
"getInitialDamage",
LuaMethodWrapper<ApplyDamage, decltype(&ApplyDamage::getInitialDamage), &ApplyDamage::getInitialDamage>::invoke,
false
},
{