From 67cdd9d883562b3ae8dc11c1445c565de0607d06 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 2 Jan 2013 22:33:32 +0000
Subject: [PATCH] gameexec.c: factor code for "ifnosounds" into sounds.c:
 A_CheckAnySoundPlaying.

git-svn-id: https://svn.eduke32.com/eduke32@3365 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/gameexec.c | 18 ++----------------
 polymer/eduke32/source/sounds.c   | 17 +++++++++++++++++
 polymer/eduke32/source/sounds.h   |  1 +
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index c431a1a32..3d93e6433 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -5084,22 +5084,8 @@ nullquote:
 
         case CON_IFNOSOUNDS:
         {
-            int32_t j = MAXSOUNDS-1;
-            for (; j>=0; j--)
-            {
-                int32_t k = 0;
-
-                for (; k<MAXSOUNDINSTANCES; k++)
-                {
-                    if (g_sounds[j].SoundOwner[k].ow == vm.g_i)
-                        break;
-                }
-
-                if (k != MAXSOUNDINSTANCES)
-                    break;
-            }
-
-            VM_CONDITIONAL(j < 0);
+            int32_t j = !A_CheckAnySoundPlaying(vm.g_i);
+            VM_CONDITIONAL(j);
         }
         continue;
 
diff --git a/polymer/eduke32/source/sounds.c b/polymer/eduke32/source/sounds.c
index 2e3b55e54..767811e5f 100644
--- a/polymer/eduke32/source/sounds.c
+++ b/polymer/eduke32/source/sounds.c
@@ -913,6 +913,23 @@ int32_t A_CheckSoundPlaying(int32_t i, int32_t num)
     return (i == -1) ? g_sounds[num].num : 0;
 }
 
+// Check if actor <i> is playing any sound.
+int32_t A_CheckAnySoundPlaying(int32_t i)
+{
+    int32_t j;
+
+    for (j=g_maxSoundPos; j>=0; j--)
+    {
+        int32_t k;
+
+        for (k=0; k<MAXSOUNDINSTANCES; k++)
+            if (g_sounds[j].SoundOwner[k].ow == i)
+                return 1;
+    }
+
+    return 0;
+}
+
 int32_t S_CheckSoundPlaying(int32_t i, int32_t num)
 {
     if (num > g_maxSoundPos || num < 0) return 0;
diff --git a/polymer/eduke32/source/sounds.h b/polymer/eduke32/source/sounds.h
index 1dd8d1e1b..84235919b 100644
--- a/polymer/eduke32/source/sounds.h
+++ b/polymer/eduke32/source/sounds.h
@@ -75,6 +75,7 @@ extern int32_t g_numEnvSoundsPlaying,g_maxSoundPos;
 int32_t A_CheckSoundPlaying(int32_t i,int32_t num);
 int32_t A_PlaySound(uint32_t num,int32_t i);
 void S_Callback(uint32_t num);
+int32_t A_CheckAnySoundPlaying(int32_t i);
 int32_t S_CheckSoundPlaying(int32_t i,int32_t num);
 void S_Cleanup(void);
 void S_ClearSoundLocks(void);