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.105 by root, Thu Nov 8 19:43:23 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
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