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.52 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.54 by root, Mon Dec 25 14:54:44 2006 UTC

1011esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1012{ 1012{
1013 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1014 uint16 flags; 1014 uint16 flags;
1015 1015
1016 if (!pl->ns)
1017 return;
1018
1016 packet sl ("stats"); 1019 packet sl ("stats");
1017 1020
1018 if (pl->ob) 1021 if (pl->ob)
1019 { 1022 {
1020 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);
1503 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1504 1507
1505 /* 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
1506 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1507 */ 1510 */
1508 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face || mp->nosmooth)
1509 smoothlevel = 0; 1512 smoothlevel = 0;
1510 else 1513 else
1511 { 1514 {
1512 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1513 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
2081 * 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
2082 */ 2085 */
2083void 2086void
2084esrv_update_spells (player *pl) 2087esrv_update_spells (player *pl)
2085{ 2088{
2089 if (!pl->ns)
2090 return;
2091
2086 if (!pl->ns->monitor_spells) 2092 if (!pl->ns->monitor_spells)
2087 return; 2093 return;
2088 2094
2089 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2095 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2090 { 2096 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines