--- deliantra/server/socket/item.C 2011/04/23 04:56:58 1.96
+++ deliantra/server/socket/item.C 2017/01/19 21:18:34 1.103
@@ -1,24 +1,24 @@
/*
* 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 (©) 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
*/
@@ -144,7 +144,7 @@
}
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)
@@ -180,7 +180,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 +209,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;
@@ -644,7 +644,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 +665,7 @@
if (!op)
{
- pl->failmsg ("Could not find object to mark");
+ pl->failmsgf ("Could not find object %d to mark", tag);
return;
}