prevent CTD with -nosound (close #168)

LVLVbNH · LVLVbNH · commit 0ec18b18ab5a · 2018-05-25T16:32:55.000+05:00
diff --git a/src/xrGame/script_sound.cpp b/src/xrGame/script_sound.cpp
@@ -16,6 +16,7 @@
 
 CScriptSound::CScriptSound(LPCSTR caSoundName, ESoundTypes sound_type)
 {
+    m_bIsNoSound = strstr(Core.Params, "-nosound");
     m_caSoundToPlay = caSoundName;
     string_path l_caFileName;
     VERIFY(GEnv.Sound);
@@ -35,7 +36,7 @@ CScriptSound::~CScriptSound()
 
 Fvector CScriptSound::GetPosition() const
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     const CSound_params* l_tpSoundParams = m_sound.get_params();
     if (l_tpSoundParams)
         return (l_tpSoundParams->position);
@@ -48,15 +49,15 @@ Fvector CScriptSound::GetPosition() const
 
 void CScriptSound::Play(CScriptGameObject* object, float delay, int flags)
 {
-    THROW3(m_sound._handle(), "There is no sound", *m_caSoundToPlay);
+    THROW3(m_sound._handle() || m_bIsNoSound, "There is no sound", *m_caSoundToPlay);
     //	Msg							("%6d : CScriptSound::Play (%s), delay %f, flags
     //%d",Device.dwTimeGlobal,m_sound._handle()->file_name(),delay,flags);
     m_sound.play((object) ? &object->object() : NULL, flags, delay);
 }
 
 void CScriptSound::PlayAtPos(CScriptGameObject* object, const Fvector& position, float delay, int flags)
 {
-    THROW3(m_sound._handle(), "There is no sound", *m_caSoundToPlay);
+    THROW3(m_sound._handle() || m_bIsNoSound, "There is no sound", *m_caSoundToPlay);
     //	Msg							("%6d : CScriptSound::Play (%s), delay %f, flags
     //%d",m_sound._handle()->file_name(),delay,flags);
     m_sound.play_at_pos((object) ? &object->object() : NULL, position, flags, delay);
@@ -65,6 +66,6 @@ void CScriptSound::PlayAtPos(CScriptGameObject* object, const Fvector& position,
 void CScriptSound::PlayNoFeedback(
     CScriptGameObject* object, u32 flags /*!< Looping */, float delay /*!< Delay */, Fvector pos, float vol)
 {
-    THROW3(m_sound._handle(), "There is no sound", *m_caSoundToPlay);
+    THROW3(m_sound._handle() || m_bIsNoSound, "There is no sound", *m_caSoundToPlay);
     m_sound.play_no_feedback((object) ? &object->object() : NULL, flags, delay, &pos, &vol);
 }
diff --git a/src/xrGame/script_sound.h b/src/xrGame/script_sound.h
@@ -16,6 +16,7 @@ class CScriptSound
 {
     mutable ref_sound m_sound;
     shared_str m_caSoundToPlay;
+    bool m_bIsNoSound = false;
 
     friend class CScriptSoundAction;
 
diff --git a/src/xrGame/script_sound_inline.h b/src/xrGame/script_sound_inline.h
@@ -10,7 +10,7 @@
 
 IC u32 CScriptSound::Length()
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     return iFloor(m_sound.get_length_sec() * 1000.0f);
 }
 
@@ -28,37 +28,37 @@ IC void CScriptSound::PlayAtPos(CScriptGameObject* object, const Fvector& positi
 
 IC void CScriptSound::SetMinDistance(const float fMinDistance)
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.set_range(fMinDistance, GetMaxDistance());
 }
 
 IC void CScriptSound::SetMaxDistance(const float fMaxDistance)
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.set_range(GetMinDistance(), fMaxDistance);
 }
 
 IC const float CScriptSound::GetFrequency() const
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     return (m_sound.get_params()->freq);
 }
 
 IC const float CScriptSound::GetMinDistance() const
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     return (m_sound.get_params()->min_distance);
 }
 
 IC const float CScriptSound::GetMaxDistance() const
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     return (m_sound.get_params()->max_distance);
 }
 
 IC const float CScriptSound::GetVolume() const
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     return (m_sound.get_params()->volume);
 }
 
@@ -72,42 +72,42 @@ IC bool CScriptSound::IsPlaying() const
 IC void CScriptSound::AttachTail(LPCSTR caSoundName) { m_sound.attach_tail(caSoundName); }
 IC void CScriptSound::Stop()
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.stop();
 }
 
 IC void CScriptSound::StopDeferred()
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.stop_deferred();
 }
 
 IC void CScriptSound::SetPosition(const Fvector& position)
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.set_position(position);
 }
 
 IC void CScriptSound::SetFrequency(float frequency)
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.set_frequency(frequency);
 }
 
 IC void CScriptSound::SetVolume(float volume)
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.set_volume(volume);
 }
 
 IC const CSound_params* CScriptSound::GetParams()
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     return (m_sound.get_params());
 }
 
 IC void CScriptSound::SetParams(CSound_params* sound_params)
 {
-    VERIFY(m_sound._handle());
+    VERIFY(m_sound._handle() || m_bIsNoSound);
     m_sound.set_params(sound_params);
 }
diff --git a/src/xrGame/ui/UIComboBox.cpp b/src/xrGame/ui/UIComboBox.cpp
@@ -123,18 +123,23 @@ void CUIComboBox::SetCurrentOptValue()
     m_list_box.Clear();
     const xr_token* tok = GetOptToken();
 
-    while (tok->name)
+    if (tok)
     {
-        if (m_disabled.end() == std::find(m_disabled.begin(), m_disabled.end(), tok->id))
+        while (tok->name)
         {
-            AddItem_(tok->name, tok->id);
+            if (m_disabled.end() == std::find(m_disabled.begin(), m_disabled.end(), tok->id))
+            {
+                AddItem_(tok->name, tok->id);
+            }
+            tok++;
         }
-        tok++;
-    }
 
-    LPCSTR cur_val = *CStringTable().translate(GetOptTokenValue());
-    m_text.SetText(cur_val);
-    m_list_box.SetSelectedText(cur_val);
+        LPCSTR cur_val = *CStringTable().translate(GetOptTokenValue());
+        m_text.SetText(cur_val);
+        m_list_box.SetSelectedText(cur_val);
+    }
+    else
+        m_text.SetText("-");
 
     CUIListBoxItem* itm = m_list_box.GetSelectedItem();
     if (itm)
diff --git a/src/xrGame/ui/UIGameTutorialVideoItem.cpp b/src/xrGame/ui/UIGameTutorialVideoItem.cpp
@@ -93,7 +93,7 @@ void CUISequenceVideoItem::Load(CUIXml* xml, int idx)
     if (snd_name && snd_name[0])
     {
         m_sound.create(snd_name, st_Effect, sg_Undefined);
-        VERIFY(m_sound._handle());
+        VERIFY(m_sound._handle() || strstr(Core.Params, "-nosound"));
     }
     xml->SetLocalRoot(_stored_root);
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`CScriptSound::CScriptSound(LPCSTR caSoundName, ESoundTypes sound_type)`
`18`	`18`	`{`
	`19`	`+ m_bIsNoSound = strstr(Core.Params, "-nosound");`
`19`	`20`	`m_caSoundToPlay = caSoundName;`
`20`	`21`	`string_path l_caFileName;`
`21`	`22`	`VERIFY(GEnv.Sound);`
`@@ -35,7 +36,7 @@ CScriptSound::~CScriptSound()`
`35`	`36`
`36`	`37`	`Fvector CScriptSound::GetPosition() const`
`37`	`38`	`{`
`38`		`- VERIFY(m_sound._handle());`
	`39`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`39`	`40`	`const CSound_params* l_tpSoundParams = m_sound.get_params();`
`40`	`41`	`if (l_tpSoundParams)`
`41`	`42`	`return (l_tpSoundParams->position);`
`@@ -48,15 +49,15 @@ Fvector CScriptSound::GetPosition() const`
`48`	`49`
`49`	`50`	`void CScriptSound::Play(CScriptGameObject* object, float delay, int flags)`
`50`	`51`	`{`
`51`		`- THROW3(m_sound._handle(), "There is no sound", *m_caSoundToPlay);`
	`52`	`+ THROW3(m_sound._handle() \|\| m_bIsNoSound, "There is no sound", *m_caSoundToPlay);`
`52`	`53`	`// Msg ("%6d : CScriptSound::Play (%s), delay %f, flags`
`53`	`54`	`//%d",Device.dwTimeGlobal,m_sound._handle()->file_name(),delay,flags);`
`54`	`55`	`m_sound.play((object) ? &object->object() : NULL, flags, delay);`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`void CScriptSound::PlayAtPos(CScriptGameObject* object, const Fvector& position, float delay, int flags)`
`58`	`59`	`{`
`59`		`- THROW3(m_sound._handle(), "There is no sound", *m_caSoundToPlay);`
	`60`	`+ THROW3(m_sound._handle() \|\| m_bIsNoSound, "There is no sound", *m_caSoundToPlay);`
`60`	`61`	`// Msg ("%6d : CScriptSound::Play (%s), delay %f, flags`
`61`	`62`	`//%d",m_sound._handle()->file_name(),delay,flags);`
`62`	`63`	`m_sound.play_at_pos((object) ? &object->object() : NULL, position, flags, delay);`
`@@ -65,6 +66,6 @@ void CScriptSound::PlayAtPos(CScriptGameObject* object, const Fvector& position,`
`65`	`66`	`void CScriptSound::PlayNoFeedback(`
`66`	`67`	`CScriptGameObject* object, u32 flags /!< Looping /, float delay /!< Delay /, Fvector pos, float vol)`
`67`	`68`	`{`
`68`		`- THROW3(m_sound._handle(), "There is no sound", *m_caSoundToPlay);`
	`69`	`+ THROW3(m_sound._handle() \|\| m_bIsNoSound, "There is no sound", *m_caSoundToPlay);`
`69`	`70`	`m_sound.play_no_feedback((object) ? &object->object() : NULL, flags, delay, &pos, &vol);`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class CScriptSound`
`16`	`16`	`{`
`17`	`17`	`mutable ref_sound m_sound;`
`18`	`18`	`shared_str m_caSoundToPlay;`
	`19`	`+ bool m_bIsNoSound = false;`
`19`	`20`
`20`	`21`	`friend class CScriptSoundAction;`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`IC u32 CScriptSound::Length()`
`12`	`12`	`{`
`13`		`- VERIFY(m_sound._handle());`
	`13`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`14`	`14`	`return iFloor(m_sound.get_length_sec() * 1000.0f);`
`15`	`15`	`}`
`16`	`16`
`@@ -28,37 +28,37 @@ IC void CScriptSound::PlayAtPos(CScriptGameObject* object, const Fvector& positi`
`28`	`28`
`29`	`29`	`IC void CScriptSound::SetMinDistance(const float fMinDistance)`
`30`	`30`	`{`
`31`		`- VERIFY(m_sound._handle());`
	`31`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`32`	`32`	`m_sound.set_range(fMinDistance, GetMaxDistance());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`IC void CScriptSound::SetMaxDistance(const float fMaxDistance)`
`36`	`36`	`{`
`37`		`- VERIFY(m_sound._handle());`
	`37`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`38`	`38`	`m_sound.set_range(GetMinDistance(), fMaxDistance);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`IC const float CScriptSound::GetFrequency() const`
`42`	`42`	`{`
`43`		`- VERIFY(m_sound._handle());`
	`43`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`44`	`44`	`return (m_sound.get_params()->freq);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`IC const float CScriptSound::GetMinDistance() const`
`48`	`48`	`{`
`49`		`- VERIFY(m_sound._handle());`
	`49`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`50`	`50`	`return (m_sound.get_params()->min_distance);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`IC const float CScriptSound::GetMaxDistance() const`
`54`	`54`	`{`
`55`		`- VERIFY(m_sound._handle());`
	`55`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`56`	`56`	`return (m_sound.get_params()->max_distance);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`IC const float CScriptSound::GetVolume() const`
`60`	`60`	`{`
`61`		`- VERIFY(m_sound._handle());`
	`61`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`62`	`62`	`return (m_sound.get_params()->volume);`
`63`	`63`	`}`
`64`	`64`
`@@ -72,42 +72,42 @@ IC bool CScriptSound::IsPlaying() const`
`72`	`72`	`IC void CScriptSound::AttachTail(LPCSTR caSoundName) { m_sound.attach_tail(caSoundName); }`
`73`	`73`	`IC void CScriptSound::Stop()`
`74`	`74`	`{`
`75`		`- VERIFY(m_sound._handle());`
	`75`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`76`	`76`	`m_sound.stop();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`IC void CScriptSound::StopDeferred()`
`80`	`80`	`{`
`81`		`- VERIFY(m_sound._handle());`
	`81`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`82`	`82`	`m_sound.stop_deferred();`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`IC void CScriptSound::SetPosition(const Fvector& position)`
`86`	`86`	`{`
`87`		`- VERIFY(m_sound._handle());`
	`87`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`88`	`88`	`m_sound.set_position(position);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`IC void CScriptSound::SetFrequency(float frequency)`
`92`	`92`	`{`
`93`		`- VERIFY(m_sound._handle());`
	`93`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`94`	`94`	`m_sound.set_frequency(frequency);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`IC void CScriptSound::SetVolume(float volume)`
`98`	`98`	`{`
`99`		`- VERIFY(m_sound._handle());`
	`99`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`100`	`100`	`m_sound.set_volume(volume);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`IC const CSound_params* CScriptSound::GetParams()`
`104`	`104`	`{`
`105`		`- VERIFY(m_sound._handle());`
	`105`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`106`	`106`	`return (m_sound.get_params());`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`IC void CScriptSound::SetParams(CSound_params* sound_params)`
`110`	`110`	`{`
`111`		`- VERIFY(m_sound._handle());`
	`111`	`+ VERIFY(m_sound._handle() \|\| m_bIsNoSound);`
`112`	`112`	`m_sound.set_params(sound_params);`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void CUISequenceVideoItem::Load(CUIXml* xml, int idx)`
`93`	`93`	`if (snd_name && snd_name[0])`
`94`	`94`	`{`
`95`	`95`	`m_sound.create(snd_name, st_Effect, sg_Undefined);`
`96`		`- VERIFY(m_sound._handle());`
	`96`	`+ VERIFY(m_sound._handle() \|\| strstr(Core.Params, "-nosound"));`
`97`	`97`	`}`
`98`	`98`	`xml->SetLocalRoot(_stored_root);`
`99`	`99`	`}`