Server|Debug: Investigating initial player mobj angle

skyjake · Feb 8, 2013 · d4e38f0 · d4e38f0
1 parent 953f4ed
commit d4e38f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/doomsday/plugins/common/src/d_netsv.c b/doomsday/plugins/common/src/d_netsv.c
@@ -637,6 +637,9 @@ void NetSv_NewPlayerEnters(int plrNum)
         if((start = P_GetPlayerStart(gameMapEntryPoint, plrNum, false)))
         {
             const mapspot_t* spot = &mapSpots[start->spot];
+#ifdef _DEBUG
+            Con_Message("NetSv_NewPlayerEnters: Spawning player with angle:%x\n", spot->angle);
+#endif
             P_SpawnPlayer(plrNum, pClass, spot->origin[VX], spot->origin[VY],
                           spot->origin[VZ], spot->angle, spot->flags,
                           false, true);

diff --git a/doomsday/plugins/common/src/p_start.c b/doomsday/plugins/common/src/p_start.c
@@ -467,8 +467,9 @@ void P_SpawnPlayer(int plrNum, playerclass_t pClass, coord_t x, coord_t y, coord
                   x, y, z, angle);
 
 #ifdef _DEBUG
-    Con_Message("P_SpawnPlayer: Player #%i spawned pos:[%g, %g, %g] floorz:%g\n",
-                plrNum, mo->origin[VX], mo->origin[VY], mo->origin[VZ], mo->floorZ);
+    Con_Message("P_SpawnPlayer: Player #%i spawned pos:[%g, %g, %g] angle:%x floorz:%g mobjid:%i\n",
+                plrNum, mo->origin[VX], mo->origin[VY], mo->origin[VZ], mo->angle, mo->floorZ,
+                mo->thinker.id);
 #endif
 
     p = &players[plrNum];
@@ -503,6 +504,7 @@ void P_SpawnPlayer(int plrNum, playerclass_t pClass, coord_t x, coord_t y, coord
     p->plr->lookDir = 0; /* $unifiedangles */
     p->plr->flags |= DDPF_FIXANGLES | DDPF_FIXORIGIN | DDPF_FIXMOM;
     p->plr->flags &= ~DDPF_UNDEFINED_ORIGIN;
+    assert(mo->angle == angle);
     p->jumpTics = 0;
     p->airCounter = 0;
     mo->player = p;
@@ -871,7 +873,8 @@ void P_RebornPlayer(int plrNum)
     }
 
 #ifdef _DEBUG
-    Con_Message("P_RebornPlayer: Spawning player at (%f,%f,%f).\n", pos[VX], pos[VY], pos[VZ]);
+    Con_Message("P_RebornPlayer: Spawning player at (%f,%f,%f) angle:%x.\n",
+                pos[VX], pos[VY], pos[VZ], angle);
 #endif
 
     spawnPlayer(plrNum, pClass, pos[VX], pos[VY], pos[VZ], angle,

diff --git a/doomsday/server/src/server/sv_main.cpp b/doomsday/server/src/server/sv_main.cpp
@@ -887,6 +887,10 @@ void Sv_SendPlayerFixes(int plrNum)
     Writer_WriteUInt32(msgWriter, fixes);
     Writer_WriteUInt16(msgWriter, ddpl->mo->thinker.id);
 
+#ifdef _DEBUG
+    Con_Message("Sv_SendPlayerFixes: Fixing mobj %i...\n", ddpl->mo->thinker.id);
+#endif
+
     // Increment counters.
     if(ddpl->flags & DDPF_FIXANGLES)
     {
@@ -895,9 +899,8 @@ void Sv_SendPlayerFixes(int plrNum)
         Writer_WriteFloat(msgWriter, ddpl->lookDir);
 
 #ifdef _DEBUG
-Con_Message("Sv_SendPlayerFixes: Sent angles (%i): angle=%f lookdir=%f\n",
-            ddpl->fixCounter.angles, FIX2FLT(ddpl->mo->angle),
-            ddpl->lookDir);
+        Con_Message("Sv_SendPlayerFixes: Sent angles (%i): angle=%x lookdir=%f\n",
+                    ddpl->fixCounter.angles, ddpl->mo->angle, ddpl->lookDir);
 #endif
     }
 
@@ -909,9 +912,9 @@ Con_Message("Sv_SendPlayerFixes: Sent angles (%i): angle=%f lookdir=%f\n",
         Writer_WriteFloat(msgWriter, ddpl->mo->origin[VZ]);
 
 #ifdef _DEBUG
-Con_Message("Sv_SendPlayerFixes: Sent position (%i): %f, %f, %f\n",
-            ddpl->fixCounter.origin,
-            ddpl->mo->origin[VX], ddpl->mo->origin[VY], ddpl->mo->origin[VZ]);
+        Con_Message("Sv_SendPlayerFixes: Sent position (%i): %f, %f, %f\n",
+                    ddpl->fixCounter.origin,
+                    ddpl->mo->origin[VX], ddpl->mo->origin[VY], ddpl->mo->origin[VZ]);
 #endif
     }
 
@@ -923,9 +926,9 @@ Con_Message("Sv_SendPlayerFixes: Sent position (%i): %f, %f, %f\n",
         Writer_WriteFloat(msgWriter, ddpl->mo->mom[MZ]);
 
 #ifdef _DEBUG
-Con_Message("Sv_SendPlayerFixes: Sent momentum (%i): %f, %f, %f\n",
-            ddpl->fixCounter.mom,
-            ddpl->mo->mom[MX], ddpl->mo->mom[MY], ddpl->mo->mom[MZ]);
+        Con_Message("Sv_SendPlayerFixes: Sent momentum (%i): %f, %f, %f\n",
+                    ddpl->fixCounter.mom,
+                    ddpl->mo->mom[MX], ddpl->mo->mom[MY], ddpl->mo->mom[MZ]);
 #endif
     }