ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/lowlevel.C
(Generate patch)

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.37 by root, Mon Apr 2 19:56:11 2007 UTC vs.
Revision 1.40 by root, Tue Apr 24 00:42:03 2007 UTC

… …
190static struct packet_type packets[] = { 190static struct packet_type packets[] = {
191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, 191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
193 193
194 {"examine", PC(ExamineCmd) PF_PLAYING }, 194 {"examine", PC(ExamineCmd) PF_PLAYING },
195 {"ex", PC(ExCmd) PF_PLAYING },
195 {"apply", PC(ApplyCmd) PF_PLAYING }, 196 {"apply", PC(ApplyCmd) PF_PLAYING },
196 {"lookat", PC(LookAt) PF_PLAYING }, 197 {"lookat", PC(LookAt) PF_PLAYING },
197 {"lock", PC(LockItem) PF_PLAYING }, 198 {"lock", PC(LockItem) PF_PLAYING },
198 {"mark", PC(MarkItem) PF_PLAYING }, 199 {"mark", PC(MarkItem) PF_PLAYING },
199 {"move", PC(MoveCmd) PF_PLAYING }, 200 {"move", PC(MoveCmd) PF_PLAYING },
200 {"ext", PC(ExtCmd) 0 }, /* CF+ */ 201 {"ext", PC(ExtCmd) 0 }, // CF+
201 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ 202 {"mapredraw", PC(MapRedrawCmd) 0 },
202 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ 203 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
203 204
204 {"reply", SC(ReplyCmd) 0 }, 205 {"reply", SC(ReplyCmd) 0 },
205 {"exti", SC(ExtiCmd) 0 }, /* CF+ */ 206 {"exti", SC(ExtiCmd) 0 }, // CF+
206 {"addme", SC(AddMeCmd) 0 }, 207 {"addme", SC(AddMeCmd) 0 },
207 {"askface", SC(AskFaceCmd) 0 }, 208 {"askface", SC(AskFaceCmd) 0 },
208 {"requestinfo", SC(RequestInfo) 0 }, 209 {"requestinfo", SC(RequestInfo) 0 },
209 {"setfacemode", SC(SetFaceMode) 0 }, 210 {"setfacemode", SC(SetFaceMode) 0 },
210 {"setsound", SC(SetSound) 0 }, 211 {"setsound", SC(SetSound) 0 },
… …
510client::send_drawinfo (const char *msg, int flags) 511client::send_drawinfo (const char *msg, int flags)
511{ 512{
512 send_packet_printf ("drawinfo %d %s", flags, msg); 513 send_packet_printf ("drawinfo %d %s", flags, msg);
513} 514}
514 515
516void
517client::send_msg (int color, const char *type, const char *msg)
518{
519 if (can_msg)
520 send_packet_printf ("msg %d %s %s", color, type, msg);
521 else if (color < 0)
522 return; // client cannot handle this
523 else if (strchr (msg, '<') || strchr (msg, '&'))
524 {
525 //TODO: should escape/modify to old syntax
526 send_packet_printf ("drawinfo %d %s", color, msg);
527 }
528 else
529 send_packet_printf ("drawinfo %d %s", color, msg);
530}
531
515/*********************************************************************** 532/***********************************************************************
516 * 533 *
517 * packet functions/utilities 534 * packet functions/utilities
518 * 535 *
519 **********************************************************************/ 536 **********************************************************************/
… …
532 enum { maxlen = 32 / 7 + 1}; 549 enum { maxlen = 32 / 7 + 1};
533 uint8 buf[maxlen]; 550 uint8 buf[maxlen];
534 uint8 *p = buf + maxlen; 551 uint8 *p = buf + maxlen;
535 uint32 val = v.val; 552 uint32 val = v.val;
536 553
554 *--p = val & 0x7F;
555
537 while (val > 0x7F) 556 while (val > 0x7F)
538 { 557 {
558 val >>= 7;
539 *--p = (val & 0x7F) | 0x80; 559 *--p = (val & 0x7F) | 0x80;
540 val >>= 7;
541 } 560 }
542
543 *--p = val;
544 561
545 return *this << data (p, buf + maxlen - p); 562 return *this << data (p, buf + maxlen - p);
546} 563}
547 564
548packet &packet::operator <<(const data &v) 565packet &packet::operator <<(const data &v)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines