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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.21 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC

… …
26 variable. */ 26 variable. */
27 27
28 28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <newserver.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34/* Maps the MOVE_* values to names */ 33/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 35
… …
280 279
281 if (!op->name_pl) 280 if (!op->name_pl)
282 op->name_pl = op->name; 281 op->name_pl = op->name;
283 282
284 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
286 { 285 {
287 if (op->map != NULL) 286 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
289 else 288 else
290 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
… …
556 555
557 if (arch != NULL) 556 if (arch != NULL)
558 tmp = arch_to_object (arch); 557 tmp = arch_to_object (arch);
559 else 558 else
560 { 559 {
561 tmp = get_object (); 560 tmp = object::create ();
562 /* record the name of the broken object */ 561 /* record the name of the broken object */
563 tmp->name = str; 562 tmp->name = str;
564 } 563 }
565 564
566 parse_object (tmp, thawer, map_flags); 565 parse_object (tmp, thawer, map_flags);
… …
593 op_inv = tmp; 592 op_inv = tmp;
594 } 593 }
595 else 594 else
596 { 595 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 596 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 tmp->destroy (0); 597 tmp->destroy ();
599 } 598 }
600 } 599 }
601 else 600 else
602 { 601 {
603 /* This is the actual archetype definition then */ 602 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 603 op->arch = archetype::find (str);
605 604
606 if (op->arch != NULL) 605 if (op->arch)
607 copy_object (&op->arch->clone, op); 606 op->arch->clone.copy_to (op);
608 else if (!arch_init) 607 else if (!arch_init)
609 /* record the name of the broken object */ 608 /* record the name of the broken object */
610 op->name = str; 609 op->name = str;
611 } 610 }
612 } 611 }
… …
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
831 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 831 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 832 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 833 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 834 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
1183 KW_monster, 1181 KW_monster,
1184 KW_friendly, 1182 KW_friendly,
1185 KW_generator, 1183 KW_generator,
1186 KW_is_thrown, 1184 KW_is_thrown,
1187 KW_auto_apply, 1185 KW_auto_apply,
1188 KW_treasure, 1186 KW_NULL, // was KW_treasure
1189 KW_player_sold, 1187 KW_player_sold,
1190 /* 20 */ 1188 /* 20 */
1191 KW_see_invisible, 1189 KW_see_invisible,
1192 KW_can_roll, 1190 KW_can_roll,
1193 KW_overlay_floor, 1191 KW_overlay_floor,
… …
1303 if (!arch_field || my_field->value != arch_field->value) 1301 if (!arch_field || my_field->value != arch_field->value)
1304 f.put (my_field->key, my_field->value); 1302 f.put (my_field->key, my_field->value);
1305 } 1303 }
1306 1304
1307 /* We don't need to worry about the arch's extra fields - they 1305 /* We don't need to worry about the arch's extra fields - they
1308 * will get taken care of the copy_object function. 1306 * will get taken care of the copy_to method.
1309 */ 1307 */
1310 1308
1311 { 1309 {
1312 char uids[64]; 1310 char uids[64];
1313 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1311 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1430 CMP_OUT (move_on); 1428 CMP_OUT (move_on);
1431 CMP_OUT (move_off); 1429 CMP_OUT (move_off);
1432 CMP_OUT (move_slow); 1430 CMP_OUT (move_slow);
1433 CMP_OUT (move_slow_penalty); 1431 CMP_OUT (move_slow_penalty);
1434 1432
1435 if (!COMPARE_FLAGS (op, tmp)) 1433 if (op->flag != tmp->flag)
1436 for (i = 0; i <= NUM_FLAGS; i++) 1434 for (i = 0; i <= NUM_FLAGS; i++)
1437 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1435 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1438 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1436 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1439 1437
1440 /* Save body locations */ 1438 /* Save body locations */
1441 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1439 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1442 if (op->body_info[i] != tmp->body_info[i]) 1440 if (op->body_info[i] != tmp->body_info[i])
1443 f.put (body_locations[i].save_name, op->body_info[i]); 1441 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1498 save_object (fp, tmp, flag); 1496 save_object (fp, tmp, flag);
1499 old = tmp; 1497 old = tmp;
1500 } 1498 }
1501 1499
1502 if (!(flag & 2)) 1500 if (!(flag & 2))
1503 {
1504 op->remove ();
1505 op->destroy (0); 1501 op->destroy ();
1506 }
1507 1502
1508 fp.put (op); 1503 fp.put (op);
1509 fprintf (fp, "end\n"); 1504 fprintf (fp, "end\n");
1510} 1505}
1511 1506

Diff Legend

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