Fixed crash when rocket ride is interrupted by rider disconnecting and then re-connecting as a twin. Fixes #1110

Author: jasonrohrer

documentation/changeLog.txt

@@ -10,6 +10,9 @@ Server Fixes:
 --Fixed so that shutdownLongLineagePos.txt is cleared during apocalypse, so
   that Eve location is fully reset to 0.  Fixes #1103
 
+--Fixed crash when rocket ride is interrupted by rider disconnecting and then
+  re-connecting as a twin.  Fixes #1110
+
 
 
 

server/lifeLog.cpp

@@ -262,6 +262,14 @@ void logDeath( int inPlayerID, char *inPlayerEmail,
                     if( inKillerID == inPlayerID ) {
                         causeString = stringDuplicate( "suicide" );
                         }
+                    else if( inKillerID == -999999998 ) {
+                        causeString = 
+                            stringDuplicate( "rocket_ride_interrupted" );
+                        }
+                    else if( inKillerID == -999999999 ) {
+                        causeString = 
+                            stringDuplicate( "rocket_ride_completed" );
+                        }
                     else if( inKillerID < -1 ) {
 
                         // use cleaned-up non-human object string
@@ -284,6 +292,11 @@ void logDeath( int inPlayerID, char *inPlayerEmail,
                                 nextSpace = strstr( nextSpace, " " );
                                 }
                             }
+                        else {
+                            causeString = 
+                                autoSprintf( "killed_by_unknown_object_%d",
+                                             -inKillerID );
+                            }
                         }
                     else {
                         causeString = stringDuplicate( "hunger" );

server/server.cpp

@@ -27143,6 +27143,10 @@ int main() {
                         // include as negative of ID
                         killerID = - nextPlayer->deathSourceID;
                         }
+                    else if( nextPlayer->rodeRocket ) {
+                        // completed rocket ride
+                        killerID = -999999999;
+                        }
                     // never have suicide in this case
 
                     logDeath( nextPlayer->id,
@@ -27394,7 +27398,8 @@ int main() {
                     killerID = nextPlayer->id;
                     }
                 else if( nextPlayer->rodeRocket ) {
-                    killerID = -999999999;
+                    // rocket interrupted by error
+                    killerID = -999999998;
                     }
 
                 char male = ! getFemale( nextPlayer );