fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

respect return value with hud plugin call, disable scoreboard in hud plugin

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2376 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-08-20 01:35:56 +00:00
parent 5d58e5ce6e
commit 0939c0e46c
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/common/plugin.c
View file

@ -1532,9 +1532,10 @@ void Plug_SBar(void)
extern qboolean sb_showscores, sb_showteamscores; extern qboolean sb_showscores, sb_showteamscores;
plugin_t *oc=currentplug; plugin_t *oc=currentplug;
int cp; int cp, ret;
vrect_t rect; vrect_t rect;
ret = 0;
if (!plug_sbar.value) if (!plug_sbar.value)
currentplug = NULL; currentplug = NULL;
else else
@ -1548,13 +1549,13 @@ void Plug_SBar(void)
SCR_VRectForPlayer(&rect, cp); SCR_VRectForPlayer(&rect, cp);
if (Draw_ImageColours) if (Draw_ImageColours)
Draw_ImageColours(1, 1, 1, 1); // ensure menu colors are reset Draw_ImageColours(1, 1, 1, 1); // ensure menu colors are reset
VM_Call(currentplug->vm, currentplug->sbarlevel[0], cp, rect.x, rect.y, rect.width, rect.height, sb_showscores+sb_showteamscores*2); ret |= VM_Call(currentplug->vm, currentplug->sbarlevel[0], cp, rect.x, rect.y, rect.width, rect.height, sb_showscores+sb_showteamscores*2);
} }
break; break;
} }
} }
} }
if (!currentplug) if (!ret)
{ {
Sbar_Draw(); Sbar_Draw();
currentplug = oc; currentplug = oc;

11
plugins/hud/ui_sbar.c
View file

@ -1265,13 +1265,13 @@ int UI_StatusBarEdit(int *arg) // seperated so further improvements to editor vi
return true; return true;
} }
/*
int UI_ScoreBoard(int *arg) int UI_ScoreBoard(int *arg)
{ {
int i; int i;
if (!arg[5]) if (!arg[5])
return 0; return false;
sbarminx = 320; sbarminx = 320;
sbarminy = 48; sbarminy = 48;
@ -1289,8 +1289,9 @@ int UI_ScoreBoard(int *arg)
sbarminy += 16; sbarminy += 16;
} }
return 0; return true;
} }
*/
#define HUD_VERSION 52345 #define HUD_VERSION 52345
void PutFloat(float f, char sep, qhandle_t handle) void PutFloat(float f, char sep, qhandle_t handle)
@ -2042,7 +2043,7 @@ int Plug_Init(int *args)
{ {
if (Plug_Export("Tick", Plug_Tick) && if (Plug_Export("Tick", Plug_Tick) &&
Plug_Export("SbarBase", UI_StatusBar) && Plug_Export("SbarBase", UI_StatusBar) &&
Plug_Export("SbarOverlay", UI_ScoreBoard) && // Plug_Export("SbarOverlay", UI_ScoreBoard) &&
Plug_Export("ExecuteCommand", Plug_ExecuteCommand) && Plug_Export("ExecuteCommand", Plug_ExecuteCommand) &&
Plug_Export("MenuEvent", Plug_MenuEvent)) Plug_Export("MenuEvent", Plug_MenuEvent))
{ {