--- deliantra/server/socket/item.C 2011/04/23 04:56:58 1.96 +++ deliantra/server/socket/item.C 2018/11/14 23:24:27 1.105 @@ -1,24 +1,25 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * + * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002 Mark Wedel & Crossfire Development Team * Copyright (©) 1992 Frank Tore Johansen - * + * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or (at your * option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the Affero GNU General Public License * and the GNU General Public License along with this program. If not, see * . - * + * * The authors can be reached via e-mail to */ @@ -48,7 +49,7 @@ /** * This is a similar to query_name, but returns flags - * to be sent to client. + * to be sent to client. */ static unsigned int query_flags (object *op) @@ -136,20 +137,20 @@ const char *name; uint8 *len = sl.cur++; // patch up length later - name = query_base_name (head, 0); sl << data (name, min (127, strlen (name))); + name = query_base_name (head, 0); sl << data_n (name, min (127, strlen (name))); sl << uint8 (0); - name = query_base_name (head, 1); sl << data (name, min (127, strlen (name))); + name = query_base_name (head, 1); sl << data_n (name, min (127, strlen (name))); *len = sl.cur - len - 1; } else { - int len = min (head->custom_name.length (), 127); + int len = min (127, head->custom_name.length ()); sl << uint8 (len * 2 + 1) - << data (head->custom_name, len) + << data_n (head->custom_name, len) << uint8 (0) - << data (head->custom_name, len); + << data_n (head->custom_name, len); } sl << uint16 (head->animation_id); @@ -180,7 +181,7 @@ #define FINGER_DOWN "finger_down.x11" /** - * Send the look window. Don't need to do animations here + * Send the look window. Don't need to do animations here * This sends all the faces to the client, not just updates. This is * because object ordering would otherwise be inconsistent. */ @@ -209,7 +210,7 @@ if (ob->flag [FLAG_REMOVED] || !ob->map - || ob->map->in_memory != MAP_ACTIVE + || ob->map->state != MAP_ACTIVE || out_of_map (ob->map, ob->x, ob->y)) return; @@ -609,7 +610,7 @@ packet sl ("ex"); sl << ber32 (tag) - << data (*pl->expand_cfpod (s.c_str ())); + << data_n (*pl->expand_cfpod (s.c_str ())); pl->ns->send_packet (sl); } @@ -644,7 +645,7 @@ if (!op) { - pl->failmsg ("Could not find object to lock/unlock"); + pl->failmsgf ("Could not find object %d to lock/unlock", tag); return; } @@ -665,7 +666,7 @@ if (!op) { - pl->failmsg ("Could not find object to mark"); + pl->failmsgf ("Could not find object %d to mark", tag); return; }