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.184 by root, Sun May 8 11:44:43 2011 UTC vs.
Revision 1.188 by root, Mon Oct 29 23:55:57 2012 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,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992 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.
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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25//+GPL 25//+GPL
26 26
… …
163 if (ob->map && ob->map->path) 163 if (ob->map && ob->map->path)
164 { 164 {
165 int flags = 0; 165 int flags = 0;
166 166
167 // due to historical glitches, the bit ordering and map index ordering differs 167 // due to historical glitches, the bit ordering and map index ordering differs
168 if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01; 168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
169 if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02; 169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
170 if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04; 170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
171 if (ob->map->tile_path[TILE_WEST ]) flags |= 0x08; 171 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
172 // these two are debatable 172 // these two are debatable
173 if (ob->map->tile_path[TILE_UP ]) flags |= 0x10; 173 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path[TILE_DOWN ]) flags |= 0x20; 174 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
175 175
176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
178 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
179 } 179 }
… …
349 349
350 // due to historical glitches, the mapinfo index and tile index differs 350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN }; 351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352 352
353 // maybe we should only allow the four flat directions 353 // maybe we should only allow the four flat directions
354 if (dir >= 0 && dir < array_length (dirmap)) 354 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
355 { 355 {
356 dir = dirmap [dir]; 356 dir = dirmap [dir];
357 357
358 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
359 map = 0; 359 map = 0;
… …
386 else 386 else
387 { 387 {
388 int flags = 0; 388 int flags = 0;
389 389
390 // due to historical glitches, the bit ordering and map index ordering differs 390 // due to historical glitches, the bit ordering and map index ordering differs
391 if (map->tile_path[TILE_NORTH]) flags |= 0x01; 391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
392 if (map->tile_path[TILE_EAST ]) flags |= 0x02; 392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
393 if (map->tile_path[TILE_SOUTH]) flags |= 0x04; 393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
394 if (map->tile_path[TILE_WEST ]) flags |= 0x08; 394 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
395 // these two are debatable 395 // these two are debatable
396 if (map->tile_path[TILE_UP ]) flags |= 0x10; 396 if (map->tile_path [TILE_UP ]) flags |= 0x10;
397 if (map->tile_path[TILE_DOWN ]) flags |= 0x20; 397 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
398 398
399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
400 } 400 }
401 401
402 return 1; 402 return 1;
… …
1235 1235
1236/* appends the spell *spell to the Socklist we will send the data to. */ 1236/* appends the spell *spell to the Socklist we will send the data to. */
1237static void 1237static void
1238append_spell (player *pl, packet &sl, object *spell) 1238append_spell (player *pl, packet &sl, object *spell)
1239{ 1239{
1240 int i, skill = 0; 1240 int skill = 0;
1241 1241
1242 if (!(spell->name)) 1242 if (!(spell->name))
1243 { 1243 {
1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1245 return; 1245 return;

Diff Legend

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