diff options
| author | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
| commit | c99975c73ae2941751d86d3b8466454c5ad122c0 (patch) | |
| tree | b5bb65655fbdbc22201426046092939bcf696abe /src/qcommon/vm_x86.c | |
| parent | 27ad2c0e19891f7f2454c9eedf76878dc1942ba6 (diff) | |
* Merge of ioq3-r1163
+ SDL everywhere
+ New R_LoadImage
+ net_ip.c
+ Window icon
+ GUI based dedicated server support
+ Compile time linked OpenGL
* Remove ui_menuFiles cvar
Diffstat (limited to 'src/qcommon/vm_x86.c')
| -rw-r--r-- | src/qcommon/vm_x86.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/qcommon/vm_x86.c b/src/qcommon/vm_x86.c index d298b755..5eb49b0b 100644 --- a/src/qcommon/vm_x86.c +++ b/src/qcommon/vm_x86.c @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <windows.h> #endif -#ifdef __FreeBSD__ // rb0101023 +#ifdef __FreeBSD__ #include <sys/types.h> #endif @@ -78,13 +78,11 @@ static int asmCallPtr = (int)AsmCall; #else // _MSC_VER #if defined( FTOL_PTR ) -// bk001213 - BEWARE: does not work! UI menu etc. broken - stack! -// bk001119 - added: int gftol( float x ) { return (int)x; } -int qftol( void ); // bk001213 - label, see unix/ftol.nasm -int qftol027F( void ); // bk001215 - fixed FPU control variants +int qftol( void ); +int qftol027F( void ); int qftol037F( void ); -int qftol0E7F( void ); // bk010102 - fixed bogus bits (duh) +int qftol0E7F( void ); int qftol0F7F( void ); @@ -96,7 +94,7 @@ static int asmCallPtr = (int)doAsmCall; #endif -static int callMask = 0; // bk001213 - init +static int callMask = 0; static int instruction, pass; static int lastConst = 0; @@ -1021,7 +1019,7 @@ void VM_Compile( vm_t *vm, vmHeader_t *header ) { EmitString( "D9 1F" ); // fstp dword ptr [edi] break; case OP_CVFI: -#ifndef FTOL_PTR // WHENHELLISFROZENOVER // bk001213 - was used in 1.17 +#ifndef FTOL_PTR // WHENHELLISFROZENOVER // not IEEE complient, but simple and fast EmitString( "D9 07" ); // fld dword ptr [edi] EmitString( "DB 1F" ); // fistp dword ptr [edi] |