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.34 by root, Sun Dec 31 18:10:40 2006 UTC vs.
Revision 1.43 by root, Mon Jan 8 12:44:34 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program 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
… …
263static void 264static void
264check_loaded_object (object *op) 265check_loaded_object (object *op)
265{ 266{
266 int ip; 267 int ip;
267 268
268 /* We do some specialized handling to handle legacy cases of name_pl. 269 /* We do some specialised handling to handle legacy cases of name_pl.
269 * If the object doesn't have a name_pl, we just use the object name - 270 * If the object doesn't have a name_pl, we just use the object name -
270 * this isn't perfect (things won't be properly pluralized), but works to 271 * this isn't perfect (things won't be properly pluralised), but works to
271 * that degree (5 heart is still quite understandable). But the case we 272 * that degree (5 heart is still quite understandable). But the case we
272 * also have to catch is if this object is not using the normal name for 273 * also have to catch is if this object is not using the normal name for
273 * the object. In that case, we also want to use the loaded name. 274 * the object. In that case, we also want to use the loaded name.
274 * Otherwise, what happens is that the the plural name will lose 275 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 276 * information (appear as just 'hearts' and not 'goblins heart')
… …
320 { 321 {
321 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
322 op->gen_sp_armour = op->last_heal; 323 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 324 op->last_heal = 0;
324 } 325 }
325 if (editor) 326
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 327 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 328 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 329 if (!op->item_power && ip)
331 { 330 {
332 if (ip > 3) 331 if (ip > 3)
333 { 332 {
… …
816 CLEAR_FLAG (op, FLAG_WIZCAST); 815 CLEAR_FLAG (op, FLAG_WIZCAST);
817 } 816 }
818 break; 817 break;
819 818
820 case KW_friendly: 819 case KW_friendly:
821 GET_FLAG (op, FLAG_FRIENDLY); 820 if (thawer.get_sint32 ())
822 //TODO: move to check_object or so 821 if (op->type != PLAYER)
823 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
824 add_friendly_object (op); 822 add_friendly_object (op);
823
825 break; 824 break;
826 825
827 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
828 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
829 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
830 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
830 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
831 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 831 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
832 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 832 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
833 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 833 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
834 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 834 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
835 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 835 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
906 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 906 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
907 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 907 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
908 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 908 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
909 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 909 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
910 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 910 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
911 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
911 912
912 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
914 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
915 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
989 case KW_msg: 990 case KW_msg:
990 thawer.get_ml (KW_endmsg, op->msg); 991 thawer.get_ml (KW_endmsg, op->msg);
991 //TODO: allow longer messages 992 //TODO: allow longer messages
992 if (strlen (op->msg) >= HUGE_BUF) 993 if (strlen (op->msg) >= HUGE_BUF)
993 { 994 {
994 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 995 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
995 op->msg = "ERROR, please report: string too long, winged.\n"; 996 op->msg = "ERROR, please report: string too long, winged.\n";
996 } 997 }
997 break; 998 break;
998 999
999 case KW_lore: 1000 case KW_lore:
… …
1001 //TODO: allow longer messages 1002 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1003 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1004 * about not overflowing the buffer.
1004 */ 1005 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1006 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1007 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 break; 1009 break;
1009 1010
1010 case KW_editable: 1011 case KW_editable:
1011 case KW_editor_folder: 1012 case KW_editor_folder:
… …
1057 * 1058 *
1058 */ 1059 */
1059int 1060int
1060load_object (object_thawer &fp, object *op, int map_flags) 1061load_object (object_thawer &fp, object *op, int map_flags)
1061{ 1062{
1062 // cede every 500 objects loaded 1063 coroapi::cede_every (1000); // cede once in a while
1063 {
1064 static int cede_counter = 0;
1065
1066 if (++cede_counter >= 500)
1067 {
1068 cede_counter = 0;
1069 if (coroapi::nready ())
1070 coroapi::cede ();
1071 }
1072 }
1073 1064
1074 return parse_object (op, fp, map_flags); 1065 return parse_object (op, fp, map_flags);
1075} 1066}
1076 1067
1077/* This takes a buffer, scans it for variables, and sets those variables 1068/* This takes a buffer, scans it for variables, and sets those variables
… …
1276 KW_berserk, 1267 KW_berserk,
1277 KW_neutral, 1268 KW_neutral,
1278 /* 100 */ 1269 /* 100 */
1279 KW_no_attack, 1270 KW_no_attack,
1280 KW_no_damage, 1271 KW_no_damage,
1281 KW_NULL, 1272 KW_obj_original,
1282 KW_NULL, 1273 KW_NULL,
1283 KW_activate_on_push, 1274 KW_activate_on_push,
1284 KW_activate_on_release, 1275 KW_activate_on_release,
1285 KW_is_water, 1276 KW_is_water,
1286 KW_use_content_on_gen, 1277 KW_use_content_on_gen,
1287 KW_NULL, 1278 KW_NULL,
1288 KW_is_buildable, 1279 KW_is_buildable,
1289 /* 110 */ 1280 /* 110 */
1281 KW_destroy_on_death,
1290 }; 1282 };
1291 1283
1292 int i; 1284 int i;
1293 1285
1294 /* This saves the key/value lists. We do it first so that any 1286 /* This saves the key/value lists. We do it first so that any

Diff Legend

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