fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Quick fix for something that noone noticed.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3164 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-04-07 20:03:25 +00:00
parent 84117bd7e3
commit 9a2ed9307a
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
engine/client/sys_npqtv.c
View file

@ -413,6 +413,14 @@ void DrawWndBack(struct context *ctx, HWND hWnd, HDC hdc, PAINTSTRUCT *p)
PatBlt(hdc, p->rcPaint.left, p->rcPaint.top, p->rcPaint.right-p->rcPaint.left,p->rcPaint.bottom-p->rcPaint.top,PATCOPY); PatBlt(hdc, p->rcPaint.left, p->rcPaint.top, p->rcPaint.right-p->rcPaint.left,p->rcPaint.bottom-p->rcPaint.top,PATCOPY);
} }
char *cleanarg(char *arg)
{
//no hacking us, please.
while (*arg == '-' || *arg == '+')
arg++;
return arg;
}
LRESULT CALLBACK MyPluginWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK MyPluginWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
struct qstream *str; struct qstream *str;
@ -506,30 +514,30 @@ LRESULT CALLBACK MyPluginWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
break; break;
case QTVCT_STREAM: case QTVCT_STREAM:
argv[argc++] = "+qtvplay"; argv[argc++] = "+qtvplay";
argv[argc++] = ctx->qtvf.server; argv[argc++] = cleanarg(ctx->qtvf.server);
break; break;
case QTVCT_CONNECT: case QTVCT_CONNECT:
argv[argc++] = "+connect"; argv[argc++] = "+connect";
argv[argc++] = ctx->qtvf.server; argv[argc++] = cleanarg(ctx->qtvf.server);
break; break;
case QTVCT_JOIN: case QTVCT_JOIN:
argv[argc++] = "+join"; argv[argc++] = "+join";
argv[argc++] = ctx->qtvf.server; argv[argc++] = cleanarg(ctx->qtvf.server);
break; break;
case QTVCT_OBSERVE: case QTVCT_OBSERVE:
argv[argc++] = "+observe"; argv[argc++] = "+observe";
argv[argc++] = ctx->qtvf.server; argv[argc++] = cleanarg(ctx->qtvf.server);
break; break;
case QTVCT_MAP: case QTVCT_MAP:
argv[argc++] = "+map"; argv[argc++] = "+map";
argv[argc++] = ctx->qtvf.server; argv[argc++] = cleanarg(ctx->qtvf.server);
break; break;
} }
if (ctx->password) if (ctx->password)
{ {
argv[argc++] = "+password"; argv[argc++] = "+password";
argv[argc++] = ctx->password; argv[argc++] = cleanarg(ctx->password);
} }
//figure out the game dirs (first token is the base game) //figure out the game dirs (first token is the base game)
@ -550,13 +558,15 @@ LRESULT CALLBACK MyPluginWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
else else
{ {
argv[argc++] = "-basegame"; argv[argc++] = "-basegame";
argv[argc++] = strdup(com_token); //FIXME: this will leak argv[argc++] = strdup(cleanarg(com_token)); //FIXME: this will leak
} }
//later options are additions to that //later options are additions to that
while ((s = COM_ParseOut(s, com_token, sizeof(com_token)))) while ((s = COM_ParseOut(s, com_token, sizeof(com_token))))
{ {
if (argc == sizeof(argv)/sizeof(argv[0]))
break;
argv[argc++] = "-addbasegame"; argv[argc++] = "-addbasegame";
argv[argc++] = strdup(com_token); //FIXME: this will leak argv[argc++] = strdup(cleanarg(com_token)); //FIXME: this will leak
} }
sys_parentwidth = ctx->window.width; sys_parentwidth = ctx->window.width;