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

remove unnecessary reference passing

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-11-27 08:10:53 -06:00
committed by Celtic Minstrel
parent 09a6b2a4fd
commit 96c71bdce4
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/boe.party.cpp
View File

@@ -2279,7 +2279,7 @@ short damage_pc(cPlayer& which_pc,short how_much,eDamageType damage_type,eRace t
// Note: sound type 0 can now be forced for UNBLOCKABLE by passing sound_type 0,
// but -1 is the new value for "use default"
set_sound_type(damage_type, sound_type);
sound_type = get_sound_type(damage_type, sound_type);
// armor
if(damage_type == eDamageType::WEAPON || damage_type == eDamageType::UNDEAD || damage_type == eDamageType::DEMON) {

6
src/game/boe.specials.cpp
View File

@@ -1419,7 +1419,8 @@ void change_level(short town_num,short x,short y) {
start_town_mode(town_num,9);
}
void set_sound_type(eDamageType dam_type, short& sound_type) {
short get_sound_type(eDamageType dam_type, short forced_sound_type) {
short sound_type = forced_sound_type;
if(sound_type == -1){
sound_type = 0;
if(dam_type == eDamageType::FIRE || dam_type == eDamageType::UNBLOCKABLE)
@@ -1431,6 +1432,7 @@ void set_sound_type(eDamageType dam_type, short& sound_type) {
else if(dam_type == eDamageType::POISON)
sound_type = 11;
}
return sound_type;
}
short get_boom_type(eDamageType dam_type){
@@ -1455,7 +1457,7 @@ short damage_monst(cCreature& victim, short who_hit, short how_much, eDamageType
// Note: sound type 0 can now be forced for UNBLOCKABLE by passing sound_type 0,
// but -1 is the new value for "use default"
set_sound_type(dam_type, sound_type);
sound_type = get_sound_type(dam_type, sound_type);
if(dam_type < eDamageType::SPECIAL) {
how_much = percent(how_much, victim.resist[dam_type]);

2
src/game/boe.specials.hpp
View File

@@ -8,7 +8,7 @@ void use_spec_item(short item, bool& need_redraw);
void use_item(short pc,short item);
bool use_space(location where);
bool adj_town_look(location where);
void set_sound_type(eDamageType dam_type, short& sound_type);
short get_sound_type(eDamageType dam_type, short forced_sound_type = -1);
short get_boom_type(eDamageType dam_type);
short damage_monst(cCreature& which_m, short who_hit, short how_much, eDamageType dam_type, short sound_type = -1, bool do_print = true);
void petrify_monst(cCreature& which_m,int strength);