--- deliantra/server/include/object.h 2007/09/10 12:44:06 1.149
+++ deliantra/server/include/object.h 2007/11/08 19:43:24 1.153
@@ -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 (©) 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
+ * 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
*/
#ifndef OBJECT_H
@@ -299,6 +299,8 @@
do_remove ();
}
+ MTH bool blocked (maptile *m, int x, int y) const;
+
void move_to (const mapxy &pos)
{
remove ();
@@ -507,6 +509,8 @@
void statusmsg (const char *msg, int color = NDI_BLACK);
void failmsg (const char *msg, int color = NDI_RED);
+ const char *query_inventory (object *who = 0, const char *indent = "");
+
MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
@@ -578,6 +582,8 @@
MTH void link ();
MTH void unlink ();
+ MTH object *instance ();
+
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
@@ -637,9 +643,6 @@
* beneath the player, but not actually above it. Note - the
* map and x,y coordinates for the object to be inserted must
* match the originator.
- * INS_MAP_LOAD: disable lots of checkings done at insertion to
- * speed up map loading process, as we assume the ordering in
- * loaded map is correct.
*
* Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
* are mutually exclusive. The behaviour for passing more than one
@@ -652,7 +655,6 @@
#define INS_NO_WALK_ON 0x0004
#define INS_ON_TOP 0x0008
#define INS_BELOW_ORIGINATOR 0x0010
-#define INS_MAP_LOAD 0x0020
#define ARCH_DEPLETION "depletion"