--- deliantra/server/include/object.h 2010/04/13 22:05:42 1.243
+++ deliantra/server/include/object.h 2012/10/29 23:55:53 1.263
@@ -1,24 +1,24 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992 Frank Tore Johansen
- *
+ *
* Deliantra is free software: you can redistribute it and/or modify it under
* the terms of the Affero 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.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -35,37 +35,34 @@
// also see common/item.C
enum
{
- body_skill,
- body_combat,
- body_range,
- body_shield,
- body_arm,
- body_torso,
- body_head,
- body_neck,
- body_finger,
- body_shoulder,
- body_foot,
- body_hand,
- body_wrist,
- body_waist,
+# define def(name, use, nonuse) body_ ## name,
+# include "slotinc.h"
+# undef def
NUM_BODY_LOCATIONS
};
/* See common/item.c */
-typedef struct Body_Locations
+struct Body_Locations
{
- keyword save_name; /* Name used to load/save it to disk */
+ const char *name; /* Short name/identifier */
+ keyword kw; /* Name used to load/save it to disk */
const char *use_name; /* Name used when describing an item we can use */
const char *nonuse_name; /* Name to describe objects we can't use */
-} Body_Locations;
+};
extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
+// for each set of directions (1 == up, 2 == right, 4 == down, 8 == left)
+// contains the wall suffix (0, 1_3, 1_4 and so on).
+extern const char *wall_suffix[16];
+
#define NUM_COINS 4 /* number of coin types */
extern const char *const coins[NUM_COINS + 1];
+// restart server when object_count reaches this value
+#define RESTART_COUNT 0xe0000000
+
/*
* Each object (this also means archetypes!) could have a few of these
* "dangling" from it; this could also end up containing 'parse errors'.
@@ -78,10 +75,59 @@
*/
struct key_value : slice_allocated
{
- key_value *next;
+ key_value *next; // must be first element
shstr key, value;
};
+// "crossfires version of a perl hash."
+struct key_values
+{
+ key_value *first; // must be first element
+
+ bool empty() const
+ {
+ return !first;
+ }
+
+ void clear ();
+ shstr_tmp get (shstr_tmp key) const;
+ void del (shstr_tmp key);
+ void set (shstr_tmp key, shstr_tmp value);
+
+ void add (shstr_tmp key, shstr_tmp value); // liek set, but doesn't check for duplicates
+ void reverse (); // reverses the ordering, to be used after loading an object
+ key_values &operator =(const key_values &kv);
+
+ // custom extra fields management
+ struct access_proxy
+ {
+ key_values &kv;
+ shstr_tmp key;
+
+ access_proxy (key_values &kv, shstr_tmp key)
+ : kv (kv), key (key)
+ {
+ }
+
+ const access_proxy &operator =(shstr_tmp value) const
+ {
+ kv.set (key, value);
+ return *this;
+ }
+
+ operator const shstr_tmp () const { return kv.get (key); }
+ operator const char *() const { return kv.get (key); }
+
+ private:
+ void operator =(int);
+ };
+
+ const access_proxy operator [](shstr_tmp key)
+ {
+ return access_proxy (*this, key);
+ }
+};
+
//-GPL
struct UUID
@@ -327,7 +373,6 @@
*/
object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
- key_value *key_values; /* Fields not explictly known by the loader. */
MTH void set_flag (int flagnum)
{
@@ -339,43 +384,11 @@
flag [flagnum] = false;
}
- // privates / perl
- shstr_tmp kv_get (shstr_tmp key) const;
- void kv_del (shstr_tmp key);
- void kv_set (shstr_tmp key, shstr_tmp value);
+ // extra key value pairs
+ key_values kv;
//-GPL
- // custom extra fields management
- struct key_value_access_proxy
- {
- object &ob;
- shstr_tmp key;
-
- key_value_access_proxy (object &ob, shstr_tmp key)
- : ob (ob), key (key)
- {
- }
-
- const key_value_access_proxy &operator =(shstr_tmp value) const
- {
- ob.kv_set (key, value);
- return *this;
- }
-
- operator const shstr_tmp () const { return ob.kv_get (key); }
- operator const char *() const { return ob.kv_get (key); }
-
- private:
- void operator =(int);
- };
-
- // operator [] is too annoying to use
- const key_value_access_proxy kv (shstr_tmp key)
- {
- return key_value_access_proxy (*this, key);
- }
-
bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
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.
@@ -447,7 +460,7 @@
&& can_merge_slow (op1, op2);
}
- MTH void set_owner (object *owner);
+ MTH void set_owner (object_ornull *owner);
MTH void set_speed (float speed);
MTH void set_glow_radius (sint8 rad);
@@ -569,6 +582,12 @@
MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
+ /* need_identify returns true if the item should be identified. This
+ * function really should not exist - by default, any item not identified
+ * should need it.
+ */
+ MTH bool need_identify () const;
+
// returns the outermost owner, never returns 0
MTH object *outer_owner ()
{
@@ -645,7 +664,7 @@
return glow_radius;
}
- // returns the player that cna see this object, if any
+ // returns the player that can see this object, if any
MTH object *visible_to () const;
MTH std::string long_desc (object *who = 0); // query_name . " " . describe
@@ -684,14 +703,20 @@
MTH void activate_recursive ();
MTH void deactivate_recursive ();
+ // prefetch and activate the surrounding area
+ MTH void prefetch_surrounding_maps ();
+
// set the given flag on all objects in the inventory recursively
MTH void set_flag_inv (int flag, int value = 1);
- void enter_exit (object *exit);//Perl
- MTH void enter_map (maptile *newmap, int x, int y);
+ void enter_exit (object *exit); // perl
+ MTH bool enter_map (maptile *newmap, int x, int y);
void player_goto (const_utf8_string path, int x, int y); // only for players
MTH bool apply (object *ob, int aflags = AP_APPLY); // ob may be 0
+ MTH object *mark () const;
+ MTH void splay_marked ();
+
// returns the mapspace this object is in
mapspace &ms () const;
@@ -751,14 +776,14 @@
MTH struct region *region () const;
- void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
- void failmsg (const_utf8_string msg, int color = NDI_RED);
+ MTH void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
+ MTH void failmsg (const_utf8_string msg, int color = NDI_RED);
void failmsgf (const_utf8_string format, ...); // always NDI_RED...
- const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
+ MTH const_utf8_string query_inventory (object *who = 0, const_utf8_string 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
+ static object *deref (const_octet_string ref); // returns the object from the generated reference, if possible
// make some noise with given item into direction dir,
// currently only used for players to make them temporarily visible
@@ -952,6 +977,7 @@
#define INS_NO_WALK_ON 0x0004
#define INS_ON_TOP 0x0008
#define INS_BELOW_ORIGINATOR 0x0010
+#define INS_NO_AUTO_EXIT 0x0020 // temporary, fix exits instead
//-GPL