Use GL3.2 Core Profile context.

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 4fe5fcf5db9595b59fea887651eb9e1a795a4e77..c62a83fa7eeeec1b9eadf9c10ec6cf660e19b790 100644 (file)
--- a/world.c
+++ b/world.c
@@ -185,6 +185,10 @@ 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];
 
+       // avoid crash in showtex code on level change
+       if (prog == NULL || prog->num_edicts < 1)
+               return 0;
+
        // 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);
@@ -3012,8 +3016,8 @@ static void nearCallback (void *data, dGeomID o1, dGeomID o2)
 
 void World_Physics_Frame(world_t *world, double frametime, double gravity)
 {
-       prvm_prog_t *prog = world->prog;
 #ifdef USEODE
+       prvm_prog_t *prog = world->prog;
        double tdelta, tdelta2, tdelta3, simulationtime, collisiontime;
 
        tdelta = Sys_DirtyTime();