Q1BSP: fix misaligned memory access

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index e37b24c01325f9ef136abef2ace19350ce2f5c0b..fb70ab02766f01fd3c795672139f1159e385c6b0 100644 (file)
--- a/world.c
+++ b/world.c
@@ -119,7 +119,7 @@ void World_SetSize(world_t *world, const char *filename, const vec3_t mins, cons
 {
        int i;
 
-       strlcpy(world->filename, filename, sizeof(world->filename));
+       dp_strlcpy(world->filename, filename, sizeof(world->filename));
        VectorCopy(mins, world->mins);
        VectorCopy(maxs, world->maxs);
        world->prog = prog;
@@ -2063,7 +2063,7 @@ static void World_Physics_Frame_JointFromEntity(world_t *world, prvm_edict_t *ed
                                break;
                        case 0:
                        default:
-                               Sys_Error("what? but above the joint was valid...\n");
+                               Sys_Abort("what? but above the joint was valid...\n");
                                break;
                }
 #undef SETPARAMS
@@ -2624,7 +2624,7 @@ treatasbox:
                        dMassSetCylinderTotal(&mass, massval, 3, radius, length);
                        break;
                default:
-                       Sys_Error("World_Physics_BodyFromEntity: unrecognized geomtype value %i was accepted by filter\n", solid);
+                       Sys_Abort("World_Physics_BodyFromEntity: unrecognized geomtype value %i was accepted by filter\n", solid);
                        // this goto only exists to prevent warnings from the compiler
                        // about uninitialized variables (mass), while allowing it to
                        // catch legitimate uninitialized variable warnings