… | |
… | |
187 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
187 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
188 | {"command", PC(PlayerCmd) PF_PLAYING }, |
188 | {"command", PC(PlayerCmd) PF_PLAYING }, |
189 | |
189 | |
190 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
190 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
191 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
191 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
192 | {"reply", PC(ReplyCmd) 0 }, |
|
|
193 | {"lookat", PC(LookAt) PF_PLAYING }, |
192 | {"lookat", PC(LookAt) PF_PLAYING }, |
194 | {"lock", PC(LockItem) PF_PLAYING }, |
193 | {"lock", PC(LockItem) PF_PLAYING }, |
195 | {"mark", PC(MarkItem) PF_PLAYING }, |
194 | {"mark", PC(MarkItem) PF_PLAYING }, |
196 | {"move", PC(MoveCmd) PF_PLAYING }, |
195 | {"move", PC(MoveCmd) PF_PLAYING }, |
197 | {"ext", PC(ExtCmd) 0 }, /* CF+ */ |
196 | {"ext", PC(ExtCmd) 0 }, /* CF+ */ |
198 | {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ |
197 | {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ |
199 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
198 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
200 | |
199 | |
|
|
200 | {"reply", SC(ReplyCmd) 0 }, |
201 | {"exti", SC(ExtiCmd) 0 }, /* CF+ */ |
201 | {"exti", SC(ExtiCmd) 0 }, /* CF+ */ |
202 | {"addme", SC(AddMeCmd) 0 }, |
202 | {"addme", SC(AddMeCmd) 0 }, |
203 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
203 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
204 | {"requestinfo", SC(RequestInfo) 0 }, |
204 | {"requestinfo", SC(RequestInfo) 0 }, |
205 | {"setfacemode", SC(SetFaceMode) 0 }, |
205 | {"setfacemode", SC(SetFaceMode) 0 }, |
… | |
… | |
294 | // callback called when socket is either readable or writable |
294 | // callback called when socket is either readable or writable |
295 | void |
295 | void |
296 | client::socket_cb (iow &w, int got) |
296 | client::socket_cb (iow &w, int got) |
297 | { |
297 | { |
298 | //TODO remove when we have better socket cleanup logic |
298 | //TODO remove when we have better socket cleanup logic |
299 | if (status == Ns_Dead) |
299 | if (destroyed) |
300 | { |
300 | { |
301 | socket_ev.poll (0); |
301 | socket_ev.poll (0); |
302 | return; |
302 | return; |
303 | } |
303 | } |
304 | |
304 | |
… | |
… | |
380 | { |
380 | { |
381 | char *buf = (char *)buf_; |
381 | char *buf = (char *)buf_; |
382 | char *pos = buf; |
382 | char *pos = buf; |
383 | int amt = 0; |
383 | int amt = 0; |
384 | |
384 | |
385 | if (status == Ns_Dead || !buf) |
385 | if (destroyed || !buf) |
386 | return; |
386 | return; |
387 | |
387 | |
388 | if ((len + outputbuffer.len) > SOCKETBUFSIZE) |
388 | if ((len + outputbuffer.len) > SOCKETBUFSIZE) |
389 | { |
389 | { |
390 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
390 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
… | |
… | |
421 | * shortcut function. |
421 | * shortcut function. |
422 | */ |
422 | */ |
423 | void |
423 | void |
424 | client::send_packet (packet &sl) |
424 | client::send_packet (packet &sl) |
425 | { |
425 | { |
426 | if (status == Ns_Dead) |
426 | if (destroyed) |
427 | return; |
427 | return; |
428 | |
428 | |
429 | if (sl.length () >= MAXSOCKBUF) |
429 | if (sl.length () >= MAXSOCKBUF) |
430 | { |
430 | { |
431 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); |
431 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); |
… | |
… | |
477 | /*********************************************************************** |
477 | /*********************************************************************** |
478 | * |
478 | * |
479 | * packet functions/utilities |
479 | * packet functions/utilities |
480 | * |
480 | * |
481 | **********************************************************************/ |
481 | **********************************************************************/ |
|
|
482 | |
|
|
483 | packet::packet (const char *name) |
|
|
484 | { |
|
|
485 | reset (); |
|
|
486 | |
|
|
487 | int len = strlen (name); |
|
|
488 | memcpy (cur, name, len); cur += len; |
|
|
489 | *cur++ = ' '; |
|
|
490 | } |
482 | |
491 | |
483 | packet &packet::operator <<(const data &v) |
492 | packet &packet::operator <<(const data &v) |
484 | { |
493 | { |
485 | if (room () < v.len) |
494 | if (room () < v.len) |
486 | reset (); |
495 | reset (); |