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.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.54 by root, Mon Dec 25 14:54:44 2006 UTC

… …
399 { 399 {
400 ns->sound = atoi (param); 400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 402 }
403 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
409 { 406 {
410 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 409 }
… …
1014esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1015{ 1012{
1016 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1017 uint16 flags; 1014 uint16 flags;
1018 1015
1016 if (!pl->ns)
1017 return;
1018
1019 packet sl ("stats"); 1019 packet sl ("stats");
1020 1020
1021 if (pl->ob) 1021 if (pl->ob)
1022 { 1022 {
1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
… …
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1036 } 1036 }
1037 1037
1038 if (pl->ns->exp64)
1039 for (int s = 0; s < NUM_SKILLS; s++) 1038 for (int s = 0; s < NUM_SKILLS; s++)
1040 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1041 { 1040 {
1042 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1043 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1044 */ 1043 */
1045 sl << uint8 (s + CS_STAT_SKILLINFO) 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1046 << uint8 (pl->last_skill_ob[s]->level) 1045 << uint8 (pl->last_skill_ob[s]->level)
1047 << uint64 (pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1048 1047
1049 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1050 } 1049 }
1051 1050
1052 if (pl->ns->exp64)
1053 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1054 else
1055 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1056
1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1058 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1059 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1060 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1061 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1511 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1512 1507
1513 /* If there is no object for this space, or if the face for the object 1508 /* If there is no object for this space, or if the face for the object
1514 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1515 */ 1510 */
1516 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face || mp->nosmooth)
1517 smoothlevel = 0; 1512 smoothlevel = 0;
1518 else 1513 else
1519 { 1514 {
1520 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1521 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
2089 * it then sends an updspell packet for each spell that has changed in this way 2084 * it then sends an updspell packet for each spell that has changed in this way
2090 */ 2085 */
2091void 2086void
2092esrv_update_spells (player *pl) 2087esrv_update_spells (player *pl)
2093{ 2088{
2089 if (!pl->ns)
2090 return;
2091
2094 if (!pl->ns->monitor_spells) 2092 if (!pl->ns->monitor_spells)
2095 return; 2093 return;
2096 2094
2097 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2095 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2098 { 2096 {

Diff Legend

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