--- deliantra/server/include/object.h 2007/07/14 14:57:16 1.137
+++ 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
@@ -133,6 +133,7 @@
shstr ACC (RW, race); /* human, goblin, dragon, etc */
shstr ACC (RW, slaying); /* Which race to do double damage to */
/* If this is an exit, this is the filename */
+ shstr ACC (RW, tag); // a tag used to tracking this object
shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
shstr ACC (RW, lore); /* Obscure information about this object, */
@@ -186,7 +187,9 @@
uint32 ACC (RW, weapontype); /* type of weapon */
uint32 ACC (RW, tooltype); /* type of tool or build facility */
body_slot slot [NUM_BODY_LOCATIONS];
- faceidx ACC (RW, face); /* Face with colors */
+ faceidx ACC (RW, face); /* the graphical face */
+ faceidx ACC (RW, sound); /* the sound face */
+ faceidx ACC (RW, sound_destroy); /* played on destroy */
living ACC (RO, stats); /* Str, Con, Dex, etc */
/* See the pod/objects.pod for more info about body locations */
@@ -250,7 +253,7 @@
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 */
+ player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */
object *ACC (RW, below); /* Pointer to the object stacked below this one */
object *ACC (RW, above); /* Pointer to the object stacked above this one */
@@ -270,12 +273,13 @@
key_value *key_values; /* Fields not explictly known by the loader. */
bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
- void post_load_check (); // do some adjustments after parsing
+ MTH void post_load_check (); // do some adjustments after parsing
static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
bool write (object_freezer &f);
MTH int slottype () const;
MTH static object *create ();
+ const mapxy &operator =(const mapxy &pos);
object &operator =(const object &src);
MTH void copy_to (object *dst);
MTH object *clone (); // create + copy_to
@@ -286,6 +290,8 @@
// recursively destroy all objects in inventory, optionally dropping them to the ground instead
MTH void destroy_inv (bool drop_to_ground = false);
MTH object *insert (object *item); // insert into inventory
+ MTH void play_sound (faceidx sound) const;
+
void do_remove ();
MTH void remove ()
{
@@ -293,6 +299,15 @@
do_remove ();
}
+ MTH bool blocked (maptile *m, int x, int y) const;
+
+ void move_to (const mapxy &pos)
+ {
+ remove ();
+ *this = pos;
+ insert_at (this, this);
+ }
+
static bool can_merge_slow (object *op1, object *op2);
// this is often used in time-critical code, so optimise
@@ -381,7 +396,7 @@
// contr => is a player
// head => only save head of a multitile object
// owner => can not reference owner yet
- MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; }
+ MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
/* This return true if object has still randomitems which
* could be expanded.
@@ -491,6 +506,14 @@
MTH struct region *region () const;
+ 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
+
protected:
void link ();
void unlink ();
@@ -552,16 +575,18 @@
void gather_callbacks (AV *&callbacks, event_type event) const;
static archetype *read (object_thawer &f);
- static archetype *get (const char *name); // find or create
- static archetype *find (const char *name);
- void link ();
- void unlink ();
+ MTH static archetype *get (const_utf8_string name); // find or create
+ MTH static archetype *find (const_utf8_string name);
+
+ 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
- uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
sint8 ACC (RW, max_x), ACC (RW, max_y);
@@ -618,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
@@ -633,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"