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.124 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.129 by root, Tue May 6 19:37:01 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
686 * syntax is: move (to) (tag) (nrof) 686 * syntax is: move (to) (tag) (nrof)
687 */ 687 */
688void 688void
689MoveCmd (char *buf, int len, player *pl) 689MoveCmd (char *buf, int len, player *pl)
690{ 690{
691 int vals[3], i; 691 int to, tag, nrof;
692 692
693 /* A little funky here. We only cycle for 2 records, because 693 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694 * we obviously are not going to find a space after the third
695 * record. Perhaps we should just replace this with a
696 * sscanf?
697 */
698 for (i = 0; i < 2; i++)
699 { 694 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 695 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 696 return;
706 }
707
708 buf++;
709 } 697 }
710 698
711 vals[2] = atoi (buf); 699 esrv_move_object (pl->ob, to, tag, nrof);
712
713/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715} 700}
716 701
717/****************************************************************************** 702/******************************************************************************
718 * 703 *
719 * Start of commands the server sends to the client. 704 * Start of commands the server sends to the client.
886 871
887/** 872/**
888 * Tells the client that here is a player it should start using. 873 * Tells the client that here is a player it should start using.
889 */ 874 */
890void 875void
891esrv_new_player (player *pl, uint32 weight) 876esrv_new_player (player *pl)
892{ 877{
878 sint32 weight = pl->ob->client_weight ();
879
893 packet sl ("player"); 880 packet sl ("player");
894 881
895 sl << uint32 (pl->ob->count) 882 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 883 << uint32 (weight)
897 << uint32 (pl->ob->face) 884 << uint32 (pl->ob->face)
1242 uint8 flags = 0; 1229 uint8 flags = 0;
1243 tag_t player = 0; 1230 tag_t player = 0;
1244 1231
1245 // send hp information, if applicable 1232 // send hp information, if applicable
1246 if (object *op = ms.faces_obj [0]) 1233 if (object *op = ms.faces_obj [0])
1234 if (op->is_head () && !op->invisible)
1247 { 1235 {
1248 if (op->head || op->invisible) 1236 if (op->stats.maxhp > op->stats.hp
1249 ; // do not show 1237 && op->stats.maxhp > 0
1250 else if (op->type == PLAYER 1238 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0
1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1240 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1252 {
1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1254 { 1241 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 } 1244 }
1258 }
1259 1245
1260 if (op->msg && op->msg[0] == '@') 1246 if (op->msg && op->msg[0] == '@')
1261 flags |= 1; 1247 flags |= 1;
1262 1248
1263 if (op->type == PLAYER && op != ob) 1249 if (op->type == PLAYER && op != ob)
1264 player = op->count; 1250 player = op->count;
1265 } 1251 }
1266 1252
1267 if (lastcell.stat_hp != stat_hp) 1253 if (lastcell.stat_hp != stat_hp)
1268 { 1254 {
1269 lastcell.stat_hp = stat_hp; 1255 lastcell.stat_hp = stat_hp;
1270 1256

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines