vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

CBaseTrigger: The order of states was actually kinda iffy for relays. Adjusted the internal order to require no messy conversion.

Browse source
This commit is contained in:
Marco Cawthorne 2020-08-09 02:11:54 +02:00
parent bbf426e58e
commit b3ba711bab
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gs-entbase/server/basetrigger.cpp
View file

@ -22,9 +22,9 @@ enum
enum
{
TRIG_TOGGLE,
TRIG_OFF,
TRIG_ON
TRIG_ON,
TRIG_TOGGLE
};
class CBaseTrigger:CBaseEntity
@ -112,8 +112,8 @@ CBaseTrigger::GetMaster(void)
/* default to success */
if (!m_strMaster) {
dprint(sprintf("^2%s::^3GetMaster^7: No master, return success\n",
this.classname));
/*dprint(sprintf("^2%s::^3GetMaster^7: No master, return success\n",
this.classname));*/
return TRUE;
}
@ -121,17 +121,17 @@ CBaseTrigger::GetMaster(void)
/* we couldn't find it, so let's not even bother going further */
if (!t) {
dprint(sprintf("^2%s::^3GetMaster^7: Invalid master, return success\n",
this.classname));
/*dprint(sprintf("^2%s::^3GetMaster^7: Invalid master, return success\n",
this.classname));*/
return TRUE;
}
if (t.GetValue() == 1)
/*if (t.GetValue() == 1)
dprint(sprintf("^2%s::^3GetMaster^7: %s learns %s ^2POSITIVE\n",
this.classname, m_strTargetName, m_strMaster));
else
dprint(sprintf("^2%s::^3GetMaster^7: %s learns %s ^1NEGATIVE\n",
this.classname, m_strTargetName, m_strMaster));
this.classname, m_strTargetName, m_strMaster));*/
return t.GetValue();
}

7
src/gs-entbase/server/trigger_relay.cpp
View file

@ -33,13 +33,6 @@ enumflags
TRLY_ONCE,
};
enum
{
TRL_STATE_OFF,
TRL_STATE_ON,
TRL_STATE_TOGGLE
};
class trigger_relay:CBaseTrigger
{
int m_iTriggerState;