From 57b2687485a5aaf32f371c3c0a7c6adeb8a37e99 Mon Sep 17 00:00:00 2001 From: vortex Date: Sat, 31 Dec 2011 17:11:35 +0000 Subject: [PATCH] UNMERGE! Try fix ode_body cast. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11629 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::unmerge=579f5e5afabbb24f524eb9c8d8f6bded47393e71 --- world.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/world.c b/world.c index 39d85140..b23fe2c9 100644 --- a/world.c +++ b/world.c @@ -1864,20 +1864,20 @@ static void World_Physics_Frame_ForceFromEntity(world_t *world, prvm_edict_t *ed return; VectorCopy(PRVM_gameedictvector(ed, movedir), movedir); VectorCopy(PRVM_gameedictvector(ed, origin), origin); - dBodyEnable((dBodyID)prog->edicts[enemy].priv.server->ode_body); + dBodyEnable(prog->edicts[enemy].priv.server->ode_body); switch(forcetype) { case FORCETYPE_FORCE: if (movedir[0] || movedir[1] || movedir[2]) - dBodyAddForce((dBodyID)prog->edicts[enemy].priv.server->ode_body, movedir[0], movedir[1], movedir[2]); + dBodyAddForce(prog->edicts[enemy].priv.server->ode_body, movedir[0], movedir[1], movedir[2]); break; case FORCETYPE_FORCEATPOS: if (movedir[0] || movedir[1] || movedir[2]) - dBodyAddForceAtPos((dBodyID)prog->edicts[enemy].priv.server->ode_body, movedir[0], movedir[1], movedir[2], origin[0], origin[1], origin[2]); + dBodyAddForceAtPos(prog->edicts[enemy].priv.server->ode_body, movedir[0], movedir[1], movedir[2], origin[0], origin[1], origin[2]); break; case FORCETYPE_TORQUE: if (movedir[0] || movedir[1] || movedir[2]) - dBodyAddTorque((dBodyID)prog->edicts[enemy].priv.server->ode_body, movedir[0], movedir[1], movedir[2]); + dBodyAddTorque(prog->edicts[enemy].priv.server->ode_body, movedir[0], movedir[1], movedir[2]); break; case FORCETYPE_NONE: default: -- 2.39.2