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

- Nuked the storage_gworld and party_template_gworld. Monster, terrain, and PC graphics are now drawn directly from their sheets of origin. This is partly tested, and seems to work fine.

Browse Source 
- Removed the terrain_pic and terrain_blockage arrays, which were redundant (though shorter).
- Cleaned out some of the commented code in boe.graphics.cpp and boe.graphutil.cpp
- Added a templated get function to cOutdoors::cWandering.
In the dialog engine:
- Important fields are now initialized to default values, as they should be.
- The absence of required attributes is now recognized as an error
- Added stack element to the DTD; no code support yet
- Added fore attribute to the dialog element to specify default text colour; DTD updated and code support added.
- Likewise with the def-key attribute on other clickable items besides buttons (which already had it)
- Updated stylesheet to fall back on the fore attribute when colour is unspecified
- When drawing default monster graphics, it uses m_start_pic instead of num as the index. This should be right, though it's untested.
Unfortunately, the dialog engine is still unstable.

git-svn-id: http://openexile.googlecode.com/svn/trunk@100 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-06-28 17:18:24 +00:00
parent e5ac5db275
commit 6af129c277
35 changed files with 395 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
osx/boe.fileio.cpp
View File

@@ -57,8 +57,7 @@ extern bool modeless_exists[18];
//extern location monster_targs[60];
extern DialogPtr modeless_dialogs[18] ;
extern short which_combat_type;
extern char terrain_blocked[256];
extern short terrain_pic[256],cur_town_talk_loaded;
extern short cur_town_talk_loaded;
extern cScenario scenario;
extern cUniverse univ;
//extern piles_of_stuff_dumping_type *data_store;
@@ -193,8 +192,6 @@ void finish_load_party(){
// graphics wise
end_startup();
set_up_ter_pics();
load_outdoors(loc(univ.party.outdoor_corner.x + 1,univ.party.outdoor_corner.y + 1),univ.out.outdoors[1][1]);
load_outdoors(loc(univ.party.outdoor_corner.x,univ.party.outdoor_corner.y + 1),univ.out.outdoors[0][1]);
load_outdoors(loc(univ.party.outdoor_corner.x + 1,univ.party.outdoor_corner.y),univ.out.outdoors[1][0]);
@@ -205,12 +202,10 @@ void finish_load_party(){
stat_screen_mode = 0;
build_outdoors();
erase_out_specials();
update_pc_graphics();
if (!town_restore) {
center = univ.party.p_loc;
load_area_graphics();
}
else {
load_town_str(univ.town.num,univ.town.record);
@@ -250,7 +245,6 @@ void finish_load_party(){
blade_wall = true;
sleep_field = true;
center = univ.town.p_loc;
load_area_graphics();
}
create_clip_region();
@@ -628,10 +622,6 @@ void shift_universe_left()
load_outdoors(loc(univ.party.outdoor_corner.x,univ.party.outdoor_corner.y),univ.out.outdoors[0][0]);
load_outdoors(loc(univ.party.outdoor_corner.x,univ.party.outdoor_corner.y + 1),univ.out.outdoors[0][1]);
build_outdoors();
// reload graphics -- who knows what we added
load_area_graphics();
make_cursor_sword();
}
@@ -666,9 +656,6 @@ void shift_universe_right()
load_outdoors(loc(univ.party.outdoor_corner.x + 1,univ.party.outdoor_corner.y),univ.out.outdoors[1][0]);
load_outdoors(loc(univ.party.outdoor_corner.x + 1,univ.party.outdoor_corner.y + 1),univ.out.outdoors[1][1]);
build_outdoors();
// reload graphics -- who knows what we added
load_area_graphics();
make_cursor_sword();
}
@@ -704,9 +691,6 @@ void shift_universe_up()
load_outdoors(loc(univ.party.outdoor_corner.x + 1,univ.party.outdoor_corner.y),univ.out.outdoors[1][0]);
build_outdoors();
// reload graphics -- who knows what we added
load_area_graphics();
make_cursor_sword();
}
@@ -743,9 +727,6 @@ void shift_universe_down()
load_outdoors(loc(univ.party.outdoor_corner.x + 1,univ.party.outdoor_corner.y + 1),univ.out.outdoors[1][1]);
build_outdoors();
// reload graphics -- who knows what we added
load_area_graphics();
make_cursor_sword();
}
@@ -1118,14 +1099,14 @@ void end_data_dump()
// return true;
//}
void set_up_ter_pics()
{
short i;
set_terrain_blocked();
for (i = 0; i < 256; i++)
terrain_pic[i] = scenario.ter_types[i].picture;
}
//void set_up_ter_pics()
//{
// short i;
//
// set_terrain_blocked();
// for (i = 0; i < 256; i++)
// terrain_pic[i] = scenario.ter_types[i].picture;
//}
//void oops_error(short error)
//{
// Str255 error_str;