Merge branch 'master' into Mario/entrap_nade

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

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 6dadff2f3cb8e610b2fd81bfbd78f77807557614..dce058c816da9f2c4abbfae97c4bad68d34931dd 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -92,7 +92,7 @@ void LocalCommand_boxparticles(int request, int argc)
                                        if (index <= 0)
                                                own = entitybyindex(-index);
                                        else
-                                               own = findfloat(world, entnum, index);
+                                               own = findfloat(NULL, entnum, index);
                                        vector org_from = stov(argv(3));
                                        vector org_to = stov(argv(4));
                                        vector dir_from = stov(argv(5));
@@ -252,7 +252,7 @@ void QuickMenu_Close();
 bool QuickMenu_Open(string mode, string submenu);
 
 bool HUD_MinigameMenu_IsOpened();
-void HUD_MinigameMenu_Close();
+void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger);
 void HUD_MinigameMenu_Open();
 
 void HUD_Radar_Show_Maximized(bool doshow, bool clickable);