Client: MobjThinker ignores partial/unpredictable clmobjs

skyjake · Apr 15, 2011 · a66ee86 · a66ee86
1 parent 1e47795
commit a66ee86
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/doomsday/engine/api/doomsday.def b/doomsday/engine/api/doomsday.def
@@ -3,7 +3,6 @@ NAME            "DOOMSDAY"
 ; Highest ordinal is currently
 ; --> 448 <--
 ; Other free ordinals:
-; 43 formerly P_RegisterPlayerControl
 ; 44 formerly B_FormEventString
 ; 45 formerly B_BindingsForCommand
 ; 65 formerly P_GetBlockRootIdx
@@ -298,6 +297,7 @@ EXPORTS
     P_MobjUnlink                @67 NONAME
     P_MobjLinesIterator         @71 NONAME
     P_MobjSectorsIterator       @72 NONAME
+    ClMobj_IsValid              @43 NONAME
 
 ; Play: Polyobjs.
     P_PolyobjMove               @79 NONAME

diff --git a/doomsday/engine/api/doomsday.h b/doomsday/engine/api/doomsday.h
@@ -278,6 +278,7 @@ extern          "C" {
     void            P_MobjSetState(struct mobj_s* mo, int statenum);
     void            P_MobjLink(struct mobj_s* mo, byte flags);
     int             P_MobjUnlink(struct mobj_s* mo);
+    boolean         ClMobj_IsValid(struct mobj_s* mo);
 
     // Mobj linked object iterators.
     boolean         P_MobjLinesIterator(struct mobj_s* mo,

diff --git a/doomsday/engine/portable/src/cl_mobj.c b/doomsday/engine/portable/src/cl_mobj.c
@@ -736,7 +736,7 @@ boolean ClMobj_IsValid(mobj_t* mo)
 {
     clmoinfo_t* info = ClMobj_GetInfo(mo);
 
-    if(!Cl_IsClientMobj(mo)) return false;
+    if(!Cl_IsClientMobj(mo)) return true;
     if(info->flags & (CLMF_HIDDEN | CLMF_UNPREDICTABLE))
     {
         // Should not use this for playsim.

diff --git a/doomsday/plugins/jdoom/src/p_mobj.c b/doomsday/plugins/jdoom/src/p_mobj.c
@@ -655,13 +655,8 @@ void P_MobjThinker(mobj_t* mo)
     if(!mo)
         return; // Wha?
 
-    /*
-    if(mo->ddFlags & DDMF_REMOTE)
-    {
-        Con_Message("P_MobjThinker: mo %i is remote, ignored for now\n", mo->thinker.id);
-        return; // Remote mobjs are handled separately.
-    }
-    */
+    if(IS_CLIENT && !ClMobj_IsValid(mo))
+        return; // We should not touch this right now.
 
     // Spectres get selector = 1.
     if(mo->type == MT_SHADOWS)