From 2f6fb049e44345a0a93054a5999299545655ca05 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Sat, 18 Apr 2009 22:55:00 +0000 Subject: [PATCH] revert splitclient, fte->fteh2 for hexen 2, fix sw console background drawing git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3174 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_input.c | 2 -- engine/common/fs.c | 2 +- engine/sw/sw_draw.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/engine/client/cl_input.c b/engine/client/cl_input.c index ac3d9f863..a08fdbeb2 100644 --- a/engine/client/cl_input.c +++ b/engine/client/cl_input.c @@ -1231,8 +1231,6 @@ qboolean CL_SendCmdQ2 (sizebuf_t *buf) seq_hash = cls.netchan.outgoing_sequence; - cl.splitclients = 1; - // send this and the previous cmds in the message, so // if the last packet was dropped, it can be recovered i = cls.netchan.outgoing_sequence & UPDATE_MASK; diff --git a/engine/common/fs.c b/engine/common/fs.c index a6b96f270..d9017a24e 100644 --- a/engine/common/fs.c +++ b/engine/common/fs.c @@ -1796,7 +1796,7 @@ const gamemode_info_t gamemode_info[] = { {"Nexuiz", "nexuiz", "-nexuiz", "nexuiz.exe", NEXCFG, {"data", "ftedata"}, "Nexuiz"}, //supported commercial mods (some are currently only partially supported) - {"FTE-Hexen2", "hexen", "-hexen2", "data1/pak0.pak", NULL, {"data1", "fte"}, "Hexen II"}, + {"FTE-Hexen2", "hexen", "-hexen2", "data1/pak0.pak", NULL, {"data1", "fteh2"}, "Hexen II"}, {"FTE-Quake2", "q2", "-q2", "baseq2/pak0.pak", NULL, {"baseq2", "fteq2"}, "Quake II"}, {"FTE-Quake3", "q3", "-q3", "baseq3/pak0.pk3", NULL, {"baseq3", "fteq3"}, "Quake III Arena"}, diff --git a/engine/sw/sw_draw.c b/engine/sw/sw_draw.c index 7cbf9aa2f..3ea0c1fc6 100644 --- a/engine/sw/sw_draw.c +++ b/engine/sw/sw_draw.c @@ -2019,7 +2019,7 @@ Draw_ConsoleBackground ================ */ -void SWDraw_ConsoleBackground (int lines) +void SWDraw_ConsoleBackground (int firstline, int lastline, qboolean forceopaque) { int x, y, v, w, h; qbyte *src; @@ -2029,7 +2029,7 @@ void SWDraw_ConsoleBackground (int lines) char ver[100]; // static char saveback[320*8]; - if ((!scr_con_forcedraw && !scr_conalpha.value) || !lines) + if ((!forceopaque && !scr_conalpha.value) || !lastline) return; conback = (mpic_t *)SWDraw_SafeCachePic ("gfx/conback.lmp"); @@ -2054,8 +2054,8 @@ void SWDraw_ConsoleBackground (int lines) w = conback->width; h = conback->height; - if (lines > vid.conheight) - lines = vid.conheight; + if (lastline > vid.conheight) + lastline = vid.conheight; // hack the version number directly into the pic @@ -2077,9 +2077,9 @@ void SWDraw_ConsoleBackground (int lines) { D_SetTransLevel(scr_conalpha.value, BM_BLEND); - for (y=0 ; yd.data + v*w; f = 0; fstep = w*0x10000/vid.conwidth; @@ -2098,10 +2098,10 @@ void SWDraw_ConsoleBackground (int lines) } else { - for (y=0 ; yd.data + v*w; if (vid.conwidth == w) memcpy (dest, src, vid.conwidth); @@ -2129,10 +2129,10 @@ void SWDraw_ConsoleBackground (int lines) unsigned short *dest16 = (unsigned short *)vid.conbuffer; unsigned short *pal = d_8to16table; - for (y=0 ; yd.data + v*w; // if (vid.conwidth == w) // memcpy (dest16, src, vid.conwidth); @@ -2172,15 +2172,15 @@ void SWDraw_ConsoleBackground (int lines) qbyte *src2; int f1, f2; int vf, hf; - for (y=0 ; yd.data + v*w; - v = (vid.conheight - lines + y)*(h-1)/vid.conheight+1; + v = (vid.conheight - lastline + y)*(h-1)/vid.conheight+1; src2 = conback->d.data + v*w; - v = (vid.conheight - lines + y)*(h-1)/vid.conheight; - vf = (((vid.conheight - lines + y)*(h-1.0)/vid.conheight) - v) * 255; + v = (vid.conheight - lastline + y)*(h-1)/vid.conheight; + vf = (((vid.conheight - lastline + y)*(h-1.0)/vid.conheight) - v) * 255; f = 0; fstep = (w-1)*0x10000/vid.conwidth; @@ -2214,9 +2214,9 @@ void SWDraw_ConsoleBackground (int lines) if (alpha != 255) //blend it on { - for (y=0 ; yd.data + v*w; f = 0; @@ -2233,9 +2233,9 @@ void SWDraw_ConsoleBackground (int lines) } else //block colour (fast) { - for (y=0 ; yd.data + v*w; f = 0; @@ -2260,7 +2260,7 @@ void SWDraw_ConsoleBackground (int lines) void SWDraw_EditorBackground (int lines) { - SWDraw_ConsoleBackground (lines); + SWDraw_ConsoleBackground (0, lines, true); }