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

Comparing deliantra/server/common/living.C (file contents):
Revision 1.100 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.116 by root, Sun Apr 4 04:10:47 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 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
262	/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,	262	/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
263	* make this macro to clean those up. Not usuable outside change_abil	263	* make this macro to clean those up. Not usuable outside change_abil
264	* function since some of the values passed to new_draw_info are hardcoded.	264	* function since some of the values passed to new_draw_info are hardcoded.
265	*/	265	*/
266	#define DIFF_MSG(flag, msg1, msg2) \	266	#define DIFF_MSG(flag, msg1, msg2) \
267	new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2);	267	new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
268		268
269	/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */	269	/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
270		270
271	/* flag is set to 1 if we are applying the object, -1 if we are removing	271	/* flag is set to 1 if we are applying the object, -1 if we are removing
272	* the object.	272	* the object.
…		…
415	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));	415	(op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
416	}	416	}
417		417
418	if (tmp->move_type & MOVE_SWIM)	418	if (tmp->move_type & MOVE_SWIM)
419	DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");	419	DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
420
421	/* Changing move status may mean you are affected by things you weren't before */
422	check_move_on (op, op);
423	}	420	}
424		421
425	/* becoming UNDEAD... a special treatment for this flag. Only those not	422	/* becoming UNDEAD... a special treatment for this flag. Only those not
426	* originally undead may change their status	423	* originally undead may change their status
427	*/	424	*/
…		…
607	{	604	{
608	tmp = present_arch_in_ob (at, this);	605	tmp = present_arch_in_ob (at, this);
609		606
610	if (!tmp)	607	if (!tmp)
611	{	608	{
612	tmp = arch_to_object (at);	609	tmp = at->instance ();
613	tmp = insert_ob_in_ob (tmp, this);	610	tmp = insert_ob_in_ob (tmp, this);
614	SET_FLAG (tmp, FLAG_APPLIED);	611	SET_FLAG (tmp, FLAG_APPLIED);
615	}	612	}
616	}	613	}
617		614
…		…
637	if (!tmp)	634	if (!tmp)
638	{	635	{
639	if (!value)	636	if (!value)
640	return;	637	return;
641		638
642	tmp = arch_to_object (at);	639	tmp = at->instance ();
643	tmp = insert_ob_in_ob (tmp, this);	640	tmp = insert_ob_in_ob (tmp, this);
644	SET_FLAG (tmp, FLAG_APPLIED);	641	SET_FLAG (tmp, FLAG_APPLIED);
645	}	642	}
646		643
647	if (value)	644	if (value)
…		…
764	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];	761	int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
765	object grace_obj = NULL, mana_obj = NULL, *tmp;	762	object grace_obj = NULL, mana_obj = NULL, *tmp;
766	float old_speed = speed;	763	float old_speed = speed;
767	int stat_sum [NUM_STATS];	764	int stat_sum [NUM_STATS];
768		765
		766	MoveType move_type; // we use change_move_type to change it, so use a local copy
		767
769	/* First task is to clear all the values back to their original values */	768	/* First task is to clear all the values back to their original values */
770	if (type == PLAYER)	769	if (type == PLAYER)
771	{	770	{
		771	contr->delayed_update = false;
		772
772	for (int i = 0; i < NUM_STATS; i++)	773	for (int i = 0; i < NUM_STATS; i++)
773	stat_sum [i] = contr->orig_stats.stat (i);	774	stat_sum [i] = contr->orig_stats.stat (i);
774		775
775	if (settings.spell_encumbrance == TRUE)	776	if (settings.spell_encumbrance == TRUE)
776	contr->encumbrance = 0;	777	contr->encumbrance = 0;
…		…
809	path_repelled = arch->path_repelled;	810	path_repelled = arch->path_repelled;
810	path_denied = arch->path_denied;	811	path_denied = arch->path_denied;
811	glow_radius = arch->glow_radius;	812	glow_radius = arch->glow_radius;
812	move_type = arch->move_type;	813	move_type = arch->move_type;
813		814
814	chosen_skill = 0;
815
816	/* initializing resistances from the values in player/monster's	815	/* initializing resistances from the values in player/monster's
817	* archetype clone	816	* archetype clone
818	*/	817	*/
819	memcpy (&resist, &arch->resist, sizeof (resist));	818	memcpy (&resist, &arch->resist, sizeof (resist));
820		819
821	for (int i = 0; i < NROFATTACKS; i++)	820	for (int i = 0; i < NROFATTACKS; i++)
822	{	821	{
823	if (resist[i] > 0)	822	if (resist[i] > 0)
824	prot[i] = resist[i], vuln[i] = 0;	823	prot[i] = resist[i], vuln[i] = 0;
825	else	824	else
826	vuln[i] = -(resist[i]), prot[i] = 0;	825	vuln[i] = -resist[i], prot[i] = 0;
827		826
828	potion_resist[i] = 0;	827	potion_resist[i] = -1000;
829	}	828	}
830		829
831	wc = arch->stats.wc;	830	wc = arch->stats.wc;
832	stats.dam = arch->stats.dam;	831	stats.dam = arch->stats.dam;
833		832
…		…
846	else	845	else
847	ac = arch->stats.ac;	846	ac = arch->stats.ac;
848		847
849	stats.luck = arch->stats.luck;	848	stats.luck = arch->stats.luck;
850	speed = arch->speed;	849	speed = arch->speed;
		850
		851	chosen_skill = 0;
851		852
852	/* OK - we've reset most all the objects attributes to sane values.	853	/* OK - we've reset most all the objects attributes to sane values.
853	* now go through and make adjustments for what the player has equipped.	854	* now go through and make adjustments for what the player has equipped.
854	*/	855	*/
855	for (tmp = inv; tmp; tmp = tmp->below)	856	for (tmp = inv; tmp; tmp = tmp->below)
…		…
894	* up, etc.	895	* up, etc.
895	*/	896	*/
896	if ((tmp->flag [FLAG_APPLIED]	897	if ((tmp->flag [FLAG_APPLIED]
897	&& tmp->type != CONTAINER	898	&& tmp->type != CONTAINER
898	&& tmp->type != CLOSE_CON)	899	&& tmp->type != CLOSE_CON)
899	\|\| (tmp->type == SKILL
900	&& tmp->subtype == SK_PRAYING))	900	\|\| (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
901	{	901	{
902	if (type == PLAYER)	902	if (type == PLAYER)
903	{	903	{
904	contr->item_power += tmp->item_power;	904	contr->item_power += tmp->item_power;
905		905
906	if (tmp == contr->combat_ob \|\| tmp == contr->ranged_ob)
907	if (tmp != current_weapon
908	&& (tmp->type != SKILL \|\| tmp->subtype != SK_PRAYING)
909	&& !tmp->flag [FLAG_CURSED]
910	&& !tmp->flag [FLAG_DAMNED])
911	continue;
912
913	for (int i = 0; i < NUM_STATS; i++)	906	for (int i = 0; i < NUM_STATS; i++)
914	stat_sum [i] = stat_sum [i] + tmp->stats.stat (i);	907	stat_sum [i] += tmp->stats.stat (i);
915		908
916	if (digest_types [tmp->type])	909	if (digest_types [tmp->type])
917	{	910	{
918	contr->digestion += tmp->stats.food;	911	contr->digestion += tmp->stats.food;
919	contr->gen_hp += tmp->stats.hp;	912	contr->gen_hp += tmp->stats.hp;
…		…
928	if (tmp->type == WEAPON)	921	if (tmp->type == WEAPON)
929	current_weapon = tmp;	922	current_weapon = tmp;
930	}	923	}
931		924
932	/* Update slots used for items */	925	/* Update slots used for items */
933	if (QUERY_FLAG (tmp, FLAG_APPLIED))	926	if (tmp->flag [FLAG_APPLIED]) // exclude praying...
934	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	927	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
935	slot[i].used += tmp->slot[i].info;	928	slot[i].used += tmp->slot[i].info;
936		929
937	if (tmp->type == SYMPTOM)	930	if (tmp->type == SYMPTOM)
938	speed_reduce_from_disease =
939	min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);	931	min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
940		932
941	/* Pos. and neg. protections are counted separate (-> pro/vuln).	933	/* Pos. and neg. protections are counted separate (-> pro/vuln).
942	* (Negative protections are calculated exactly like positive.)	934	* (Negative protections are calculated exactly like positive.)
943	* Resistance from potions are treated special as well. If there's	935	* Resistance from potions are treated special as well. If there's
944	* more than one potion-effect, the bigger prot.-value is taken.	936	* more than one potion-effect, the bigger prot.-value is taken.
945	*/	937	*/
946	if (tmp->type != POTION)	938	if (tmp->type == POTION_EFFECT)
947	{
948	for (int i = 0; i < NROFATTACKS; i++)	939	for (int i = 0; i < NROFATTACKS; i++)
949	{
950	/* Potential for cursed potions, in which case we just can use
951	* a straight MAX, as potion_resist is initialised to zero.
952	*/
953	if (tmp->type == POTION_EFFECT)
954	{
955	if (potion_resist[i])
956	potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
957	else
958	potion_resist[i] = tmp->resist[i];	940	max_it (potion_resist[i], tmp->resist[i]);
959	}	941	else if (tmp->type != POTION)
		942	for (int i = 0; i < NROFATTACKS; i++)
960	else if (tmp->resist[i] > 0)	943	if (tmp->resist[i] > 0)
961	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;	944	prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
962	else if (tmp->resist[i] < 0)	945	else if (tmp->resist[i] < 0)
963	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;	946	vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
964	}
965	}
966		947
967	/* There may be other things that should not adjust the attacktype */	948	/* There may be other things that should not adjust the attacktype */
968	if (tmp->type != SYMPTOM)	949	if (tmp->type != SYMPTOM)
969	{	950	{
970	attacktype \|= tmp->attacktype;	951	attacktype \|= tmp->attacktype;
…		…
978	flag \|= tmp->flag & copy_flags;	959	flag \|= tmp->flag & copy_flags;
979		960
980	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))	961	if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
981	SET_FLAG (this, FLAG_UNDEAD);	962	SET_FLAG (this, FLAG_UNDEAD);
982		963
		964	//TODO: copy_flags?
983	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))	965	if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
984	{	966	{
985	SET_FLAG (this, FLAG_MAKE_INVIS);	967	SET_FLAG (this, FLAG_MAKE_INVIS);
986	invisible = 1;	968	invisible = 1;
987	}	969	}
…		…
997	added_speed += tmp->stats.exp;	979	added_speed += tmp->stats.exp;
998	}	980	}
999		981
1000	switch (tmp->type)	982	switch (tmp->type)
1001	{	983	{
1002	#if 0
1003	case WAND:
1004	case ROD:
1005	case HORN:
1006	if (type != PLAYER \|\| current_weapon == tmp)
1007	chosen_skill = tmp;
1008	break;
1009	#endif
1010
1011	/* skills modifying the character -b.t. */
1012	/* for all skills and skill granting objects */
1013	case SKILL:	984	case SKILL:
1014	{	985	{
		986	// some skills will end up here without counting as "applied"
1015	if (!QUERY_FLAG (tmp, FLAG_APPLIED) \|\| skill_flags [tmp->subtype] & SF_APPLY)	987	if (!tmp->flag [FLAG_APPLIED] \|\| skill_flags [tmp->subtype] & SF_AUTARK)
1016	break;	988	break;
1017		989
1018	if (chosen_skill)	990	if (chosen_skill)
1019	{	991	{
1020	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",	992	LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
…		…
1022		994
1023	tmp->flag [FLAG_APPLIED] = false;	995	tmp->flag [FLAG_APPLIED] = false;
1024	update_stats ();	996	update_stats ();
1025	return;	997	return;
1026	}	998	}
1027	else	999
1028	chosen_skill = tmp;	1000	chosen_skill = tmp;
1029		1001
1030	if (tmp->stats.dam > 0)	1002	if (tmp->stats.dam > 0)
1031	{ /* skill is a 'weapon' */	1003	{ /* skill is a 'weapon' */
1032	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))	1004	if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1033	weapon_speed = WEAPON_SPEED (tmp);	1005	weapon_speed = max (0, WEAPON_SPEED (tmp));
1034
1035	if (weapon_speed < 0)
1036	weapon_speed = 0;
1037		1006
1038	weapon_weight = tmp->weight;	1007	weapon_weight = tmp->weight;
1039	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;	1008	stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1040		1009
1041	if (tmp->magic)	1010	if (tmp->magic)
…		…
1050		1019
1051	if (tmp->stats.ac)	1020	if (tmp->stats.ac)
1052	ac -= tmp->stats.ac + tmp->magic;	1021	ac -= tmp->stats.ac + tmp->magic;
1053		1022
1054	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1023	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1055	contr->encumbrance += (int) 3 *tmp->weight / 1000;	1024	contr->encumbrance += 3 * tmp->weight / 1000;
1056	}	1025	}
1057		1026
1058	break;	1027	break;
1059		1028
1060	case SHIELD:	1029	case SHIELD:
1061	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1030	if (settings.spell_encumbrance == TRUE && type == PLAYER)
1062	contr->encumbrance += (int) tmp->weight / 2000;	1031	contr->encumbrance += tmp->weight / 2000;
		1032	//FALLTHROUGH
1063	case RING:	1033	case RING:
1064	case AMULET:	1034	case AMULET:
1065	case GIRDLE:	1035	case GIRDLE:
1066	case HELMET:	1036	case HELMET:
1067	case BOOTS:	1037	case BOOTS:
…		…
1076	if (tmp->stats.ac)	1046	if (tmp->stats.ac)
1077	ac -= tmp->stats.ac + tmp->magic;	1047	ac -= tmp->stats.ac + tmp->magic;
1078		1048
1079	break;	1049	break;
1080		1050
		1051	case WAND:
		1052	case ROD:
		1053	case HORN:
		1054	break;
		1055
1081	case BOW:	1056	case BOW:
1082	case WEAPON:	1057	case WEAPON:
1083	if (type != PLAYER \|\| current_weapon == tmp)
1084	{
1085	wc -= tmp->stats.wc + tmp->magic;	1058	wc -= tmp->stats.wc + tmp->magic;
1086		1059
1087	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)	1060	if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1088	ac -= tmp->stats.ac + tmp->magic;	1061	ac -= tmp->stats.ac + tmp->magic;
1089		1062
1090	stats.dam += tmp->stats.dam + tmp->magic;	1063	stats.dam += tmp->stats.dam + tmp->magic;
1091	weapon_weight = tmp->weight;	1064	weapon_weight = tmp->weight;
1092	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;	1065	weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1093		1066
1094	if (weapon_speed < 0)	1067	if (weapon_speed < 0)
1095	weapon_speed = 0;	1068	weapon_speed = 0;
1096		1069
1097	slaying = tmp->slaying;	1070	slaying = tmp->slaying;
1098		1071
1099	/* If there is desire that two handed weapons should do	1072	/* If there is desire that two handed weapons should do
1100	* extra strength damage, this is where the code should	1073	* extra strength damage, this is where the code should
1101	* go.	1074	* go.
1102	*/	1075	*/
1103		1076
1104	if (type == PLAYER)	1077	if (type == PLAYER)
1105	if (settings.spell_encumbrance)	1078	if (settings.spell_encumbrance)
1106	contr->encumbrance += tmp->weight * 3 / 1000;	1079	contr->encumbrance += tmp->weight * 3 / 1000;
1107	}
1108		1080
1109	break;	1081	break;
1110		1082
1111	case ARMOUR: /* Only the best of these three are used: */	1083	case ARMOUR: /* Only the best of these three are used: */
1112	if (settings.spell_encumbrance == TRUE && type == PLAYER)	1084	if (settings.spell_encumbrance == TRUE && type == PLAYER)
…		…
1148	break;	1120	break;
1149	} /* switch tmp->type */	1121	} /* switch tmp->type */
1150	} /* item is equipped */	1122	} /* item is equipped */
1151	} /* for loop of items */	1123	} /* for loop of items */
1152		1124
1153	glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);	1125	min_it (glow_radius, MAX_LIGHT_RADIUS);
1154		1126
1155	/* We've gone through all the objects the player has equipped. For many things, we	1127	/* We've gone through all the objects the player has equipped. For many things, we
1156	* have generated intermediate values which we now need to assign.	1128	* have generated intermediate values which we now need to assign.
1157	*/	1129	*/
1158		1130
…		…
1164	*/	1136	*/
1165	for (int i = 0; i < NROFATTACKS; i++)	1137	for (int i = 0; i < NROFATTACKS; i++)
1166	{	1138	{
1167	resist[i] = prot[i] - vuln[i];	1139	resist[i] = prot[i] - vuln[i];
1168		1140
1169	if (potion_resist[i] && ((potion_resist[i] > resist[i]) \|\| (potion_resist[i] < 0)))	1141	if (potion_resist[i] != -1000
		1142	&& (potion_resist[i] < 0 \|\| potion_resist[i] > resist[i]))
1170	resist[i] = potion_resist[i];	1143	resist[i] = potion_resist[i];
1171	}	1144	}
1172		1145
1173	if (type == PLAYER)	1146	if (type == PLAYER)
1174	{	1147	{
1175	// clamp various player stats	1148	// clamp various player stats
1176	for (int i = 0; i < NUM_STATS; ++i)	1149	for (int i = 0; i < NUM_STATS; ++i)
1177	stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);	1150	stats.stat (i) = stat_sum [i];
		1151
		1152	check_stat_bounds (&stats);
1178		1153
1179	contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);	1154	contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1180		1155
1181	/* Figure out the players sp/mana/hp totals. */	1156	/* Figure out the players sp/mana/hp totals. */
1182	int pl_level;	1157	int pl_level;
1183		1158
1184	check_stat_bounds (&(stats));
1185	pl_level = level;
1186
1187	if (pl_level < 1)
1188	pl_level = 1; /* safety, we should always get 1 levels worth of hp! */	1159	pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1189		1160
1190	/* You basically get half a con bonus/level. But we do take into account rounding,	1161	/* You basically get half a con bonus/level. But we do take into account rounding,
1191	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.	1162	* so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1192	*/	1163	*/
1193	stats.maxhp = 0;	1164	stats.maxhp = 0;
…		…
1356	speed *= speed_reduce_from_disease;	1327	speed *= speed_reduce_from_disease;
1357		1328
1358	/* Put a lower limit on speed. Note with this speed, you move once every	1329	/* Put a lower limit on speed. Note with this speed, you move once every
1359	* 25 ticks or so. This amounts to once every 3 seconds of realtime.	1330	* 25 ticks or so. This amounts to once every 3 seconds of realtime.
1360	*/	1331	*/
1361	if (speed < 0.04f && type == PLAYER)	1332	max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1362	speed = 0.04f;
1363		1333
1364	if (speed != old_speed)	1334	if (speed != old_speed)
1365	set_speed (speed);	1335	set_speed (speed);
1366		1336
1367	if (type == PLAYER)	1337	if (type == PLAYER)
…		…
1402	if (move_type == 0)	1372	if (move_type == 0)
1403	move_type = MOVE_WALK;	1373	move_type = MOVE_WALK;
1404	else if (move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH))	1374	else if (move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH))
1405	move_type &= ~MOVE_WALK;	1375	move_type &= ~MOVE_WALK;
1406		1376
		1377	// now apply the new move_type
		1378	if (this->move_type != move_type)
		1379	change_move_type (move_type);
		1380
1407	/* It is quite possible that a player's spell costing might have changed,	1381	/* It is quite possible that a player's spell costing might have changed,
1408	* so we will check that now.	1382	* so we will check that now.
1409	*/	1383	*/
1410	if (type == PLAYER)	1384	if (is_player ())
1411	{	1385	contr->update_spells ();
1412	esrv_update_stats (contr);
1413	esrv_update_spells (contr);
1414	}
1415		1386
1416	// update the mapspace, if we are on a map	1387	// update the mapspace, if we are on a map
1417	if (!flag [FLAG_REMOVED] && map)	1388	if (!flag [FLAG_REMOVED] && map)
1418	map->at (x, y).flags_ = 0;	1389	map->at (x, y).flags_ = 0;
1419	}	1390	}
…		…
1609	{	1580	{
1610	changed = true;	1581	changed = true;
1611		1582
1612	op->level++;	1583	op->level++;
1613		1584
1614	if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))	1585	if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1615	dragon_level_gain (who);	1586	dragon_level_gain (who);
1616		1587
1617	/* Only roll these if it is the player (who) that gained the level */	1588	/* Only roll these if it is the player (who) that gained the level */
1618	if (op == who && (who->level < 11) && who->type == PLAYER)	1589	if (op == who && (who->level < 11) && who->type == PLAYER)
1619	{	1590	{
…		…
1652	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);	1623	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, who, buf);
1653	}	1624	}
1654	}	1625	}
1655		1626
1656	if (changed)	1627	if (changed)
1657	{	1628	who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1658	who->update_stats ();
1659	esrv_update_stats (who->contr);
1660	/* check if the spell data has changed */
1661	esrv_update_spells (who->contr);
1662	}
1663	}	1629	}
1664		1630
1665	/*	1631	/*
1666	* Returns how much experience is needed for a player to become	1632	* Returns how much experience is needed for a player to become
1667	* the given level. level should really never exceed max_level	1633	* the given level. level should really never exceed max_level

Diff Legend

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

Comparing deliantra/server/common/living.C (file contents): Revision 1.100 by root, Sat Nov 7 18:30:05 2009 UTC vs. Revision 1.116 by root, Sun Apr 4 04:10:47 2010 UTC

Diff Legend

Comparing deliantra/server/common/living.C (file contents):
Revision 1.100 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.116 by root, Sun Apr 4 04:10:47 2010 UTC