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.97 by root, Wed May 4 07:41:14 2011 UTC vs.
Revision 1.99 by root, Tue Jan 3 11:25:37 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 (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
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
142 142
143 *len = sl.cur - len - 1; 143 *len = sl.cur - len - 1;
144 } 144 }
145 else 145 else
146 { 146 {
147 int len = min (head->custom_name.length (), 127); 147 int len = min (127, head->custom_name.length ());
148 148
149 sl << uint8 (len * 2 + 1) 149 sl << uint8 (len * 2 + 1)
150 << data (head->custom_name, len) 150 << data (head->custom_name, len)
151 << uint8 (0) 151 << uint8 (0)
152 << data (head->custom_name, len); 152 << data (head->custom_name, len);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines