--- deliantra/server/common/loader.C 2007/06/04 13:04:00 1.88
+++ deliantra/server/common/loader.C 2007/07/10 05:51:37 1.92
@@ -1,23 +1,22 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
*
* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the 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.
+ * 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 GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
* The authors can be reached via e-mail to
*/
@@ -961,23 +960,10 @@
case KW_msg:
f.get_ml (KW_endmsg, msg);
- //TODO: allow longer messages
- if (strlen (msg) >= HUGE_BUF)
- {
- LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
- msg = "ERROR, please report: string too long, winged.\n";
- }
break;
case KW_lore:
f.get_ml (KW_endlore, lore);
- //TODO: allow longer messages
- /* Just print a warning so we can be reasonably safe
- * about not overflowing the buffer.
- */
- if (strlen (lore) > (HUGE_BUF / 2))
- LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
- HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
break;
case KW_editable:
@@ -1287,8 +1273,8 @@
f.put (KW_msg, KW_endmsg, op->msg);
if (op->lore != tmp->lore)
f.put (KW_lore, KW_endlore, op->lore);
- if (op->other_arch != tmp->other_arch)
- f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
+
+ CMP_OUT (other_arch);
if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
@@ -1298,10 +1284,10 @@
f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
if (!QUERY_FLAG (op, FLAG_ANIMATE))
- f.put (KW_is_animated, (sint32) 0);
+ f.put (KW_is_animated, (sint32)0);
}
else
- f.put (KW_animation, (const char *) 0);
+ f.put (KW_animation, (const char *)0);
CMP_OUT2 (str, stats.Str);
CMP_OUT2 (dex, stats.Dex);