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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.96 by root, Wed Apr 14 22:35:41 2010 UTC vs.
Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC

… …
51# define def(uc, flags) flags, 51# define def(uc, flags) flags,
52# include "skillinc.h" 52# include "skillinc.h"
53# undef def 53# undef def
54}; 54};
55 55
56vector<object_ptr> skillvec;
57
56static int attack_hth (object *pl, int dir, const char *string, object *skill); 58static int attack_hth (object *pl, int dir, const char *string, object *skill);
57static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); 59static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);
58 60
59/* init_skills basically just sets up the skill_names table 61/* init_skills basically just sets up the skill_names table
60 * above. The index into the array is set up by the 62 * above. The index into the array is set up by the
61 * subtypes. 63 * subtypes.
62 */ 64 */
63void 65void
64init_skills () 66init_skills ()
65{ 67{
66 for_all_archetypes (at) 68 // nop
67 if (at->type == SKILL) 69}
70
71void
72add_skill_archetype (object *o)
73{
74 printf ("<%s><%s>\n", &o->name, &o->skill);//D
75
76 assert (("skill name must equal skill skill", o->name == o->skill));
77
78 for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
79 if ((*i)->name == o->name)
68 { 80 {
69 if (skill_names[at->subtype]) 81 // replace existing entry
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 82 SKILL_INDEX (o) = i - skillvec.begin ();
71 at->subtype, &skill_names[at->subtype], &at->skill); 83 *i = o;
72 else 84 return;
73 skill_names[at->subtype] = at->skill;
74 } 85 }
75 86
76 /* This isn't really an error if there is no skill subtype set, but 87 // add new entry
77 * checking for this may catch some user errors. 88 assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
78 */ 89 SKILL_INDEX (o) = skillvec.size ();
79 for (int i = 1; i < NUM_SKILLS; i++) 90 skillvec.push_back (o);
80 if (!skill_names[i])
81 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
82} 91}
83 92
84/* This function goes through the player inventory and sets 93/* This function goes through the player inventory and sets
85 * up the last_skills[] array in the player object. 94 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 95 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 96 * mostly used for sending exp.
88 */ 97 */
89void 98void
90player::link_skills () 99player::link_skills ()
91{ 100{
92 for (int i = 0; i < NUM_SKILLS; ++i) 101 for (int i = 0; i < CS_NUM_SKILLS; ++i)
93 last_skill_ob [i] = 0; 102 last_skill_ob [i] = 0;
94 103
95 for (object *tmp = ob->inv; tmp; tmp = tmp->below) 104 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
96 if (tmp->type == SKILL) 105 if (tmp->type == SKILL)
97 { 106 {
107 int idx = SKILL_INDEX (tmp);
108
98 assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); 109 assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
99 110
100 if (last_skill_ob [tmp->subtype] != tmp) 111 if (last_skill_ob [idx] != tmp)
101 { 112 {
102 /* This is really a warning, hence no else below */
103 if (last_skill_ob [tmp->subtype])
104 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
105 &last_skill_ob [tmp->subtype]->skill, &tmp->skill);
106
107 last_skill_ob [tmp->subtype] = tmp; 113 last_skill_ob [idx] = tmp;
108 if (ns) 114 if (ns)
109 ns->last_skill_exp [tmp->subtype] = -1; 115 ns->last_skill_exp [idx] = -1;
110 } 116 }
111 } 117 }
112} 118}
113 119
114static object * 120static object *
… …
195 * tool, this code will equip it. 201 * tool, this code will equip it.
196 * 202 *
197 * This code is basically the same as find_skill_by_name() above, 203 * This code is basically the same as find_skill_by_name() above,
198 * but instead a skill name, we search by matching number. 204 * but instead a skill name, we search by matching number.
199 * this replaces find_skill. 205 * this replaces find_skill.
206 *
207 * MUST NOT BE USED IN NEW CODE! (schmorp)
200 */ 208 */
201object * 209object *
202find_skill_by_number (object *who, int skillno) 210find_skill_by_number (object *who, int skillno)
203{ 211{
204 for (object *tmp = who->inv; tmp; tmp = tmp->below) 212 for (object *tmp = who->inv; tmp; tmp = tmp->below)

Diff Legend

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