reenabled index buffers on GLES2 path

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index ffa54d19992c93da7afebab69af2745fdf611ae1..abacf51d2ee614111f26d68ee9ea2cd02e08724d 100644 (file)
--- a/world.c
+++ b/world.c
@@ -185,8 +185,11 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
        vec3_t paddedmins, paddedmaxs;
        int igrid[3], igridmins[3], igridmaxs[3];
 
-       VectorSet(paddedmins, requestmins[0] - 1.0f, requestmins[1] - 1.0f, requestmins[2] - 1.0f);
-       VectorSet(paddedmaxs, requestmaxs[0] + 1.0f, requestmaxs[1] + 1.0f, requestmaxs[2] + 1.0f);
+       // LordHavoc: discovered this actually causes its own bugs (dm6 teleporters being too close to info_teleport_destination)
+       //VectorSet(paddedmins, requestmins[0] - 1.0f, requestmins[1] - 1.0f, requestmins[2] - 1.0f);
+       //VectorSet(paddedmaxs, requestmaxs[0] + 1.0f, requestmaxs[1] + 1.0f, requestmaxs[2] + 1.0f);
+       VectorCopy(requestmins, paddedmins);
+       VectorCopy(requestmaxs, paddedmaxs);
 
        // FIXME: if areagrid_marknumber wraps, all entities need their
        // ent->priv.server->areagridmarknumber reset
@@ -1471,10 +1474,16 @@ static void World_Physics_Init(void)
        const char* dllnames [] =
        {
 # if defined(WIN32)
+               "libode3.dll",
+               "libode2.dll",
                "libode1.dll",
 # elif defined(MACOSX)
+               "libode.3.dylib",
+               "libode.2.dylib",
                "libode.1.dylib",
 # else
+               "libode.so.3",
+               "libode.so.2",
                "libode.so.1",
 # endif
                NULL
@@ -2105,7 +2114,7 @@ static void World_Physics_Frame_BodyFromEntity(world_t *world, prvm_edict_t *ed)
        prvm_prog_t *prog = world->prog;
        const float *iv;
        const int *ie;
-       dBodyID body = (dBodyID)ed->priv.server->ode_body;
+       dBodyID body;
        dMass mass;
        const dReal *ovelocity, *ospinvelocity;
        void *dataID;