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

Documented/commented my I/O system changes in CBaseTrigger/CBaseOutput and cleaned some things up.

Browse source
This commit is contained in:
Marco Cawthorne 2020-09-20 15:50:45 +02:00
parent dc47146e99
commit 5dcb79e30c
2 changed files with 26 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gs-entbase/server/baseoutput.cpp
View file

@ -14,7 +14,9 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* inspired by https://developer.valvesoftware.com/wiki/Inputs_and_Outputs */
/* inspired by https://developer.valvesoftware.com/wiki/Inputs_and_Outputs
a lot of the action also happens in CBaseTrigger.
*/
/* modern trigger architecture */
class CBaseOutput:CBaseEntity
@ -53,17 +55,21 @@ CBaseOutput::TriggerOutput(void)
void
CBaseOutput::SpawnInit(void)
{
/* EMPTY! */
/* SpawnInit of CBaseEntity will tokenize __fullspawndata which
in turn will break CBaseTrigger::CreateOutput's tokenize loop,
as we'll be creating a bunch of CBaseOutput's in there */
}
void
CBaseOutput::Respawn(void)
{
/* gotta reset our counter */
m_iCount = m_iOldCount;
}
void
CBaseOutput::CBaseOutput(void)
{
/* Make sure Respawn() will be called between rounds */
gflags = GF_CANRESPAWN;
}

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

@ -20,6 +20,7 @@ CBaseTrigger::UseOutput(entity act, string outname)
{
for (entity f = world; (f = find(f, ::targetname, outname));) {
CBaseOutput op = (CBaseOutput)f;
/* no more tries and not -1 (infinite) */
if (op.m_iCount == 0) {
return;
@ -31,21 +32,27 @@ CBaseTrigger::UseOutput(entity act, string outname)
}
}
/* input is a 4-5 parameter, commar separated string, output is the targetname
/* input is a 5 parameter, commar separated string, output is the targetname
of a minion entity that'll handle the triggering (and counting down of uses)
as defined in the Source Input/Output specs */
string
CBaseTrigger::CreateOutput(string outmsg)
{
static int outcount = 0;
string outname = "";
float c;
if (!outmsg)
return "";
string outname = sprintf("output_%i\n", outcount);
outname = sprintf("output_%i\n", outcount);
outcount++;
/* to make sure tokenize 'remembers' to tell us about the commonly
empty data string, we prepared the output string beforehand to
at least contain a _ symbol after the comma separator... now
we gotta clip that away using substring(). messy, but that's the
only way to keep them at 5 argv() calls per output */
c = tokenizebyseparator(outmsg, ",");
for (float i = 1; i < c; i+=5) {
CBaseOutput new_minion = spawn(CBaseOutput);
@ -58,20 +65,17 @@ CBaseTrigger::CreateOutput(string outmsg)
new_minion.m_flDelay = stof(substring(argv(i+3), 1,-1));
new_minion.m_iCount = stoi(substring(argv(i+4), 1,-1));
new_minion.m_iOldCount = new_minion.m_iCount;
/* print final debug output */
dprint(sprintf("^2%s::CreateOutput report:\n", classname));
dprint(sprintf("Target: %s\n", new_minion.m_strTarget));
dprint(sprintf("Input: %s\n", new_minion.m_strInput));
dprint(sprintf("Data Message: %s\n", new_minion.m_strData));
dprint(sprintf("Delay: %f\n", new_minion.m_flDelay));
dprint(sprintf("Uses: %i\n\n", new_minion.m_iCount));
}
/* print final debug output */
for (entity f = world; (f = find(f, ::targetname, outname));) {
CBaseOutput new_minion = (CBaseOutput)f;
print(sprintf("^2%s::OnTrigger report:\n", classname));
print(sprintf("Target: %s\n", new_minion.m_strTarget));
print(sprintf("Input: %s\n", new_minion.m_strInput));
print(sprintf("Data Message: %s\n", new_minion.m_strData));
print(sprintf("Delay: %f\n", new_minion.m_flDelay));
print(sprintf("Uses: %i\n\n", new_minion.m_iCount));
}
/* return the minion's name that'll act as the trigger */
/* return the name that'll act as the trigger for all outputs */
return outname;
}
@ -198,48 +202,6 @@ CBaseTrigger::InitBrushTrigger(void)
SetRenderMode(RM_TRIGGER);
}
void CompilerTest(void)
{
string outmsg = ",_control_retinal2,_BeginSequence,_,_0,_-1,_control_retinal3,_BeginSequence,_,_0,_-1,_control_retinal1,_BeginSequence,_,_0,_-1";
string out_targetname;
string out_name;
string out_in;
string out_data;
float out_delay;
int out_uses;
float c;
static int outcount = 0;
out_targetname = sprintf("output_%i\n", outcount);
outcount++;
c = tokenizebyseparator(outmsg, ",");
for (float i = 1; i < c; i+=5) {
out_name = substring(argv(i), 1,-1);
out_in = substring(argv(i+1), 1,-1);
out_data = substring(argv(i+2), 1,-1);
out_delay = stof(substring(argv(i+3), 1,-1));
out_uses = stoi(substring(argv(i+4), 1,-1));
print(sprintf("%d: %s\n", i, out_name));
print(sprintf("%d: %s\n", i, out_in));
print(sprintf("%d: %s\n", i, out_data));
print(sprintf("%d: %d\n", i, out_delay));
print(sprintf("%d: %i\n", i, out_uses));
CBaseOutput new_minion = spawn(CBaseOutput);
new_minion.classname = "triggerminion";
new_minion.targetname = out_targetname;
new_minion.m_strTarget = out_name;
new_minion.m_strInput = out_in;
new_minion.m_strData = out_data;
new_minion.m_flDelay = out_delay;
new_minion.m_iCount = out_uses;
new_minion.m_iOldCount = out_uses;
}
}
void
CBaseTrigger::SpawnKey(string strKey, string strValue)
{