Skip to content

Commit

Permalink
Merge pull request scp-fs2open#6268 from Baezon/remove-some-prints
Browse files Browse the repository at this point in the history
Remove some overzealous prints
  • Loading branch information
Goober5000 authored Aug 17, 2024
2 parents 6b0fe5a + 05a0220 commit cc5bb30
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 2 additions & 3 deletions code/math/vecmat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,8 @@ float vm_vec_copy_normalize(vec3d *dest, const vec3d *src)

// Mainly here to trap attempts to normalize a null vector.
if (m <= 0.0f) {
mprintf(("Null vec3d in vec3d normalize.\n"
"Trace out of vecmat.cpp and find offending code.\n"));

nprintf(("Network", "Null vec3d in vec3d normalize.\n"
"Trace out of vecmat.cpp and find offending code.\n"));
dest->xyz.x = 1.0f;
dest->xyz.y = 0.0f;
dest->xyz.z = 0.0f;
Expand Down
2 changes: 0 additions & 2 deletions code/particle/effects/GenericShapeEffect.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ class GenericShapeEffect : public ParticleEffect {
case ConeDirection::Normal: {
vec3d normal;
if (!source->getOrientation()->getNormal(&normal)) {
mprintf(("Effect '%s' tried to use normal direction for source without a normal!\n", m_name.c_str()));
return source->getOrientation()->getDirectionVector(source->getOrigin(), m_particleProperties.m_parent_local);
}

Expand All @@ -62,7 +61,6 @@ class GenericShapeEffect : public ParticleEffect {
vec3d out = source->getOrientation()->getDirectionVector(source->getOrigin(), m_particleProperties.m_parent_local);
vec3d normal;
if (!source->getOrientation()->getNormal(&normal)) {
mprintf(("Effect '%s' tried to use normal direction for source without a normal!\n", m_name.c_str()));
return out;
}

Expand Down

0 comments on commit cc5bb30

Please sign in to comment.