| 1 | /* |
1 | /* |
| 2 | CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
| 3 | |
3 | * |
|
|
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
| 4 | Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team |
5 | * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team |
| 5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
| 6 | |
7 | * |
| 7 | This program is free software; you can redistribute it and/or modify |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
| 8 | it under the terms of the GNU General Public License as published by |
9 | * under the terms of the GNU General Public License as published by the Free |
| 9 | the Free Software Foundation; either version 2 of the License, or |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
| 10 | (at your option) any later version. |
11 | * any later version. |
| 11 | |
12 | * |
| 12 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, but |
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
| 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
| 15 | GNU General Public License for more details. |
16 | * for more details. |
| 16 | |
17 | * |
| 17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License along |
| 18 | along with this program; if not, write to the Free Software |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
| 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | |
21 | * |
| 21 | The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
| 22 | */ |
23 | */ |
| 23 | |
24 | |
| 24 | /** |
25 | /** |
| 25 | * \file |
26 | * \file |
| 26 | * Main client/server loops. |
27 | * Main client/server loops. |
| 27 | * |
28 | * |
| 28 | * \date 2003-12-02 |
29 | * \date 2003-12-02 |
| 29 | * |
30 | * |
| 30 | * loop.c mainly deals with initialization and higher level socket |
31 | * loop.c mainly deals with initialization and higher level socket |
| 31 | * maintenance (checking for lost connections and if data has arrived.) |
32 | * maintanance (checking for lost connections and if data has arrived.) |
| 32 | * The reading of data is handled in ericserver.c |
|
|
| 33 | */ |
33 | */ |
| 34 | |
|
|
| 35 | |
34 | |
| 36 | #include <global.h> |
35 | #include <global.h> |
| 37 | #include <sproto.h> |
36 | #include <sproto.h> |
| 38 | #include <sockproto.h> |
37 | #include <sockproto.h> |
| 39 | |
38 | |
| … | |
… | |
| 46 | #include <unistd.h> |
45 | #include <unistd.h> |
| 47 | #include <arpa/inet.h> |
46 | #include <arpa/inet.h> |
| 48 | |
47 | |
| 49 | #include <loader.h> |
48 | #include <loader.h> |
| 50 | |
49 | |
| 51 | /***************************************************************************** |
50 | #define BG_SCRUB_RATE 4 // how often to send a face in the background |
| 52 | * Start of command dispatch area. |
|
|
| 53 | * The commands here are protocol commands. |
|
|
| 54 | ****************************************************************************/ |
|
|
| 55 | |
51 | |
| 56 | /* Either keep this near the start or end of the file so it is |
52 | #define MAX_QUEUE_DEPTH 500 |
| 57 | * at least reasonablye easy to find. |
53 | #define MAX_QUEUE_BACKLOG 3. |
| 58 | * There are really 2 commands - those which are sent/received |
|
|
| 59 | * before player joins, and those happen after the player has joined. |
|
|
| 60 | * As such, we have function types that might be called, so |
|
|
| 61 | * we end up having 2 tables. |
|
|
| 62 | */ |
|
|
| 63 | |
54 | |
| 64 | enum { |
55 | void |
| 65 | PF_PLAYER = 0x01, // must have valid player |
56 | client::reset_state () |
| 66 | PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately |
|
|
| 67 | PF_PLAYING = 0x04, // must be in playing state |
|
|
| 68 | }; |
|
|
| 69 | |
|
|
| 70 | struct pkt_type |
|
|
| 71 | { |
57 | { |
| 72 | const char *name; |
58 | if (!pl) |
| 73 | void *cb; |
59 | return; |
| 74 | int flags; |
|
|
| 75 | |
60 | |
| 76 | bool may_execute (client *ns) |
61 | pl->run_on = 0; |
|
|
62 | pl->fire_on = 0; |
|
|
63 | } |
|
|
64 | |
|
|
65 | void |
|
|
66 | client::queue_command (packet_type *handler, char *data, int datalen) |
|
|
67 | { |
|
|
68 | tstamp stamp = NOW; |
|
|
69 | |
|
|
70 | if (cmd_queue.size () >= MAX_QUEUE_DEPTH) |
| 77 | { |
71 | { |
| 78 | return (!(flags & PF_PLAYER) || ns->pl) |
72 | //TODO: just disconnect here? |
| 79 | && (!(flags & PF_PLAYING) || (ns->pl && ns->pl->state == ST_PLAYING)); |
73 | reset_state (); |
|
|
74 | send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED); |
| 80 | } |
75 | } |
| 81 | |
|
|
| 82 | void execute (client *ns, char *data, int datalen) |
|
|
| 83 | { |
|
|
| 84 | //TODO: only one format |
|
|
| 85 | if (flags & PF_PLAYER) |
|
|
| 86 | ((void (*)(char *, int, player * ))cb)((char *)data, datalen, ns->pl); |
|
|
| 87 | else |
76 | else |
| 88 | ((void (*)(char *, int, client *))cb)((char *)data, datalen, ns); |
77 | { |
| 89 | } |
78 | cmd_queue.push_back (command ()); |
| 90 | }; |
79 | command &cmd = cmd_queue.back (); |
| 91 | |
80 | cmd.stamp = stamp; |
| 92 | // SocketCommand, PlayingCommand, should not exist with those ugly casts |
81 | cmd.handler = handler; |
| 93 | #define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), |
82 | cmd.data = salloc<char> (datalen + 1, data); |
| 94 | #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | |
83 | cmd.datalen = datalen; |
| 95 | |
|
|
| 96 | /** |
|
|
| 97 | * Dispatch table for the server. |
|
|
| 98 | */ |
|
|
| 99 | static struct pkt_type packets[] = { |
|
|
| 100 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
|
|
| 101 | {"command", PC(PlayerCmd) PF_PLAYING }, |
|
|
| 102 | |
|
|
| 103 | {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE }, |
|
|
| 104 | {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE }, |
|
|
| 105 | {"reply", PC(ReplyCmd) PF_IMMEDIATE }, |
|
|
| 106 | {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE }, |
|
|
| 107 | {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE }, |
|
|
| 108 | {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE }, |
|
|
| 109 | {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE }, |
|
|
| 110 | {"ext", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */ |
|
|
| 111 | {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */ |
|
|
| 112 | {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */ |
|
|
| 113 | |
|
|
| 114 | {"addme", SC(AddMeCmd) PF_IMMEDIATE }, |
|
|
| 115 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
|
|
| 116 | {"requestinfo", SC(RequestInfo) 0 }, |
|
|
| 117 | {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE }, |
|
|
| 118 | {"setsound", SC(SetSound) PF_IMMEDIATE }, |
|
|
| 119 | {"setup", SC(SetUp) PF_IMMEDIATE }, |
|
|
| 120 | {"version", SC(VersionCmd) PF_IMMEDIATE }, |
|
|
| 121 | {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */ |
|
|
| 122 | {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */ |
|
|
| 123 | {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */ |
|
|
| 124 | }; |
|
|
| 125 | |
|
|
| 126 | /** |
|
|
| 127 | * Handle client input. |
|
|
| 128 | * |
|
|
| 129 | * HandleClient is actually not named really well - we only get here once |
|
|
| 130 | * there is input, so we don't do exception or other stuff here. |
|
|
| 131 | * sock is the output socket information. pl is the player associated |
|
|
| 132 | * with this socket, null if no player (one of the init_sockets for just |
|
|
| 133 | * starting a connection) |
|
|
| 134 | */ |
|
|
| 135 | void |
|
|
| 136 | HandleClient (client *ns, player *pl) |
|
|
| 137 | { |
|
|
| 138 | /* Loop through this - maybe we have several complete packets here. */ |
|
|
| 139 | // limit to a few commands only, though, as to not monopolise the server |
|
|
| 140 | for (int repeat = 16; repeat--;) |
|
|
| 141 | { |
84 | } |
| 142 | /* If it is a player, and they don't have any speed left, we |
85 | } |
| 143 | * return, and will read in the data when they do have time. |
|
|
| 144 | */ |
|
|
| 145 | if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) |
|
|
| 146 | return; |
|
|
| 147 | |
86 | |
| 148 | int pkt_len = ns->read_packet (); |
87 | bool |
|
|
88 | client::handle_command () |
|
|
89 | { |
|
|
90 | if (!cmd_queue.empty () |
|
|
91 | && state == ST_PLAYING |
|
|
92 | && pl->ob->speed_left > 0.f) |
|
|
93 | { |
|
|
94 | command &cmd = cmd_queue.front (); |
| 149 | |
95 | |
| 150 | if (pkt_len < 0) |
96 | if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW) |
| 151 | { |
97 | { |
| 152 | LOG (llevError, "read error on player %s\n", &pl->ob->name); |
98 | reset_state (); |
| 153 | /* Caller will take care of cleaning this up */ |
99 | send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); |
| 154 | ns->status = Ns_Dead; |
|
|
| 155 | return; |
|
|
| 156 | } |
|
|
| 157 | else if (pkt_len == 0) |
|
|
| 158 | /* Still dont have a full packet */ |
|
|
| 159 | return; |
|
|
| 160 | |
|
|
| 161 | /* First, break out beginning word. There are at least |
|
|
| 162 | * a few commands that do not have any paremeters. If |
|
|
| 163 | * we get such a command, don't worry about trying |
|
|
| 164 | * to break it up. |
|
|
| 165 | */ |
|
|
| 166 | int datalen; |
|
|
| 167 | char *data = strchr ((char *)ns->inbuf + 2, ' '); |
|
|
| 168 | |
|
|
| 169 | if (data) |
|
|
| 170 | { |
|
|
| 171 | *data++ = 0; |
|
|
| 172 | datalen = pkt_len - (data - (char *)ns->inbuf); |
|
|
| 173 | } |
100 | } |
| 174 | else |
101 | else |
| 175 | { |
102 | execute (cmd.handler, cmd.data, cmd.datalen); |
| 176 | data = (char *)ns->inbuf + 2; // better read garbage than segfault |
|
|
| 177 | datalen = 0; |
|
|
| 178 | } |
|
|
| 179 | |
103 | |
| 180 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
104 | cmd_queue.pop_front (); |
| 181 | |
105 | return true; |
| 182 | for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
|
|
| 183 | if (!strcmp ((char *)ns->inbuf + 2, pkt->name)) |
|
|
| 184 | { |
|
|
| 185 | if (pkt->may_execute (ns)) |
|
|
| 186 | { |
|
|
| 187 | pkt->execute (ns, data, datalen); |
|
|
| 188 | ns->skip_packet (pkt_len); |
|
|
| 189 | //D//TODO not doing this causes random memory corruption |
|
|
| 190 | if (pkt->flags & PF_IMMEDIATE) |
|
|
| 191 | goto next_packet; |
|
|
| 192 | return; |
|
|
| 193 | } |
|
|
| 194 | } |
|
|
| 195 | |
|
|
| 196 | /* If we get here, we didn't find a valid command. Logging |
|
|
| 197 | * this might be questionable, because a broken client/malicious |
|
|
| 198 | * user could certainly send a whole bunch of invalid commands. |
|
|
| 199 | */ |
|
|
| 200 | LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2); |
|
|
| 201 | ns->skip_packet (pkt_len); |
|
|
| 202 | next_packet: |
|
|
| 203 | ; |
|
|
| 204 | } |
106 | } |
|
|
107 | else |
|
|
108 | return false; |
| 205 | } |
109 | } |
| 206 | |
110 | |
| 207 | void |
111 | void |
| 208 | flush_sockets (void) |
112 | flush_sockets (void) |
| 209 | { |
113 | { |
| 210 | for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) |
114 | for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) |
| 211 | if ((*i)->status != Ns_Dead) |
|
|
| 212 | (*i)->flush (); |
115 | (*i)->flush (); |
| 213 | } |
116 | } |
| 214 | |
117 | |
| 215 | /** |
118 | /** |
| 216 | * This checks the sockets for input, does the right thing. |
119 | * This checks the sockets for input, does the right thing. |
| 217 | * |
120 | * |
| … | |
… | |
| 220 | * |
123 | * |
| 221 | */ |
124 | */ |
| 222 | void |
125 | void |
| 223 | doeric_server (void) |
126 | doeric_server (void) |
| 224 | { |
127 | { |
| 225 | int i, pollret; |
128 | //TODO: should not be done here, either |
| 226 | fd_set tmp_read; |
129 | for (unsigned i = 0; i < clients.size (); ++i) |
| 227 | struct sockaddr_in addr; |
130 | { |
| 228 | socklen_t addrlen = sizeof (struct sockaddr); |
131 | client *ns = clients [i]; |
| 229 | player *pl, *next; |
|
|
| 230 | int maxfd = 0; |
|
|
| 231 | |
132 | |
| 232 | #ifdef CS_LOGSTATS |
133 | ns->tick (); |
| 233 | if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) |
134 | ns->refcnt_chk (); |
| 234 | write_cs_stats (); |
135 | } |
| 235 | #endif |
136 | } |
| 236 | |
137 | |
| 237 | /* Go through the players. Let the loop set the next pl value, |
138 | void |
| 238 | * since we may remove some |
139 | client::tick () |
|
|
140 | { |
|
|
141 | if (!pl || destroyed ()) |
|
|
142 | return; |
|
|
143 | |
|
|
144 | /* Update the players stats once per tick. More efficient than |
|
|
145 | * sending them whenever they change, and probably just as useful |
| 239 | */ |
146 | */ |
| 240 | //TODO: must be handled cleanly elsewhere |
147 | esrv_update_stats (pl); |
| 241 | for (pl = first_player; pl; ) |
148 | |
|
|
149 | if (last_weight != -1 && last_weight != WEIGHT (pl->ob)) |
|
|
150 | { |
|
|
151 | esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); |
|
|
152 | if (last_weight != WEIGHT (pl->ob)) |
|
|
153 | LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", |
|
|
154 | (unsigned long) last_weight, WEIGHT (pl->ob)); |
| 242 | { |
155 | } |
| 243 | player *npl = pl->next; |
|
|
| 244 | |
156 | |
| 245 | //TODO: must be handled cleanly elsewhere |
157 | draw_client_map (pl); |
| 246 | if (pl->socket->status == Ns_Dead) |
158 | |
|
|
159 | if (update_look) |
|
|
160 | esrv_draw_look (pl); |
|
|
161 | |
|
|
162 | if (askface.empty () && !partial_face_ofs) |
|
|
163 | { |
|
|
164 | // regularly send a new face when queue is empty |
|
|
165 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
|
|
166 | while (scrub_idx < faces.size () - 1) |
|
|
167 | { |
|
|
168 | ++scrub_idx; |
|
|
169 | if (!faces_sent [scrub_idx]) |
|
|
170 | { |
|
|
171 | send_face (scrub_idx); |
|
|
172 | flush_fx (); |
|
|
173 | |
|
|
174 | bg_scrub = 1; // send up to one face per tick, unless an image was requested |
|
|
175 | break; |
|
|
176 | } |
|
|
177 | } |
|
|
178 | |
|
|
179 | rate_avail = max_rate - outputbuffer_len (); |
|
|
180 | } |
|
|
181 | else |
|
|
182 | { |
|
|
183 | int ol = outputbuffer_len (); |
|
|
184 | |
|
|
185 | rate_avail = min (max_rate, rate_avail + max_rate); |
|
|
186 | rate_avail -= ol; |
|
|
187 | |
|
|
188 | int avail = rate_avail; |
|
|
189 | |
|
|
190 | // if we can split images, transfer up to mss packets if possible |
|
|
191 | // but never more 768 bytes more. |
|
|
192 | if (fxix) avail += min (768, mss - (ol % mss)); |
|
|
193 | |
|
|
194 | bg_scrub = BG_SCRUB_RATE; |
|
|
195 | |
|
|
196 | while (avail > 0) |
| 247 | { |
197 | { |
| 248 | save_player (pl->ob, 0); |
198 | if (partial_face_ofs) |
| 249 | |
|
|
| 250 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
|
|
| 251 | { |
199 | { |
| 252 | terminate_all_pets (pl->ob); |
200 | if (facedata *d = face_data (partial_face, faceset)) |
| 253 | pl->ob->remove (); |
201 | { |
|
|
202 | // 9 bytes is enough for fx_FFFOOO, 40 leaves some room |
|
|
203 | int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); |
|
|
204 | |
|
|
205 | if (chunk <= 0) |
|
|
206 | break; |
|
|
207 | |
|
|
208 | partial_face_ofs -= chunk; |
|
|
209 | |
|
|
210 | packet sl ("ix"); |
|
|
211 | |
|
|
212 | sl << ber32 (partial_face) |
|
|
213 | << ber32 (partial_face_ofs) |
|
|
214 | << data (d->data.data () + partial_face_ofs, chunk); |
|
|
215 | |
|
|
216 | send_packet (sl); |
|
|
217 | } |
|
|
218 | else |
|
|
219 | partial_face_ofs = 0; |
| 254 | } |
220 | } |
|
|
221 | else if (!askface.empty ()) |
|
|
222 | { |
|
|
223 | // use a lifo to send most recently requested images |
|
|
224 | faceidx facenum = askface.back (); |
|
|
225 | askface.pop_back (); |
| 255 | |
226 | |
| 256 | leave (pl, 1); |
227 | if (fxix) |
| 257 | final_free_player (pl); |
228 | { |
|
|
229 | if (facedata *d = face_data (facenum, faceset)) |
|
|
230 | { |
|
|
231 | partial_face = facenum; |
|
|
232 | partial_face_ofs = d->data.size (); |
|
|
233 | } |
|
|
234 | } |
|
|
235 | else |
|
|
236 | send_image (facenum); |
|
|
237 | } |
|
|
238 | else |
|
|
239 | break; |
|
|
240 | |
|
|
241 | int consumed = ol - outputbuffer_len (); |
|
|
242 | avail -= consumed; |
|
|
243 | rate_avail -= consumed; |
| 258 | } |
244 | } |
| 259 | |
|
|
| 260 | pl = npl; |
|
|
| 261 | } |
|
|
| 262 | |
|
|
| 263 | FD_ZERO (&tmp_read); |
|
|
| 264 | |
|
|
| 265 | for (sockvec::iterator i = clients.begin (); i != clients.end (); ) |
|
|
| 266 | { |
245 | } |
| 267 | client *s = *i; |
|
|
| 268 | |
|
|
| 269 | if (s->status == Ns_Dead) |
|
|
| 270 | { |
|
|
| 271 | clients.erase (i); |
|
|
| 272 | delete s; |
|
|
| 273 | } |
|
|
| 274 | else |
|
|
| 275 | { |
|
|
| 276 | if (s->fd > maxfd) maxfd = s->fd; |
|
|
| 277 | |
|
|
| 278 | FD_SET (s->fd, &tmp_read); |
|
|
| 279 | |
|
|
| 280 | ++i; |
|
|
| 281 | } |
|
|
| 282 | } |
|
|
| 283 | |
|
|
| 284 | struct timeval timeout; |
|
|
| 285 | |
|
|
| 286 | timeout.tv_sec = 0; |
|
|
| 287 | timeout.tv_usec = 0; |
|
|
| 288 | |
|
|
| 289 | pollret = select (maxfd + 1, |
|
|
| 290 | &tmp_read, 0, 0, |
|
|
| 291 | &timeout); |
|
|
| 292 | |
|
|
| 293 | if (pollret == -1) |
|
|
| 294 | { |
|
|
| 295 | LOG (llevError, "select failed: %s\n", strerror (errno)); |
|
|
| 296 | return; |
|
|
| 297 | } |
|
|
| 298 | |
|
|
| 299 | /* We need to do some of the processing below regardless */ |
|
|
| 300 | |
|
|
| 301 | /* Check for any input on the sockets */ |
|
|
| 302 | for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) |
|
|
| 303 | { |
|
|
| 304 | client *s = *i; |
|
|
| 305 | player *pl = s->pl; |
|
|
| 306 | |
|
|
| 307 | //TODO: disassociate handleclient from socket readin |
|
|
| 308 | if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read)) |
|
|
| 309 | HandleClient (s, pl); |
|
|
| 310 | |
|
|
| 311 | //TODO: should not be done here, either |
|
|
| 312 | if (s->status != Ns_Dead && pl) |
|
|
| 313 | { |
|
|
| 314 | /* Update the players stats once per tick. More efficient than |
|
|
| 315 | * sending them whenever they change, and probably just as useful |
|
|
| 316 | */ |
|
|
| 317 | esrv_update_stats (pl); |
|
|
| 318 | if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) |
|
|
| 319 | { |
|
|
| 320 | esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); |
|
|
| 321 | if (pl->last_weight != WEIGHT (pl->ob)) |
|
|
| 322 | LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", |
|
|
| 323 | (unsigned long) pl->last_weight, WEIGHT (pl->ob)); |
|
|
| 324 | } |
|
|
| 325 | |
|
|
| 326 | /* draw_client_map does sanity checking that map is |
|
|
| 327 | * valid, so don't do it here. |
|
|
| 328 | */ |
|
|
| 329 | draw_client_map (pl->ob); |
|
|
| 330 | if (s->update_look) |
|
|
| 331 | esrv_draw_look (pl->ob); |
|
|
| 332 | } |
|
|
| 333 | } |
|
|
| 334 | } |
246 | } |
| 335 | |
247 | |
