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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.60 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.61 by root, Tue Apr 13 21:23:49 2010 UTC

298/** 298/**
299 * If the god does/doesnt have this flag, we 299 * If the god does/doesnt have this flag, we
300 * give/remove it from the experience object if it doesnt/does 300 * give/remove it from the experience object if it doesnt/does
301 * already exist. For players only! 301 * already exist. For players only!
302 */ 302 */
303static void 303static inline void
304update_priest_flag (object *god, object *exp_ob, uint32 flag) 304update_priest_flag (object *god, object *exp_ob, uint32 flag)
305{ 305{
306 exp_ob->flag [flag] = god->flag [flag];
307 return;
308
309 // old code follows for reference...
306 if (god->flag [flag] && !exp_ob->flag [flag]) 310 if (god->flag [flag] && !exp_ob->flag [flag])
307 exp_ob->flag [flag]; 311 exp_ob->set_flag (flag);
308 else if (exp_ob->flag [flag] && !god->flag [flag]) 312 else if (exp_ob->flag [flag] && !god->flag [flag])
309 { 313 {
310 /* When this is called with the exp_ob set to the player, 314 /* When this is called with the exp_ob set to the player,
311 * this check is broken, because most all players arch 315 * this check is broken, because most all players arch
312 * allow use of weapons. I'm not actually sure why this 316 * allow use of weapons. I'm not actually sure why this
313 * check is here - I guess if you had a case where the 317 * check is here - I guess if you had a case where the
314 * value in the archetype (wisdom) should over ride the restrictions 318 * value in the archetype (wisdom) should over ride the restrictions
315 * the god places on it, this may make sense. But I don't think 319 * the god places on it, this may make sense. But I don't think
316 * there is any case like that. 320 * there is any case like that.
317 */ 321 */
318
319/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 322/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
320 exp_ob->clr_flag (flag); 323 exp_ob->clr_flag (flag);
321 }; 324 };
322} 325}
323 326

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines