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.158 by root, Fri Nov 6 13:11:28 2009 UTC vs.
Revision 1.171 by root, Sun Apr 11 00:34:07 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
44 44
45#include <global.h> 45#include <global.h>
46#include <sproto.h> 46#include <sproto.h>
47 47
48#include <living.h> 48#include <living.h>
49#include <commands.h>
50 49
51/* This block is basically taken from socket.c - I assume if it works there, 50/* This block is basically taken from socket.c - I assume if it works there,
52 * it should work here. 51 * it should work here.
53 */ 52 */
54#include <sys/types.h> 53#include <sys/types.h>
… …
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 446 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 447}
449 448
450//+GPL 449//+GPL
451 450
452/*
453#define MSG_TYPE_BOOK 1
454#define MSG_TYPE_CARD 2
455#define MSG_TYPE_PAPER 3
456#define MSG_TYPE_SIGN 4
457#define MSG_TYPE_MONUMENT 5
458#define MSG_TYPE_SCRIPTED_DIALOG 6*/
459
460/** Reply to ExtendedInfos command */
461void
462ToggleExtendedText (char *buf, int len, client * ns)
463{
464 char cmdback[MAX_BUF];
465 char temp[10];
466 char command[50];
467 int info, nextinfo, i, flag;
468
469 cmdback[0] = '\0';
470
471 nextinfo = 0;
472 while (1)
473 {
474 /* 1. Extract an info */
475 info = nextinfo;
476
477 while ((info < len) && (buf [info] == ' '))
478 info++;
479
480 if (info >= len)
481 break;
482
483 nextinfo = info + 1;
484
485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
486 nextinfo++;
487
488 if (nextinfo - info >= 49) /*Erroneous info asked */
489 continue;
490
491 memcpy (command, buf + info, nextinfo - info);
492 command [nextinfo - info] = 0;
493
494 /* 2. Interpret info */
495 i = sscanf (command, "%d", &flag);
496
497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
498 ns->supported_readables |= (1 << flag);
499 /*3. Next info */
500 }
501
502 /* Send resulting state */
503 strcpy (cmdback, "ExtendedTextSet");
504
505 for (i = 0; i <= MSG_TYPE_LAST; i++)
506 if (ns->supported_readables & (1 << i))
507 {
508 strcat (cmdback, " ");
509 snprintf (temp, sizeof (temp), "%d", i);
510 strcat (cmdback, temp);
511 }
512
513 ns->send_packet (cmdback);
514}
515
516/** 451/**
517 * This handles the general commands from the client (ie, north, fire, cast, 452 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 453 * etc.)
519 */ 454 */
520void 455void
… …
576 * commands. 511 * commands.
577 */ 512 */
578 pl->count = 0; 513 pl->count = 0;
579 514
580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 515 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
581 int time = fabs (pl->ob->speed) < 0.001 516 int time = pl->ob->has_active_speed ()
582 ? time = MAX_TIME * 100
583 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 517 ? (int) (MAX_TIME / pl->ob->speed)
518 : MAX_TIME * 100;
584 519
585 /* Send confirmation of command execution now */ 520 /* Send confirmation of command execution now */
586 packet sl ("comc"); 521 packet sl ("comc");
587 sl << uint16 (cmdid) << uint32 (time); 522 sl << uint16 (cmdid) << uint32 (time);
588 pl->ns->send_packet (sl); 523 pl->ns->send_packet (sl);
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 565 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 566 }
632} 567}
633 568
634/** 569/**
635 * Client tells its version. If there is a mismatch, we close the 570 * Client tells its version info.
636 * socket. In real life, all we should care about is the client having
637 * something older than the server. If we assume the client will be
638 * backwards compatible, having it be a later version should not be a
639 * problem.
640 */ 571 */
641void 572void
642VersionCmd (char *buf, int len, client * ns) 573VersionCmd (char *buf, int len, client *ns)
643{ 574{
644 if (!buf) 575 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
645 {
646 LOG (llevError, "CS: received corrupted version command\n");
647 return;
648 }
649
650 ns->cs_version = atoi (buf);
651 ns->sc_version = ns->cs_version;
652
653 LOG (llevDebug, "connection from client <%s>\n", buf);
654
655 //TODO: should log here just for statistics
656
657 //if (VERSION_CS != ns->cs_version)
658 // unchecked;
659
660 char *cp = strchr (buf + 1, ' ');
661 if (!cp)
662 return;
663
664 ns->sc_version = atoi (cp);
665
666 //if (VERSION_SC != ns->sc_version)
667 // unchecked;
668
669 cp = strchr (cp + 1, ' ');
670
671 if (cp)
672 {
673 ns->version = cp + 1;
674
675 if (ns->sc_version < 1026)
676 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
677 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
678 }
679} 576}
680 577
681/** sound related functions. */ 578/** sound related functions. */
682void 579void
683SetSound (char *buf, int len, client * ns) 580SetSound (char *buf, int len, client * ns)
… …
735 */ 632 */
736static void 633static void
737rangetostring (player *pl, char *obuf) 634rangetostring (player *pl, char *obuf)
738{ 635{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 636 dynbuf_text &buf = msg_dynbuf; buf.clear ();
637
638#if 0
639 // print ranged/chosen_skill etc. objects every call
640 printf ("%s %s => %s (%s)\n",
641 pl->ranged_ob ? &pl->ranged_ob->name : "-",
642 pl->combat_ob ? &pl->combat_ob->name : "-",
643 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
644 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
645 );
646#endif
740 647
741 if (pl->ranged_ob) 648 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 649 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 650
744 if (pl->combat_ob) 651 if (pl->combat_ob)
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 745 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 746 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 747 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 748 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 749 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 750 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 751 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 752 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 753 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 754
848 flags = 0; 755 flags = 0;
849 756
850 if (opl->fire_on) 757 if (opl->fire_on)
… …
853 if (opl->run_on) 760 if (opl->run_on)
854 flags |= SF_RUNON; 761 flags |= SF_RUNON;
855 762
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 763 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 764
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 765 for (int i = 0; i < NROFATTACKS; i++)
862 { 766 {
863 /* Skip ones we won't send */ 767 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 768 if (atnr_cs_stat[i] == -1)
865 continue; 769 continue;
866 770
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 771 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 } 772 }
869 773
870 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
871 { 775 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 776 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 777 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
984prefetch_surrounding_maps (maptile *map, int distance) 888prefetch_surrounding_maps (maptile *map, int distance)
985{ 889{
986 map->touch (); 890 map->touch ();
987 891
988 if (--distance) 892 if (--distance)
989 for (int dir = 4; --dir; ) 893 for (int dir = 4; dir--; )
990 if (const shstr &path = map->tile_path [dir]) 894 if (const shstr &path = map->tile_path [dir])
991 if (maptile *&neigh = map->tile_map [dir]) 895 if (maptile *&neigh = map->tile_map [dir])
992 prefetch_surrounding_maps (neigh, distance); 896 prefetch_surrounding_maps (neigh, distance);
993 else 897 else
994 neigh = maptile::find_async (path, map); 898 neigh = maptile::find_async (path, map);
… …
1087 map_clearcell (&lastcell, -1); 991 map_clearcell (&lastcell, -1);
1088 } 992 }
1089 993
1090 continue; 994 continue;
1091 } 995 }
1092 996
1093 int d = pl->blocked_los_uc (dx, dy); 997 int d = pl->blocked_los_uc (dx, dy);
1094 998
1095 if (d > 3) 999 if (d > 3)
1096 { 1000 {
1097 /* This block deals with spaces that are not visible for whatever 1001 /* This block deals with spaces that are not visible for whatever
… …
1158 { 1062 {
1159 if (op->stats.maxhp > op->stats.hp 1063 if (op->stats.maxhp > op->stats.hp
1160 && op->stats.maxhp > 0 1064 && op->stats.maxhp > 0
1161 && (op->type == PLAYER 1065 && (op->type == PLAYER
1162 || op->type == DOOR // does not work, have maxhp 0 1066 || op->type == DOOR // does not work, have maxhp 0
1163 || QUERY_FLAG (op, FLAG_MONSTER) 1067 || op->flag [FLAG_MONSTER]
1164 || QUERY_FLAG (op, FLAG_ALIVE) 1068 || op->flag [FLAG_ALIVE]
1165 || QUERY_FLAG (op, FLAG_GENERATOR))) 1069 || op->flag [FLAG_GENERATOR]))
1166 { 1070 {
1167 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1071 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1168 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1072 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1169 } 1073 }
1170 1074
… …
1276esrv_update_spells (player *pl) 1180esrv_update_spells (player *pl)
1277{ 1181{
1278 if (!pl->ns) 1182 if (!pl->ns)
1279 return; 1183 return;
1280 1184
1185 pl->ns->update_spells = false;
1186
1281 if (!pl->ns->monitor_spells) 1187 if (!pl->ns->monitor_spells)
1282 return; 1188 return;
1283 1189
1284 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1190 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1285 {
1286 if (spell->type == SPELL) 1191 if (spell->type == SPELL)
1287 { 1192 {
1288 int flags = 0; 1193 int flags = 0;
1194 int val;
1289 1195
1290 /* check if we need to update it */ 1196 /* check if we need to update it */
1291 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1197 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1198 if (spell->cached_sp != val)
1292 { 1199 {
1293 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1200 spell->cached_sp = val;
1294 flags |= UPD_SP_MANA; 1201 flags |= UPD_SP_MANA;
1295 } 1202 }
1296 1203
1297 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1204 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1205 if (spell->cached_grace != val)
1298 { 1206 {
1299 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1207 spell->cached_grace = val;
1300 flags |= UPD_SP_GRACE; 1208 flags |= UPD_SP_GRACE;
1301 } 1209 }
1302 1210
1303 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1211 val = casting_level (pl->ob, spell);
1212 if (spell->cached_eat != val)
1304 { 1213 {
1305 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1214 spell->cached_eat = val;
1306 flags |= UPD_SP_DAMAGE; 1215 flags |= UPD_SP_LEVEL;
1307 } 1216 }
1308 1217
1309 if (flags) 1218 if (flags)
1310 { 1219 {
1311 packet sl; 1220 packet sl;
1312 1221
1313 sl << "updspell " 1222 sl << "updspell "
1314 << uint8 (flags) 1223 << uint8 (flags)
1315 << uint32 (spell->count); 1224 << uint32 (spell->count);
1316 1225
1317 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1226 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1318 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1227 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1319 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1228 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1320 1229
1321 pl->ns->send_packet (sl); 1230 pl->ns->send_packet (sl);
1322 } 1231 }
1323 } 1232 }
1324 }
1325} 1233}
1326 1234
1327void 1235void
1328esrv_remove_spell (player *pl, object *spell) 1236esrv_remove_spell (player *pl, object *spell)
1329{ 1237{
… …
1356 } 1264 }
1357 1265
1358 /* store costs and damage in the object struct, to compare to later */ 1266 /* store costs and damage in the object struct, to compare to later */
1359 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1267 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1360 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1268 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1361 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1269 spell->cached_eat = casting_level (pl->ob, spell);
1362 1270
1363 /* figure out which skill it uses, if it uses one */ 1271 /* figure out which skill it uses, if it uses one */
1364 if (spell->skill) 1272 if (spell->skill)
1365 if (object *tmp = pl->find_skill (spell->skill)) 1273 if (object *tmp = pl->find_skill (spell->skill))
1366 skill = tmp->subtype + CS_STAT_SKILLINFO; 1274 skill = tmp->subtype + CS_STAT_SKILLINFO;

Diff Legend

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