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

light: make sure lightstyles reset upon round respawn

Browse source
This commit is contained in:
Marco Cawthorne 2019-01-15 22:29:04 +01:00
parent f13cb921b3
commit 95b60757e7
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Source/gs-entbase/server/light.cpp
View file

@ -6,37 +6,48 @@
* *
****/ ****/
class light : CBaseTrigger class light:CBaseTrigger
{ {
string m_strPattern; string m_strPattern;
int m_iEnabled; int m_iEnabled;
float m_flStyle; float m_flStyle;
void() light; void() light;
virtual void() Trigger; virtual void() Trigger;
virtual void() Respawn;
}; };
void light :: Trigger ( void ) void light::Trigger(void)
{ {
if ( m_iEnabled == TRUE ) { if (m_iEnabled == TRUE) {
//dprint( "light: Turned off!\n" ); lightstyle(m_flStyle, "a");
lightstyle( m_flStyle, "a" );
m_iEnabled = FALSE; m_iEnabled = FALSE;
} else { } else {
//dprint( "light: Turned on!\n" ); lightstyle(m_flStyle, m_strPattern);
lightstyle( m_flStyle, m_strPattern );
m_iEnabled = TRUE; m_iEnabled = TRUE;
} }
} }
void light :: light ( void ) void light::Respawn(void)
{ {
for ( int i = 1; i < ( tokenize( __fullspawndata ) - 1 ); i += 2 ) { if (spawnflags & 1) {
switch ( argv( i ) ) { lightstyle(m_flStyle, "a");
m_iEnabled = FALSE;
} else {
lightstyle(m_flStyle, m_strPattern);
m_iEnabled = TRUE;
}
}
void light::light(void)
{
for (int i = 1; i < (tokenize(__fullspawndata) - 1); i += 2) {
switch (argv(i)) {
case "pattern": case "pattern":
m_strPattern = argv( i + 1 ); m_strPattern = argv(i+1);
break; break;
case "style": case "style":
m_flStyle = stof( argv( i + 1 ) ); m_flStyle = stof(argv(i+1));
style = __NULL__; style = __NULL__;
break; break;
default: default:
@ -44,23 +55,13 @@ void light :: light ( void )
} }
} }
/*if ( !m_strPattern ) { if (!m_strPattern) {
m_strPattern = getlightstyle( m_flStyle );
}*/
if ( !m_strPattern ) {
m_strPattern = "m"; m_strPattern = "m";
} }
if ( spawnflags & 1 ) { light::Respawn();
lightstyle( m_flStyle, "a" );
m_iEnabled = FALSE;
} else {
lightstyle( m_flStyle, m_strPattern );
m_iEnabled = TRUE;
}
} }
CLASSEXPORT( light_spot, light ) CLASSEXPORT(light_spot, light)
CLASSEXPORT( light_environment, light ) CLASSEXPORT(light_environment, light)