Declare more ints as ints

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / target_music.qc

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 4bbbf03bc574582bb9981296d334e6ccc6998b9c..731c432af7c743ee2988829eda56dd436e6e83e2 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -4,7 +4,7 @@ entity music_target;
 entity music_trigger;
 // FIXME also control bgmvolume here, to not require a target_music for the default track.
 
-.float state;
+.int state;
 .float lastvol;
 
 void TargetMusic_Advance()
@@ -44,9 +44,9 @@ void TargetMusic_Advance()
                if(vol != vol0)
                {
                        if(vol0 < 0)
-                               sound(e, CH_BGM_SINGLE, e.noise, vol, ATTN_NONE); // restart
+                               sound(e, CH_BGM_SINGLE, e.noise, vol, ATTEN_NONE); // restart
                        else
-                               sound(e, CH_BGM_SINGLE, "", vol, ATTN_NONE);
+                               sound(e, CH_BGM_SINGLE, "", vol, ATTEN_NONE);
                        e.lastvol = vol;
                }
        }
@@ -88,10 +88,10 @@ void Net_TargetMusic()
                        strunzone(e.noise);
                e.noise = strzone(noi);
                precache_sound(e.noise);
-               sound(e, CH_BGM_SINGLE, e.noise, 0, ATTN_NONE);
+               sound(e, CH_BGM_SINGLE, e.noise, 0, ATTEN_NONE);
                if(getsoundtime(e, CH_BGM_SINGLE) < 0)
                {
-                       print(sprintf(_("Cannot initialize sound %s\n"), e.noise));
+                       dprintf("Cannot initialize sound %s\n", e.noise);
                        strunzone(e.noise);
                        e.noise = string_null;
                }
@@ -138,9 +138,7 @@ void Ent_TriggerMusic_Remove()
 
 void Ent_ReadTriggerMusic()
 {
-       float f;
-       string s;
-       f = ReadByte();
+       int f = ReadByte();
        if(f & 4)
        {
                self.origin_x = ReadCoord();
@@ -170,17 +168,17 @@ void Ent_ReadTriggerMusic()
                self.volume = ReadByte() / 255.0;
                self.fade_time = ReadByte() / 16.0;
                self.fade_rate = ReadByte() / 16.0;
-               s = self.noise;
+               string s = self.noise;
                if(self.noise)
                        strunzone(self.noise);
                self.noise = strzone(ReadString());
                if(self.noise != s)
                {
                        precache_sound(self.noise);
-                       sound(self, CH_BGM_SINGLE, self.noise, 0, ATTN_NONE);
+                       sound(self, CH_BGM_SINGLE, self.noise, 0, ATTEN_NONE);
                        if(getsoundtime(self, CH_BGM_SINGLE) < 0)
                        {
-                               print(sprintf(_("Cannot initialize sound %s\n"), self.noise));
+                               dprintf("Cannot initialize sound %s\n", self.noise);
                                strunzone(self.noise);
                                self.noise = string_null;
                        }