FOREACH_ENTITY_CLASS("target_music", true, {
it.volume = 0;
if (it.targetname == "")
- WITHSELF(it, target_music_sendto(it, MSG_ALL, 1));
+ target_music_sendto(it, MSG_ALL, 1);
else
- WITHSELF(it, target_music_sendto(it, MSG_ALL, 0));
+ target_music_sendto(it, MSG_ALL, 0);
});
}
void target_music_use(entity this, entity actor, entity trigger)
}
void TargetMusic_RestoreGame()
{
- for(entity e = world; (e = find(e, classname, "target_music")); )
+ FOREACH_ENTITY_CLASS("target_music", true,
{
- if(e.targetname == "")
- target_music_sendto(e, MSG_INIT, 1);
+ if(it.targetname == "")
+ target_music_sendto(it, MSG_INIT, 1);
else
- target_music_sendto(e, MSG_INIT, 0);
- }
+ target_music_sendto(it, MSG_INIT, 0);
+ });
}
// values:
// volume
it.lastvol = vol;
}
});
- music_trigger = world;
+ music_trigger = NULL;
bgmtime = (best) ? getsoundtime(best, CH_BGM_SINGLE) : gettime(GETTIME_CDTRACK);
}
_sound(e, CH_BGM_SINGLE, e.noise, 0, ATTEN_NONE);
if(getsoundtime(e, CH_BGM_SINGLE) < 0)
{
- LOG_TRACEF("Cannot initialize sound %s\n", e.noise);
+ LOG_TRACEF("Cannot initialize sound %s", e.noise);
strunzone(e.noise);
e.noise = string_null;
}
void Ent_TriggerMusic_Think(entity this)
{
- if(WarpZoneLib_BoxTouchesBrush(view_origin, view_origin, self, world))
+ if(WarpZoneLib_BoxTouchesBrush(view_origin, view_origin, this, NULL))
{
- music_trigger = self;
+ music_trigger = this;
}
- self.nextthink = time;
+ this.nextthink = time;
}
-void Ent_TriggerMusic_Remove()
-{SELFPARAM();
- if(self.noise)
- strunzone(self.noise);
- self.noise = string_null;
+void Ent_TriggerMusic_Remove(entity this)
+{
+ if(this.noise)
+ strunzone(this.noise);
+ this.noise = string_null;
}
NET_HANDLE(ENT_CLIENT_TRIGGER_MUSIC, bool isnew)
_sound(this, CH_BGM_SINGLE, this.noise, 0, ATTEN_NONE);
if(getsoundtime(this, CH_BGM_SINGLE) < 0)
{
- LOG_TRACEF("Cannot initialize sound %s\n", this.noise);
+ LOG_TRACEF("Cannot initialize sound %s", this.noise);
strunzone(this.noise);
this.noise = string_null;
}