openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Strictify race enum

Browse Source 
- This incidentally fixes a lot of things that were broken in the previous commit due to the magic values changing
This commit is contained in:
Celtic Minstrel
2014-12-03 20:11:14 -05:00
parent 5b7649543f
commit 13116980fb
15 changed files with 196 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osx/boe.party.cpp
View File

@@ -567,15 +567,17 @@ bool create_pc(short spot,cDialog* parent)
univ.party[spot].main_status = eMainStatus::ALIVE;
if(overall_mode != MODE_STARTUP) {
univ.party[spot].items[0] = start_items[univ.party[spot].race * 2];
// TODO: start_items will need to be extended for Vahnatai race
int raceCode = (int) univ.party[spot].race;
univ.party[spot].items[0] = start_items[raceCode * 2];
univ.party[spot].equip[0] = true;
univ.party[spot].items[1] = start_items[univ.party[spot].race * 2 + 1];
univ.party[spot].items[1] = start_items[raceCode * 2 + 1];
univ.party[spot].equip[1] = true;
// Do stat adjs for selected race.
if (univ.party[spot].race == 1)
if (univ.party[spot].race == eRace::NEPHIL)
univ.party[spot].skills[1] += 2;
if (univ.party[spot].race == 2) {
if (univ.party[spot].race == eRace::SLITH) {
univ.party[spot].skills[0] += 2;
univ.party[spot].skills[2] += 1;
}
@@ -2834,7 +2836,7 @@ void hit_party(short how_much,eDamageType damage_type)
for (i = 0; i < 6; i++)
if (univ.party[i].main_status == eMainStatus::ALIVE)
dummy = damage_pc(i,how_much,damage_type,RACE_UNKNOWN,0);
dummy = damage_pc(i,how_much,damage_type,eRace::UNKNOWN,0);
// dummy = damage_pc(i,how_much,damage_type + 30);
put_pc_screen();
}
@@ -2937,11 +2939,11 @@ bool damage_pc(short which_pc,short how_much,eDamageType damage_type,eRace type_
how_much = how_much / ((level >= 7) ? 4 : 2);
if ((damage_type == DAMAGE_DEMON) && ((level = get_prot_level(which_pc,58)) > 0))
how_much = how_much / ((level >= 7) ? 4 : 2);
if ((type_of_attacker == RACE_HUMANOID) && ((level = get_prot_level(which_pc,59)) > 0))
if ((type_of_attacker == eRace::HUMANOID) && ((level = get_prot_level(which_pc,59)) > 0))
how_much = how_much / ((level >= 7) ? 4 : 2);
if ((type_of_attacker == RACE_REPTILE) && ((level = get_prot_level(which_pc,60)) > 0))
if ((type_of_attacker == eRace::REPTILE) && ((level = get_prot_level(which_pc,60)) > 0))
how_much = how_much / ((level >= 7) ? 4 : 2);
if ((type_of_attacker == RACE_GIANT) && ((level = get_prot_level(which_pc,61)) > 0))
if ((type_of_attacker == eRace::GIANT) && ((level = get_prot_level(which_pc,61)) > 0))
how_much = how_much / ((level >= 7) ? 4 : 2);