[ViewVC] Diff of: cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.100 by root, Sat Jan 16 13:41:37 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 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 (©) 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	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/* TREASURE_DEBUG does some checking on the treasurelists after loading.	25	/* TREASURE_DEBUG does some checking on the treasurelists after loading.
32		33
33	//#define TREASURE_VERBOSE	34	//#define TREASURE_VERBOSE
34		35
35	#include <global.h>	36	#include <global.h>
36	#include <treasure.h>	37	#include <treasure.h>
37	#include <loader.h>
38		38
39	extern char *spell_mapping[];	39	extern char *spell_mapping[];
40		40
41	static treasurelist *first_treasurelist;	41	static treasurelist *first_treasurelist;
42		42
…		…
50	slice_allocator< std::pair<const char const, treasurelist > >	50	slice_allocator< std::pair<const char const, treasurelist > >
51	> tl_map_t;	51	> tl_map_t;
52		52
53	static tl_map_t tl_map;	53	static tl_map_t tl_map;
54		54
		55	//TODO: class method
		56	static void free_treasurestruct (treasure *t); // bleh desu
		57	static void
		58	clear (treasurelist *tl)
		59	{
		60	if (tl->items)
		61	{
		62	free_treasurestruct (tl->items);
		63	tl->items = 0;
		64	}
		65
		66	tl->total_chance = 0;
		67	}
		68
55	/*	69	/*
56	* Searches for the given treasurelist	70	* Searches for the given treasurelist
57	*/	71	*/
58	treasurelist *	72	treasurelist *
59	treasurelist::find (const char *name)	73	treasurelist::find (const char *name)
…		…
88		102
89	tl_map.insert (std::make_pair (tl->name, tl));	103	tl_map.insert (std::make_pair (tl->name, tl));
90	}	104	}
91		105
92	return tl;	106	return tl;
93	}
94
95	//TODO: class method
96	void
97	clear (treasurelist *tl)
98	{
99	if (tl->items)
100	{
101	free_treasurestruct (tl->items);
102	tl->items = 0;
103	}
104
105	tl->total_chance = 0;
106	}	107	}
107		108
108	#ifdef TREASURE_DEBUG	109	#ifdef TREASURE_DEBUG
109	/* recursived checks the linked list. Treasurelist is passed only	110	/* recursived checks the linked list. Treasurelist is passed only
110	* so that the treasure name can be printed out	111	* so that the treasure name can be printed out
…		…
308	}	309	}
309	else	310	else
310	{	311	{
311	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))	312	if (t->item && (t->item->invisible != 0 \|\| !(flag & GT_INVISIBLE)))
312	{	313	{
313	object *tmp = arch_to_object (t->item);	314	object *tmp = t->item->instance ();
314		315
315	if (t->nrof && tmp->nrof <= 1)	316	if (t->nrof && tmp->nrof <= 1)
316	tmp->nrof = rndm (t->nrof) + 1;	317	tmp->nrof = rndm (t->nrof) + 1;
317		318
318	fix_generated_item (tmp, op, difficulty, t->magic, flag);	319	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
365	else if (t->nrof)	366	else if (t->nrof)
366	create_one_treasure (tl, op, flag, difficulty, tries);	367	create_one_treasure (tl, op, flag, difficulty, tries);
367	}	368	}
368	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))	369	else if (t->item && (t->item->invisible != 0 \|\| flag != GT_INVISIBLE))
369	{	370	{
370	if (object *tmp = arch_to_object (t->item))	371	if (object *tmp = t->item->instance ())
371	{	372	{
372	if (t->nrof && tmp->nrof <= 1)	373	if (t->nrof && tmp->nrof <= 1)
373	tmp->nrof = rndm (t->nrof) + 1;	374	tmp->nrof = rndm (t->nrof) + 1;
374		375
375	fix_generated_item (tmp, op, difficulty, t->magic, flag);	376	fix_generated_item (tmp, op, difficulty, t->magic, flag);
…		…
441		442
442	if (ob->inv)	443	if (ob->inv)
443	LOG (llevError, "In generate treasure, created multiple objects.\n");	444	LOG (llevError, "In generate treasure, created multiple objects.\n");
444		445
445	ob->destroy ();	446	ob->destroy ();
		447
446	return tmp;	448	return tmp;
447	}	449	}
448		450
449	/*	451	/*
450	* This is a new way of calculating the chance for an item to have	452	* This is a new way of calculating the chance for an item to have
…		…
493	* This code presumes that op has had its spell object created (in op->inv)	495	* This code presumes that op has had its spell object created (in op->inv)
494	*	496	*
495	* elmex Wed Aug 9 17:44:59 CEST 2006:	497	* elmex Wed Aug 9 17:44:59 CEST 2006:
496	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.	498	* Removed multiplicator, too many high-level items were generated on low-difficulty maps.
497	*/	499	*/
498	int	500	static int
499	level_for_item (const object *op, int difficulty)	501	level_for_item (const object *op, int difficulty)
500	{	502	{
501	if (!op->inv)	503	if (!op->inv)
502	{	504	{
503	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);	505	LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
…		…
520	* elmex Thu Aug 10 18:45:44 CEST 2006:	522	* elmex Thu Aug 10 18:45:44 CEST 2006:
521	* Scaling difficulty by max_level, as difficulty is a level and not some	523	* Scaling difficulty by max_level, as difficulty is a level and not some
522	* weird integer between 1-31.	524	* weird integer between 1-31.
523	*	525	*
524	*/	526	*/
525	int	527	static int
526	magic_from_difficulty (int difficulty)	528	magic_from_difficulty (int difficulty)
527	{	529	{
528	int percent = 0, magic = 0;	530	int percent = 0, magic = 0;
529	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);	531	int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
530		532
…		…
620	* 1) Since rings can have multiple bonuses, if the same bonus	622	* 1) Since rings can have multiple bonuses, if the same bonus
621	* is rolled again, increase it - the bonuses now stack with	623	* is rolled again, increase it - the bonuses now stack with
622	* other bonuses previously rolled and ones the item might natively have.	624	* other bonuses previously rolled and ones the item might natively have.
623	* 2) Add code to deal with new PR method.	625	* 2) Add code to deal with new PR method.
624	*/	626	*/
625	void	627	static void
626	set_ring_bonus (object *op, int bonus)	628	set_ring_bonus (object *op, int bonus)
627	{	629	{
628
629	int r = rndm (bonus > 0 ? 25 : 11);	630	int r = rndm (bonus > 0 ? 25 : 11);
630		631
631	if (op->type == AMULET)	632	if (op->type == AMULET)
632	{	633	{
633	if (!(rndm (21)))	634	if (!(rndm (21)))
…		…
756	* higher is the chance of returning a low number.	757	* higher is the chance of returning a low number.
757	* It is only used in fix_generated_treasure() to set bonuses on	758	* It is only used in fix_generated_treasure() to set bonuses on
758	* rings and amulets.	759	* rings and amulets.
759	* Another scheme is used to calculate the magic of weapons and armours.	760	* Another scheme is used to calculate the magic of weapons and armours.
760	*/	761	*/
761	int	762	static int
762	get_magic (int diff)	763	get_magic (int diff)
763	{	764	{
764	int i;	765	int i;
765		766
766	if (diff < 3)	767	if (diff < 3)
…		…
769	for (i = 0; i < 4; i++)	770	for (i = 0; i < 4; i++)
770	if (rndm (diff))	771	if (rndm (diff))
771	return i;	772	return i;
772		773
773	return 4;	774	return 4;
		775	}
		776
		777	/* special_potion() - so that old potion code is still done right. */
		778	static int
		779	special_potion (object *op)
		780	{
		781	if (op->attacktype)
		782	return 1;
		783
		784	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
		785	return 1;
		786
		787	for (int i = 0; i < NROFATTACKS; i++)
		788	if (op->resist[i])
		789	return 1;
		790
		791	return 0;
774	}	792	}
775		793
776	#define DICE2 (get_magic(2)==2?2:1)	794	#define DICE2 (get_magic(2)==2?2:1)
777	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))	795	#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
778		796
…		…
815	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);	833	create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
816	/* So the treasure doesn't get created again */	834	/* So the treasure doesn't get created again */
817	op->randomitems = 0;	835	op->randomitems = 0;
818	}	836	}
819		837
820	if (difficulty < 1)	838	max_it (difficulty, 1);
821	difficulty = 1;
822		839
823	if (INVOKE_OBJECT (ADD_BONUS, op,	840	if (INVOKE_OBJECT (ADD_BONUS, op,
824	ARG_OBJECT (creator != op ? creator : 0),	841	ARG_OBJECT (creator != op ? creator : 0),
825	ARG_INT (difficulty), ARG_INT (max_magic),	842	ARG_INT (difficulty), ARG_INT (max_magic),
826	ARG_INT (flags)))	843	ARG_INT (flags)))
…		…
885	* again below */	902	* again below */
886	}	903	}
887	}	904	}
888		905
889	/* materialtype modifications. Note we allow this on artifacts. */	906	/* materialtype modifications. Note we allow this on artifacts. */
890	set_materialname (op, difficulty, NULL);	907	select_material (op, difficulty);
891		908
892	if (flags & GT_MINIMAL)	909	if (flags & GT_MINIMAL)
893	{	910	{
894	if (op->type == POTION)	911	if (op->type == POTION)
895	/* Handle healing and magic power potions */	912	/* Handle healing and magic power potions */
…		…
926	int too_many_tries = 0, is_special = 0;	943	int too_many_tries = 0, is_special = 0;
927		944
928	/* Handle healing and magic power potions */	945	/* Handle healing and magic power potions */
929	if (op->stats.sp && !op->randomitems)	946	if (op->stats.sp && !op->randomitems)
930	{	947	{
931	object *tmp;
932
933	tmp = get_archetype (spell_mapping[op->stats.sp]);	948	object *tmp = get_archetype (spell_mapping[op->stats.sp]);
934	insert_ob_in_ob (tmp, op);	949	insert_ob_in_ob (tmp, op);
935	op->stats.sp = 0;	950	op->stats.sp = 0;
936	}	951	}
937		952
938	while (!(is_special = special_potion (op)) && !op->inv)	953	while (!(is_special = special_potion (op)) && !op->inv)
…		…
946	* since the value set on those is already correct.	961	* since the value set on those is already correct.
947	*/	962	*/
948	if (op->inv && op->randomitems)	963	if (op->inv && op->randomitems)
949	{	964	{
950	/* value multiplier is same as for scrolls */	965	/* value multiplier is same as for scrolls */
951	op->value = (op->value * op->inv->value);	966	op->value *= op->inv->value;
952	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);	967	op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
953	}	968	}
954	else	969	else
955	{	970	{
956	op->name = "potion";	971	op->name = "potion";
957	op->name_pl = "potions";	972	op->name_pl = "potions";
958	}	973	}
959		974
960	if (!(flags & GT_ONLY_GOOD) && rndm (2))	975	if (!(flags & GT_ONLY_GOOD) && rndm (2))
961	SET_FLAG (op, FLAG_CURSED);	976	SET_FLAG (op, FLAG_CURSED);
		977
962	break;	978	break;
963	}	979	}
964		980
965	case AMULET:	981	case AMULET:
966	if (IS_ARCH (op->arch, amulet))	982	if (IS_ARCH (op->arch, amulet))
967	op->value = 5; / Since it's not just decoration */	983	op->value = 5; / Since it's not just decoration */
968		984
969	case RING:	985	case RING:
970	if (!op->arch) // wtf? schmorp
971	{
972	op->destroy ();
973	op = 0;
974	break;
975	}
976
977	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */	986	if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
978	break;	987	break;
979		988
980	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))	989	if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
981	SET_FLAG (op, FLAG_CURSED);	990	SET_FLAG (op, FLAG_CURSED);
…		…
1002	op->value *= 5;	1011	op->value *= 5;
1003	set_ring_bonus (op, d);	1012	set_ring_bonus (op, d);
1004	}	1013	}
1005	}	1014	}
1006		1015
1007	if (GET_ANIM_ID (op))	1016	if (op->animation_id)
1008	SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));	1017	op->set_anim_frame (rndm (op->anim_frames ()));
1009		1018
1010	break;	1019	break;
1011		1020
1012	case BOOK:	1021	case BOOK:
1013	/* Is it an empty book?, if yes lets make a special·	1022	/* Is it an empty book?, if yes lets make a special·
…		…
1028	op->level = rndm (creator->level);	1037	op->level = rndm (creator->level);
1029		1038
1030	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);	1039	tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1031	/* books w/ info are worth more! */	1040	/* books w/ info are worth more! */
1032	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));	1041	op->value = ((op->level > 10 ? op->level : (op->level + 1) / 2) ((strlen (op->msg) / 250) + 1));
1033	/* creator related stuff */
1034
1035	/* for library, chained books. Note that some monsters have no_pick
1036	* set - we don't want to set no pick in that case.
1037	*/
1038	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1039	SET_FLAG (op, FLAG_NO_PICK);
1040	if (creator->slaying && !op->slaying) /* for check_inv floors */
1041	op->slaying = creator->slaying;
1042		1042
1043	/* add exp so reading it gives xp (once) */	1043	/* add exp so reading it gives xp (once) */
1044	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;	1044	op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1045	}	1045	}
		1046
		1047	/* creator related stuff */
		1048
		1049	/* for library, chained books. Note that some monsters have no_pick
		1050	* set - we don't want to set no pick in that case.
		1051	*/
		1052	if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
		1053	SET_FLAG (op, FLAG_NO_PICK);
		1054	if (creator->slaying && !op->slaying) /* for check_inv floors */
		1055	op->slaying = creator->slaying;
1046	break;	1056	break;
1047		1057
1048	case SPELLBOOK:	1058	case SPELLBOOK:
1049	op->value = op->value * op->inv->value;	1059	op->value = op->value * op->inv->value;
1050	/* add exp so learning gives xp */	1060	/* add exp so learning gives xp */
…		…
1084	* 10 time multiplier). This way, the value are a bit more reasonable.	1094	* 10 time multiplier). This way, the value are a bit more reasonable.
1085	*/	1095	*/
1086	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);	1096	op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1087	/* maxhp is used to denote how many 'charges' the rod holds before */	1097	/* maxhp is used to denote how many 'charges' the rod holds before */
1088	if (op->stats.maxhp)	1098	if (op->stats.maxhp)
1089	op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace);	1099	op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1090	else	1100	else
1091	op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace);	1101	op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1092		1102
1093	op->stats.hp = op->stats.maxhp;	1103	op->stats.hp = op->stats.maxhp;
1094	break;	1104	break;
1095		1105
1096	case SCROLL:	1106	case SCROLL:
…		…
1133		1143
1134	/*	1144	/*
1135	* Allocate and return the pointer to an empty artifactlist structure.	1145	* Allocate and return the pointer to an empty artifactlist structure.
1136	*/	1146	*/
1137	static artifactlist *	1147	static artifactlist *
1138	get_empty_artifactlist (void)	1148	get_empty_artifactlist ()
1139	{	1149	{
1140	return salloc0<artifactlist> ();	1150	return salloc0<artifactlist> ();
1141	}	1151	}
1142		1152
1143	/*	1153	/*
1144	* Allocate and return the pointer to an empty artifact structure.	1154	* Allocate and return the pointer to an empty artifact structure.
1145	*/	1155	*/
1146	static artifact *	1156	static artifact *
1147	get_empty_artifact (void)	1157	get_empty_artifact ()
1148	{	1158	{
1149	return salloc0<artifact> ();	1159	return salloc0<artifact> ();
1150	}	1160	}
1151		1161
1152	/*	1162	/*
…		…
1165		1175
1166	/*	1176	/*
1167	* Builds up the lists of artifacts from the file in the libdir.	1177	* Builds up the lists of artifacts from the file in the libdir.
1168	*/	1178	*/
1169	void	1179	void
1170	init_artifacts (void)	1180	init_artifacts ()
1171	{	1181	{
1172	static int has_been_inited = 0;	1182	static int has_been_inited = 0;
1173	char filename[MAX_BUF];	1183	char filename[MAX_BUF];
1174	artifact *art = NULL;	1184	artifact *art = NULL;
1175	artifactlist *al;	1185	artifactlist *al;
…		…
1195		1205
1196	{	1206	{
1197	if (!strcmp (f.get_str (), "all"))	1207	if (!strcmp (f.get_str (), "all"))
1198	break;	1208	break;
1199		1209
1200	char next, cp = f.get_str ();	1210	const char *cp = f.get_str ();
1201		1211	char *next;
1202	do	1212	do
1203	{	1213	{
1204	if ((next = strchr (cp, ',')))	1214	if ((next = (char *)strchr (cp, ',')))
1205	*next++ = '\0';	1215	*next++ = '\0';
1206		1216
1207	linked_char *tmp = new linked_char;	1217	linked_char *tmp = new linked_char;
1208		1218
1209	tmp->name = cp;	1219	tmp->name = cp;
…		…
1353	* to cast. So convert that to into a spell and put it into	1363	* to cast. So convert that to into a spell and put it into
1354	* this object.	1364	* this object.
1355	*/	1365	*/
1356	if (op->type == HORN \|\| op->type == POTION)	1366	if (op->type == HORN \|\| op->type == POTION)
1357	{	1367	{
1358	object *tmp_obj;
1359
1360	/* Remove any spells this object currently has in it */	1368	/* Remove any spells this object currently has in it */
1361	while (op->inv)
1362	op->inv->destroy ();	1369	op->destroy_inv (false);
1363		1370
1364	tmp_obj = arch_to_object (change->other_arch);	1371	object *tmp = change->other_arch->instance ();
1365	insert_ob_in_ob (tmp_obj, op);	1372	insert_ob_in_ob (tmp, op);
1366	}	1373	}
1367	/* No harm setting this for potions/horns */	1374	/* No harm setting this for potions/horns */
1368	op->other_arch = change->other_arch;	1375	op->other_arch = change->other_arch;
1369	}	1376	}
1370		1377
…		…
1455	op->value *= change->value;	1462	op->value *= change->value;
1456		1463
1457	if (change->materials)	1464	if (change->materials)
1458	op->materials = change->materials;	1465	op->materials = change->materials;
1459		1466
1460	if (change->materialname)	1467	if (change->material != MATERIAL_NULL)
1461	op->materialname = change->materialname;	1468	op->material = change->material;
1462		1469
1463	if (change->slaying)	1470	if (change->slaying)
1464	op->slaying = change->slaying;	1471	op->slaying = change->slaying;
1465		1472
1466	if (change->race)	1473	if (change->race)
…		…
1575	#if 1	1582	#if 1
1576	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);	1583	LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1577	#endif	1584	#endif
1578	return;	1585	return;
1579	}	1586	}
1580	if (!strcmp (art->item->name, "NONE"))	1587
		1588	if (art->item->name == shstr_NONE)
1581	return;	1589	return;
		1590
1582	if (FABS (op->magic) < art->item->magic)	1591	if (fabs (op->magic) < art->item->magic)
1583	continue; /* Not magic enough to be this item */	1592	continue; /* Not magic enough to be this item */
1584		1593
1585	/* Map difficulty not high enough */	1594	/* Map difficulty not high enough */
1586	if (difficulty < art->difficulty)	1595	if (difficulty < art->difficulty)
1587	continue;	1596	continue;
…		…
1638	item->level = donor->level;	1647	item->level = donor->level;
1639		1648
1640	/* if donor has some attacktypes, the flesh is poisonous */	1649	/* if donor has some attacktypes, the flesh is poisonous */
1641	if (donor->attacktype & AT_POISON)	1650	if (donor->attacktype & AT_POISON)
1642	item->type = POISON;	1651	item->type = POISON;
		1652
1643	if (donor->attacktype & AT_ACID)	1653	if (donor->attacktype & AT_ACID)
1644	item->stats.hp = -1 * item->stats.food;	1654	item->stats.hp = -1 * item->stats.food;
		1655
1645	SET_FLAG (item, FLAG_NO_STEAL);	1656	SET_FLAG (item, FLAG_NO_STEAL);
1646	}	1657	}
1647	}	1658	}
1648		1659
1649	/* special_potion() - so that old potion code is still done right. */	1660	static void
1650	int
1651	special_potion (object *op)
1652	{
1653	if (op->attacktype)
1654	return 1;
1655
1656	if (op->stats.Str \|\| op->stats.Dex \|\| op->stats.Con \|\| op->stats.Pow \|\| op->stats.Wis \|\| op->stats.Int \|\| op->stats.Cha)
1657	return 1;
1658
1659	for (int i = 0; i < NROFATTACKS; i++)
1660	if (op->resist[i])
1661	return 1;
1662
1663	return 0;
1664	}
1665
1666	void
1667	free_treasurestruct (treasure *t)	1661	free_treasurestruct (treasure *t)
1668	{	1662	{
1669	if (t->next) free_treasurestruct (t->next);	1663	if (t->next) free_treasurestruct (t->next);
1670	if (t->next_yes) free_treasurestruct (t->next_yes);	1664	if (t->next_yes) free_treasurestruct (t->next_yes);
1671	if (t->next_no) free_treasurestruct (t->next_no);	1665	if (t->next_no) free_treasurestruct (t->next_no);
1672		1666
1673	delete t;	1667	delete t;
1674	}	1668	}
1675		1669
1676	void	1670	static void
1677	free_charlinks (linked_char *lc)	1671	free_charlinks (linked_char *lc)
1678	{	1672	{
1679	if (lc->next)	1673	if (lc->next)
1680	free_charlinks (lc->next);	1674	free_charlinks (lc->next);
1681		1675
1682	delete lc;	1676	delete lc;
1683	}	1677	}
1684		1678
1685	void	1679	static void
1686	free_artifact (artifact *at)	1680	free_artifact (artifact *at)
1687	{	1681	{
1688	if (at->next) free_artifact (at->next);	1682	if (at->next) free_artifact (at->next);
1689	if (at->allowed) free_charlinks (at->allowed);	1683	if (at->allowed) free_charlinks (at->allowed);
1690		1684
1691	at->item->destroy (1);	1685	at->item->destroy ();
1692		1686
1693	sfree (at);	1687	sfree (at);
1694	}	1688	}
1695		1689
1696	void
1697	free_artifactlist (artifactlist *al)
1698	{
1699	artifactlist *nextal;
1700
1701	for (al = first_artifactlist; al; al = nextal)
1702	{
1703	nextal = al->next;
1704
1705	if (al->items)
1706	free_artifact (al->items);
1707
1708	sfree (al);
1709	}
1710	}
1711
1712	void
1713	free_all_treasures (void)
1714	{
1715	treasurelist tl, next;
1716
1717	for (tl = first_treasurelist; tl; tl = next)
1718	{
1719	clear (tl);
1720
1721	next = tl->next;
1722	delete tl;
1723	}
1724
1725	free_artifactlist (first_artifactlist);
1726	}

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC vs. Revision 1.100 by root, Sat Jan 16 13:41:37 2010 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.100 by root, Sat Jan 16 13:41:37 2010 UTC