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.85 by root, Sat Apr 14 14:47:48 2007 UTC vs.
Revision 1.96 by root, Sat May 12 19:30:18 2007 UTC

… …
159 { 159 {
160 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
161 { 161 {
162 int flags = 0; 162 int flags = 0;
163 163
164 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
165 flags |= 1;
166 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
167 flags |= 2;
168 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
169 flags |= 4;
170 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
171 flags |= 8;
172 168
173 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",
174 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);
175 } 171 }
176 else 172 else
… …
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0]) 322 else if (map && map->path[0])
327 { 323 {
328 int flags = 0; 324 int flags = 0;
329 325
330 if (map->tile_path[0]) 326 if (map->tile_path[0]) flags |= 1;
331 flags |= 1;
332 if (map->tile_path[1]) 327 if (map->tile_path[1]) flags |= 2;
333 flags |= 2;
334 if (map->tile_path[2]) 328 if (map->tile_path[2]) flags |= 4;
335 flags |= 4;
336 if (map->tile_path[3]) 329 if (map->tile_path[3]) flags |= 8;
337 flags |= 8;
338 330
339 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);
340 } 332 }
341 else 333 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
611 { 603 {
612 case ST_PLAYING: 604 case ST_PLAYING:
613 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 605 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
614 break; 606 break;
615 607
616 case ST_CHANGE_CLASS:
617 key_change_class (pl->ob, buf[0]);
618 break;
619
620 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 608 case ST_GET_PARTY_PASSWORD: /* Get password for party */
621 receive_party_password (pl->ob, 13); 609 receive_party_password (pl->ob, 13);
622 break; 610 break;
623 611
624 default: 612 default:
… …
663 651
664 cp = strchr (cp + 1, ' '); 652 cp = strchr (cp + 1, ' ');
665 653
666 if (cp) 654 if (cp)
667 { 655 {
668 assign (ns->version, cp + 1); 656 ns->version = cp + 1;
669 657
670 if (ns->sc_version < 1026) 658 if (ns->sc_version < 1026)
671 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 659 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
672 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 660 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
673 } 661 }
… …
736 */ 724 */
737void 725void
738send_query (client *ns, uint8 flags, const char *text) 726send_query (client *ns, uint8 flags, const char *text)
739{ 727{
740 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 (player *pl, char *obuf)
736{
737 dynbuf_text buf;
738
739 if (pl->ranged_ob)
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741
742 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
744
745 //TODO: maybe golem should become the current_weapon, quite simply?
746 if (pl->golem)
747 buf << " Golem*: " << pl->golem->name;
748
749 buf.linearise (obuf);
750 obuf [buf.size ()] = 0;
741} 751}
742 752
743#define AddIfInt64(Old,New,Type) if (Old != New) {\ 753#define AddIfInt64(Old,New,Type) if (Old != New) {\
744 Old = New; \ 754 Old = New; \
745 sl << uint8 (Type) << uint64 (New); \ 755 sl << uint8 (Type) << uint64 (New); \
… …
852 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 862 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
853 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 863 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
854 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 864 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
855 } 865 }
856 866
857 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 867 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
858 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 868 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
859 set_title (ob, buf); 869 set_title (ob, buf);
860 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 870 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
861 871
862 /* Only send it away if we have some actual data */ 872 /* Only send it away if we have some actual data */
… …
1183 1193
1184 mapspace &ms = m->at (nx, ny); 1194 mapspace &ms = m->at (nx, ny);
1185 1195
1186 if (socket.extmap) 1196 if (socket.extmap)
1187 { 1197 {
1188 uint8 stat_hp = 0; 1198 uint8 stat_hp = 0;
1189 uint8 stat_width = 0; 1199 uint8 stat_width = 0;
1190 uint8 flags = 0; 1200 uint8 flags = 0;
1191 UUID player = 0; 1201 tag_t player = 0;
1192 1202
1193 // send hp information, if applicable 1203 // send hp information, if applicable
1194 if (object *op = ms.faces_obj [0]) 1204 if (object *op = ms.faces_obj [0])
1195 { 1205 {
1196 if (op->head || op->invisible) 1206 if (op->head || op->invisible)
… …
1237 1247
1238 mask |= 0x8; 1248 mask |= 0x8;
1239 *last_ext |= 0x80; 1249 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()]; 1250 last_ext = &sl[sl.length ()];
1241 1251
1242 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1252 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1243 } 1253 }
1244 1254
1245 if (lastcell.flags != flags) 1255 if (lastcell.flags != flags)
1246 { 1256 {
1247 lastcell.flags = flags; 1257 lastcell.flags = flags;

Diff Legend

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