--- deliantra/server/include/object.h 2007/06/06 05:41:26 1.132
+++ deliantra/server/include/object.h 2007/07/01 05:00:18 1.135
@@ -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 (©) 2001,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
*/
@@ -248,8 +247,8 @@
UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
int ACC (RO, count);
- int ACC (RO, index); // index into objects
- int ACC (RO, active); // index into actives
+ object_vector_index ACC (RO, index); // index into objects
+ object_vector_index ACC (RO, active); // index into actives
player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
@@ -555,7 +554,7 @@
void link ();
void unlink ();
- int ACC (RW, archid); // index in archvector
+ object_vector_index ACC (RW, archid); // index in archvector
shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
bool ACC (RW, stub); // if true, this is an invalid archetype
uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
@@ -632,10 +631,7 @@
#define INS_BELOW_ORIGINATOR 0x0010
#define INS_MAP_LOAD 0x0020
-#define ARCH_SINGULARITY "singularity"
-#define ARCH_DETECT_MAGIC "detect_magic"
#define ARCH_DEPLETION "depletion"
-#define ARCH_SYMPTOM "symptom"
#endif