Merge branch 'master' into terencehill/bot_waypoints

[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 8d014c819c288145c076484bd3e185feaf6cac42..80b3684a4e9a768b8ef17e4ea596f463d9cc886d 100644 (file)
--- a/qcsrc/common/triggers/target/music.qh
+++ b/qcsrc/common/triggers/target/music.qh
@@ -1,5 +1,4 @@
-#ifndef TARGET_MUSIC_H
-#define TARGET_MUSIC_H
+#pragma once
 
 .float lifetime;
 
@@ -10,18 +9,18 @@ entity music_target;
 entity music_trigger;
 // FIXME also control bgmvolume here, to not require a target_music for the default track.
 
-.int state;
-.float lastvol;
+entityclass(TargetMusic);
+class(TargetMusic) .int state;
+class(TargetMusic) .float lastvol;
 
 void TargetMusic_Advance();
 
 void Net_TargetMusic();
 
-void Ent_TriggerMusic_Think();
+void Ent_TriggerMusic_Think(entity this);
 
-void Ent_TriggerMusic_Remove();
-
-void Ent_ReadTriggerMusic();
-#endif
+void Ent_TriggerMusic_Remove(entity this);
 
+#elif defined(SVQC)
+void target_music_kill();
 #endif