Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - q_shared.c
diff -s -r q2_305/q_shared.c q2_314/q_shared.c
Left File < - 3.05/q_shared.c
Right File > - 3.14/q_shared.c
Back to Index
328a329
> #if !id386
381c382
< assert( 1 );
---
> assert( 0 );
394a396,404
> #else
> #pragma warning( disable: 4035 )
>
> __declspec( naked ) int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
> {
> static int bops_initialized;
> static int Ljmptab[8];
>
> __asm {
395a406,629
> push ebx
>
> cmp bops_initialized, 1
> je initialized
> mov bops_initialized, 1
>
> mov Ljmptab[0*4], offset Lcase0
> mov Ljmptab[1*4], offset Lcase1
> mov Ljmptab[2*4], offset Lcase2
> mov Ljmptab[3*4], offset Lcase3
> mov Ljmptab[4*4], offset Lcase4
> mov Ljmptab[5*4], offset Lcase5
> mov Ljmptab[6*4], offset Lcase6
> mov Ljmptab[7*4], offset Lcase7
>
> initialized:
>
> mov edx,ds:dword ptr[4+12+esp]
> mov ecx,ds:dword ptr[4+4+esp]
> xor eax,eax
> mov ebx,ds:dword ptr[4+8+esp]
> mov al,ds:byte ptr[17+edx]
> cmp al,8
> jge Lerror
> fld ds:dword ptr[0+edx]
> fld st(0)
> jmp dword ptr[Ljmptab+eax*4]
> Lcase0:
> fmul ds:dword ptr[ebx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ebx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase1:
> fmul ds:dword ptr[ecx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ebx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase2:
> fmul ds:dword ptr[ebx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ecx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase3:
> fmul ds:dword ptr[ecx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ecx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase4:
> fmul ds:dword ptr[ebx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ebx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase5:
> fmul ds:dword ptr[ecx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ebx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase6:
> fmul ds:dword ptr[ebx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ecx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ecx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> jmp LSetSides
> Lcase7:
> fmul ds:dword ptr[ecx]
> fld ds:dword ptr[0+4+edx]
> fxch st(2)
> fmul ds:dword ptr[ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[4+ecx]
> fld ds:dword ptr[0+8+edx]
> fxch st(2)
> fmul ds:dword ptr[4+ebx]
> fxch st(2)
> fld st(0)
> fmul ds:dword ptr[8+ecx]
> fxch st(5)
> faddp st(3),st(0)
> fmul ds:dword ptr[8+ebx]
> fxch st(1)
> faddp st(3),st(0)
> fxch st(3)
> faddp st(2),st(0)
> LSetSides:
> faddp st(2),st(0)
> fcomp ds:dword ptr[12+edx]
> xor ecx,ecx
> fnstsw ax
> fcomp ds:dword ptr[12+edx]
> and ah,1
> xor ah,1
> add cl,ah
> fnstsw ax
> and ah,1
> add ah,ah
> add cl,ah
> pop ebx
> mov eax,ecx
> ret
> Lerror:
> int 3
> }
> }
> #pragma warning( default: 4035 )
> #endif
930,932c1164
< #if defined(IRIX)
< return strcmp (s1, s2);
< #elif defined(WIN32)
---
> #if defined(WIN32)
935c1167
< return stricmp (s1, s2);
---
> return strcasecmp (s1, s2);
975d1206
< char bigbuffer[0x10000];
977a1209
> char bigbuffer[0x10000];
1094a1327,1343
> /*
> ==================
> Info_Validate
>
> Some characters are illegal in info strings because they
> can mess up the server's parsing
> ==================
> */
> qboolean Info_Validate (char *s)
> {
> if (strstr (s, "\""))
> return false;
> if (strstr (s, ";"))
> return false;
> return true;
> }
>
1103a1353,1358
> return;
> }
>
> if (strstr (key, ";") )
> {
> Com_Printf ("Can't use keys or values with a semicolon\n");