okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Zachary Slater 2005-08-27 02:24:00 +00:00
parent 59cce31e75
commit f46ede91fb
23 changed files with 150 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

5
code/client/cl_cgame.c
View file

@ -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:

9
code/client/cl_cin.c
View file

@ -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) ) {

6
code/client/cl_ui.c
View file

@ -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) ) );