From: Laszlo T. <ave...@us...> - 2004-11-07 21:21:57
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28272 Modified Files: EffectQueue.cpp Log Message: EffectQueue now compiles Index: EffectQueue.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/EffectQueue.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EffectQueue.cpp 7 Nov 2004 19:48:44 -0000 1.1 --- EffectQueue.cpp 7 Nov 2004 21:21:36 -0000 1.2 *************** *** 97,101 **** case 0x5A: fx_open_locks_modifier ( target, fx ); break; case 0xA6: fx_resistance_to_magic_damage ( target, fx ); break; ! default: printf( "fx_???: (%d) %d %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); } } --- 97,101 ---- case 0x5A: fx_open_locks_modifier ( target, fx ); break; case 0xA6: fx_resistance_to_magic_damage ( target, fx ); break; ! default: printf( "fx_???: (%d) %d %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); } } *************** *** 134,138 **** int fx_ac_vs_damage_type_modifier (Actor* target, Effect* fx) { ! printf( "fx_ac_vs_damage_type_modifier (%2d): AC Modif: %d ; Type: %d ; MinLevel: %d ; MaxLevel: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2, fx->DiceSides, fx->DiceThrown ); CHECK_LEVEL(); --- 134,138 ---- int fx_ac_vs_damage_type_modifier (Actor* target, Effect* fx) { ! printf( "fx_ac_vs_damage_type_modifier (%2d): AC Modif: %d ; Type: %d ; MinLevel: %d ; MaxLevel: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2, (int) fx->DiceSides, (int) fx->DiceThrown ); CHECK_LEVEL(); *************** *** 156,160 **** int fx_condition_modifier (Actor* target, Effect* fx) { ! printf( "fx_condition_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 156,160 ---- int fx_condition_modifier (Actor* target, Effect* fx) { ! printf( "fx_condition_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 176,180 **** int fx_maximum_hp_modifier (Actor* target, Effect* fx) { ! printf( "fx_maximum_hp_modifier (%2d): Stat Modif: %d ; Modif Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); int bonus; --- 176,180 ---- int fx_maximum_hp_modifier (Actor* target, Effect* fx) { ! printf( "fx_maximum_hp_modifier (%2d): Stat Modif: %d ; Modif Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); int bonus; *************** *** 211,216 **** int fx_bonus_wizard_spells (Actor* target, Effect* fx) { ! printf( "fx_bonus_wizard_spells (%2d): Spell Add: %d ; Spell Level: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); ! return FX_APPLIED; } --- 211,227 ---- int fx_bonus_wizard_spells (Actor* target, Effect* fx) { ! printf( "fx_bonus_wizard_spells (%2d): Spell Add: %d ; Spell Level: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); ! ! int i=1; ! for( int j=0;j<9;j++) { ! if (fx->Parameter2&i) { ! if(fx->Parameter1) { ! STAT_ADD( IE_WIZARDBONUS1+j, fx->Parameter1); ! } ! else { ! STAT_ADD( IE_WIZARDBONUS1+j, target->BaseStats[ IE_WIZARDBONUS1+j ]); ! } ! } ! } return FX_APPLIED; } *************** *** 219,223 **** int fx_save_vs_death_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_death_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 230,234 ---- int fx_save_vs_death_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_death_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 239,243 **** int fx_save_vs_wands_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_wands_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 250,254 ---- int fx_save_vs_wands_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_wands_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 259,263 **** int fx_save_vs_poly_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_poly_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 270,274 ---- int fx_save_vs_poly_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_poly_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 279,283 **** int fx_save_vs_breath_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_breath_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 290,294 ---- int fx_save_vs_breath_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_breath_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 299,303 **** int fx_save_vs_spell_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_spell_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 310,314 ---- int fx_save_vs_spell_modifier (Actor* target, Effect* fx) { ! printf( "fx_save_vs_spell_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 319,323 **** int fx_strength_modifier (Actor* target, Effect* fx) { ! printf( "fx_strength_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 330,334 ---- int fx_strength_modifier (Actor* target, Effect* fx) { ! printf( "fx_strength_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 339,343 **** int fx_to_hit_modifier (Actor* target, Effect* fx) { ! printf( "fx_to_hit_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 350,354 ---- int fx_to_hit_modifier (Actor* target, Effect* fx) { ! printf( "fx_to_hit_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 359,363 **** int fx_stealth_bonus (Actor* target, Effect* fx) { ! printf( "fx_stealth_bonus (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 370,374 ---- int fx_stealth_bonus (Actor* target, Effect* fx) { ! printf( "fx_stealth_bonus (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 379,383 **** int fx_damage_bonus (Actor* target, Effect* fx) { ! printf( "fx_damage_bonus (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 390,394 ---- int fx_damage_bonus (Actor* target, Effect* fx) { ! printf( "fx_damage_bonus (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 395,399 **** int fx_open_locks_modifier (Actor* target, Effect* fx) { ! printf( "fx_open_locks_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 406,410 ---- int fx_open_locks_modifier (Actor* target, Effect* fx) { ! printf( "fx_open_locks_modifier (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { *************** *** 415,419 **** int fx_resistance_to_magic_damage (Actor* target, Effect* fx) { ! printf( "fx_resistance_to_magic_damage (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 ); switch (fx->Parameter2) { --- 426,430 ---- int fx_resistance_to_magic_damage (Actor* target, Effect* fx) { ! printf( "fx_resistance_to_magic_damage (%2d): Mod: %d, Type: %d\n", fx->Opcode, (int) fx->Parameter1, (int) fx->Parameter2 ); switch (fx->Parameter2) { |