nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-01-19 23:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

couple of fixes there.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3427 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-11-08 23:00:11 +00:00
parent e6d1ae1a8f
commit 0e9a9dd00f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/common/com_phys_ode.c
View file

@ -63,9 +63,9 @@ cvar_t physics_ode_spinlimit = CVARDP4(0, "physics_ode_spinlimit", "10000", "res
#else #else
#ifdef WINAPI #ifdef WINAPI
// ODE does not use WINAPI // ODE does not use WINAPI
#define ODE_API #define ODE_API VARGS /*vargs because fte likes to be compiled fastcall (vargs is defined as cdecl...)*/
#else #else
#define ODE_API #define ODE_API VARGS
#endif #endif
#define DEG2RAD(d) (d * M_PI * (1/180.0f)) #define DEG2RAD(d) (d * M_PI * (1/180.0f))
@ -246,7 +246,7 @@ typedef void dNearCallback (void *data, dGeomID o1, dGeomID o2);
#define dSAP_AXES_ZYX ((2)|(1<<2)|(0<<4)) #define dSAP_AXES_ZYX ((2)|(1<<2)|(0<<4))
//const char* (ODE_API *dGetConfiguration)(void); //const char* (ODE_API *dGetConfiguration)(void);
//int (ODE_API *dCheckConfiguration)( const char* token ); int (ODE_API *dCheckConfiguration)( const char* token );
int (ODE_API *dInitODE)(void); int (ODE_API *dInitODE)(void);
//int (ODE_API *dInitODE2)(unsigned int uiInitFlags); //int (ODE_API *dInitODE2)(unsigned int uiInitFlags);
//int (ODE_API *dAllocateODEDataForThread)(unsigned int uiAllocateFlags); //int (ODE_API *dAllocateODEDataForThread)(unsigned int uiAllocateFlags);
@ -712,7 +712,7 @@ dGeomID (ODE_API *dCreateTriMesh)(dSpaceID space, dTriMeshDataID Data, d
static dllfunction_t odefuncs[] = static dllfunction_t odefuncs[] =
{ {
// {"dGetConfiguration", (void **) &dGetConfiguration}, // {"dGetConfiguration", (void **) &dGetConfiguration},
// {"dCheckConfiguration", (void **) &dCheckConfiguration}, {(void **) &dCheckConfiguration, "dCheckConfiguration"},
{(void **) &dInitODE, "dInitODE"}, {(void **) &dInitODE, "dInitODE"},
// {"dInitODE2", (void **) &dInitODE2}, // {"dInitODE2", (void **) &dInitODE2},
// {"dAllocateODEDataForThread", (void **) &dAllocateODEDataForThread}, // {"dAllocateODEDataForThread", (void **) &dAllocateODEDataForThread},
@ -1202,7 +1202,7 @@ void World_Physics_Init(void)
{ {
dInitODE(); dInitODE();
// dInitODE2(0); // dInitODE2(0);
#ifdef ODE_DNYAMIC #ifdef ODE_DYNAMIC
# ifdef dSINGLE # ifdef dSINGLE
if (!dCheckConfiguration("ODE_single_precision")) if (!dCheckConfiguration("ODE_single_precision"))
# else # else
@ -1214,7 +1214,7 @@ void World_Physics_Init(void)
# else # else
Con_Printf("ode library not compiled for double precision - incompatible! Not using ODE physics.\n"); Con_Printf("ode library not compiled for double precision - incompatible! Not using ODE physics.\n");
# endif # endif
Sys_UnloadLibrary(&ode_dll); Sys_CloseLibrary(ode_dll);
ode_dll = NULL; ode_dll = NULL;
} }
#endif #endif