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.120 by root, Fri Aug 24 00:40:31 2007 UTC vs.
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 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 * Crossfire TRT 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
… …
263{ 263{
264 char *token = buf; 264 char *token = buf;
265 buf += strlen (buf) + 9; 265 buf += strlen (buf) + 9;
266 266
267 // initial map and its origin 267 // initial map and its origin
268 maptile *map = pl->ob->map; 268 maptile *map = pl->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x; 269 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->y; 270 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous 271 int max_distance = 8; // limit maximum path length to something generous
272 272
273 while (*buf && map && max_distance) 273 while (*buf && map && max_distance)
274 { 274 {
275 int dir = *buf++ - '1'; 275 int dir = *buf++ - '1';
… …
1031 1031
1032 /* If player is just joining the game, he isn't here yet, so the map 1032 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will 1033 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in. 1034 * be OK once they really log in.
1035 */ 1035 */
1036 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1036 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1037 return; 1037 return;
1038 1038
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1040 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1041 uint8 eentrysize; 1041 uint8 eentrysize;
… …
1129 1129
1130 if (!m) 1130 if (!m)
1131 { 1131 {
1132 nx = x; ny = y; m = plmap; 1132 nx = x; ny = y; m = plmap;
1133 1133
1134 if (!xy_normalise (m, nx, ny)) 1134 if (xy_normalise (m, nx, ny))
1135 m->touch ();
1136 else
1135 m = 0; 1137 m = 0;
1136 } 1138 }
1137 1139
1138 int emask, mask; 1140 int emask, mask;
1139 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
… …
1156 } 1158 }
1157 1159
1158 continue; 1160 continue;
1159 } 1161 }
1160 1162
1161 m->touch ();
1162
1163 int d = pl->blocked_los[ax][ay]; 1163 int d = pl->blocked_los[ax][ay];
1164 1164
1165 if (d > 3) 1165 if (d > 3)
1166 { 1166 {
1167 1167
… …
1242 uint8 flags = 0; 1242 uint8 flags = 0;
1243 tag_t player = 0; 1243 tag_t player = 0;
1244 1244
1245 // send hp information, if applicable 1245 // send hp information, if applicable
1246 if (object *op = ms.faces_obj [0]) 1246 if (object *op = ms.faces_obj [0])
1247 if (op->is_head () && !op->invisible)
1247 { 1248 {
1248 if (op->head || op->invisible) 1249 if (op->stats.maxhp > op->stats.hp
1249 ; // do not show 1250 && op->stats.maxhp > 0
1250 else if (op->type == PLAYER 1251 && (op->type == PLAYER
1252 || 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)) 1253 || 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 { 1254 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 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 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 } 1257 }
1258 }
1259 1258
1260 if (op->msg && op->msg[0] == '@') 1259 if (op->msg && op->msg[0] == '@')
1261 flags |= 1; 1260 flags |= 1;
1262 1261
1263 if (op->type == PLAYER && op != ob) 1262 if (op->type == PLAYER && op != ob)
1264 player = op->count; 1263 player = op->count;
1265 } 1264 }
1266 1265
1267 if (lastcell.stat_hp != stat_hp) 1266 if (lastcell.stat_hp != stat_hp)
1268 { 1267 {
1269 lastcell.stat_hp = stat_hp; 1268 lastcell.stat_hp = stat_hp;
1270 1269

Diff Legend

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