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/Sim.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/Sim.cpp')
| -rw-r--r-- | Stars45/Sim.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Stars45/Sim.cpp b/Stars45/Sim.cpp index e5482da..6d1f0fc 100644 --- a/Stars45/Sim.cpp +++ b/Stars45/Sim.cpp @@ -1,6 +1,6 @@ /* Project Starshatter 5.0
Destroyer Studios LLC
- Copyright © 1997-2007. All Rights Reserved.
+ Copyright (C) 1997-2007. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: Sim.cpp
@@ -2733,11 +2733,14 @@ SimRegion::DamageShips() // then delete the ship:
if (ship_destroyed) {
NetUtil::SendObjKill(ship, owner, shot->IsMissile() ? NetObjKill::KILL_SECONDARY : NetObjKill::KILL_PRIMARY);
-
+ Director* director;
+
Print(" %s Killed %s (%s)\n", owner_name, ship->Name(), FormatGameTime());
- // alert the killer
- Director* director = owner->GetDirector();
+ if (owner)
+ director = owner->GetDirector();
+
+ // alert the killer
if (director && director->Type() > SteerAI::SEEKER && director->Type() < SteerAI::GROUND) {
ShipAI* shipAI = (ShipAI*) director;
shipAI->Splash(ship);
|