From e5cb58e7c4093ee9ff4e308872a40eddf49c7d28 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Wed, 17 Aug 2016 21:18:04 +0300
Subject: [PATCH] Add debug info about ID_GAME_BASE_INFO packets

---
 apps/openmw-mp/Networking.cpp    |  3 ++-
 apps/openmw/mwmp/LocalPlayer.cpp |  2 +-
 apps/openmw/mwmp/Networking.cpp  | 14 +++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index 9d1c8acbd..131953b13 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -6,6 +6,7 @@
 #include <RakPeer.h>
 #include <Kbhit.h>
 #include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/Log.hpp>
 #include <iostream>
 #include <Script/Script.hpp>
 #include <Script/API/TimerAPI.hpp>
@@ -118,7 +119,7 @@ void Networking::Update(RakNet::Packet *packet)
     {
         case ID_GAME_BASE_INFO:
         {
-            DEBUG_PRINTF("ID_GAME_BASE_INFO\n");
+            LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_GAME_BASE_INFO about %s", player->Npc()->mName.c_str());
 
             myPacket->Read(player);
             myPacket->Send(player, true);
diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index 7b0c22b14..9f90c1ff8 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -486,7 +486,7 @@ bool LocalPlayer::CharGenThread() // ToDo: need fix
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
             (*Npc()) = *player.get<ESM::NPC>()->mBase;
 
-            printf("Sending ID_GAME_BASE_INFO to server with my CharGen info");
+            printf("Sending ID_GAME_BASE_INFO to server with my CharGen info\n");
             GetNetworking()->GetPacket(ID_GAME_BASE_INFO)->Send(this);
 
             if (CharGenStage()->end != 1)
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
index f4c4b7793..0648a7383 100644
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/apps/openmw/mwmp/Networking.cpp
@@ -180,9 +180,12 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
         }
         case ID_GAME_BASE_INFO:
         {
+            printf("Received ID_GAME_BASE_INFO from server\n");
+
             if (id == myid)
             {
-                cout << "TEST: " << packet->length << endl;
+                printf("- Packet was about my id\n");
+
                 if (packet->length == myPacket->headerSize())
                 {
                     cout << "ID_GAME_BASE_INFO request only" << endl;
@@ -191,14 +194,19 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
                 else
                 {
                     myPacket->Packet(&bsIn, getLocalPlayer(), false);
-                    cout << "ID_GAME_BASE_INFO" << endl;
+                    cout << "- Updating LocalPlayer" << endl;
                     getLocalPlayer()->updateChar();
                 }
             }
             else
             {
-                if (pl == 0)
+                printf("- Packet was about %s\n", pl == 0 ? "new player" : pl->Npc()->mName.c_str());
+
+                if (pl == 0) {
+
+                    printf("- Exchanging data with new player\n");
                     pl = Players::NewPlayer(id);
+                }
 
                 myPacket->Packet(&bsIn, pl, false);
                 Players::CreatePlayer(id);