diff options
| author | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
|---|---|---|
| committer | rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-30 13:26:32 +0000 |
| commit | eaa453335563d670d856da44bf4ea1f332c618a7 (patch) | |
| tree | a976bf3e0fc4b690042915745e637eb6b00929e4 /Stars45/HUDView.cpp | |
| parent | 035cfd86e5d221cffb2673e936dcb8703e28ce4b (diff) | |
| download | starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.zip starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.gz starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.bz2 | |
Ensure check for NULL pointer occurs prior to use, not after
Diffstat (limited to 'Stars45/HUDView.cpp')
| -rw-r--r-- | Stars45/HUDView.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Stars45/HUDView.cpp b/Stars45/HUDView.cpp index 1aaaf96..48953ac 100644 --- a/Stars45/HUDView.cpp +++ b/Stars45/HUDView.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 4.5
Destroyer Studios LLC
- Copyright © 1997-2004. All Rights Reserved.
+ Copyright (C) 1997-2004. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: HUDView.cpp
@@ -1116,9 +1116,9 @@ HUDView::DrawContact(Contact* contact, int index) Point delta_v;
if (c_ship)
- delta_v = ship->Velocity() - c_ship->Velocity();
- else
- delta_v = ship->Velocity() - c_shot->Velocity();
+ delta_v = ship->Velocity() - c_ship->Velocity();
+ else if (c_shot)
+ delta_v = ship->Velocity() - c_shot->Velocity();
if (delta_v * ship->Velocity() < 0) // losing ground
closing = '-';
|