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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC vs.
Revision 1.312 by elmex, Sat Mar 20 00:42:08 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
26#include <stdio.h> 26#include <stdio.h>
27#include <sys/types.h> 27#include <sys/types.h>
28#include <sys/uio.h> 28#include <sys/uio.h>
29#include <object.h> 29#include <object.h>
30#include <sproto.h> 30#include <sproto.h>
31#include <loader.h>
32 31
33#include <bitset> 32#include <bitset>
34 33
35UUID UUID::cur; 34UUID UUID::cur;
36static uint64_t seq_next_save; 35static uint64_t seq_next_save;
… …
248 * Improvements made with merge: Better checking on potion, and also 247 * Improvements made with merge: Better checking on potion, and also
249 * check weight 248 * check weight
250 */ 249 */
251bool object::can_merge_slow (object *ob1, object *ob2) 250bool object::can_merge_slow (object *ob1, object *ob2)
252{ 251{
253 /* A couple quicksanity checks */ 252 /* A couple quick sanity checks */
254 if (ob1 == ob2 253 if (ob1 == ob2
255 || ob1->type != ob2->type 254 || ob1->type != ob2->type
256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
257 || ob1->value != ob2->value 255 || ob1->value != ob2->value
258 || ob1->name != ob2->name) 256 || ob1->name != ob2->name
257 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
259 return 0; 258 return 0;
260 259
261 /* Do not merge objects if nrof would overflow, assume nrof 260 /* Do not merge objects if nrof would overflow, assume nrof
262 * is always 0 .. 2**31-1 */ 261 * is always 0 .. 2**31-1 */
263 if (ob1->nrof > 0x7fffffff - ob2->nrof) 262 if (ob1->nrof > 0x7fffffff - ob2->nrof)
… …
284 || ob1->magic != ob2->magic 283 || ob1->magic != ob2->magic
285 || ob1->slaying != ob2->slaying 284 || ob1->slaying != ob2->slaying
286 || ob1->skill != ob2->skill 285 || ob1->skill != ob2->skill
287 || ob1->value != ob2->value 286 || ob1->value != ob2->value
288 || ob1->animation_id != ob2->animation_id 287 || ob1->animation_id != ob2->animation_id
289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 288 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
290 || ob1->client_type != ob2->client_type 289 || ob1->client_type != ob2->client_type
291 || ob1->material != ob2->material 290 || ob1->material != ob2->material
292 || ob1->lore != ob2->lore 291 || ob1->lore != ob2->lore
293 || ob1->subtype != ob2->subtype 292 || ob1->subtype != ob2->subtype
294 || ob1->move_type != ob2->move_type 293 || ob1->move_type != ob2->move_type
… …
515object * 514object *
516find_object (tag_t i) 515find_object (tag_t i)
517{ 516{
518 for_all_objects (op) 517 for_all_objects (op)
519 if (op->count == i) 518 if (op->count == i)
519 return op;
520
521 return 0;
522}
523
524/*
525 * Returns the object which has the uuid equal to the argument.
526 * MOAR VERRRY slow.
527 */
528
529object *
530find_object_uuid (UUID i)
531{
532 for_all_objects (op)
533 if (op->uuid == i)
520 return op; 534 return op;
521 535
522 return 0; 536 return 0;
523} 537}
524 538
… …
1269 1283
1270 object *prev = this; 1284 object *prev = this;
1271 1285
1272 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1286 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1273 { 1287 {
1274 object *op = arch_to_object (at); 1288 object *op = at->instance ();
1275 1289
1276 op->name = name; 1290 op->name = name;
1277 op->name_pl = name_pl; 1291 op->name_pl = name_pl;
1278 op->title = title; 1292 op->title = title;
1279 1293
… …
2563 // TODO: this does not seem to serve any purpose anymore? 2577 // TODO: this does not seem to serve any purpose anymore?
2564#if 0 2578#if 0
2565 // insert the "Close Container" object. 2579 // insert the "Close Container" object.
2566 if (archetype *closer = new_container->other_arch) 2580 if (archetype *closer = new_container->other_arch)
2567 { 2581 {
2568 object *closer = arch_to_object (new_container->other_arch); 2582 object *closer = new_container->other_arch->instance ();
2569 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2583 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2570 new_container->insert (closer); 2584 new_container->insert (closer);
2571 } 2585 }
2572#endif 2586#endif
2573 2587

Diff Legend

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