ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.38 by root, Sun Apr 29 04:14:57 2007 UTC vs.
Revision 1.39 by root, Sun Apr 29 14:39:55 2007 UTC

… …
843 843
844 if (settings.spell_encumbrance == TRUE) 844 if (settings.spell_encumbrance == TRUE)
845 contr->encumbrance = 0; 845 contr->encumbrance = 0;
846 846
847 attacktype = 0; 847 attacktype = 0;
848
848 contr->digestion = 0; 849 contr->digestion = 0;
849 contr->gen_hp = 0; 850 contr->gen_hp = 0;
850 contr->gen_sp = 0; 851 contr->gen_sp = 0;
851 contr->gen_grace = 0; 852 contr->gen_grace = 0;
852 contr->gen_sp_armour = 10; 853 contr->gen_sp_armour = 10;
853 contr->item_power = 0; 854 contr->item_power = 0;
854 855
855 /* Don't clobber all the range_ values. range_golem otherwise 856 /* Don't clobber all the range_ values. range_golem otherwise
856 * gets reset for no good reason, and we don't want to reset 857 * gets reset for no good reason, and we don't want to reset
857 * range_magic (what spell is readied). These three below 858 * range_magic (what spell is readied). These three below
858 * well get filled in based on what the player has equipped. 859 * well get filled in based on what the player has equipped.
… …
879 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 880 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
880 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 881 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
881 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 882 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
882 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 883 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
883 884
884 path_attuned = arch->clone.path_attuned; 885 path_attuned = arch->clone.path_attuned;
885 path_repelled = arch->clone.path_repelled; 886 path_repelled = arch->clone.path_repelled;
886 path_denied = arch->clone.path_denied; 887 path_denied = arch->clone.path_denied;
887 glow_radius = arch->clone.glow_radius; 888 glow_radius = arch->clone.glow_radius;
888 move_type = arch->clone.move_type; 889 move_type = arch->clone.move_type;
890
889 chosen_skill = NULL; 891 chosen_skill = NULL;
890 892
891 /* initializing resistances from the values in player/monster's 893 /* initializing resistances from the values in player/monster's
892 * archetype clone 894 * archetype clone
893 */ 895 */
… …
969 * in the praying skill, and the player should always get those. 971 * in the praying skill, and the player should always get those.
970 * It also means we need to put in additional checks for applied below, 972 * It also means we need to put in additional checks for applied below,
971 * because the skill shouldn't count against body positions being used 973 * because the skill shouldn't count against body positions being used
972 * up, etc. 974 * up, etc.
973 */ 975 */
974 if ((QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type != CONTAINER && tmp->type != CLOSE_CON) || 976 if ((QUERY_FLAG (tmp, FLAG_APPLIED)
977 && tmp->type != CONTAINER
978 && tmp->type != CLOSE_CON)
979 || (tmp->type == SKILL
975 (tmp->type == SKILL && tmp->subtype == SK_PRAYING)) 980 && tmp->subtype == SK_PRAYING))
976 { 981 {
977 if (type == PLAYER) 982 if (type == PLAYER)
978 { 983 {
979 if (tmp->type == BOW) 984 if (tmp->type == BOW)
980 contr->ranges[range_bow] = tmp; 985 contr->ranges[range_bow] = tmp;
981 986
982 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 987 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
983 contr->ranges[range_misc] = tmp; 988 contr->ranges[range_misc] = tmp;
984 989
985 for (i = 0; i < NUM_STATS; i++) 990 for (i = 0; i < NUM_STATS; i++)
986 change_attr_value (&(stats), i, get_attr_value (&(tmp->stats), i)); 991 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i));
987 992
988 /* these are the items that currently can change digestion, regeneration, 993 /* these are the items that currently can change digestion, regeneration,
989 * spell point recovery and mana point recovery. Seems sort of an arbitary 994 * spell point recovery and mana point recovery. Seems sort of an arbitary
990 * list, but other items store other info into stats array. 995 * list, but other items store other info into stats array.
991 */ 996 */
… …
1013 body_used[i] += tmp->body_info[i]; 1018 body_used[i] += tmp->body_info[i];
1014 1019
1015 if (tmp->type == SYMPTOM) 1020 if (tmp->type == SYMPTOM)
1016 { 1021 {
1017 speed_reduce_from_disease = tmp->last_sp / 100.0; 1022 speed_reduce_from_disease = tmp->last_sp / 100.0;
1023
1018 if (speed_reduce_from_disease == 0) 1024 if (speed_reduce_from_disease == 0)
1019 speed_reduce_from_disease = 1; 1025 speed_reduce_from_disease = 1;
1020 } 1026 }
1021 1027
1022 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 1028 /* Pos. and neg. protections are counted seperate (-> pro/vuln).
… …
1047 1053
1048 /* There may be other things that should not adjust the attacktype */ 1054 /* There may be other things that should not adjust the attacktype */
1049 if (tmp->type != BOW && tmp->type != SYMPTOM) 1055 if (tmp->type != BOW && tmp->type != SYMPTOM)
1050 attacktype |= tmp->attacktype; 1056 attacktype |= tmp->attacktype;
1051 1057
1052 path_attuned |= tmp->path_attuned; 1058 path_attuned |= tmp->path_attuned;
1053 path_repelled |= tmp->path_repelled; 1059 path_repelled |= tmp->path_repelled;
1054 path_denied |= tmp->path_denied; 1060 path_denied |= tmp->path_denied;
1061 move_type |= tmp->move_type;
1055 stats.luck += tmp->stats.luck; 1062 stats.luck += tmp->stats.luck;
1056 move_type |= tmp->move_type;
1057 1063
1058 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 1064 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE);
1059 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL); 1065 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1060 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE); 1066 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1061 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH); 1067 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);

Diff Legend

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