From b04bb1bf68724d0f809354338d2e94be38102c52 Mon Sep 17 00:00:00 2001 From: driAn Date: Sun, 12 Oct 2008 14:14:12 +0000 Subject: [PATCH] accept flag-stolen message even if actor is not known yet (fixes flag info on connect) git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2983 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 3 +-- source/src/server.cpp | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 901a9e16..cabd04f5 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -368,9 +368,8 @@ void flagscore(int fln) void flagstolen(int flag, int act) { playerent *actor = act == getclientnum() ? player1 : getclient(act); - if(!actor) return; flaginfo &f = flaginfos[flag]; - f.actor = actor; + f.actor = actor; // could be NULL if we just connected f.actor_cn = act; f.flagent->spawned = false; f.ack = true; diff --git a/source/src/server.cpp b/source/src/server.cpp index fb32754b..540ada64 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -2440,6 +2440,8 @@ void process(ENetPacket *packet, int sender, int chan) // sender may be -1 int curmsg; while((curmsg = p.length()) < p.maxlen) { + DEBUG("processing message"); + type = checktype(getint(p), cl); #ifdef _DEBUG