Merge branch 'master' into DefaultUser/trigger_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / target / music.qh

diff --git a/qcsrc/common/triggers/target/music.qh b/qcsrc/common/triggers/target/music.qh
index 712d412f6ac4b003daee36eca37de96aa33b804a..ccf3f674e6f069394ec256b6a086df3eb1076aee 100644 (file)
--- a/qcsrc/common/triggers/target/music.qh
+++ b/qcsrc/common/triggers/target/music.qh
@@ -1,8 +1,9 @@
-#ifndef TARGET_MUSIC_H
-#define TARGET_MUSIC_H
+#pragma once
 
 .float lifetime;
 
+const int SF_MUSIC_ORIGIN = BIT(2);
+
 #ifdef CSQC
 float music_disabled;
 entity music_default;
@@ -11,18 +12,17 @@ entity music_trigger;
 // FIXME also control bgmvolume here, to not require a target_music for the default track.
 
 entityclass(TargetMusic);
-class(TargetMusic) .int state;
-class(TargetMusic) .float lastvol;
+classfield(TargetMusic) .int state;
+classfield(TargetMusic) .float lastvol;
 
 void TargetMusic_Advance();
 
 void Net_TargetMusic();
 
-void Ent_TriggerMusic_Think();
-
-void Ent_TriggerMusic_Remove();
+void Ent_TriggerMusic_Think(entity this);
 
-void Ent_ReadTriggerMusic();
-#endif
+void Ent_TriggerMusic_Remove(entity this);
 
+#elif defined(SVQC)
+void target_music_kill();
 #endif