ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.265 by root, Wed Nov 14 05:21:10 2012 UTC vs.
Revision 1.268 by root, Sun Nov 25 14:59:24 2012 UTC

482 return type == CONTAINER 482 return type == CONTAINER
483 && ((env && env->container_ () == this) 483 && ((env && env->container_ () == this)
484 || (!env && flag [FLAG_APPLIED])); 484 || (!env && flag [FLAG_APPLIED]));
485 } 485 }
486 486
487 MTH object *find_spell (const_utf8_string prefix) const;
488
487 MTH object *force_find (shstr_tmp name); 489 MTH object *force_find (shstr_tmp name);
488 MTH void force_set_timer (int duration); 490 MTH void force_set_timer (int duration);
489 MTH object *force_add (shstr_tmp name, int duration = 0); 491 MTH object *force_add (shstr_tmp name, int duration = 0);
490 492
491 oblinkpt *find_link () const; 493 oblinkpt *find_link () const;
924// "safely" iterate over inv in a way such that the current item is removable 926// "safely" iterate over inv in a way such that the current item is removable
925// quite horrible, that's why its hidden in some macro 927// quite horrible, that's why its hidden in some macro
926#define for_inv_removable(op,var) \ 928#define for_inv_removable(op,var) \
927 for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; ) 929 for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
928 930
929#define for_all_objects(var) \ 931#define for_all_objects(var) \
930 for (unsigned _i = 0; _i < objects.size (); ++_i) \ 932 for (unsigned _i = 0; _i < objects.size (); ++_i) \
931 statementvar (object *, var, objects [_i]) 933 statementvar (object *, var, objects [_i])
932 934
933#define for_all_actives(var) \ 935#define for_all_actives(var) \
934 for (unsigned _i = 0; _i < actives.size (); ++_i) \ 936 for (unsigned _i = 0; _i < actives.size (); ++_i) \
935 statementvar (object *, var, actives [_i]) 937 statementvar (object *, var, actives [_i])
936 938
937#define for_all_archetypes(var) \ 939#define for_all_archetypes(var) \
938 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ 940 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
939 statementvar (archetype *, var, archetypes [_i]) 941 statementvar (archetype *, var, archetypes [_i])
940 942
941//+GPL 943//+GPL
942 944
943/* Used by update_object to know if the object being passed is 945/* Used by update_object to know if the object being passed is
946#define UP_OBJ_INSERT 1 948#define UP_OBJ_INSERT 1
947#define UP_OBJ_REMOVE 2 949#define UP_OBJ_REMOVE 2
948#define UP_OBJ_CHANGE 3 950#define UP_OBJ_CHANGE 3
949#define UP_OBJ_FACE 4 /* Only thing that changed was the face */ 951#define UP_OBJ_FACE 4 /* Only thing that changed was the face */
950 952
951/* These are flags passed to insert_ob_in_map and 953/* These are flags passed to insert_ob_in_map and
952 * insert_ob_in_ob. Note that all flags may not be meaningful 954 * insert_ob_in_ob. Note that all flags may not be meaningful
953 * for both functions. 955 * for both functions.
954 * Most are fairly explanatory: 956 * Most are fairly explanatory:
955 * INS_NO_MERGE: don't try to merge inserted object with ones alrady 957 * INS_NO_MERGE: don't try to merge inserted object with ones alrady
956 * on space. 958 * on space.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines