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.102 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.104 by elmex, Thu Nov 8 12:10:47 2007 UTC

169 "spell_magic_drain", /* 122 */ 169 "spell_magic_drain", /* 122 */
170 "spell_counterspell", /* 123 */ 170 "spell_counterspell", /* 123 */
171 "spell_disarm", /* 124 */ 171 "spell_disarm", /* 124 */
172 "spell_cure_confusion", /* 125 */ 172 "spell_cure_confusion", /* 125 */
173 "spell_restoration", /* 126 */ 173 "spell_restoration", /* 126 */
174 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 174 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
175 "spell_counterwall", /* 128 */ 175 "spell_counterwall", /* 128 */
176 "spell_cause_light_wounds", /* 129 */ 176 "spell_cause_light_wounds", /* 129 */
177 "spell_cause_medium_wounds", /* 130 */ 177 "spell_cause_medium_wounds", /* 130 */
178 "spell_cause_heavy_wounds", /* 131 */ 178 "spell_cause_heavy_wounds", /* 131 */
179 "spell_charm_monsters", /* 132 */ 179 "spell_charm_monsters", /* 132 */
568 { 568 {
569 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 575 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 576
576 if (!op_inv) 577 if (!op_inv)
577 { 578 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines