--- deliantra/server/socket/request.C 2006/08/24 17:29:30 1.9 +++ deliantra/server/socket/request.C 2006/08/29 07:34:01 1.11 @@ -1,6 +1,6 @@ /* * static char *rcsid_init_c = - * "$Id: request.C,v 1.9 2006/08/24 17:29:30 root Exp $"; + * "$Id: request.C,v 1.11 2006/08/29 07:34:01 root Exp $"; */ /* @@ -235,7 +235,7 @@ void ExtCmd (char *buf, int len, player *pl) { - execute_global_event (EVENT_EXTCMD, pl, buf, len); + INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); } void MapInfoCmd (char *buf, int len, player *pl) @@ -1993,11 +1993,7 @@ return; } - if (pl->contr->transport) { - pm = pl->contr->transport->map; - } - else - pm = pl->map; + pm = pl->map; /* If player is just joining the game, he isn't here yet, so the map * can get swapped out. If so, don't try to send them a map. All will