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.266 by root, Wed Nov 14 05:25:25 2012 UTC vs.
Revision 1.269 by root, Wed Nov 16 22:14:05 2016 UTC

294 294
295 // 8 free bits 295 // 8 free bits
296 296
297 //float ACC (RW, expmul) = 1.0; /* needed experience = (calc_exp*expmul) - means some */ 297 //float ACC (RW, expmul) = 1.0; /* needed experience = (calc_exp*expmul) - means some */
298 // /* races/classes can need less/more exp to gain levels */ 298 // /* races/classes can need less/more exp to gain levels */
299 static const float expmul = 1.0;//D 299 constexpr static const float expmul = 1.0;//D
300 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 300 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
301 301
302 /* Following are values used by any object */ 302 /* Following are values used by any object */
303 /* this objects turns into or what this object creates */ 303 /* this objects turns into or what this object creates */
304 treasurelist *ACC (RW, randomitems); /* Items to be generated */ 304 treasurelist *ACC (RW, randomitems); /* Items to be generated */
481 // strangely enough, using ?: here causes code to inflate 481 // strangely enough, using ?: here causes code to inflate
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
487 MTH object *find_spell (const_utf8_string prefix) const;
486 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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines