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

Diff Legend

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