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.64 by root, Sat Dec 23 06:21:02 2006 UTC vs.
Revision 1.223 by root, Sun Nov 29 17:41:07 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 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 (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at crossfire@schmorp.de 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24#ifndef OBJECT_H 25#ifndef OBJECT_H
25#define OBJECT_H 26#define OBJECT_H
26 27
27#include <bitset> 28#include <bitset>
28 29
29#include "cfperl.h" 30#include "cfperl.h"
30#include "shstr.h" 31#include "shstr.h"
31 32
33//+GPL
34
32typedef uint32 tag_t; 35typedef int tag_t;
33#define NUM_BODY_LOCATIONS 12 36
34#define BODY_ARMS 1 37enum {
38 body_skill,
39 body_combat,
40 body_range,
41 body_shield,
42 body_arm,
43 body_torso,
44 body_head,
45 body_neck,
46 body_finger,
47 body_shoulder,
48 body_foot,
49 body_hand,
50 body_wrist,
51 body_waist,
52 NUM_BODY_LOCATIONS
53};
54
55enum slottype_t
56{
57 slot_none,
58 slot_combat,
59 slot_ranged,
60};
35 61
36/* See common/item.c */ 62/* See common/item.c */
37 63
38typedef struct Body_Locations 64typedef struct Body_Locations
39{ 65{
40 const char *save_name; /* Name used to load/save it to disk */ 66 keyword save_name; /* Name used to load/save it to disk */
41 const char *use_name; /* Name used when describing an item we can use */ 67 const char *use_name; /* Name used when describing an item we can use */
42 const char *nonuse_name; /* Name to describe objects we can't use */ 68 const char *nonuse_name; /* Name to describe objects we can't use */
43} Body_Locations; 69} Body_Locations;
44 70
45extern Body_Locations body_locations[NUM_BODY_LOCATIONS]; 71extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
72
73#define NUM_COINS 4 /* number of coin types */
74extern const char *const coins[NUM_COINS + 1];
46 75
47/* 76/*
48 * Each object (this also means archetypes!) could have a few of these 77 * Each object (this also means archetypes!) could have a few of these
49 * "dangling" from it; this could also end up containing 'parse errors'. 78 * "dangling" from it; this could also end up containing 'parse errors'.
50 * 79 *
51 * key and value are shared-strings. 80 * key and value are shared-strings.
52 * 81 *
53 * Please use get_ob_key_value(), set_ob_key_value() from object.c rather than 82 * Please use kv_get/kv_set/kv_del from object rather than
54 * accessing the list directly. 83 * accessing the list directly.
55 * Exception is if you want to walk this list for some reason. 84 * Exception is if you want to walk this list for some reason.
56 */ 85 */
57struct key_value 86struct key_value : slice_allocated
58{ 87{
59 key_value *next; 88 key_value *next;
60 shstr key, value; 89 shstr key, value;
61}; 90};
62 91
92//-GPL
93
63struct UUID 94struct UUID
64{ 95{
65 uint64 seq; 96 uint64 seq;
97
98 enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
99
100 static UUID cur; // last uuid generated
101 static void init ();
102 static UUID gen ();
66 103
67 UUID () { } 104 UUID () { }
68 UUID (uint64 seq) : seq(seq) { } 105 UUID (uint64 seq) : seq(seq) { }
69 operator uint64() { return seq; } 106 operator uint64() { return seq; }
70 void operator =(uint64 seq) { this->seq = seq; } 107 void operator =(uint64 seq) { this->seq = seq; }
108
109 bool parse (const char *s);
110 char *append (char *buf) const;
111 char *c_str () const;
71}; 112};
72 113
73extern void init_uuid (); 114//+GPL
74extern UUID gen_uuid ();
75extern const uint64 UUID_SKIP;
76 115
77/* Definition for WILL_APPLY values. Replaces having harcoded values 116/* Definition for WILL_APPLY values. Replaces having harcoded values
78 * 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
79 * 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
80 * can_apply and will_apply? 119 * can_apply and will_apply?
83#define WILL_APPLY_TREASURE 0x02 122#define WILL_APPLY_TREASURE 0x02
84#define WILL_APPLY_EARTHWALL 0x04 123#define WILL_APPLY_EARTHWALL 0x04
85#define WILL_APPLY_DOOR 0x08 124#define WILL_APPLY_DOOR 0x08
86#define WILL_APPLY_FOOD 0x10 125#define WILL_APPLY_FOOD 0x10
87 126
88/* However, if you're keeping a pointer of some sort, you probably 127struct body_slot
89 * don't just want it copied, so you'll need to add to common/object.C,
90 * e.g. ->copy_to ()
91 */
92
93// these are not being copied
94ACC_CLASS (object)
95struct object_keep : refcounted
96{ 128{
97 /* These variables are not changed by ->copy_to */ 129 signed char used:4; /* Calculated value based on items equipped */
98 130 signed char info:4; /* body info as loaded from the file */
99 tag_t ACC (RW, count); /* Generation count for this object */
100 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
101
102 player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
103 object *ACC (RW, next); /* Pointer to the next object in the free/used list */
104 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */
105 object *ACC (RW, active_next);/* Next & previous object in the 'active' */
106 object *ACC (RW, active_prev);/* List. This is used in process_events */
107 /* so that the entire object list does not */
108 /* need to be gone through. */
109 object *ACC (RW, below); /* Pointer to the object stacked below this one */
110 object *ACC (RW, above); /* Pointer to the object stacked above this one */
111 /* Note: stacked in the *same* environment */
112 object *inv; /* Pointer to the first object in the inventory */
113 object *ACC (RW, container); /* Current container being used. I think this
114 * is only used by the player right now.
115 */
116 object *ACC (RW, env); /* Pointer to the object which is the environment.
117 * This is typically the container that the object is in.
118 */
119 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
120 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
121 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
122 client_container *seen_by; // seen by which player/container currently?
123}; 131};
124 132
133typedef struct oblnk
134{ /* Used to link together several objects */
135 object_ptr ob;
136 struct oblnk *next;
137} objectlink;
138
139typedef struct oblinkpt
140{ /* Used to link together several object links */
141 struct oblnk *link;
142 struct oblinkpt *next;
143 shstr id; /* Used as connected value in buttons/gates */
144} oblinkpt;
145
146INTERFACE_CLASS (object)
125// these are being copied 147// these are being copied
126struct object_copy : attachable<object> 148struct object_copy : attachable
127{ 149{
150 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
151
152 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
153 uint8 ACC (RW, subtype); /* subtype of object */
154 sint8 ACC (RW, direction); /* Means the object is moving that way. */
155 sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
156
128 shstr ACC (RW, name); /* The name of the object, obviously... */ 157 shstr ACC (RW, name); /* The name of the object, obviously... */
129 shstr ACC (RW, name_pl); /* The plural name of the object */ 158 shstr ACC (RW, name_pl); /* The plural name of the object */
130 shstr ACC (RW, title); /* Of foo, etc */ 159 shstr ACC (RW, title); /* Of foo, etc */
131 shstr ACC (RW, race); /* human, goblin, dragon, etc */ 160 shstr ACC (RW, race); /* human, goblin, dragon, etc */
132 shstr ACC (RW, slaying); /* Which race to do double damage to */ 161 shstr ACC (RW, slaying); /* Which race to do double damage to */
133 /* If this is an exit, this is the filename */ 162 /* If this is an exit, this is the filename */
163
164 typedef bitset<NUM_FLAGS> flags_t;
165 flags_t flag; /* various flags */
166#if FOR_PERL
167 bool ACC (RW, flag[NUM_FLAGS]);
168#endif
169
170 materialtype_t *material; // What material this object consists of //TODO, make perl-accessible
134 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 */
135 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
136 shstr ACC (RW, lore); /* Obscure information about this object, */
137 /* To get put into books and the like. */
138 shstr ACC (RW, materialname); /* specific material name */
139 shstr ACC (RW, custom_name); /* Custom name assigned by player */
140 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 */
141 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 */
142 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 */
143 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ 175 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
144 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 */
145 object_ptr ACC (RW, spell); /* Spell that was being cast */ 177 object_ptr ACC (RW, spell); /* Spell that was being cast */
146 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */ 178 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
147 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 179 arch_ptr ACC (RW, arch); /* Pointer to archetype */
148 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 180 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
149};
150 181
151// these are being copied and also cleared
152struct object_pod
153{
154 typedef bitset<NUM_FLAGS> flags_t;
155
156 New_Face *ACC (RW, face); /* Face with colors */
157 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
158 float ACC (RW, speed); /* The overall speed of this object */ 182 float ACC (RW, speed); /* The overall speed of this object */
159 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 183 float ACC (RW, speed_left); /* How much speed is left to spend this round */
184
160 uint32 ACC (RW, nrof); /* How many of the objects */ 185 sint32 ACC (RW, nrof); /* How many of the objects */
161 sint8 ACC (RW, direction); /* Means the object is moving that way. */
162 sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
163
164 /* This next big block are basically used for monsters and equipment */ 186 /* This next big block is basically used for monsters and equipment */
165 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
166 uint8 ACC (RW, subtype); /* subtype of object */
167 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ 187 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
168 sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */ 188 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
189
169 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */ 190 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
170 uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */ 191 uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
171 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */ 192 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
172 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */ 193 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
173 uint16 ACC (RW, material); /* What materials this object consist of */ 194
195 uint16 ACC (RW, materials); /* What materials this object consists of */
174 sint8 ACC (RW, magic); /* Any magical bonuses to this item */ 196 sint8 ACC (RW, magic); /* Any magical bonuses to this item */
175 uint8 ACC (RW, state); /* How the object was last drawn (animation) */ 197 uint8 ACC (RW, state); /* How the object was last drawn (animation) */
176 sint32 ACC (RW, value); /* How much money it is worth (or contains) */ 198 sint32 ACC (RW, value); /* How much money it is worth (or contains) */
199
177 /* Note that the last_.. values are sometimes used for non obvious 200 /* Note that the last_.. values are sometimes used for non obvious
178 * meanings by some objects, eg, sp penalty, permanent exp. 201 * meanings by some objects, eg, sp penalty, permanent exp.
179 */ 202 */
180 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */ 203 sint16 ACC (RW, last_heal); /* Last healed. Depends on constitution */
181 sint32 ACC (RW, last_sp); /* As last_heal, but for spell points */ 204 sint16 ACC (RW, last_sp); /* As last_heal, but for spell points */
182 sint16 ACC (RW, last_grace); /* as last_sp, except for grace */ 205 sint16 ACC (RW, last_grace); /* as last_sp, except for grace */
183 sint16 ACC (RW, last_eat); /* How long since we last ate */ 206 sint16 ACC (RW, last_eat); /* How long since we last ate */
207
184 sint16 ACC (RW, invisible); /* How much longer the object will be invis */ 208 sint16 ACC (RW, invisible); /* How much longer the object will be invis */
185 sint16 ACC (RW, level); /* Level of creature or object */ 209 sint16 ACC (RW, level); /* Level of creature or object */
210
186 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 211 uint8 ACC (RW, pick_up); /* See crossfire.doc */
187 sint8 ACC (RW, item_power); /* power rating of the object */
188 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) */
189 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 */
214 uint8 ACC (RW, weapontype); /* type of weapon */
215
216 body_slot slot [NUM_BODY_LOCATIONS];
217
218 faceidx ACC (RW, face); /* the graphical face */
219
220 faceidx ACC (RW, sound); /* the sound face */
221 faceidx ACC (RW, sound_destroy); /* played on destroy */
222
190 sint32 ACC (RW, weight); /* Attributes of the object */ 223 sint32 ACC (RW, weight); /* Attributes of the object */
191 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 224 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
225
192 sint32 ACC (RW, carrying); /* How much weight this object contains */ 226 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
227
193 sint64 ACC (RW, perm_exp); /* Permanent exp */ 228 sint64 ACC (RW, perm_exp); /* Permanent exp */
194 uint32 ACC (RW, weapontype); /* type of weapon */
195 uint32 ACC (RW, tooltype); /* type of tool or build facility */
196 sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */
197 sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */
198 living ACC (RO, stats); /* Str, Con, Dex, etc */ 229 living ACC (RO, stats); /* Str, Con, Dex, etc */
199 /* See the doc/Developers/objects for more info about body locations */ 230 /* See the pod/objects.pod for more info about body locations */
200 231
201 /* Following mostly refers to fields only used for monsters */ 232 /* Following mostly refers to fields only used for monsters */
202 uint32 ACC (RW, hide); /* The object is hidden, not invisible */
203 /* changes made by kholland@sunlab.cit.cornell.edu */
204 /* allows different movement patterns for attackers */
205 sint32 ACC (RW, move_status); /* What stage in attack mode */
206 uint16 ACC (RW, attack_movement); /* What kind of attack movement */
207 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
208 float ACC (RW, expmul); /* needed experience = (calc_exp*expmul) - means some */
209 /* races/classes can need less/more exp to gain levels */
210 233
211 /* Spell related information, may be useful elsewhere 234 /* Spell related information, may be useful elsewhere
212 * Note that other fields are used - these files are basically 235 * Note that other fields are used - these files are basically
213 * only used in spells. 236 * only used in spells.
214 */ 237 */
215 sint16 ACC (RW, duration); /* How long the spell lasts */ 238 sint16 ACC (RW, duration); /* How long the spell lasts */
216 sint16 ACC (RW, casting_time);/* time left before spell goes off */ 239 uint8 ACC (RW, casting_time); /* time left before spell goes off */
217 uint16 ACC (RW, start_holding);
218 uint8 ACC (RW, duration_modifier); /* how level modifies duration */ 240 uint8 ACC (RW, duration_modifier); /* how level modifies duration */
241
219 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */ 242 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
220 sint8 ACC (RW, range); /* Range of the spell */ 243 sint8 ACC (RW, range); /* Range of the spell */
221 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 244 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
222 char *ACC (RW, spellarg); 245 sint8 ACC (RW, item_power); /* power rating of the object */
246
247 uint8 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
248 MoveType ACC (RW, move_type); /* Type of movement this object uses */
249 MoveType ACC (RW, move_block);/* What movement types this blocks */
250 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
251
252 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
253 MoveType ACC (RW, move_off); /* Move types affected moving off this space */
254 MoveType ACC (RW, move_slow); /* Movement types this slows down */
255
256 // 8 free bits
257
258 //float ACC (RW, expmul) = 1.0; /* needed experience = (calc_exp*expmul) - means some */
259 // /* races/classes can need less/more exp to gain levels */
260 static const float expmul = 1.0;//D
261 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
223 262
224 /* Following are values used by any object */ 263 /* Following are values used by any object */
225 /* this objects turns into or what this object creates */ 264 /* this objects turns into or what this object creates */
226 treasurelist *ACC (RW, randomitems); /* Items to be generated */ 265 treasurelist *ACC (RW, randomitems); /* Items to be generated */
227 key_value *key_values; /* Fields not explictly known by the loader. */ 266
228 object_pod::flags_t flags; /* various flags */
229 uint16 ACC (RW, animation_id);/* An index into the animation array */
230 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
231 uint8 ACC (RW, last_anim); /* last sequence used to draw face */ 267 uint8 ACC (RW, last_anim); /* last sequence used to draw face */
232 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
233 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ 268 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
234 uint8 ACC (RW, will_apply); /* See crossfire.doc */ 269 uint8 ACC (RW, will_apply); /* See crossfire.doc */
270 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
271 uint16 ACC (RW, animation_id);/* An index into the animation array */
272 uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */
235 273
236 MoveType ACC (RW, move_type); /* Type of movement this object uses */ 274 uint16 ACC (RW, cached_eat); /* cached food, used by esrv_update_spells */
237 MoveType ACC (RW, move_block);/* What movement types this blocks */ 275 uint16 ACC (RW, cached_sp); /* cached spell points used for a spell, used by esrv_update_spells */
238 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */ 276 /* allows different movement patterns for attackers */
239 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */ 277 uint8 ACC (RW, move_status); /* What stage in attack mode */
240 MoveType ACC (RW, move_off); /* Move types affected moving off this space */ 278 uint8 ACC (RW, attack_movement);/* What kind of attack movement */
241 MoveType ACC (RW, move_slow); /* Movement types this slows down */ 279
242 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 280 //16+ free bits
281
282 // rarely-accessed members should be at the end
283 shstr ACC (RW, tag); // a tag used to tracking this object
284 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
285 shstr ACC (RW, lore); /* Obscure information about this object, */
286 /* To get put into books and the like. */
287 shstr ACC (RW, custom_name); /* Custom name assigned by player */
243}; 288};
244 289
290const char *query_weight (const object *op);
291const char *query_short_name (const object *op);
292const char *query_name (const object *op);
293const char *query_base_name (const object *op, int plural);
294
245struct object : zero_initialised, object_keep, object_copy, object_pod 295struct object : zero_initialised, object_copy
246{ 296{
247 typedef object_pod::flags_t flags_t; 297 // These variables are not changed by ->copy_to
248 typedef unordered_vector<object *> vector; 298 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
249 299
250 static vector mortals; 300 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
251 static vector active; // active objects, not yet used 301 int ACC (RO, count);
252 static vector objects; // not used yet, use first->next->... 302 object_vector_index ACC (RO, index); // index into objects
253 static object *first; // will be replaced by "objects" 303 object_vector_index ACC (RO, active); // index into actives
254 304
305 player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */
306
307 object *ACC (RW, below); /* Pointer to the object stacked below this one */
308 object *ACC (RW, above); /* Pointer to the object stacked above this one */
309 /* Note: stacked in the *same* environment */
310 object *inv; /* Pointer to the first object in the inventory */
311
312 //TODO: container must move into client
313 object_ptr ACC (RW, container);/* Currently opened container. I think this
314 * is only used by the player right now.
315 */
316 object *ACC (RW, env); /* Pointer to the object which is the environment.
317 * This is typically the container that the object is in.
318 */
319 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
320 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
321 key_value *key_values; /* Fields not explictly known by the loader. */
322
323 // privates / perl
324 shstr_tmp kv_get (shstr_tmp key) const;
325 void kv_del (shstr_tmp key);
326 void kv_set (shstr_tmp key, shstr_tmp value);
327
328//-GPL
329
330 // custom extra fields management
331 struct key_value_access_proxy
332 {
333 object &ob;
334 shstr_tmp key;
335
336 key_value_access_proxy (object &ob, shstr_tmp key)
337 : ob (ob), key (key)
338 {
339 }
340
341 const key_value_access_proxy &operator =(shstr_tmp value) const
342 {
343 ob.kv_set (key, value);
344 return *this;
345 }
346
347 operator const shstr_tmp () const { return ob.kv_get (key); }
348 operator const char *() const { return ob.kv_get (key); }
349
350 private:
351 void operator =(int);
352 };
353
354 // operator [] is too annoying to use
355 const key_value_access_proxy kv (shstr_tmp key)
356 {
357 return key_value_access_proxy (*this, key);
358 }
359
360 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
361 MTH void post_load_check (); // do some adjustments after parsing
362 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
363 bool write (object_freezer &f);
364
365 MTH int slottype () const;
255 static object *create (); 366 MTH static object *create ();
367 const mapxy &operator =(const mapxy &pos);
256 void copy_to (object *dst); 368 MTH void copy_to (object *dst);
257 object *clone (); // create + copy_to 369 MTH object *clone (); // create + copy_to a single object
258 void destroy (bool destroy_inventory = false); 370 MTH object *deep_clone (); // copy whole more chain and inventory
259 void remove (); 371 void do_destroy ();
372 void gather_callbacks (AV *&callbacks, event_type event) const;
373 MTH void destroy ();
374 MTH void drop_and_destroy ()
375 {
376 destroy_inv (true);
377 destroy ();
378 }
379
380 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
381 MTH void destroy_inv (bool drop_to_ground = false);
260 object *insert (object *item); // insert into inventory 382 MTH object *insert (object *item); // insert into inventory
383 MTH void play_sound (faceidx sound) const;
384 MTH void say_msg (const char *msg) const;
261 385
262 static void free_mortals (); 386 void do_remove ();
387 MTH void remove ()
388 {
389 if (!flag [FLAG_REMOVED])
390 do_remove ();
391 }
392
393 MTH bool blocked (maptile *m, int x, int y) const;
394
395 void move_to (const mapxy &pos)
396 {
397 remove ();
398 *this = pos;
399 insert_at (this, this);
400 }
401
402 // high-level move functions, return true if successful
403 int move (int dir, object *originator);
404
405 int move (int dir)
406 {
407 return move (dir, this);
408 }
409
263 static bool can_merge_slow (object *op1, object *op2); 410 static bool can_merge_slow (object *op1, object *op2);
264 411
265 // this is often used in time-critical code, so optimise 412 // this is often used in time-critical code, so optimise
266 static bool can_merge (object *op1, object *op2) 413 MTH static bool can_merge (object *op1, object *op2)
267 { 414 {
268 return op1->value == op2->value 415 return op1->value == op2->value
269 && op1->name == op2->name 416 && op1->name == op2->name
270 && can_merge_slow (op1, op2); 417 && can_merge_slow (op1, op2);
271 } 418 }
272 419
273 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
274
275 void set_owner (object *owner); 420 MTH void set_owner (object *owner);
421 MTH void set_speed (float speed);
422 MTH void set_glow_radius (sint8 rad);
423 MTH bool change_weapon (object *ob);
424 MTH bool change_skill (object *ob);
276 425
426 MTH void open_container (object *new_container);
427 MTH void close_container ()
428 {
429 open_container (0);
430 }
431
432 // potential future accessor for "container"
433 MTH object *container_ () const
434 {
435 return container;
436 }
437
438 MTH bool is_open_container () const
439 {
440 // strangely enough, using ?: here causes code to inflate
441 return type == CONTAINER
442 && ((env && env->container_ () == this)
443 || (!env && flag [FLAG_APPLIED]));
444 }
445
446 MTH object *force_find (shstr_tmp name);
447 MTH void force_set_timer (int duration);
448 MTH object *force_add (shstr_tmp name, int duration = 0);
449
450 oblinkpt *find_link () const;
451 MTH void add_link (maptile *map, shstr_tmp id);
452 MTH void remove_link ();
453
454 // overwrite the attachable should_invoke function with a version that also checks ev_want_type
455 bool should_invoke (event_type event)
456 {
457 return ev_want_event [event] || ev_want_type [type] || cb;
458 }
459
277 void instantiate () 460 MTH void instantiate ();
278 {
279 if (!uuid.seq) // HACK
280 uuid = gen_uuid ();
281
282 attachable<object>::instantiate ();
283 }
284 461
285 // recalculate all stats 462 // recalculate all stats
286 void update_stats (); 463 MTH void update_stats ();
287 void roll_stats (); 464 MTH void roll_stats ();
288 void swap_stats (int a, int b); 465 MTH void swap_stats (int a, int b);
289 void add_statbonus (); 466 MTH void add_statbonus ();
290 void remove_statbonus (); 467 MTH void remove_statbonus ();
291 void drain_stat (); 468 MTH void drain_stat ();
292 void drain_specific_stat (int deplete_stats); 469 MTH void drain_specific_stat (int deplete_stats);
293 void change_luck (int value); 470 MTH void change_luck (int value);
294 471
295 // info must hold 256 * 3 bytes currently 472 // info must hold 256 * 3 bytes currently
296 const char *debug_desc (char *info) const; 473 const char *debug_desc (char *info) const;
297 const char *debug_desc () const; 474 MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
475 const char *flag_desc (char *desc, int len) const;
298 476
477 MTH bool decrease (sint32 nr = 1); // returns true if anything is left
478 MTH object *split (sint32 nr = 1); // return 0 on failure
479
480 MTH int number_of () const
481 {
482 return nrof ? nrof : 1;
483 }
484
485 MTH sint32 total_weight () const
486 {
487 return (weight + carrying) * number_of ();
488 }
489
490 MTH void update_weight ();
491
492 // return the dominant material of this item, always return something
493 const materialtype_t *dominant_material () const
494 {
495 return material;
496 }
497
498 // return the volume of this object in cm³
499 MTH uint64 volume () const
500 {
501 return (uint64)total_weight ()
502 * 1024 // 1000 actually
503 * (type == CONTAINER ? 128 : 1)
504 / dominant_material ()->density; // ugh, division
505 }
506
507 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
508
509 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
299 bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; } 510 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
300 bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET 511 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET
301 || type == CLOAK || type == BOOTS || type == GLOVES 512 || type == CLOAK || type == BOOTS || type == GLOVES
302 || type == BRACERS || type == GIRDLE; } 513 || type == BRACERS || type == GIRDLE; }
303 bool is_alive () const { return (type == PLAYER 514 MTH bool is_alive () const { return (type == PLAYER
304 || flags [FLAG_MONSTER] 515 || flag [FLAG_MONSTER]
305 || (flags [FLAG_ALIVE] && !flags [FLAG_GENERATOR] && type != DOOR)) 516 || (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))
306 && !flags [FLAG_IS_A_TEMPLATE]; } 517 && !flag [FLAG_IS_A_TEMPLATE]; }
307 bool is_arrow () const { return type == ARROW 518 MTH bool is_arrow () const { return type == ARROW
308 || (type == SPELL_EFFECT 519 || (type == SPELL_EFFECT
309 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 520 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
521 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
522
523 MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
524
525 // temporary: wether the object can be saved in a map file
526 // contr => is a player
527 // head => only save head of a multitile object
528 // owner => can not reference owner yet
529 MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
310 530
311 /* This return true if object has still randomitems which 531 /* This return true if object has still randomitems which
312 * could be expanded. 532 * could be expanded.
313 */ 533 */
314 bool has_random_items () const { return randomitems && !flags [FLAG_IS_A_TEMPLATE]; } 534 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
535
536 static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
537
538 MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
539
540 // returns the outermost owner, never returns 0
541 MTH object *outer_owner ()
542 {
543 object *op;
544
545 for (op = this; op->owner; op = op->owner)
546 ;
547
548 return op;
549 }
550
551 // returns the outermost environment, never returns 0
552 MTH object *outer_env_or_self () const
553 {
554 const object *op;
555
556 for (op = this; op->env; op = op->env)
557 ;
558
559 return const_cast<object *>(op);
560 }
561
562 // returns the outermost environment, may return 0
563 MTH object *outer_env () const
564 {
565 return env ? outer_env_or_self () : 0;
566 }
315 567
316 // returns the player that has this object in his inventory, or 0 568 // returns the player that has this object in his inventory, or 0
569 // we assume the player is always the outer env
317 object *in_player () const 570 MTH object *in_player () const
318 { 571 {
319 for (object *op = env; op; op = op->env) 572 object *op = outer_env_or_self ();
320 if (op->type == PLAYER)
321 return op;
322 573
574 return op->type == PLAYER ? op : 0;
575 }
576
577 // "temporary" helper function
578 MTH object *head_ () const
579 {
580 return head ? head : const_cast<object *>(this);
581 }
582
583 MTH bool is_head () const
584 {
585 return head_ () == this;
586 }
587
588 MTH bool is_on_map () const
589 {
590 return !env && !flag [FLAG_REMOVED];
591 }
592
593 MTH bool is_inserted () const
594 {
595 return !flag [FLAG_REMOVED];
596 }
597
598 MTH bool is_player () const
599 {
323 return 0; 600 return !!contr;
324 } 601 }
602
603 MTH bool affects_los () const
604 {
605 return glow_radius || flag [FLAG_BLOCKSVIEW];
606 }
607
608 MTH bool has_carried_lights () const
609 {
610 return glow_radius;
611 }
612
613 // returns the player that cna see this object, if any
614 MTH object *visible_to () const;
615
616 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
617 MTH std::string describe_monster (object *who = 0);
618 MTH std::string describe_item (object *who = 0);
619 MTH std::string describe (object *who = 0); // long description, without name
620
621 MTH const char *query_weight () { return ::query_weight (this); }
622 MTH const char *query_name () { return ::query_name (this); }
623 MTH const char *query_short_name () { return ::query_short_name (this); }
624 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); }
625
626 // If this object has no extra parts but should have them,
627 // add them, effectively expanding heads into multipart
628 // objects. This method only works on objects not inserted
629 // anywhere.
630 MTH void expand_tail ();
631
632 MTH void create_treasure (treasurelist *tl, int flags = 0);
633
634 // insert object at same map position as 'where'
635 // handles both inventory and map "positions"
636 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
637 // check whether we can put this into the map, respect max_nrof, max_volume, max_items
638 MTH bool can_drop_at (maptile *m, int x, int y, object *originator = 0);
639 MTH void drop_unpaid_items ();
640
641 MTH void activate ();
642 MTH void deactivate ();
643 MTH void activate_recursive ();
644 MTH void deactivate_recursive ();
645
646 // set the given flag on all objects in the inventory recursively
647 MTH void set_flag_inv (int flag, int value = 1);
648
649 void enter_exit (object *exit);//Perl
650 MTH void enter_map (maptile *newmap, int x, int y);
651 void player_goto (const char *path, int x, int y); // only for players
325 652
326 // returns the mapspace this object is in 653 // returns the mapspace this object is in
327 mapspace &ms () const; 654 mapspace &ms () const;
328 655
329 // fully recursive iterator 656 // fully recursive iterator
339 operator object *() const { return item; } 666 operator object *() const { return item; }
340 667
341 object *operator ->() const { return item; } 668 object *operator ->() const { return item; }
342 object &operator * () const { return *item; } 669 object &operator * () const { return *item; }
343 }; 670 };
671
672 MTH unsigned int random_seed () const
673 {
674 return (unsigned int)uuid.seq;
675 }
344 676
345 // depth-first recursive iterator 677 // depth-first recursive iterator
346 struct depth_iterator : iterator_base 678 struct depth_iterator : iterator_base
347 { 679 {
348 depth_iterator (object *container); 680 depth_iterator (object *container);
359 object *end () 691 object *end ()
360 { 692 {
361 return this; 693 return this;
362 } 694 }
363 695
696 /* This returns TRUE if the object is something that
697 * a client might want to know about.
698 */
699 MTH bool client_visible () const
700 {
701 return !invisible && type != PLAYER;
702 }
703
704 // the client does nrof * this weight
705 MTH sint32 client_weight () const
706 {
707 return weight + carrying;
708 }
709
710 MTH struct region *region () const;
711
712 void statusmsg (const char *msg, int color = NDI_BLACK);
713 void failmsg (const char *msg, int color = NDI_RED);
714
715 const char *query_inventory (object *who = 0, const char *indent = "");
716
717 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
718 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
719
720 // make some noise with given item into direction dir,
721 // currently only used for players to make them temporarily visible
722 // when they are invisible.
723 MTH void make_noise ();
724
725 /* animation */
726 MTH bool has_anim () const { return animation_id; }
727 const animation &anim () const { return animations [animation_id]; }
728 MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
729 MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
730 /* anim_frames () returns the number of animations allocated. The last
731 * usuable animation will be anim_frames () - 1 (for example, if an object
732 * has 8 animations, anim_frames () will return 8, but the values will
733 * range from 0 through 7.
734 */
735 MTH int anim_frames () const { return anim ().num_animations; }
736 MTH int anim_facings () const { return anim ().facings; }
737
738 MTH char *as_string ();
739
364protected: 740protected:
365 friend struct archetype;
366
367 void link (); 741 void link ();
368 void unlink (); 742 void unlink ();
369 743
370 object (); 744 object ();
371 ~object (); 745 ~object ();
746
747private:
748 object &operator =(const object &);
749 object (const object &);
372}; 750};
373 751
374typedef struct oblnk 752// move this object to the top of its env's inventory to speed up
375{ /* Used to link together several objects */ 753// searches for it.
376 object_ptr ob; 754static inline object *
377 struct oblnk *next; 755splay (object *ob)
378} objectlink; 756{
757 if (ob->above && ob->env)
758 {
759 if (ob->above) ob->above->below = ob->below;
760 if (ob->below) ob->below->above = ob->above;
379 761
380typedef struct oblinkpt 762 ob->above = 0;
381{ /* Used to link together several object links */ 763 ob->below = ob->env->inv;
382 struct oblnk *link; 764 ob->below->above = ob;
383 long value; /* Used as connected value in buttons/gates */ 765 ob->env->inv = ob;
384 struct oblinkpt *next; 766 }
385} oblinkpt; 767
768 return ob;
769}
770
771//+GPL
772
773object *find_skill_by_name_fuzzy (object *who, const char *name);
774object *find_skill_by_name (object *who, shstr_cmp sh);
775object *find_skill_by_number (object *who, int skillno);
386 776
387/* 777/*
388 * The archetype structure is a set of rules on how to generate and manipulate 778 * The archetype structure is a set of rules on how to generate and manipulate
389 * objects which point to archetypes. 779 * objects which point to archetypes.
390 * This probably belongs in arch.h, but there really doesn't appear to 780 * This probably belongs in arch.h, but there really doesn't appear to
391 * be much left in the archetype - all it really is is a holder for the 781 * be much left in the archetype - all it really is is a holder for the
392 * object and pointers. This structure should get removed, and just replaced 782 * object and pointers. This structure should get removed, and just replaced
393 * by the object structure 783 * by the object structure
394 */ 784 */
395 785
786//-GPL
787
396ACC_CLASS (archetype) 788INTERFACE_CLASS (archetype)
397struct archetype : zero_initialised, refcounted 789struct archetype : object
398{ 790{
399 archetype (); 791 static arch_ptr empty; // the empty_archetype
792 MTH static void gc ();
793
794 archetype (const char *name);
400 ~archetype (); 795 ~archetype ();
796 void gather_callbacks (AV *&callbacks, event_type event) const;
401 797
402 static archetype *find (const char *arch); 798 MTH static archetype *find (const_utf8_string name);
403 799
404 void hash_add (); // add to hastable 800 MTH void link ();
405 void hash_del (); // remove from hashtable 801 MTH void unlink ();
406 802
803 MTH static object *get (const char *name); // (find() || singularity)->instance()
804 MTH object *instance ();
805
806 MTH void post_load_check (); // do some adjustments after parsing
807
808 object_vector_index ACC (RW, archid); // index in archvector
407 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 809 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
408 struct archetype *ACC (RW, next); /* Next archetype in a linked list */ 810
409 struct archetype *ACC (RW, head); /* The main part of a linked object */ 811 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
410 struct archetype *ACC (RW, more); /* Next part of a linked object */ 812 sint8 ACC (RW, max_x), ACC (RW, max_y);
411 object ACC (RO, clone); /* An object from which to do ->copy_to () */ 813
412 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ 814 // support for archetype loading
413 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is 815 static archetype *read (object_thawer &f);
414 * in comparison to the head. 816 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
415 */ 817 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
416}; 818};
417 819
820inline void
821object_freezer::put (const keyword_string k, archetype *v)
822{
823 if (expect_true (v))
824 put (k, v->archname);
825 else
826 put (k);
827}
828
829typedef object_vector<object, &object::index > objectvec;
830typedef object_vector<object, &object::active> activevec;
831typedef object_vector<archetype, &archetype::archid> archvec;
832
418extern object *objects; 833extern objectvec objects;
419extern object *active_objects; 834extern activevec actives;
835extern archvec archetypes;
420 836
421extern int nrofallocobjects; 837// "safely" iterate over inv in a way such that the current item is removable
838// quite horrible, that's why its hidden in some macro
839#define for_inv_removable(op,var) \
840 for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
422 841
423/* This returns TRUE if the object is something that 842#define for_all_objects(var) \
424 * should be displayed in the look window 843 for (unsigned _i = 0; _i < objects.size (); ++_i) \
425 */ 844 statementvar (object *, var, objects [_i])
426#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR) 845
846#define for_all_actives(var) \
847 for (unsigned _i = 0; _i < actives.size (); ++_i) \
848 statementvar (object *, var, actives [_i])
849
850#define for_all_archetypes(var) \
851 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
852 statementvar (archetype *, var, archetypes [_i])
853
854//+GPL
427 855
428/* Used by update_object to know if the object being passed is 856/* Used by update_object to know if the object being passed is
429 * being added or removed. 857 * being added or removed.
430 */ 858 */
431#define UP_OBJ_INSERT 1 859#define UP_OBJ_INSERT 1
448 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator - 876 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
449 * Use for treasure chests so the new object is the highest thing 877 * Use for treasure chests so the new object is the highest thing
450 * beneath the player, but not actually above it. Note - the 878 * beneath the player, but not actually above it. Note - the
451 * map and x,y coordinates for the object to be inserted must 879 * map and x,y coordinates for the object to be inserted must
452 * match the originator. 880 * match the originator.
453 * INS_MAP_LOAD: disable lots of checkings done at insertion to
454 * speed up map loading process, as we assume the ordering in
455 * loaded map is correct.
456 * 881 *
457 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY 882 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
458 * are mutually exclusive. The behaviour for passing more than one 883 * are mutually exclusive. The behaviour for passing more than one
459 * should be considered undefined - while you may notice what happens 884 * should be considered undefined - while you may notice what happens
460 * right now if you pass more than one, that could very well change 885 * right now if you pass more than one, that could very well change
463#define INS_NO_MERGE 0x0001 888#define INS_NO_MERGE 0x0001
464#define INS_ABOVE_FLOOR_ONLY 0x0002 889#define INS_ABOVE_FLOOR_ONLY 0x0002
465#define INS_NO_WALK_ON 0x0004 890#define INS_NO_WALK_ON 0x0004
466#define INS_ON_TOP 0x0008 891#define INS_ON_TOP 0x0008
467#define INS_BELOW_ORIGINATOR 0x0010 892#define INS_BELOW_ORIGINATOR 0x0010
468#define INS_MAP_LOAD 0x0020
469 893
470#define ARCH_SINGULARITY "singularity" 894//-GPL
471#define ARCH_SINGULARITY_LEN 11
472#define ARCH_DETECT_MAGIC "detect_magic"
473#define ARCH_DEPLETION "depletion"
474#define ARCH_SYMPTOM "symptom"
475 895
476#endif 896#endif
477 897

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines