ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.46 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.50 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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 Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
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 it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
836 * look_at prints items on the specified square. 835 * look_at prints items on the specified square.
837 * 836 *
838 * [ removed EARTHWALL check and added check for containers inventory. 837 * [ removed EARTHWALL check and added check for containers inventory.
839 * Tero.Haatanen@lut.fi ] 838 * Tero.Haatanen@lut.fi ]
840 */ 839 */
841void 840static void
842look_at (object *op, int dx, int dy) 841look_at (player *pl, int dx, int dy)
843{ 842{
844 object *tmp; 843 object *ob = pl->ob;
845 int flag = 0;
846 sint16 x, y;
847 maptile *m;
848 844
849 x = op->x + dx; 845 maptile *m = pl->observe->map;
850 y = op->y + dy; 846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
851 848
852 if (out_of_map (op->map, x, y))
853 return;
854
855 m = get_map_from_coord (op->map, &x, &y);
856 if (!m) 849 if (!m)
857 return; 850 return;
858 851
859 for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above) 852 if (!xy_normalise (m, x, y))
860 ; 853 {
861 854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
862 for (; tmp; tmp = tmp->below) 855 return;
863 { 856 }
857
858 int flag = 0;
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
861 {
864 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
865 continue; 863 continue;
866 864
867 if (!flag) 865 if (!flag)
868 { 866 {
869 if (dx || dy) 867 if (dx || dy)
870 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
871 else 869 else
872 {
873 clear_win_info (op);
874 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
875 } 871
876 flag = 1; 872 flag = 1;
877 } 873 }
878 874
879 if (QUERY_FLAG (op, FLAG_WIZ)) 875 if (QUERY_FLAG (ob, FLAG_WIZ))
880 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
881 else 877 else
882 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 878 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
883 879
884 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
885 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) 881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
886 inventory (op, tmp->head == NULL ? tmp : tmp->head); 882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
887 883
888 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 884 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
889 break; 885 break;
890 } 886 }
891 887
892 if (!flag) 888 if (!flag)
893 { 889 {
894 if (dx || dy) 890 if (dx || dy)
895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
896 else 892 else
897 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
898 } 894 }
899} 895}
900 896
901/** Client wants to look at some object. Lets do so. */ 897/** Client wants to look at some object. Lets do so. */
902void 898void
903LookAt (char *buf, int len, player *pl) 899LookAt (char *buf, int len, player *pl)
904{ 900{
905 int dx, dy;
906 char *cp; 901 char *cp;
907 902
908 dx = atoi (buf); 903 int dx = atoi (buf);
909 if (!(cp = strchr (buf, ' '))) 904 if (!(cp = strchr (buf, ' ')))
910 return; 905 return;
911 906
912 dy = atoi (cp); 907 int dy = atoi (cp);
908
909 if (player *opl = pl->observe->contr)
910 if (client *ns = opl->ns)
911 {
913 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 912 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
914 return; 913 return;
915 914
916 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 915 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
917 return; 916 return;
917 }
918 918
919 look_at (pl->ob, dx, dy); 919 look_at (pl, dx, dy);
920} 920}
921 921
922/** Move an object to a new location */ 922/** Move an object to a new location */
923void 923void
924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines