--- deliantra/server/common/image.C 2007/07/01 05:00:17 1.26
+++ deliantra/server/common/image.C 2007/11/08 19:43:23 1.29
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * Deliantra 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.
@@ -18,7 +18,7 @@
* 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
+ * The authors can be reached via e-mail to
*/
#include
@@ -96,10 +96,16 @@
}
facedata *
+faceinfo::data (int faceset) const
+{
+ return (facedata *)&(faceset && !type && data64.data.size () ? data64 : data32);
+}
+
+facedata *
face_data (faceidx idx, int faceset)
{
if (faceinfo *f = face_info (idx))
- return &(faceset && !f->type ? f->data64 : f->data32);
+ return f->data (faceset);
return 0;
}