From 5ebb75e651fd6d4163220675304ffeb8c76ac678 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Sat, 6 May 2006 10:54:55 +0000 Subject: [PATCH] Fix remapShader command in cgame and tweak it in ui. --- code/cgame/cg_servercmds.c | 16 +++++++++++++--- code/ui/ui_atoms.c | 6 +++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c index 80a13457..abb8d5fc 100644 --- a/code/cgame/cg_servercmds.c +++ b/code/cgame/cg_servercmds.c @@ -1058,9 +1058,19 @@ static void CG_ServerCommand( void ) { return; } - if ( Q_stricmp (cmd, "remapShader") == 0 ) { - if (trap_Argc() == 4) { - trap_R_RemapShader(CG_Argv(1), CG_Argv(2), CG_Argv(3)); + if ( Q_stricmp (cmd, "remapShader") == 0 ) + { + if (trap_Argc() == 4) + { + char shader1[MAX_QPATH]; + char shader2[MAX_QPATH]; + char shader3[MAX_QPATH]; + + Q_strncpyz(shader1, CG_Argv(1), sizeof(shader1)); + Q_strncpyz(shader2, CG_Argv(2), sizeof(shader2)); + Q_strncpyz(shader3, CG_Argv(3), sizeof(shader3)); + + trap_R_RemapShader(shader1, shader2, shader3); } } diff --git a/code/ui/ui_atoms.c b/code/ui/ui_atoms.c index 760e686f..9130e33f 100644 --- a/code/ui/ui_atoms.c +++ b/code/ui/ui_atoms.c @@ -345,9 +345,13 @@ qboolean UI_ConsoleCommand( int realTime ) { if (trap_Argc() == 4) { char shader1[MAX_QPATH]; char shader2[MAX_QPATH]; + char shader3[MAX_QPATH]; + Q_strncpyz(shader1, UI_Argv(1), sizeof(shader1)); Q_strncpyz(shader2, UI_Argv(2), sizeof(shader2)); - trap_R_RemapShader(shader1, shader2, UI_Argv(3)); + Q_strncpyz(shader3, UI_Argv(3), sizeof(shader3)); + + trap_R_RemapShader(shader1, shader2, shader3); return qtrue; } }