Ludwig's 1st diff: Some 64bit fixes for x86_64. Also fixes Makefile build.

git-svn-id: svn://svn.icculus.org/quake3/trunk@7 edf5b092-35ff-0310-97b2-ce42778d08ea

3 files changed, 18 insertions, 2 deletions

diff --git a/code/client/cl_cgame.c b/code/client/cl_cgame.c
index 56dc01c..19ac57e 100755
--- a/code/client/cl_cgame.c
+++ b/code/client/cl_cgame.c
@@ -623,7 +623,10 @@ int CL_CgameSystemCalls( int *args ) {
 		Com_Memcpy( VMA(1), VMA(2), args[3] );
 		return 0;
 	case CG_STRNCPY:
-		return (int)strncpy( VMA(1), VMA(2), args[3] );
+#warning 64bit broken!
+		strncpy( VMA(1), VMA(2), args[3] );
+//		Com_Printf("%s:%d %s() *** return value of CG_STRNCPY not 64bit clean\n", __FILE__, __LINE__, __FUNCTION__);
+		return 0;
 	case CG_SIN:
 		return FloatAsInt( sin( VMF(1) ) );
 	case CG_COS:
diff --git a/code/client/cl_cin.c b/code/client/cl_cin.c
index f042d23..4f78965 100755
--- a/code/client/cl_cin.c
+++ b/code/client/cl_cin.c
@@ -1410,6 +1410,10 @@ e_status CIN_RunCinematic (int handle)
 
 	if (handle < 0 || handle>= MAX_VIDEO_HANDLES || cinTable[handle].status == FMV_EOF) return FMV_EOF;
 
+#warning disabled CIN_RunCinematic
+Com_Printf("XXX: %s disabled\n", __FUNCTION__);
+return FMV_EOF;
+
 	if (cin.currentHandle != handle) {
 		currentHandle = handle;
 		cin.currentHandle = currentHandle;
@@ -1489,6 +1493,11 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
 		Com_sprintf (name, sizeof(name), "%s", arg);
 	}
 
+#warning disabled CIN_PlayCinematic
+Com_Printf("XXX: %s disabled, not playing %s\n", __FUNCTION__, name);
+return -1;
+
+
 	if (!(systemBits & CIN_system)) {
 		for ( i = 0 ; i < MAX_VIDEO_HANDLES ; i++ ) {
 			if (!strcmp(cinTable[i].fileName, name) ) {
diff --git a/code/client/cl_ui.c b/code/client/cl_ui.c
index 96cc07e..2c91991 100755
--- a/code/client/cl_ui.c
+++ b/code/client/cl_ui.c
@@ -1043,7 +1043,11 @@ int CL_UISystemCalls( int *args ) {
 		return 0;
 
 	case UI_STRNCPY:
-		return (int)strncpy( VMA(1), VMA(2), args[3] );
+#warning 64bit broken!
+//		Com_Printf("%s:%d %s() *** return value of UI_STRNCPY not 64bit clean\n", __FILE__, __LINE__, __FUNCTION__);
+//		Com_Printf("%s %d\n", VMA(2), args[3]);
+		strncpy( VMA(1), VMA(2), args[3] );
+		return 0;
 
 	case UI_SIN:
 		return FloatAsInt( sin( VMF(1) ) );