Skip to content

Commit 6a049cc

Browse files
authored
Merge pull request #3082 from JohnAFernandez/Update-Submodel-Comments
Update Comments for #548
2 parents 9879ef4 + ecf2dfb commit 6a049cc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

code/asteroid/asteroid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
10851085

10861086
}
10871087

1088-
// Recover and do usual ship_ship collision, but without rotating submodels
1088+
// Now complete base model collision checks that do not take into account rotating submodels.
10891089
mc.flags = copy_flags;
10901090
*mc.p0 = copy_p0;
10911091
*mc.p1 = copy_p1;

code/debris/debris.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ int debris_check_collision(object *pdebris, object *other_obj, vec3d *hitpos, co
940940
}
941941
}
942942

943-
// Recover and do usual ship_ship collision, but without rotating submodels
943+
// Now complete base model collision checks that do not take into account rotating submodels.
944944
mc.flags = copy_flags;
945945
*mc.p0 = copy_p0;
946946
*mc.p1 = copy_p1;

code/object/collideshipship.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ int ship_ship_check_collision(collision_info_struct *ship_ship_hit_info)
326326

327327
}
328328

329-
// Recover and do usual ship_ship collision, but without rotating submodels
329+
// Now complete base model collision checks that do not take into account rotating submodels.
330330
mc.flags = copy_flags;
331331
*mc.p0 = copy_p0;
332332
*mc.p1 = copy_p1;

0 commit comments

Comments
 (0)