From: molivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 21 Jan 2006 09:59:11 +0000 (+0000)
Subject: A few casts and variable type changes to get rid of warnings on Win64. By Willis
X-Git-Tag: xonotic-v0.1.0preview~4376
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=ad8ec18c8a2884d92134fe13db3399ce5c039c78

A few casts and variable type changes to get rid of warnings on Win64. By Willis


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5920 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/console.c b/console.c
index 641bc965..4f498a95 100644
--- a/console.c
+++ b/console.c
@@ -886,7 +886,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 	min = 666;
 	for(max=i=0;i<t->numfilenames;i++)
 	{
-		k = strlen(t->filenames[i]);
+		k = (int)strlen(t->filenames[i]);
 		k -= 9;
 		if(max < k)
 			max = k;
@@ -895,7 +895,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 			min = k;
 		len[i] = k;
 	}
-	o = strlen(s);
+	o = (int)strlen(s);
 	for(i=0;i<t->numfilenames;i++)
 	{
 		int lumpofs = 0, lumplen = 0;
@@ -1104,7 +1104,7 @@ void Con_CompleteCommandLine (void)
 				char t[MAX_QPATH];
 				if (GetMapList(s, t, sizeof(t)))
 				{
-					i = strlen(t) - strlen(s);
+					i = (int)(strlen(t) - strlen(s));
 					strcpy((char*)s, t);
 					if(s2[0])	//add back chars after cursor
 						strcpy(&key_lines[edit_line][key_linepos], s2);
diff --git a/csprogs.c b/csprogs.c
index 1de0cf97..b0f811ab 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -401,7 +401,7 @@ static void CL_VM_Parse_Print (const char *msg)
 
 void CSQC_AddPrintText (const char *msg)
 {
-	int i;
+	size_t i;
 	if(!csqc_loaded || !CSQC_Parse_Print)
 	{
 		Con_Print(msg);
diff --git a/image_png.c b/image_png.c
index 19304fbc..2adb9617 100644
--- a/image_png.c
+++ b/image_png.c
@@ -211,8 +211,8 @@ void PNG_fReadData(void *png, unsigned char *data, size_t length)
 		length = l;
 	}
 	memcpy(data, my_png.tmpBuf + my_png.tmpi, length);
-	my_png.tmpi += length;
-	Com_HexDumpToConsole(data, length);
+	my_png.tmpi += (int)length;
+	Com_HexDumpToConsole(data, (int)length);
 }
 
 void PNG_error_fn(void *png, const char *message)
diff --git a/keys.c b/keys.c
index 97070dd6..b311d1ed 100644
--- a/keys.c
+++ b/keys.c
@@ -465,7 +465,7 @@ Key_Console (int key, char ascii)
 		if (keydown[K_CTRL])
 			con_backscroll = 0;
 		else
-			key_linepos = strlen(key_lines[edit_line]);
+			key_linepos = (int)strlen(key_lines[edit_line]);
 		return;
 	}
 
diff --git a/prvm_cmds.c b/prvm_cmds.c
index aadcabc8..db63a141 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3562,7 +3562,8 @@ void VM_buf_implode (void)
 	qcstrbuffer_t	*b;
 	char			*k;
 	const char		*sep;
-	int				i, l;
+	int				i;
+	size_t			l;
 	VM_SAFEPARMCOUNT(2, VM_buf_implode);
 
 	b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));