Fix: SE013 Problem: Compilation fails if YEOMAN is commented out in config.h. You will still get warnings during the compilation of Yeoman.des, but these are unimportant, and can't be helped. Vanilla does the same thing if you comment out TOURIST. Compatible with: Slash'EM 0.0.5E4 Author: J. Ali Harlow, ali@avrc.city.ac.uk Date: 3 Sep 1999 *** src/hack.c.orig Wed Aug 18 16:07:33 1999 --- src/hack.c Fri Sep 3 15:07:14 1999 *************** *** 535,544 **** --- 535,546 ---- x = u.ux + u.dx; y = u.uy + u.dy; + #ifdef YEOMAN /* Check if your steed can move */ if (u.usteed && (!u.usteed->mcanmove || u.usteed->msleep)) { Your("steed doesn't respond!"); } + #endif if(Stunned || (Confusion && !rn2(5)) #ifdef YEOMAN || (u.usteed && u.usteed->mconf) *** src/u_init.c.orig Wed Aug 18 16:09:01 1999 --- src/u_init.c Fri Sep 3 15:41:21 1999 *************** *** 450,456 **** { P_ATTACK_SPELL, P_SKILLED }, { P_BODY_SPELL, P_SKILLED }, /*WAC - 'B' is good at attack spells and body manipulation spells -both combat oriented */ ! { P_RIDING, P_BASIC }, { P_TWO_WEAPON_COMBAT, P_BASIC }, { P_BARE_HANDED_COMBAT, P_GRAND_MASTER }, { P_NONE, 0 } --- 450,458 ---- { P_ATTACK_SPELL, P_SKILLED }, { P_BODY_SPELL, P_SKILLED }, /*WAC - 'B' is good at attack spells and body manipulation spells -both combat oriented */ ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif { P_TWO_WEAPON_COMBAT, P_BASIC }, { P_BARE_HANDED_COMBAT, P_GRAND_MASTER }, { P_NONE, 0 } *************** *** 510,517 **** /* Dwarves avoid magic */ { P_DIVINATION_SPELL, P_BASIC }, ! ! { P_RIDING, P_BASIC }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; #endif /* DWARF */ --- 512,521 ---- /* Dwarves avoid magic */ { P_DIVINATION_SPELL, P_BASIC }, ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif ! { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; #endif /* DWARF */ *************** *** 531,537 **** { P_ENCHANTMENT_SPELL, P_EXPERT }, /*WAC removed attack_spell skilled as attack spells include "evil spells and elves can now be lawful. Replaced with Matter spells*/ ! { P_RIDING, P_SKILLED }, { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; --- 535,543 ---- { P_ENCHANTMENT_SPELL, P_EXPERT }, /*WAC removed attack_spell skilled as attack spells include "evil spells and elves can now be lawful. Replaced with Matter spells*/ ! #ifdef YEOMAN ! { P_RIDING, P_SKILLED }, ! #endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; *************** *** 562,568 **** { P_MATTER_SPELL, P_EXPERT }, /* Added expert matter spell (elements), skilled in attack, basic in rest He is a mage, so knows the types.*/ ! { P_RIDING, P_SKILLED }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; --- 568,576 ---- { P_MATTER_SPELL, P_EXPERT }, /* Added expert matter spell (elements), skilled in attack, basic in rest He is a mage, so knows the types.*/ ! #ifdef YEOMAN ! { P_RIDING, P_SKILLED }, ! #endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; *************** *** 587,593 **** { P_DIVINATION_SPELL, P_BASIC }, { P_ENCHANTMENT_SPELL, P_EXPERT }, /*WAC - G must be good at enchant, since his class skill is fear. also added a basic divination (from id gems) */ ! { P_RIDING, P_BASIC }, { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; --- 595,603 ---- { P_DIVINATION_SPELL, P_BASIC }, { P_ENCHANTMENT_SPELL, P_EXPERT }, /*WAC - G must be good at enchant, since his class skill is fear. also added a basic divination (from id gems) */ ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; *************** *** 608,614 **** { P_PROTECTION_SPELL, P_BASIC }, { P_BODY_SPELL, P_BASIC }, { P_MATTER_SPELL, P_BASIC }, ! { P_RIDING, P_BASIC }, { P_BARE_HANDED_COMBAT, P_BASIC }, { P_NONE, 0 } }; --- 618,626 ---- { P_PROTECTION_SPELL, P_BASIC }, { P_BODY_SPELL, P_BASIC }, { P_MATTER_SPELL, P_BASIC }, ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif { P_BARE_HANDED_COMBAT, P_BASIC }, { P_NONE, 0 } }; *************** *** 621,627 **** --- 633,641 ---- { P_QUARTERSTAFF, P_BASIC }, { P_SPEAR, P_BASIC }, { P_SLING, P_EXPERT }, { P_CROSSBOW, P_BASIC }, { P_DART, P_BASIC }, { P_UNICORN_HORN, P_SKILLED }, + #ifdef YEOMAN { P_RIDING, P_BASIC }, + #endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } *************** *** 649,655 **** { P_PROTECTION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_BASIC }, { P_MATTER_SPELL, P_EXPERT }, /*WAC - same as Flame Mage*/ ! { P_RIDING, P_SKILLED }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; --- 663,671 ---- { P_PROTECTION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_BASIC }, { P_MATTER_SPELL, P_EXPERT }, /*WAC - same as Flame Mage*/ ! #ifdef YEOMAN ! { P_RIDING, P_SKILLED }, ! #endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; *************** *** 671,677 **** /*WAC - removed the attack spells - no good having knights summoning undead! Replaced with skilled body spells*/ ! { P_RIDING, P_EXPERT }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; --- 687,695 ---- /*WAC - removed the attack spells - no good having knights summoning undead! Replaced with skilled body spells*/ ! #ifdef YEOMAN ! { P_RIDING, P_EXPERT }, ! #endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; *************** *** 765,771 **** { P_DIVINATION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_SKILLED }, { P_MATTER_SPELL, P_SKILLED }, /*WAC Left as is*/ ! { P_RIDING, P_BASIC }, { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; --- 783,791 ---- { P_DIVINATION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_SKILLED }, { P_MATTER_SPELL, P_SKILLED }, /*WAC Left as is*/ ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } }; *************** *** 783,789 **** { P_PROTECTION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_BASIC }, /* WAC - removed the attack spells, replace with body. clairvoyance, meditate*/ ! { P_RIDING, P_SKILLED }, { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_MARTIAL_ARTS, P_GRAND_MASTER }, { P_NONE, 0 } }; --- 803,811 ---- { P_PROTECTION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_BASIC }, /* WAC - removed the attack spells, replace with body. clairvoyance, meditate*/ ! #ifdef YEOMAN ! { P_RIDING, P_SKILLED }, ! #endif { P_TWO_WEAPON_COMBAT, P_EXPERT }, { P_MARTIAL_ARTS, P_GRAND_MASTER }, { P_NONE, 0 } }; *************** *** 811,817 **** { P_DIVINATION_SPELL, P_BASIC }, { P_ENCHANTMENT_SPELL, P_BASIC }, { P_BODY_SPELL, P_SKILLED }, /*WAC left alone*/ ! { P_RIDING, P_BASIC }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; --- 833,841 ---- { P_DIVINATION_SPELL, P_BASIC }, { P_ENCHANTMENT_SPELL, P_BASIC }, { P_BODY_SPELL, P_SKILLED }, /*WAC left alone*/ ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; *************** *** 865,871 **** /* replace attack spell with matter spell - cone of cold, lightning * Boosted to Expert */ ! { P_RIDING, P_SKILLED }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } --- 889,897 ---- /* replace attack spell with matter spell - cone of cold, lightning * Boosted to Expert */ ! #ifdef YEOMAN ! { P_RIDING, P_SKILLED }, ! #endif { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_EXPERT }, { P_NONE, 0 } *************** *** 887,893 **** { P_MATTER_SPELL, P_SKILLED }, /* added matter spell skilled, as fireball and cone of cold are matter spells, but now specialty of F/I Mages*/ ! { P_RIDING, P_BASIC }, { P_BARE_HANDED_COMBAT, P_BASIC }, { P_NONE, 0 } }; --- 913,921 ---- { P_MATTER_SPELL, P_SKILLED }, /* added matter spell skilled, as fireball and cone of cold are matter spells, but now specialty of F/I Mages*/ ! #ifdef YEOMAN ! { P_RIDING, P_BASIC }, ! #endif { P_BARE_HANDED_COMBAT, P_BASIC }, { P_NONE, 0 } }; *************** *** 912,918 **** { P_ENCHANTMENT_SPELL, P_SKILLED }, { P_PROTECTION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_BASIC }, ! { P_RIDING, P_EXPERT }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } }; --- 940,946 ---- { P_ENCHANTMENT_SPELL, P_SKILLED }, { P_PROTECTION_SPELL, P_SKILLED }, { P_BODY_SPELL, P_BASIC }, ! { P_RIDING, P_EXPERT }, { P_TWO_WEAPON_COMBAT, P_SKILLED }, { P_BARE_HANDED_COMBAT, P_SKILLED }, { P_NONE, 0 } };