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

- Removed the ADVEN macro in favour of using the overloaded operatr[] on univ.party

Browse Source 
- Removed all referenes to cPopulation::dudes in favour of the overloaded operator[]

git-svn-id: http://openexile.googlecode.com/svn/trunk@84 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-05-30 23:11:47 +00:00
parent aa2f13c679
commit c55948c03f
46 changed files with 1881 additions and 1926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osx/boe.townspec.cpp
View File

@@ -29,7 +29,6 @@ extern short current_pc,stat_window;
//extern cOutdoors outdoors[2][2];
extern location pc_pos[6],center;
//extern town_item_list t_i;
//extern pc_record_type ADVEN[6];
//extern big_tr_type t_d;
extern WindowPtr mainPtr;
extern cScenario scenario;
@@ -162,12 +161,12 @@ bool run_trap(short pc_num,eTrapType trap_type,short trap_level,short diff)
i = stat_adj(pc_num,1);
if ((i_level = get_prot_level(pc_num,42)) > 0)
i = i + i_level / 2;
skill = minmax(0,20,ADVEN[pc_num].skills[SKILL_DISARM_TRAPS] +
+ ADVEN[pc_num].skills[SKILL_LUCK] / 2 + 1 - univ.town.difficulty + 2 * i);
skill = minmax(0,20,univ.party[pc_num].skills[SKILL_DISARM_TRAPS] +
+ univ.party[pc_num].skills[SKILL_LUCK] / 2 + 1 - univ.town.difficulty + 2 * i);
r1 = get_ran(1,1,100) + diff;
// Nimble?
if (ADVEN[pc_num].traits[TRAIT_NIMBLE])
if (univ.party[pc_num].traits[TRAIT_NIMBLE])
r1 -= 6;
@@ -220,7 +219,7 @@ bool run_trap(short pc_num,eTrapType trap_type,short trap_level,short diff)
add_string_to_buf(" You feel weak. ");
r1 = 40;
r1 = r1 + trap_level * 30;
ADVEN[pc_num].experience = max (0,ADVEN[pc_num].experience - r1);
univ.party[pc_num].experience = max (0,univ.party[pc_num].experience - r1);
break;
case TRAP_ALERT:
@@ -286,7 +285,7 @@ void start_split(short a,short b,short noise)
univ.town.p_loc.y = b;
for (i = 0; i < 6; i++)
if (i != PSD[SDF_PARTY_SPLIT_PC])
ADVEN[i].main_status += MAIN_STATUS_SPLIT;
univ.party[i].main_status += MAIN_STATUS_SPLIT;
current_pc = PSD[SDF_PARTY_SPLIT_PC];
update_explored(univ.town.p_loc);
center = univ.town.p_loc;
@@ -306,8 +305,8 @@ void end_split(short noise)
univ.town.p_loc.y = PSD[SDF_PARTY_SPLIT_Y];
PSD[SDF_IS_PARTY_SPLIT] = 0;
for (i = 0; i < 6; i++)
if (ADVEN[i].main_status >= MAIN_STATUS_SPLIT)
ADVEN[i].main_status -= MAIN_STATUS_SPLIT;
if (univ.party[i].main_status >= MAIN_STATUS_SPLIT)
univ.party[i].main_status -= MAIN_STATUS_SPLIT;
update_explored(univ.town.p_loc);
center = univ.town.p_loc;
if (noise > 0)