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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.83 by root, Mon Apr 2 18:04:47 2007 UTC vs.
Revision 1.93 by root, Tue May 1 05:48:21 2007 UTC

… …
148{ 148{
149 client &socket = *pl->ns; 149 client &socket = *pl->ns;
150 object *ob = pl->ob; 150 object *ob = pl->ob;
151 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
152 152
153 if (socket.force_newmap) 153 if (socket.current_map != ob->map || socket.force_newmap)
154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
157 socket.current_map = ob->map;
158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 { 154 {
162 clear_map (pl); 155 clear_map (pl);
163 socket.current_map = ob->map; 156 socket.current_map = ob->map;
164 157
165 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
166 { 159 {
167 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
168 { 161 {
169 int flags = 0; 162 int flags = 0;
170 163
171 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
172 flags |= 1;
173 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
174 flags |= 2;
175 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
176 flags |= 4;
177 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
178 flags |= 8;
179 168
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 169 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 171 }
183 else 172 else
… …
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333 else if (map && map->path[0]) 322 else if (map && map->path[0])
334 { 323 {
335 int flags = 0; 324 int flags = 0;
336 325
337 if (map->tile_path[0]) 326 if (map->tile_path[0]) flags |= 1;
338 flags |= 1;
339 if (map->tile_path[1]) 327 if (map->tile_path[1]) flags |= 2;
340 flags |= 2;
341 if (map->tile_path[2]) 328 if (map->tile_path[2]) flags |= 4;
342 flags |= 4;
343 if (map->tile_path[3]) 329 if (map->tile_path[3]) flags |= 8;
344 flags |= 8;
345 330
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347 } 332 }
348 else 333 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
505 */ 490 */
506void 491void
507AskSmooth (char *buf, int len, client *ns) 492AskSmooth (char *buf, int len, client *ns)
508{ 493{
509 ns->send_face (atoi (buf)); 494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
510} 496}
511 497
512/** 498/**
513 * This handles the general commands from the client (ie, north, fire, cast, 499 * This handles the general commands from the client (ie, north, fire, cast,
514 * etc.) 500 * etc.)
… …
617 { 603 {
618 case ST_PLAYING: 604 case ST_PLAYING:
619 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 605 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
620 break; 606 break;
621 607
622 case ST_CHANGE_CLASS:
623 key_change_class (pl->ob, buf[0]);
624 break;
625
626 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 608 case ST_GET_PARTY_PASSWORD: /* Get password for party */
627 receive_party_password (pl->ob, 13); 609 receive_party_password (pl->ob, 13);
628 break; 610 break;
629 611
630 default: 612 default:
… …
669 651
670 cp = strchr (cp + 1, ' '); 652 cp = strchr (cp + 1, ' ');
671 653
672 if (cp) 654 if (cp)
673 { 655 {
674 assign (ns->version, cp + 1); 656 ns->version = cp + 1;
675 657
676 if (ns->sc_version < 1026) 658 if (ns->sc_version < 1026)
677 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 659 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
678 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 660 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
679 } 661 }
… …
742 */ 724 */
743void 725void
744send_query (client *ns, uint8 flags, const char *text) 726send_query (client *ns, uint8 flags, const char *text)
745{ 727{
746 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 728 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
729}
730
731/**
732 * Get player's current range attack in obuf.
733 */
734static void
735rangetostring (object *ob, char *obuf)
736{
737 dynbuf_text buf;
738
739 player *pl = ob->contr;
740
741 if (pl->ranged_ob)
742 buf << " Range: " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat: " << pl->combat_ob->name;
746
747 if (pl->golem)
748 buf << " Golem: " << pl->golem->name;
749
750 if (buf.empty ())
751 *obuf = 0;
752 else
753 {
754 memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
755 obuf [buf.size ()] = 0;
756 }
747} 757}
748 758
749#define AddIfInt64(Old,New,Type) if (Old != New) {\ 759#define AddIfInt64(Old,New,Type) if (Old != New) {\
750 Old = New; \ 760 Old = New; \
751 sl << uint8 (Type) << uint64 (New); \ 761 sl << uint8 (Type) << uint64 (New); \
… …
1189 1199
1190 mapspace &ms = m->at (nx, ny); 1200 mapspace &ms = m->at (nx, ny);
1191 1201
1192 if (socket.extmap) 1202 if (socket.extmap)
1193 { 1203 {
1194 uint8 stat_hp = 0; 1204 uint8 stat_hp = 0;
1195 uint8 stat_width = 0; 1205 uint8 stat_width = 0;
1196 uint8 flags = 0; 1206 uint8 flags = 0;
1197 UUID player = 0; 1207 tag_t player = 0;
1198 1208
1199 // send hp information, if applicable 1209 // send hp information, if applicable
1200 if (object *op = ms.faces_obj [0]) 1210 if (object *op = ms.faces_obj [0])
1201 { 1211 {
1202 if (op->head || op->invisible) 1212 if (op->head || op->invisible)
… …
1243 1253
1244 mask |= 0x8; 1254 mask |= 0x8;
1245 *last_ext |= 0x80; 1255 *last_ext |= 0x80;
1246 last_ext = &sl[sl.length ()]; 1256 last_ext = &sl[sl.length ()];
1247 1257
1248 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1258 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1249 } 1259 }
1250 1260
1251 if (lastcell.flags != flags) 1261 if (lastcell.flags != flags)
1252 { 1262 {
1253 lastcell.flags = flags; 1263 lastcell.flags = flags;
… …
1326 esl.reset (eoldlen); 1336 esl.reset (eoldlen);
1327 } 1337 }
1328 } /* else this is a viewable space */ 1338 } /* else this is a viewable space */
1329 } /* for x loop */ 1339 } /* for x loop */
1330 } /* for y loop */ 1340 } /* for y loop */
1341
1342 socket.flush_fx ();
1331 1343
1332 /* Verify that we in fact do need to send this */ 1344 /* Verify that we in fact do need to send this */
1333 if (socket.ext_mapinfos) 1345 if (socket.ext_mapinfos)
1334 { 1346 {
1335 if (!(sl.length () > startlen || socket.sent_scroll)) 1347 if (!(sl.length () > startlen || socket.sent_scroll))

Diff Legend

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