ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.30 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.97 by root, Wed May 4 07:41:14 2011 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 (at your option) any later version. 11 * option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 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
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 21 *
22 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client/server logic. 27 * Client/server logic.
28 * 28 *
29 * \date 2003-12-02 29 * \date 2003-12-02
30 * 30 *
31 * This containes item logic for client/server. It doesn't contain 31 * This contains item logic for client/server. It doesn't contain
32 * the actual commands that send the data, but does contain 32 * the actual commands that send the data, but does contain
33 * the logic for what items should be sent. 33 * the logic for what items should be sent.
34 */ 34 */
35 35
36#include <global.h> 36#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
38#include <sproto.h> 38#include <sproto.h>
39 39
40/** This is the maximum number of bytes we expect any one item to take up */ 40/** This is the maximum number of bytes we expect any one item to take up */
41#define MAXITEMLEN 300 41#define MAXITEMLEN 300
42
43#if 0
44tag_t
45client_container::tag () const
46{
47 switch (type)
48 {
49 case CC_INVENTORY:
50 return ns->pl->count;
51 case CC_MAPSPACE:
52 return 0;
53 case CC_CONTAINER:
54 return env->count;
55 }
56
57 abort ();
58}
59
60void
61client_container::clear ()
62{
63 switch (type)
64 {
65 case CC_INVENTORY:
66 abort ();
67
68 case CC_MAPSPACE:
69 case CC_CONTAINER:
70 ns->send_packet_printf ("delinv %d", tag ());
71 break;
72 }
73
74 for (iterator i = begin (); i != end (); ++i)
75 i->op->seen_by = 0;
76
77 vector< refitem, slice_allocator<refitem> >::clear ();
78}
79
80inline iterator
81client_container::merge_item (iterator i, object *op)
82{
83 if (i != end () && i->op == op)
84 return ++i;
85
86 if (op->seen_by)
87 return; // seen by another entity already
88
89 op->seen_by = this;
90
91 refitem ref;
92 ref.op = op;
93
94 return insert (i, ref);
95}
96
97void
98client_container::update (int offset)
99{
100 iterator i = begin ();
101
102 switch (type)
103 {
104 case CC_INVENTORY:
105 case CC_CONTAINER:
106 {
107 object *env = type == CC_INVENTORY
108 ? ns->pl->ob
109 : this->env;
110
111 // pass 1, erase all objects no longer in container
112 for (iterator j = begin (); j != end (); ++j)
113 if (j->op->env != env)
114 {
115 j->op->seen_by = 0;
116 erase (j);
117 }
118
119 // pass 2 merge items
120 for (object *op = env->inv; op; op = op->below)
121 {
122 if (--offset < 0)
123 i = merge_item (i, op);
124 else if (offset < -FLOORBOX_PAGESIZE)
125 break;
126 }
127 }
128 break;
129
130 case CC_MAPSPACE:
131 {
132 // pass 1, erase all objects no longer on space
133 for (iterator j = begin (); j != end (); ++j)
134 if (j->op->x != x || j->op->y != y || j->op->map != map)
135 {
136 j->op->seen_by = 0;
137 erase (j);
138 }
139
140 // pass 2 merge items
141 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
142 {
143 if (--offset < 0)
144 i = merge_item (i, op);
145 else if (offset < -FLOORBOX_PAGESIZE)
146 break;
147 }
148 }
149 break;
150 }
151
152 // pass 3, erase all extra items
153 for (iterator j = i; j != end (); ++j)
154 j->op->seen_by = 0;
155
156 if (i != end ())
157 erase (i, end ());
158}
159
160void
161client_container::set_mapspace (maptile *map, int x, int y)
162{
163 if (type == CC_MAPSPACE
164 && this->map == map
165 && this->x == x
166 && this->y == y)
167 return;
168
169 clear ();
170
171 type = CC_MAPSPACE;
172 this->map = map;
173 this->x = x;
174 this->y = y;
175}
176
177void
178client_container::set_container (object *env)
179{
180}
181#endif
182 42
183/******************************************************************************* 43/*******************************************************************************
184 * 44 *
185 * Functions related to sending object data to the client. 45 * Functions related to sending object data to the client.
186 * 46 *
… …
188 48
189/** 49/**
190 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
191 * to be sent to client. 51 * to be sent to client.
192 */ 52 */
193unsigned int 53static unsigned int
194query_flags (object *op) 54query_flags (object *op)
195{ 55{
196 unsigned int flags = 0; 56 unsigned int flags = 0;
197 57
198 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (op->flag [FLAG_APPLIED])
199 {
200 switch (op->type) 59 switch (op->type)
201 { 60 {
202 case BOW: 61 case BOW:
203 case WAND: 62 case WAND:
204 case ROD: 63 case ROD:
205 case HORN: 64 case HORN:
206 flags = a_readied; 65 flags = a_readied;
207 break; 66 break;
208 case WEAPON: 67 case WEAPON:
209 flags = a_wielded; 68 flags = a_wielded;
210 break; 69 break;
211 case SKILL: 70 case SKILL:
212 case ARMOUR: 71 case ARMOUR:
213 case HELMET: 72 case HELMET:
214 case SHIELD: 73 case SHIELD:
215 case RING: 74 case RING:
216 case BOOTS: 75 case BOOTS:
217 case GLOVES: 76 case GLOVES:
218 case AMULET: 77 case AMULET:
219 case GIRDLE: 78 case GIRDLE:
220 case BRACERS: 79 case BRACERS:
221 case CLOAK: 80 case CLOAK:
222 flags = a_worn; 81 flags = a_worn;
223 break; 82 break;
224 case CONTAINER: 83 case CONTAINER:
225 flags = a_active; 84 flags = a_active;
226 break; 85 break;
227 default: 86 default:
228 flags = a_applied; 87 flags = a_applied;
229 break; 88 break;
230 } 89 }
231 }
232 90
233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 91 if (op->is_open_container ())
234 flags |= F_OPEN; 92 flags |= F_OPEN;
235 93
236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (op->flag [FLAG_KNOWN_CURSED])
237 { 95 {
238 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (op->flag [FLAG_DAMNED])
239 flags |= F_DAMNED; 97 flags |= F_DAMNED;
240 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (op->flag [FLAG_CURSED])
241 flags |= F_CURSED; 99 flags |= F_CURSED;
242 } 100 }
243 101
244 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
245 flags |= F_MAGIC; 103 flags |= F_MAGIC;
246 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (op->flag [FLAG_UNPAID])
247 flags |= F_UNPAID; 105 flags |= F_UNPAID;
248 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (op->flag [FLAG_INV_LOCKED])
249 flags |= F_LOCKED; 107 flags |= F_LOCKED;
250 108
251 return flags; 109 return flags;
252} 110}
253 111
… …
256 * animation of face to the client. 114 * animation of face to the client.
257 */ 115 */
258static void 116static void
259add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
260{ 118{
261 int flags, len, anim_speed;
262 char item_n[MAX_BUF];
263 const char *item_p;
264
265 flags = query_flags (head); 119 int flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 120
121 if (head->flag [FLAG_NO_PICK])
267 flags |= F_NOPICK; 122 flags |= F_NOPICK;
268 123
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 124 ns.send_face (head->face, -50);
270 esrv_send_face (&ns, head->face->number, 0);
271 125
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 127 ns.send_animation (head->animation_id);
274 128
275 sl << uint32 (head->count) 129 sl << uint32 (head->count)
276 << uint32 (flags) 130 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 131 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
278 << uint32 (head->face->number); 132 << uint32 (head->face);
279 133
280 if (!head->custom_name) 134 if (!head->custom_name)
281 { 135 {
282 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
283 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
284 len = strlen (item_n); 138
285 item_p = query_base_name (head, 1); 139 name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
140 sl << uint8 (0);
141 name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
142
143 *len = sl.cur - len - 1;
286 } 144 }
287 else 145 else
288 { 146 {
289 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
290 item_n[127] = 0;
291 len = strlen (item_n);
292 item_p = head->custom_name;
293 }
294 148
295 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
296 item_n[254] = 0; 150 << data (head->custom_name, len)
297 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
298 154
299 sl << data8 (item_n, len)
300 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
301 156
302 anim_speed = 0; 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
303 if (QUERY_FLAG (head, FLAG_ANIMATE)) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
304 { 159 : 1. / clamp (head->speed, 1./255., 1./1.);
305 if (head->anim_speed)
306 anim_speed = head->anim_speed;
307 else
308 {
309 if (FABS (head->speed) < 0.001)
310 anim_speed = 255;
311 else if (FABS (head->speed) >= 1.0)
312 anim_speed = 1;
313 else
314 anim_speed = (int) (1.0 / FABS (head->speed));
315 }
316
317 if (anim_speed > 255)
318 anim_speed = 255;
319 }
320 160
321 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
322 << uint32 (head->nrof); 162 << uint32 (head->nrof);
323 163
324 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
325 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
326
327 SET_FLAG (head, FLAG_CLIENT_SENT);
328} 166}
329 167
168static faceidx
169need_face_now (player *pl, const char *name)
170{
171 faceidx face = face_find (name, empty_face);
172
173 pl->ns->send_face (face, -50);
174 pl->ns->flush_fx ();
175
176 return face;
177}
178
179#define FINGER_UP "finger_up.x11"
180#define FINGER_DOWN "finger_down.x11"
330 181
331/** 182/**
332 * Send the look window. Don't need to do animations here 183 * Send the look window. Don't need to do animations here
333 * This sends all the faces to the client, not just updates. This is 184 * This sends all the faces to the client, not just updates. This is
334 * because object ordering would otherwise be inconsistent. 185 * because object ordering would otherwise be inconsistent.
335 */ 186 */
336void 187void
337esrv_draw_look (object *pl) 188esrv_draw_look (player *pl)
338{ 189{
339 object *tmp, *last; 190 object *ob = pl->ob;
340 int got_one = 0, start_look = 0, end_look = 0;
341 char buf[MAX_BUF];
342 191
343 if (!pl->contr->ns->update_look) 192 if (!pl->ns->update_look)
344 { 193 {
345 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 194 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
346 return;
347 }
348 else
349 pl->contr->ns->update_look = 0;
350
351 if (QUERY_FLAG (pl, FLAG_REMOVED)
352 || !pl->map
353 || pl->map->in_memory != MAP_IN_MEMORY
354 || out_of_map (pl->map, pl->x, pl->y))
355 return; 195 return;
356
357 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
358 ; 196 }
359 197
198 if (pl->ns->need_delinv0)
199 {
200 pl->ns->need_delinv0 = 0;
360 pl->contr->ns->send_packet ("delinv 0"); 201 pl->ns->send_packet ("delinv 0");
202 }
203
204 if (pl->run_on)
205 return;
206
207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
209
210 if (ob->flag [FLAG_REMOVED]
211 || !ob->map
212 || ob->map->state != MAP_ACTIVE
213 || out_of_map (ob->map, ob->x, ob->y))
214 return;
361 215
362 packet sl; 216 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
364 218
365 sl << uint32 (0); 219 sl << uint32 (0);
366 220
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 221 int start_pos = pl->ns->look_position;
368 esrv_send_face (pl->contr->ns, empty_face->number, 0); 222 bool dirty = false;
369 223
370 if (pl->contr->ns->look_position) 224 mapspace &ms = ob->ms ();
225
226 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
227 // start from the top
228 object *items [FLOORBOX_PAGESIZE];
229 int item_idx = 0, item_cnt = 0;
230 int pos = 0;
231
232 // find our items by walking down
233 object *item = ms.top;
234
235 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
236 {
237 if (!item->client_visible ())
238 continue;
239
240 if (++pos < start_pos)
241 continue;
242
243 // record item
244 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
245 item_cnt++;
246
247 // stop at first floor
248 if (item->flag [FLAG_IS_FLOOR])
249 {
250 // we are finished, don't append "next group of items"
251 // by setting item to ms.bot it becomes zero which is checked after the while loop
252 item = ms.bot;
253 }
371 { 254 }
372 char buf[80];
373 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
374 255
256 // see if there are more if we cared - we ignore invisible objects
257 if (item)
258 {
259 /* What we basically do is make a 'fake' object - when the user applies it,
260 * we notice the special tag the object has, and act accordingly.
261 */
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 262 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
376 << uint32 (0) 263 << uint32 (0)
377 << sint32 (-1) 264 << uint32 ((uint32) - 1)
378 << uint32 (empty_face->number) 265 << uint32 (need_face_now (pl, FINGER_DOWN))
379 << data8 (buf) 266 << data8 ("Apply this to see the items below")
380 << uint16 (0) 267 << uint16 (0)
381 << uint8 (0) 268 << uint8 (0)
382 << uint32 (0); 269 << uint32 (0);
383 270
384 if (pl->contr->ns->itemcmd == 2) 271 if (pl->ns->itemcmd == 2)
385 sl << uint16 (0); 272 sl << uint16 (0);
386 }
387 273
388 for (last = NULL; tmp != last; tmp = tmp->below) 274 dirty = true;
389 { 275 }
390 object *head;
391 276
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 277 // now send out all items in the ring buffer in reverse order
278 while (item_cnt)
279 {
280 --item_cnt;
281 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
282 object *item = items [item_idx];
283
284 add_object_to_socklist (*pl->ns, sl, item->head_ ());
285
286 dirty = true;
287
288 // if packet got too large, send it and begin a new one
289 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
393 { 290 {
394 last = tmp->below; /* assumes double floor mode */ 291 pl->ns->flush_fx ();
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 292 pl->ns->send_packet (sl);
396 last = last->below; 293
294 sl.reset ();
295 sl.printf ("item%d ", pl->ns->itemcmd);
296 sl << uint32 (0);
297
298 dirty = false;
397 } 299 }
398
399 if (LOOK_OBJ (tmp))
400 {
401 if (++start_look < pl->contr->ns->look_position)
402 continue;
403
404 end_look++;
405
406 if (end_look > FLOORBOX_PAGESIZE)
407 {
408 /* What we basically do is make a 'fake' object - when the user applies it,
409 * we notice the special tag the object has, and act accordingly.
410 */
411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
412 << uint32 (0)
413 << uint32 ((uint32) - 1)
414 << uint32 (empty_face->number)
415 << data8 ("Apply this to see next group of items")
416 << uint16 (0)
417 << uint8 (0)
418 << uint32 (0);
419
420 if (pl->contr->ns->itemcmd == 2)
421 sl << uint16 (0);
422
423 break;
424 }
425
426 if (tmp->head)
427 head = tmp->head;
428 else
429 head = tmp;
430
431 add_object_to_socklist (*pl->contr->ns, sl, head);
432 got_one++;
433
434 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
435 {
436 pl->contr->ns->send_packet (sl);
437
438 sl.reset ();
439 sl.printf ("item%d ", pl->contr->ns->itemcmd);
440 sl << uint32 (0);
441 got_one = 0;
442 }
443 }
444 } 300 }
445 301
446 if (got_one) 302 if (start_pos)
303 {
304 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
305 << uint32 (0)
306 << sint32 (-1)
307 << uint32 (need_face_now (pl, FINGER_UP))
308 << data8 ("Apply this to see the items higher up")
309 << uint16 (0)
310 << uint8 (0)
311 << uint32 (0);
312
313 if (pl->ns->itemcmd == 2)
314 sl << uint16 (0);
315
316 dirty = true;
317 }
318
319 if (dirty)
320 {
321 pl->ns->flush_fx ();
447 pl->contr->ns->send_packet (sl); 322 pl->ns->send_packet (sl);
448 323 }
449} 324}
450 325
451/** 326/**
452 * Sends whole inventory. 327 * Sends whole inventory.
453 */ 328 */
454void 329void
455esrv_send_inventory (object *pl, object *op) 330esrv_send_inventory (object *pl, object *op)
456{ 331{
457 object *tmp; 332 if (!pl->contr->ns)//D
333 return;
334
458 int got_one = 0; 335 int got_one = 0;
459
460 336
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 337 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 338
463 packet sl; 339 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 340 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 341
466 sl << uint32 (op->count); 342 sl << uint32 (op->count);
467 343
468 for (tmp = op->inv; tmp; tmp = tmp->below) 344 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 345 {
470 object *head; 346 object *head;
471 347
472 if (tmp->head) 348 if (tmp->head)
473 head = tmp->head; 349 head = tmp->head;
474 else 350 else
475 head = tmp; 351 head = tmp;
476 352
477 if (LOOK_OBJ (head)) 353 if (head->client_visible ())
478 { 354 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 355 add_object_to_socklist (*pl->contr->ns, sl, head);
480 356
481 got_one++; 357 got_one++;
482 358
483 /* IT is possible for players to accumulate a huge amount of 359 /* IT is possible for players to accumulate a huge amount of
484 * items (especially with some of the bags out there) to 360 * items (especially with some of the bags out there) to
485 * overflow the buffer. IF so, send multiple item commands. 361 * overflow the buffer. IF so, send multiple item commands.
486 */ 362 */
487 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 363 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
488 { 364 {
365 pl->contr->ns->flush_fx ();
489 pl->contr->ns->send_packet (sl); 366 pl->contr->ns->send_packet (sl);
490 367
491 sl.reset (); 368 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 369 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 370 sl << uint32 (op->count);
494 got_one = 0; 371 got_one = 0;
495 } 372 }
496 } /* If LOOK_OBJ() */ 373 }
497 } 374 }
498 375
499 if (got_one) 376 if (got_one)
377 {
378 pl->contr->ns->flush_fx ();
500 pl->contr->ns->send_packet (sl); 379 pl->contr->ns->send_packet (sl);
380 }
501} 381}
502 382
503/** 383/**
504 * Updates object *op for player *pl. 384 * Updates object *op for player *pl.
505 * 385 *
506 * flags is a list of values to update 386 * flags is a list of values to update
507 * to the client (as defined in newclient.h - might as well use the 387 * to the client (as defined in newclient.h - might as well use the
508 * same value both places. 388 * same value both places.
509 */ 389 */
510
511void 390void
512esrv_update_item (int flags, object *pl, object *op) 391esrv_update_item (int flags, object *pl, object *op)
513{ 392{
514 /* If we have a request to send the player item, skip a few checks. */ 393 /* If we have a request to send the player item, skip a few checks. */
515 if (op != pl) 394 if (op != pl && !op->client_visible ())
516 {
517 if (!LOOK_OBJ (op))
518 return; 395 return;
519 /* we remove the check for op->env, because in theory, the object
520 * is hopefully in the same place, so the client should preserve
521 * order.
522 */
523 }
524 396
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 397 client *ns = pl->contr->ns;
526 { 398 if (!ns)
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 399 return;
528 * this is happening - we can set a breakpoint here in the debugger
529 * and track back the call.
530 */
531 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
532 }
533 400
534 packet sl ("upditem"); 401 packet sl ("upditem");
535 402
536 sl << uint8 (flags); 403 sl << uint8 (flags);
537 404
538 if (op->head)
539 op = op->head; 405 op = op->head_ ();
540 406
541 sl << uint32 (op->count); 407 sl << uint32 (op->count);
542 408
543 if (flags & UPD_LOCATION) 409 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 410 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 412 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 413 sl << uint32 (query_flags (op));
548 414
549 if (flags & UPD_WEIGHT) 415 if (flags & UPD_WEIGHT)
550 { 416 {
551 sint32 weight = WEIGHT (op); 417 sint32 weight = op->client_weight ();
552 418
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 419 if (op == pl)
554
555 if (pl == op)
556 op->contr->last_weight = weight; 420 ns->last_weight = weight;
421
422 sl << uint32 (weight);
557 } 423 }
558 424
559 if (flags & UPD_FACE) 425 if (flags & UPD_FACE)
560 { 426 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 427 ns->send_face (op->face, -50);
562 esrv_send_face (pl->contr->ns, op->face->number, 0); 428 ns->flush_fx ();
563
564 sl << uint32 (op->face->number); 429 sl << uint32 (op->face);
565 } 430 }
566 431
567 if (flags & UPD_NAME) 432 if (flags & UPD_NAME)
568 { 433 {
569 int len; 434 int len;
570 const char *item_p; 435 const char *item_p;
571 char item_n[MAX_BUF]; 436 char item_n[127 * 2];
572 437
573 if (!op->custom_name) 438 if (!op->custom_name)
574 { 439 {
575 strncpy (item_n, query_base_name (op, 0), 127); 440 len = assign (item_n, query_base_name (op, 0), 127);
576 item_n[127] = 0;
577 len = strlen (item_n);
578 item_p = query_base_name (op, 1); 441 item_p = query_base_name (op, 1);
579 } 442 }
580 else 443 else
581 { 444 {
582 strncpy (item_n, op->custom_name, 127); 445 len = assign (item_n, &op->custom_name, 127);
583 item_n[127] = 0;
584 len = strlen (item_n);
585 item_p = op->custom_name; 446 item_p = &op->custom_name;
586 } 447 }
587 448
588 strncpy (item_n + len + 1, item_p, 127); 449 len += assign (item_n + len, item_p, 127);
589 item_n[254] = 0;
590 len += strlen (item_n + 1 + len) + 1;
591 450
592 sl << data8 (item_n, len); 451 sl << data8 (item_n, len);
593 } 452 }
594 453
595 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
… …
597 456
598 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
599 { 458 {
600 int anim_speed = 0; 459 int anim_speed = 0;
601 460
602 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
603 { 462 {
604 if (op->anim_speed) 463 if (op->anim_speed)
605 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
606 else 465 else
607 { 466 {
608 if (FABS (op->speed) < 0.001) 467 if (op->speed < 0.001)
609 anim_speed = 255; 468 anim_speed = 255;
610 else if (FABS (op->speed) >= 1.0) 469 else if (op->speed >= 1.0)
611 anim_speed = 1; 470 anim_speed = 1;
612 else 471 else
613 anim_speed = (int) (1.0 / FABS (op->speed)); 472 anim_speed = 1. / op->speed;
614 } 473 }
615 474
616 if (anim_speed > 255) 475 if (anim_speed > 255)
617 anim_speed = 255; 476 anim_speed = 255;
618 } 477 }
… …
630 * Sends item's info to player. 489 * Sends item's info to player.
631 */ 490 */
632void 491void
633esrv_send_item (object *pl, object *op) 492esrv_send_item (object *pl, object *op)
634{ 493{
635 /* If this is not the player object, do some more checks */ 494 if (!pl->contr->ns)
636 if (op != pl)
637 {
638 /* We only send 'visibile' objects to the client */
639 if (!LOOK_OBJ (op))
640 return; 495 return;
641 /* if the item is on the ground, mark that the look needs to 496
642 * be updated. 497 /* We only send 'visible' objects to the client, and sometimes the player */
643 */ 498 if (!op->client_visible () && op->type != PLAYER)
644 if (!op->env)
645 {
646 pl->contr->ns->floorbox_update ();
647 return; 499 return;
648 }
649 }
650 500
651 packet sl; 501 packet sl;
652 502
653 sl.printf ("item%d ", pl->contr->ns->itemcmd); 503 sl.printf ("item%d ", pl->contr->ns->itemcmd);
654 504
655 if (op->head)
656 op = op->head; 505 op = op->head_ ();
657 506
658 sl << uint32 (op->env ? op->env->count : 0); 507 sl << uint32 (op->env ? op->env->count : 0);
659 508
660 add_object_to_socklist (*pl->contr->ns, sl, op); 509 add_object_to_socklist (*pl->contr->ns, sl, op);
661 510
511 pl->contr->ns->flush_fx ();
662 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
663 SET_FLAG (op, FLAG_CLIENT_SENT);
664} 513}
665 514
666/** 515/**
667 * Tells the client to delete an item. Uses the item 516 * Tells the client to delete an item.
668 * command with a -1 location.
669 */ 517 */
670
671void 518void
672esrv_del_item (player *pl, int tag) 519esrv_del_item (player *pl, int tag)
673{ 520{
521 if (!pl->ns)
522 return;
523
674 packet sl ("delitem"); 524 packet sl ("delitem");
675 525
676 sl << uint32 (tag); 526 sl << uint32 (tag);
677 527
678 pl->ns->send_packet (sl); 528 pl->ns->send_packet (sl);
… …
687 537
688/** 538/**
689 * Takes a player and object count (tag) and returns the actual object 539 * Takes a player and object count (tag) and returns the actual object
690 * pointer, or null if it can't be found. 540 * pointer, or null if it can't be found.
691 */ 541 */
692 542static object *
693object *
694esrv_get_ob_from_count (object *pl, tag_t count) 543esrv_get_ob_from_count (object *pl, tag_t count)
695{ 544{
696 object *op, *tmp;
697
698 if (pl->count == count) 545 if (pl->count == count)
699 return pl; 546 return pl;
700 547
701 for (op = pl->inv; op; op = op->below) 548 for (object *op = pl->inv; op; op = op->below)
702 if (op->count == count) 549 if (op->count == count)
703 return op; 550 return op;
704 else if (op->type == CONTAINER && pl->container == op) 551 else if (op->type == CONTAINER && pl->container_ () == op)
705 for (tmp = op->inv; tmp; tmp = tmp->below) 552 for (object *tmp = op->inv; tmp; tmp = tmp->below)
706 if (tmp->count == count) 553 if (tmp->count == count)
707 return tmp; 554 return tmp;
708 555
709 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 556 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
710 if (op->head && op->head->count == count) 557 if (op->head && op->head->count == count)
711 return op; 558 return op;
712 else if (op->count == count) 559 else if (op->count == count)
713 return op; 560 return op;
714 else if (op->type == CONTAINER && pl->container == op) 561 else if (op->type == CONTAINER && pl->container_ () == op)
715 for (tmp = op->inv; tmp; tmp = tmp->below) 562 for (object *tmp = op->inv; tmp; tmp = tmp->below)
716 if (tmp->count == count) 563 if (tmp->count == count)
717 return tmp; 564 return tmp;
718 565
566#if 0
567 /* If the high bit is set, player examined a pseudo object. */
568 if (count & 0x80000000)
569 return 0;
570#endif
571
719 return 0; 572 return 0;
720} 573}
721 574
722
723/** Client wants to examine some object. So lets do so. */ 575/** Client wants to examine some object. So lets do so. */
724void 576void
725ExamineCmd (char *buf, int len, player *pl) 577ExamineCmd (char *buf, int len, player *pl)
726{ 578{
727 tag_t tag = atoi (buf); 579 tag_t tag = atoi (buf);
728
729 /* If the high bit is set, player examined a pseudo object. */
730 if (tag & 0x80000000)
731 return;
732
733 object *op = esrv_get_ob_from_count (pl->ob, tag);
734
735 if (!op)
736 {
737 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
738 return;
739 }
740
741 examine (pl->ob, op);
742}
743
744/** Client wants to apply some object. Lets do so. */
745void
746ApplyCmd (char *buf, int len, player *pl)
747{
748 tag_t tag = atoi (buf);
749
750 /* sort of a hack, but if the player saves and the player then manually
751 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
752 */
753 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
754 return;
755 580
756 /* If the high bit is set, player applied a pseudo object. */ 581 /* If the high bit is set, player applied a pseudo object. */
757 if (tag & 0x80000000) 582 if (tag & 0x80000000)
758 { 583 {
759 pl->ns->look_position = tag & 0x7fffffff; 584 pl->ns->look_position = tag & 0x7fffffff;
… …
763 588
764 object *op = esrv_get_ob_from_count (pl->ob, tag); 589 object *op = esrv_get_ob_from_count (pl->ob, tag);
765 590
766 if (!op) 591 if (!op)
767 { 592 {
768 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 593 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
769 return; 594 return;
595 }
596
597 examine (pl->ob, op);
598}
599
600/** Client wants to examine some object. So lets do so. */
601void
602ExCmd (char *buf, int len, player *pl)
603{
604 tag_t tag = atoi (buf);
605
606 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
770 } 607 {
608 std::string s = op->describe (pl->ob);
771 609
772 player_apply (pl->ob, op, 0, 0); 610 packet sl ("ex");
611 sl << ber32 (tag)
612 << data (*pl->expand_cfpod (s.c_str ()));
613
614 pl->ns->send_packet (sl);
615 }
616}
617
618/** Client wants to apply some object. Lets do so. */
619void
620ApplyCmd (char *buf, int len, player *pl)
621{
622 tag_t tag = atoi (buf);
623
624 /* If the high bit is set, player applied a pseudo object. */
625 if (tag & 0x80000000)
626 {
627 pl->ns->look_position = tag & 0x7fffffff;
628 pl->ns->floorbox_update ();
629 return;
630 }
631
632 // the object might be legally gone already
633 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
634 pl->ob->apply (op, AP_TOGGLE);
773} 635}
774 636
775/** Client wants to lock some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
776void 638void
777LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
… …
780 tag_t tag = net_uint32 ((uint8 *)data + 1); 642 tag_t tag = net_uint32 ((uint8 *)data + 1);
781 object *op = esrv_get_ob_from_count (pl->ob, tag); 643 object *op = esrv_get_ob_from_count (pl->ob, tag);
782 644
783 if (!op) 645 if (!op)
784 { 646 {
785 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
786 return; 648 return;
787 } 649 }
788 650
789 if (!flag) 651 if (!flag)
790 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 op->clr_flag (FLAG_INV_LOCKED);
791 else 653 else
792 SET_FLAG (op, FLAG_INV_LOCKED); 654 op->set_flag (FLAG_INV_LOCKED);
793 655
794 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
795} 657}
796 658
797/** Client wants to mark some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
… …
801 tag_t tag = net_uint32 ((uint8 *)data); 663 tag_t tag = net_uint32 ((uint8 *)data);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 664 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 665
804 if (!op) 666 if (!op)
805 { 667 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 668 pl->failmsg ("Could not find object to mark");
807 return; 669 return;
808 } 670 }
809 671
810 pl->mark = op; 672 pl->mark = op;
811 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 673 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
812} 674}
813 675
814/** 676/**
815 * look_at prints items on the specified square. 677 * look_at prints items on the specified square.
816 * 678 *
817 * [ removed EARTHWALL check and added check for containers inventory. 679 * [ removed EARTHWALL check and added check for containers inventory.
818 * Tero.Haatanen@lut.fi ] 680 * Tero.Haatanen@lut.fi ]
819 */ 681 */
820void 682static void
821look_at (object *op, int dx, int dy) 683look_at (player *pl, int dx, int dy)
822{ 684{
823 object *tmp; 685 dynbuf_text &buf = msg_dynbuf; buf.clear ();
824 int flag = 0; 686 object *ob = pl->ob;
825 sint16 x, y;
826 maptile *m;
827 687
828 x = op->x + dx; 688 if (!pl->observe->map)
829 y = op->y + dy;
830
831 if (out_of_map (op->map, x, y))
832 return; 689 return;
833 690
834 m = get_map_from_coord (op->map, &x, &y); 691 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
835 if (!m)
836 return;
837 692
838 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 693 mapxy pos (pl->observe);
694 pos.move (dx, dy);
839 695
840 for (; tmp != NULL; tmp = tmp->below) 696 if (wiz)
841 { 697 {
842 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 698 if (pos.normalise ())
843 continue;
844
845 if (!flag)
846 { 699 {
847 if (dx || dy) 700 mapspace &ms = *pos;
848 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 701 ms.update ();
849 else 702
850 { 703 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
851 clear_win_info (op); 704 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
852 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 705 &pos.m->path, pos.x, pos.y, dx, dy,
853 } 706 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
854 flag = 1; 707 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
708 );
855 } 709 }
856
857 if (QUERY_FLAG (op, FLAG_WIZ))
858 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
859 else 710 else
860 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 711 buf << "off-map\n\n";
712 }
861 713
862 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 714 int darkness = pl->blocked_los (dx, dy);
863 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
864 inventory (op, tmp->head == NULL ? tmp : tmp->head);
865 715
866 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 716 if (darkness == LOS_BLOCKED)
717 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
718 else if (darkness == LOS_MAX)
719 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
720 else
721 {
722 if (pos.normalise ())
723 for (object *tmp = pos->top; tmp; tmp = tmp->below)
724 {
725 if (tmp->invisible && !ob->flag [FLAG_WIZ])
726 continue;
727
728 if (wiz)
729 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
730 else
731 buf.printf (" - %s.\n", query_name (tmp));
732
733 object *head = tmp->head_ ();
734
735 if (head->inv)
736 if ((head->type != CONTAINER && head->type != FLESH)
737 || ob->flag [FLAG_WIZ])
738 buf << head->query_inventory (ob, " ");
739
740 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
867 break; 741 break;
868 } 742 }
869
870 if (!flag)
871 { 743 }
872 if (dx || dy)
873 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
874 else
875 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
876 }
877}
878 744
745 if (buf.empty ())
746 buf << "You see nothing there.";
879 747
748 pl->infobox (MSG_CHANNEL ("lookat"), buf);
749}
880 750
881/** Client wants to look at some object. Lets do so. */ 751/** Client wants to look at some object. Lets do so. */
882void 752void
883LookAt (char *buf, int len, player *pl) 753LookAt (char *buf, int len, player *pl)
884{ 754{
885 int dx, dy;
886 char *cp; 755 char *cp;
887 756
888 dx = atoi (buf); 757 int dx = atoi (buf);
889 if (!(cp = strchr (buf, ' '))) 758 if (!(cp = strchr (buf, ' ')))
890 {
891 return; 759 return;
892 } 760
893 dy = atoi (cp); 761 int dy = atoi (cp);
894 762
895 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
896 return;
897
898 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
899 return;
900
901 look_at (pl->ob, dx, dy); 763 look_at (pl, dx, dy);
902} 764}
903 765
904/** Move an object to a new location */ 766/** Move an object to a new location */
905void 767void
906esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 768esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
907{ 769{
908 object *op, *env;
909
910 op = esrv_get_ob_from_count (pl, tag); 770 object *op = esrv_get_ob_from_count (pl, tag);
911 if (!op) 771 if (!op)
912 { 772 {
913 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 773 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
914 return; 774 return;
915 } 775 }
… …
920 return; 780 return;
921 781
922 /* If it is an active container, then we should drop all objects 782 /* If it is an active container, then we should drop all objects
923 * in the container and not the container itself. 783 * in the container and not the container itself.
924 */ 784 */
925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 785 if (op->inv && op->flag [FLAG_APPLIED])
926 { 786 {
927 object *current, *next; 787 int cnt = MAX_ITEM_PER_ACTION;
928 788
929 for (current = op->inv; current != NULL; current = next) 789 for (object *current = op->inv; current && cnt--; )
930 { 790 {
931 next = current->below; 791 object *next = current->below;
932 drop_object (pl, current, 0); 792 drop_object (pl, current, 0);
793 current = next;
933 } 794 }
934 795
935 esrv_update_item (UPD_WEIGHT, pl, op); 796 if (cnt <= 0)
797 op->failmsg ("Only dropped some items, can't drop that many items at once.");
936 } 798 }
937 else 799 else
938 drop_object (pl, op, nrof); 800 drop_object (pl, op, nrof);
939 801
940 return; 802 return;
… …
948 pl->contr->count = nrof; 810 pl->contr->count = nrof;
949 pick_up (pl, op); 811 pick_up (pl, op);
950 return; 812 return;
951 } 813 }
952 814
953 env = esrv_get_ob_from_count (pl, to); 815 object *env = esrv_get_ob_from_count (pl, to);
954 if (!env) 816 if (!env)
955 { 817 {
956 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 818 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
957 return; 819 return;
958 } 820 }
… …
960 /* put_object_in_sack presumes that necessary sanity checking 822 /* put_object_in_sack presumes that necessary sanity checking
961 * has already been done (eg, it can be picked up and fits in 823 * has already been done (eg, it can be picked up and fits in
962 * in a sack, so check for those things. We should also check 824 * in a sack, so check for those things. We should also check
963 * an make sure env is in fact a container for that matter. 825 * an make sure env is in fact a container for that matter.
964 */ 826 */
965 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 827 if (env->type == CONTAINER
828 && can_pick (pl, op)
829 && sack_can_hold (pl, env, op, nrof))
966 put_object_in_sack (pl, env, op, nrof); 830 put_object_in_sack (pl, env, op, nrof);
967} 831}
968 832

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines