improved performance of SVBSP code

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 9fd89d766926ebfffe105631c1320c09d9a31748..935abfbfb163d7ba15c51f8b0e9de7608928b006 100644 (file)
--- a/world.c
+++ b/world.c
@@ -1449,9 +1449,7 @@ static void World_Physics_Init(void)
 #ifdef ODE_DYNAMIC
        const char* dllnames [] =
        {
-# if defined(WIN64)
-               "libode1_64.dll",
-# elif defined(WIN32)
+# if defined(WIN32)
                "libode1.dll",
 # elif defined(MACOSX)
                "libode.1.dylib",
@@ -1973,19 +1971,12 @@ static void World_Physics_Frame_BodyFromEntity(world_t *world, prvm_edict_t *ed)
                val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.modelindex);
                if (val)
                        modelindex = (int)val->_float;
-               if (world == &sv.world && modelindex >= 1 && modelindex < MAX_MODELS)
-               {
-                       model = sv.models[modelindex];
-               }
-               else if (world == &cl.world && modelindex >= 1 && modelindex < MAX_MODELS)
-               {
-                       model = cl.model_precache[modelindex];
-               }
+               if (world == &sv.world)
+                       model = SV_GetModelByIndex(modelindex);
+               else if (world == &cl.world)
+                       model = CL_GetModelByIndex(modelindex);
                else
-               {
                        model = NULL;
-                       modelindex = 0;
-               }
                if (model)
                {
                        VectorScale(model->normalmins, scale, entmins);