r773 - in trunk/code: cgame ui

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2006-05-06 06:54:55 -0400 (Sat, 06 May 2006)
New Revision: 773

Modified:
   trunk/code/cgame/cg_servercmds.c
   trunk/code/ui/ui_atoms.c
Log:
Fix remapShader command in cgame and tweak it in ui.


Modified: trunk/code/cgame/cg_servercmds.c
===================================================================
--- trunk/code/cgame/cg_servercmds.c	2006-05-06 08:46:21 UTC (rev 772)
+++ trunk/code/cgame/cg_servercmds.c	2006-05-06 10:54:55 UTC (rev 773)
@@ -1058,9 +1058,19 @@
 		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);
 		}
 	}
 

Modified: trunk/code/ui/ui_atoms.c
===================================================================
--- trunk/code/ui/ui_atoms.c	2006-05-06 08:46:21 UTC (rev 772)
+++ trunk/code/ui/ui_atoms.c	2006-05-06 10:54:55 UTC (rev 773)
@@ -345,9 +345,13 @@
 		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;
 		}
 	}