Changeset 124 for cafu/branches/cafu_to_wx/Games/DeathMatch/Code/HumanPlayer.cpp

Timestamp:

08/20/10 15:06:58 (21 months ago)

Author:

Carsten

Message:

Merged latest changes from trunk into branches/cafu_to_wx.

Files:

• cafu/branches/cafu_to_wx/Games/DeathMatch/Code/HumanPlayer.cpp (modified) (1 diff)

cafu/branches/cafu_to_wx/Games/DeathMatch/Code/HumanPlayer.cpp

@@ -755 +755 @@
                 if (OldOriginZ>=State.Origin.z && fabs(State.Velocity.x)<0.1 && fabs(State.Velocity.y)<0.1 && fabs(State.Velocity.z)<0.1 && OldModelFrameNr==State.ModelFrameNr)
                 {
-                    std::map<std::string, std::string> Props; Props["classname"]="corpse";
-
-                    // Create a new "corpse" entity in the place where we died, or else the model disappears.
-                    unsigned long CorpseID=GameWorld->CreateNewEntity(Props, ServerFrameNr, VectorT());
-
-                    if (CorpseID!=0xFFFFFFFF)
+                    if (ThinkingOnServerSide)
                     {
-                        BaseEntityT* Corpse=GameWorld->GetBaseEntityByID(CorpseID);
-
-                        Corpse->State=EntityStateT(State.Origin+VectorT(0.0, 0.0, State.Dimensions.Min.z+1728.8), VectorT(), BoundingBox3T<double>(Vector3dT()), State.Heading,
-                                                   0, 0, 0, 0, State.ModelIndex, State.ModelSequNr, State.ModelFrameNr, 0, 0, 0, 0,
-                                                   State.ActiveWeaponSlot, 0, 0.0);
+                        std::map<std::string, std::string> Props; Props["classname"]="corpse";
+
+                        // Create a new "corpse" entity in the place where we died, or else the model disappears.
+                        unsigned long CorpseID=GameWorld->CreateNewEntity(Props, ServerFrameNr, VectorT());
+
+                        if (CorpseID!=0xFFFFFFFF)
+                        {
+                            BaseEntityT* Corpse=GameWorld->GetBaseEntityByID(CorpseID);
+
+                            Corpse->State=EntityStateT(State.Origin+VectorT(0.0, 0.0, State.Dimensions.Min.z+1728.8), VectorT(), BoundingBox3T<double>(Vector3dT()), State.Heading,
+                                                       0, 0, 0, 0, State.ModelIndex, State.ModelSequNr, State.ModelFrameNr, 0, 0, 0, 0,
+                                                       State.ActiveWeaponSlot, 0, 0.0);
+                        }
                     }