[ScryMUD] SVN Commit Info r702 - branches/version-2-1/mud/grrmud/server

[scrymud at wanfear.com]

Author: eroper
Date: 2004-11-20 00:01:55 -0800 (Sat, 20 Nov 2004)
New Revision: 702

Modified:
   branches/version-2-1/mud/grrmud/server/trv_spll.cc
Log:
I (think) I've resolved the typhoon/tornado crash. This is being resolved on
the version-2-1 branch. I'm noting this here since I have no idea how
subversion will represent this fact :p

--Khaav


Modified: branches/version-2-1/mud/grrmud/server/trv_spll.cc
===================================================================
--- branches/version-2-1/mud/grrmud/server/trv_spll.cc	2004-11-20 07:53:23 UTC (rev 701)
+++ branches/version-2-1/mud/grrmud/server/trv_spll.cc	2004-11-20 08:01:55 UTC (rev 702)
@@ -717,6 +717,7 @@
                      emote("is crushed into the earth.", *ptr, 
                            room_list[ptr->getCurRoomNum()], TRUE);
                      agg_kills_vict(&agg, *ptr);
+                     ptr = NULL;
                   }//if
                   else {
                      show("You land painfully on the ground.\n", *ptr);
@@ -729,7 +730,10 @@
                   emote("lands lightly on the ground.", *ptr,
                         room_list[ptr->getCurRoomNum()], TRUE);
                }//else
-               look(1, &NULL_STRING, *ptr, TRUE);
+               // Make sure they haven't died
+               if ( ptr ) {
+                  look(1, &NULL_STRING, *ptr, TRUE);
+               }
             }//if
             if (count++ > 9) { //can't spin for too long
                break;
@@ -851,6 +855,7 @@
                      emote("is crushed into the earth.", *ptr, 
                            room_list[ptr->getCurRoomNum()], TRUE);
                      agg_kills_vict(&agg, *ptr);
+                     ptr = NULL;
                   }//if
                   else {
                      show("You land painfully on the ground.\n", *ptr);
@@ -863,7 +868,10 @@
                   emote("lands lightly on the ground.", *ptr,
                         room_list[ptr->getCurRoomNum()], TRUE);
                }//else
-               look(1, &NULL_STRING, *ptr, TRUE);
+               // Make sure they haven't died
+               if ( ptr ) {
+                  look(1, &NULL_STRING, *ptr, TRUE);
+               }
             }//if
          }//while
       }//while