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.213 by root, Mon Oct 19 21:48:49 2009 UTC vs.
Revision 1.227 by root, Fri Mar 26 00:05:45 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
28#include <bitset> 28#include <bitset>
29 29
30#include "cfperl.h" 30#include "cfperl.h"
31#include "shstr.h" 31#include "shstr.h"
32 32
33//+GPL
34
33typedef int tag_t; 35typedef int tag_t;
34 36
35enum { 37enum {
36 body_skill, 38 body_skill,
37 body_combat, 39 body_combat,
85{ 87{
86 key_value *next; 88 key_value *next;
87 shstr key, value; 89 shstr key, value;
88}; 90};
89 91
92//-GPL
93
90struct UUID 94struct UUID
91{ 95{
92 uint64 seq; 96 uint64 seq;
97
98 enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
93 99
94 static UUID cur; // last uuid generated 100 static UUID cur; // last uuid generated
95 static void init (); 101 static void init ();
96 static UUID gen (); 102 static UUID gen ();
97 103
98 UUID () { } 104 UUID () { }
99 UUID (uint64 seq) : seq(seq) { } 105 UUID (uint64 seq) : seq(seq) { }
100 operator uint64() { return seq; } 106 operator uint64() { return seq; }
101 void operator =(uint64 seq) { this->seq = seq; } 107 void operator =(uint64 seq) { this->seq = seq; }
102 108
103 typedef char BUF [32];
104
105 bool parse (const char *s) 109 bool parse (const char *s);
106 { 110 char *append (char *buf) const;
107 return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
108 }
109
110 const char *c_str (char *buf, int len) const
111 {
112 snprintf (buf, len, "<1.%" PRIx64 ">", seq);
113
114 return buf;
115 }
116
117 const char *c_str () const 111 char *c_str () const;
118 {
119 static BUF buf;
120
121 return c_str (buf, sizeof (buf));
122 }
123}; 112};
113
114//+GPL
124 115
125/* Definition for WILL_APPLY values. Replaces having harcoded values 116/* Definition for WILL_APPLY values. Replaces having harcoded values
126 * sprinkled in the code. Note that some of these also replace fields 117 * sprinkled in the code. Note that some of these also replace fields
127 * that were in the can_apply area. What is the point of having both 118 * that were in the can_apply area. What is the point of having both
128 * can_apply and will_apply? 119 * can_apply and will_apply?
133#define WILL_APPLY_DOOR 0x08 124#define WILL_APPLY_DOOR 0x08
134#define WILL_APPLY_FOOD 0x10 125#define WILL_APPLY_FOOD 0x10
135 126
136struct body_slot 127struct body_slot
137{ 128{
129 signed char used:4; /* Calculated value based on items equipped */
138 signed char info:4; /* body info as loaded from the file */ 130 signed char info:4; /* body info as loaded from the file */
139 signed char used:4; /* Calculated value based on items equipped */
140}; 131};
141 132
142typedef struct oblnk 133typedef struct oblnk
143{ /* Used to link together several objects */ 134{ /* Used to link together several objects */
144 object_ptr ob; 135 object_ptr ob;
174 flags_t flag; /* various flags */ 165 flags_t flag; /* various flags */
175#if FOR_PERL 166#if FOR_PERL
176 bool ACC (RW, flag[NUM_FLAGS]); 167 bool ACC (RW, flag[NUM_FLAGS]);
177#endif 168#endif
178 169
179 shstr ACC (RW, materialname); /* specific material name */ 170 materialtype_t *material; // What material this object consists of //TODO, make perl-accessible
180 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 171 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
181// materialtype_t *ACC (RW, material); /* What material this object consists of */
182 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */ 172 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
183 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ 173 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
184 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ 174 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
185 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ 175 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
186 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ 176 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
221 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 211 uint8 ACC (RW, pick_up); /* See crossfire.doc */
222 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */ 212 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
223 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 213 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
224 uint8 ACC (RW, weapontype); /* type of weapon */ 214 uint8 ACC (RW, weapontype); /* type of weapon */
225 215
216 body_slot slot [NUM_BODY_LOCATIONS];
217
226 faceidx ACC (RW, face); /* the graphical face */ 218 faceidx ACC (RW, face); /* the graphical face */
227 219
228 faceidx ACC (RW, sound); /* the sound face */ 220 faceidx ACC (RW, sound); /* the sound face */
229 faceidx ACC (RW, sound_destroy); /* played on destroy */ 221 faceidx ACC (RW, sound_destroy); /* played on destroy */
230
231 body_slot slot [NUM_BODY_LOCATIONS];
232 222
233 sint32 ACC (RW, weight); /* Attributes of the object */ 223 sint32 ACC (RW, weight); /* Attributes of the object */
234 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 224 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
235 225
236 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */ 226 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
295 shstr ACC (RW, lore); /* Obscure information about this object, */ 285 shstr ACC (RW, lore); /* Obscure information about this object, */
296 /* To get put into books and the like. */ 286 /* To get put into books and the like. */
297 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 287 shstr ACC (RW, custom_name); /* Custom name assigned by player */
298}; 288};
299 289
300const char *query_weight (const object *op); 290const_utf8_string query_weight (const object *op);
301const char *query_short_name (const object *op); 291const_utf8_string query_short_name (const object *op);
302const char *query_name (const object *op); 292const_utf8_string query_name (const object *op);
303const char *query_base_name (const object *op, int plural); 293const_utf8_string query_base_name (const object *op, int plural);
304 294
305struct object : zero_initialised, object_copy 295struct object : zero_initialised, object_copy
306{ 296{
307 // These variables are not changed by ->copy_to 297 // These variables are not changed by ->copy_to
308 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */ 298 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
333 // privates / perl 323 // privates / perl
334 shstr_tmp kv_get (shstr_tmp key) const; 324 shstr_tmp kv_get (shstr_tmp key) const;
335 void kv_del (shstr_tmp key); 325 void kv_del (shstr_tmp key);
336 void kv_set (shstr_tmp key, shstr_tmp value); 326 void kv_set (shstr_tmp key, shstr_tmp value);
337 327
328//-GPL
329
338 // custom extra fields management 330 // custom extra fields management
339 struct key_value_access_proxy 331 struct key_value_access_proxy
340 { 332 {
341 object &ob; 333 object &ob;
342 shstr_tmp key; 334 shstr_tmp key;
387 379
388 // recursively destroy all objects in inventory, optionally dropping them to the ground instead 380 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
389 MTH void destroy_inv (bool drop_to_ground = false); 381 MTH void destroy_inv (bool drop_to_ground = false);
390 MTH object *insert (object *item); // insert into inventory 382 MTH object *insert (object *item); // insert into inventory
391 MTH void play_sound (faceidx sound) const; 383 MTH void play_sound (faceidx sound) const;
392 MTH void say_msg (const char *msg) const; 384 MTH void say_msg (const_utf8_string msg) const;
393 385
394 void do_remove (); 386 void do_remove ();
395 MTH void remove () 387 MTH void remove ()
396 { 388 {
397 if (!flag [FLAG_REMOVED]) 389 if (!flag [FLAG_REMOVED])
412 404
413 int move (int dir) 405 int move (int dir)
414 { 406 {
415 return move (dir, this); 407 return move (dir, this);
416 } 408 }
409
410 // changes move_type to a new value - handles move_on/move_off effects
411 void change_move_type (MoveType mt);
417 412
418 static bool can_merge_slow (object *op1, object *op2); 413 static bool can_merge_slow (object *op1, object *op2);
419 414
420 // this is often used in time-critical code, so optimise 415 // this is often used in time-critical code, so optimise
421 MTH static bool can_merge (object *op1, object *op2) 416 MTH static bool can_merge (object *op1, object *op2)
476 MTH void drain_stat (); 471 MTH void drain_stat ();
477 MTH void drain_specific_stat (int deplete_stats); 472 MTH void drain_specific_stat (int deplete_stats);
478 MTH void change_luck (int value); 473 MTH void change_luck (int value);
479 474
480 // info must hold 256 * 3 bytes currently 475 // info must hold 256 * 3 bytes currently
481 const char *debug_desc (char *info) const; 476 const_utf8_string debug_desc (char *info) const;
482 MTH const char *debug_desc () const; // uses at least 3 round-robin buffers 477 MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
483 const char *flag_desc (char *desc, int len) const; 478 const_utf8_string flag_desc (char *desc, int len) const;
484 479
485 MTH bool decrease (sint32 nr = 1); // returns true if anything is left 480 MTH bool decrease (sint32 nr = 1); // returns true if anything is left
486 MTH object *split (sint32 nr = 1); // return 0 on failure 481 MTH object *split (sint32 nr = 1); // return 0 on failure
487 482
488 MTH int number_of () const 483 MTH int number_of () const
496 } 491 }
497 492
498 MTH void update_weight (); 493 MTH void update_weight ();
499 494
500 // return the dominant material of this item, always return something 495 // return the dominant material of this item, always return something
501 const materialtype_t *dominant_material () const; 496 const materialtype_t *dominant_material () const
497 {
498 return material;
499 }
502 500
503 // return the volume of this object in cm³ 501 // return the volume of this object in cm³
504 MTH uint64 volume () const 502 MTH uint64 volume () const
505 { 503 {
506 return (uint64)total_weight () 504 return (uint64)total_weight ()
507 * 1000 505 * 1024 // 1000 actually
508 * (type == CONTAINER ? 1000 : 1) 506 * (type == CONTAINER ? 128 : 1)
509 / dominant_material ()->density; 507 / dominant_material ()->density; // ugh, division
510 } 508 }
511 509
512 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; } 510 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
513 511
514 MTH bool is_wiz () const { return flag [FLAG_WIZ]; } 512 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
523 MTH bool is_arrow () const { return type == ARROW 521 MTH bool is_arrow () const { return type == ARROW
524 || (type == SPELL_EFFECT 522 || (type == SPELL_EFFECT
525 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 523 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
526 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; } 524 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
527 525
526 MTH bool is_dragon () const;
527
528 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } 528 MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
529 529
530 // temporary: wether the object can be saved in a map file 530 // temporary: wether the object can be saved in a map file
531 // contr => is a player 531 // contr => is a player
532 // head => only save head of a multitile object 532 // head => only save head of a multitile object
533 // owner => can not reference owner yet 533 // owner => can not reference owner yet
621 MTH std::string long_desc (object *who = 0); // query_name . " " . describe 621 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
622 MTH std::string describe_monster (object *who = 0); 622 MTH std::string describe_monster (object *who = 0);
623 MTH std::string describe_item (object *who = 0); 623 MTH std::string describe_item (object *who = 0);
624 MTH std::string describe (object *who = 0); // long description, without name 624 MTH std::string describe (object *who = 0); // long description, without name
625 625
626 MTH const char *query_weight () { return ::query_weight (this); } 626 MTH const_utf8_string query_weight () { return ::query_weight (this); }
627 MTH const char *query_name () { return ::query_name (this); } 627 MTH const_utf8_string query_name () { return ::query_name (this); }
628 MTH const char *query_short_name () { return ::query_short_name (this); } 628 MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
629 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); } 629 MTH const_utf8_string query_base_name (bool plural) { return ::query_base_name (this, plural); }
630 630
631 // If this object has no extra parts but should have them, 631 // If this object has no extra parts but should have them,
632 // add them, effectively expanding heads into multipart 632 // add them, effectively expanding heads into multipart
633 // objects. This method only works on objects not inserted 633 // objects. This method only works on objects not inserted
634 // anywhere. 634 // anywhere.
637 MTH void create_treasure (treasurelist *tl, int flags = 0); 637 MTH void create_treasure (treasurelist *tl, int flags = 0);
638 638
639 // insert object at same map position as 'where' 639 // insert object at same map position as 'where'
640 // handles both inventory and map "positions" 640 // handles both inventory and map "positions"
641 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 641 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
642 // check whether we can put this into the map, respect max_nrof, max_volume, max_items
643 MTH bool can_drop_at (maptile *m, int x, int y, object *originator = 0);
642 MTH void drop_unpaid_items (); 644 MTH void drop_unpaid_items ();
643 645
644 MTH void activate (); 646 MTH void activate ();
645 MTH void deactivate (); 647 MTH void deactivate ();
646 MTH void activate_recursive (); 648 MTH void activate_recursive ();
649 // set the given flag on all objects in the inventory recursively 651 // set the given flag on all objects in the inventory recursively
650 MTH void set_flag_inv (int flag, int value = 1); 652 MTH void set_flag_inv (int flag, int value = 1);
651 653
652 void enter_exit (object *exit);//Perl 654 void enter_exit (object *exit);//Perl
653 MTH void enter_map (maptile *newmap, int x, int y); 655 MTH void enter_map (maptile *newmap, int x, int y);
654 void player_goto (const char *path, int x, int y); // only for players 656 void player_goto (const_utf8_string path, int x, int y); // only for players
655 657
656 // returns the mapspace this object is in 658 // returns the mapspace this object is in
657 mapspace &ms () const; 659 mapspace &ms () const;
658 660
659 // fully recursive iterator 661 // fully recursive iterator
710 return weight + carrying; 712 return weight + carrying;
711 } 713 }
712 714
713 MTH struct region *region () const; 715 MTH struct region *region () const;
714 716
715 void statusmsg (const char *msg, int color = NDI_BLACK); 717 void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
716 void failmsg (const char *msg, int color = NDI_RED); 718 void failmsg (const_utf8_string msg, int color = NDI_RED);
717 719
718 const char *query_inventory (object *who = 0, const char *indent = ""); 720 const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
719 721
720 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference 722 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
721 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible 723 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
722 724
723 // make some noise with given item into direction dir, 725 // make some noise with given item into direction dir,
736 * range from 0 through 7. 738 * range from 0 through 7.
737 */ 739 */
738 MTH int anim_frames () const { return anim ().num_animations; } 740 MTH int anim_frames () const { return anim ().num_animations; }
739 MTH int anim_facings () const { return anim ().facings; } 741 MTH int anim_facings () const { return anim ().facings; }
740 742
741 MTH char *as_string (); 743 MTH utf8_string as_string ();
742 744
743protected: 745protected:
744 void link (); 746 void link ();
745 void unlink (); 747 void unlink ();
746 748
752 object (const object &); 754 object (const object &);
753}; 755};
754 756
755// move this object to the top of its env's inventory to speed up 757// move this object to the top of its env's inventory to speed up
756// searches for it. 758// searches for it.
757static object * 759static inline object *
758splay (object *ob) 760splay (object *ob)
759{ 761{
760 if (ob->above && ob->env) 762 if (ob->above && ob->env)
761 { 763 {
762 if (ob->above) ob->above->below = ob->below; 764 if (ob->above) ob->above->below = ob->below;
769 } 771 }
770 772
771 return ob; 773 return ob;
772} 774}
773 775
776//+GPL
777
774object *find_skill_by_name_fuzzy (object *who, const char *name); 778object *find_skill_by_name_fuzzy (object *who, const_utf8_string name);
775object *find_skill_by_name (object *who, shstr_cmp sh); 779object *find_skill_by_name (object *who, shstr_cmp sh);
776object *find_skill_by_number (object *who, int skillno); 780object *find_skill_by_number (object *who, int skillno);
777 781
778/* 782/*
779 * The archetype structure is a set of rules on how to generate and manipulate 783 * The archetype structure is a set of rules on how to generate and manipulate
782 * be much left in the archetype - all it really is is a holder for the 786 * be much left in the archetype - all it really is is a holder for the
783 * object and pointers. This structure should get removed, and just replaced 787 * object and pointers. This structure should get removed, and just replaced
784 * by the object structure 788 * by the object structure
785 */ 789 */
786 790
791//-GPL
792
787INTERFACE_CLASS (archetype) 793INTERFACE_CLASS (archetype)
788struct archetype : object 794struct archetype : object
789{ 795{
790 static arch_ptr empty; // the empty_archetype 796 static arch_ptr empty; // the empty_archetype
791 MTH static void gc (); 797 MTH static void gc ();
792 798
793 archetype (const char *name); 799 archetype (const_utf8_string name);
794 ~archetype (); 800 ~archetype ();
795 void gather_callbacks (AV *&callbacks, event_type event) const; 801 void gather_callbacks (AV *&callbacks, event_type event) const;
796 802
797 MTH static archetype *find (const_utf8_string name); 803 MTH static archetype *find (const_utf8_string name);
798 804
799 MTH void link (); 805 MTH void link ();
800 MTH void unlink (); 806 MTH void unlink ();
801 807
802 MTH static object *get (const char *name); // (find() || singularity)->instance() 808 MTH static object *get (const_utf8_string name); // (find() || singularity)->instance()
803 MTH object *instance (); 809 MTH object *instance ();
810
811 MTH void post_load_check (); // do some adjustments after parsing
804 812
805 object_vector_index ACC (RW, archid); // index in archvector 813 object_vector_index ACC (RW, archid); // index in archvector
806 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 814 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
807 815
808 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 816 sint8 ACC (RW, max_x); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
809 sint8 ACC (RW, max_x), ACC (RW, max_y);
810 817
811 // support for archetype loading 818 // support for archetype loading
812 static archetype *read (object_thawer &f); 819 static archetype *read (object_thawer &f);
813 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more 820 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
814 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */ 821 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
815}; 822};
816 823
817// compatbiility, remove once replaced by ->instance 824// returns whether the object is a dragon player, which are often specialcased
818inline object * 825inline bool
819arch_to_object (archetype *at) 826object::is_dragon () const
820{ 827{
821 return at->instance (); 828 return arch->race == shstr_dragon && is_player ();
822} 829}
823 830
824inline void 831inline void
825object_freezer::put (keyword k, archetype *v) 832object_freezer::put (const keyword_string k, archetype *v)
826{ 833{
827 put (k, v ? &v->archname : (const char *)0); 834 if (expect_true (v))
835 put (k, v->archname);
836 else
837 put (k);
828} 838}
829 839
830typedef object_vector<object, &object::index > objectvec; 840typedef object_vector<object, &object::index > objectvec;
831typedef object_vector<object, &object::active> activevec; 841typedef object_vector<object, &object::active> activevec;
832typedef object_vector<archetype, &archetype::archid> archvec; 842typedef object_vector<archetype, &archetype::archid> archvec;
849 statementvar (object *, var, actives [_i]) 859 statementvar (object *, var, actives [_i])
850 860
851#define for_all_archetypes(var) \ 861#define for_all_archetypes(var) \
852 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ 862 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
853 statementvar (archetype *, var, archetypes [_i]) 863 statementvar (archetype *, var, archetypes [_i])
864
865//+GPL
854 866
855/* Used by update_object to know if the object being passed is 867/* Used by update_object to know if the object being passed is
856 * being added or removed. 868 * being added or removed.
857 */ 869 */
858#define UP_OBJ_INSERT 1 870#define UP_OBJ_INSERT 1
888#define INS_ABOVE_FLOOR_ONLY 0x0002 900#define INS_ABOVE_FLOOR_ONLY 0x0002
889#define INS_NO_WALK_ON 0x0004 901#define INS_NO_WALK_ON 0x0004
890#define INS_ON_TOP 0x0008 902#define INS_ON_TOP 0x0008
891#define INS_BELOW_ORIGINATOR 0x0010 903#define INS_BELOW_ORIGINATOR 0x0010
892 904
893#define ARCH_DEPLETION "depletion" 905//-GPL
894 906
895#endif 907#endif
896 908

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines