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

- Fixed some bugs in the dialog code.

Browse Source 
- Dialogs in the scenario editor now show custom graphics.
- Scenario editor now works properly as a Universal binary.
- Started refactoring the structs into classes; so far this has only been applied to the game.
- Files now show proper icons (applications already did).
- Probably other things that I have forgotten.

Still not completely stable, but much closer.

git-svn-id: http://openexile.googlecode.com/svn/trunk@27 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-04-21 20:02:07 +00:00
parent 7573c1ed98
commit a2c2a85a8e
63 changed files with 1741 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
osx/boe.combat.cpp
View File

@@ -1,4 +1,7 @@
#include <stdio.h>
//#include "item.h"
#include "boe.global.h"
#include "boe.monster.h"
#include "boe.graphics.h"
@@ -835,7 +838,7 @@ void place_target(location target)
return;
}
for (i = 0; i < 8; i++) {
if (same_point(spell_targets[i],target) == TRUE) {
if (spell_targets[i] == target) {
add_string_to_buf(" Target removed.");
num_targets_left++;
spell_targets[i].x = 120;
@@ -1517,7 +1520,7 @@ void fire_missile(location target) ////
}
break;
case 12: case 14:
m_type = (is_magic(adven[current_pc].items[ammo_inv_slot]) == TRUE) ? 4 : 3;
m_type = (adven[current_pc].items[ammo_inv_slot].is_magic() == TRUE) ? 4 : 3;
break;
}
run_a_missile(pc_pos[current_pc],target,m_type,1,(overall_mode == MODE_FIRING) ? 12 : 14,
@@ -3608,8 +3611,8 @@ void place_spell_pattern(effect_pat_type pat,location center,short type,Boolean
spot_hit.x = i;
spot_hit.y = j;
if ((get_obscurity(i,j) < 5) && (adven[k].main_status == 1)
&& (((is_combat()) &&(same_point(pc_pos[k],spot_hit) == TRUE)) ||
((is_town()) && (same_point(c_town.p_loc,spot_hit) == TRUE)))) {
&& (((is_combat()) && (pc_pos[k] == spot_hit)) ||
((is_town()) && (c_town.p_loc == spot_hit)))) {
effect = pat.pattern[i - center.x + 4][j - center.y + 4];
switch (effect) {
case 4:
@@ -3840,12 +3843,12 @@ void hit_space(location target,short dam,short type,short report,short hit_all)
if (overall_mode >= MODE_COMBAT)
for (i = 0; i < 6; i++)
if ((adven[i].main_status == 1) && (stop_hitting == FALSE))
if (same_point(pc_pos[i],target) == TRUE) {
if (pc_pos[i] == target) {
damage_pc(i,dam,type,-1);
stop_hitting = (hit_all == 1) ? FALSE : TRUE;
}
if (overall_mode < MODE_COMBAT)
if (same_point(target,c_town.p_loc) == TRUE) {
if (target == c_town.p_loc) {
fast_bang = 1;
hit_party(dam,type);
fast_bang = 0;
@@ -4030,7 +4033,7 @@ Boolean combat_cast_mage_spell()
short spell_num,target,i,store_sp,bonus = 1,r1,store_sound = 0,store_m_type = 0,num_opp = 0;
char c_line[60];
creature_data_type *which_m;
monster_record_type get_monst;
cMonster get_monst;
if (is_antimagic(pc_pos[current_pc].x,pc_pos[current_pc].y)) {
add_string_to_buf(" Not in antimagic field.");
@@ -4662,11 +4665,11 @@ void scloud_space(short m,short n)
if (overall_mode >= MODE_COMBAT)
for (i = 0; i < 6; i++)
if (adven[i].main_status == 1)
if (same_point(pc_pos[i],target) == TRUE) {
if (pc_pos[i] == target) {
curse_pc(i,get_ran(1,1,2));
}
if (overall_mode < MODE_COMBAT)
if (same_point(target,c_town.p_loc) == TRUE) {
if (target == c_town.p_loc) {
for (i = 0; i < 6; i++)
if (adven[i].main_status == 1)
curse_pc(i,get_ran(1,1,2));
@@ -4686,11 +4689,11 @@ void web_space(short m,short n)
if (overall_mode >= MODE_COMBAT)
for (i = 0; i < 6; i++)
if (adven[i].main_status == 1)
if (same_point(pc_pos[i],target) == TRUE) {
if (pc_pos[i] == target) {
web_pc(i,3);
}
if (overall_mode < MODE_COMBAT)
if (same_point(target,c_town.p_loc) == TRUE) {
if (target == c_town.p_loc) {
for (i = 0; i < 6; i++)
web_pc(i,3);
}
@@ -4708,11 +4711,11 @@ void sleep_cloud_space(short m,short n)
if (overall_mode >= MODE_COMBAT)
for (i = 0; i < 6; i++)
if (adven[i].main_status == 1)
if (same_point(pc_pos[i],target) == TRUE) {
if (pc_pos[i] == target) {
sleep_pc(i,3,11,0);
}
if (overall_mode < MODE_COMBAT)
if (same_point(target,c_town.p_loc) == TRUE) {
if (target == c_town.p_loc) {
for (i = 0; i < 6; i++)
sleep_pc(i,3,11,0);
}