X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gameserver.c;h=5bbb8ae9685dbaace02f02bf1e1430c349c64d27;hb=ec3a96fde91385417ffc20e0f7745d7d8e2889ca;hp=a93d705abc32204e2c5218f000f6545dec92c94b;hpb=83890302a02892a2e6f26fa8d7bfe1309463c133;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gameserver.c b/gameserver.c index a93d705..5bbb8ae 100644 --- a/gameserver.c +++ b/gameserver.c @@ -10,7 +10,6 @@ volatile sig_atomic_t sig_stop; #include "gameserver.h" -#include "highscores.c" #include "vg/vg_opt.h" #include "network_common.h" #include "gameserver_db.h" @@ -516,7 +515,7 @@ static void gameserver_propogate_player_frame( int client_id, basic->sound_effects = 0; struct gameserver_client *c0 = &gameserver.clients[client_id]; - c0->instance = frame->instance_id; + c0->instance = frame->flags & NETMSG_PLAYERFRAME_INSTANCE_ID; for( int i=0; i