Merge branch 'Mario/dpk_support' of gitlab.com:xonotic/darkplaces

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index aab18140bfab0036098ff91f81b7a1bd2766ee45..72f8d0058f89a316edf7a199591d509d996d38cd 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -778,8 +778,8 @@ void S_Init(void)
        if (Sys_CheckParm("-nosound"))
        {
                // dummy out Play and Play2 because mods stuffcmd that
-               Cmd_AddCommand(CF_CLIENT, "play", Host_NoOperation_f, "does nothing because -nosound was specified");
-               Cmd_AddCommand(CF_CLIENT, "play2", Host_NoOperation_f, "does nothing because -nosound was specified");
+               Cmd_AddCommand(CF_CLIENT, "play", Cmd_NoOperation_f, "does nothing because -nosound was specified");
+               Cmd_AddCommand(CF_CLIENT, "play2", Cmd_NoOperation_f, "does nothing because -nosound was specified");
                return;
        }
 
@@ -1226,7 +1226,7 @@ static void SND_Spatialize_WithSfx(channel_t *ch, qbool isstatic, sfx_t *sfx)
                }
                else if (cl.entities[ch->entnum].state_current.active)
                {
-                       dp_model_t *model;
+                       model_t *model;
                        //Con_Printf("-- entnum %i origin %f %f %f neworigin %f %f %f\n", ch->entnum, ch->origin[0], ch->origin[1], ch->origin[2], cl.entities[ch->entnum].state_current.origin[0], cl.entities[ch->entnum].state_current.origin[1], cl.entities[ch->entnum].state_current.origin[2]);
                        model = CL_GetModelByIndex(cl.entities[ch->entnum].state_current.modelindex);
                        if (model && model->soundfromcenter)