team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix tile clearing with hud plugins (screensize), fix host_endgame message, fix issue with loading icon, add gl_bloom to vc2005 project 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2047 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-03-04 22:37:28 +00:00
parent d27d3c5b6d
commit d8240c391a
4 changed files with 87 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_main.c
View File

@ -2748,7 +2748,7 @@ void VARGS Host_EndGame (char *message, ...)
va_end (argptr);
Con_TPrintf (TL_NL);
Con_TPrintf (TL_LINEBREAK_EQUALS);
Con_TPrintf (TLC_CLIENTCON_ERROR_ENDGAME, S_ERROR, string);
Con_TPrintf (TLC_CLIENTCON_ERROR_ENDGAME, string);
Con_TPrintf (TL_LINEBREAK_EQUALS);
Con_TPrintf (TL_NL);

36
engine/client/cl_screen.c
View File

@ -1880,6 +1880,10 @@ void SCR_BringDownConsole (void)
void SCR_TileClear (void)
{
#ifdef PLUGINS
extern cvar_t plug_sbar;
#endif
if (cl.splitclients>1)
return; //splitclients always takes the entire screen.
@ -1893,11 +1897,10 @@ void SCR_TileClear (void)
}
else
{
char str[11] = "xxxxxxxxxx";
if (scr_viewsize.value < 100)
{
int x, y;
x = vid.width - strlen(str) * 8 - 8;
x = vid.width - 10 * 8 - 8;
y = vid.height - sb_lines - 8;
// clear background for counters
if (show_fps.value)
@ -1905,9 +1908,36 @@ void SCR_TileClear (void)
}
}
}
#ifdef PLUGINS
else if (plug_sbar.value)
{
if (scr_vrect.x > 0)
{
// left
Draw_TileClear (0, 0, scr_vrect.x, vid.height);
// right
Draw_TileClear (scr_vrect.x + scr_vrect.width, 0,
vid.width - scr_vrect.x + scr_vrect.width,
vid.height);
}
if (scr_vrect.y > 0 || scr_vrect.height != vid.height)
{
// top
Draw_TileClear (scr_vrect.x, 0,
scr_vrect.x + scr_vrect.width,
scr_vrect.y);
// bottom
Draw_TileClear (scr_vrect.x,
scr_vrect.y + scr_vrect.height,
scr_vrect.width,
vid.height);
}
}
#endif
else
{
if (scr_vrect.x > 0) {
if (scr_vrect.x > 0)
{
// left
Draw_TileClear (0, 0, scr_vrect.x, vid.height - sb_lines);
// right

52
engine/dotnet2005/ftequake.vcproj
View File

@ -11539,6 +11539,58 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\gl\gl_bloom.c"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="MinSW|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Dedicated Server|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Dedicated Server|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Dedicated ServerQ3|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\gl\gl_draw.c"
>

2
engine/gl/gl_draw.c
View File

@ -2211,7 +2211,7 @@ void GLDraw_BeginDisc (void)
if (!draw_disc || !r_drawdisk.value)
return;
qglDrawBuffer (GL_FRONT);
Draw_Pic (vid.width - 24, 0, draw_disc);
Draw_Pic (vid.width - draw_disc->width, 0, draw_disc);
qglDrawBuffer (GL_BACK);
}