- Got rid of the prefix header in favour of directly including it in every file that needs it (though some files still need the include yet apparently work fine; perhaps a clean build would catch that)

- Replaced all occurrences of FillCRect with the new tileImage, to get away from 'ppat' resources.
- Fixed a minor error in the character editor where part of a text string was off the window.
- With the prefix header gone, libticpp.dylib has been removed; TinyXML++ is now compiled right into the program.
- The scenario editor splash screen is now loaded from a file.
- The pc editor title has its transparency problem fixed.
- Added an overload of tileImage that takes a RgnHandle instead of a Rect in order to replace the single occurrence of FillCRgn.
- Removed an unused function in boe.graphics.cpp
- Changed loading of patterns. Instead of loading each pattern individually from a resource, a single file containing all of them is loading. The arrays that formerly contained the actual patterns now contain the source rects of the patterns.
- Fixed the cursor hotspots (the coordinates were reversed)
- Removed the useless flip_pict that was written when I didn't know what I was doing.
- Fixed error in tileImage in which vrep and hrep were switched.
- Added code to tileImage to ensure that the pattern will line up with anything already onscreen, regardless of the rect to fill.
- Two images were altered: pcedtitle.png to fix the transparenct problem, and pixpats.png to add one pattern that had been missed (and also rearrange the smaller patterns a little)

git-svn-id: http://openexile.googlecode.com/svn/trunk@91 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-06-10 04:01:15 +00:00
parent 78cd213972
commit 7cd4a618b4
45 changed files with 318 additions and 338 deletions

View File

@@ -1,6 +1,7 @@
#define LINES_IN_TEXT_WIN 11
#define TEXT_BUF_LEN 70
#include <Carbon/Carbon.h>
#include <cstdio>
#include <cstring>
@@ -63,7 +64,7 @@ extern short which_item_page[6];
//extern CursHandle sword_curs;
extern ControlHandle text_sbar,item_sbar;
extern Point store_anim_ul;
extern PixPatHandle bg[];
extern Rect bg[];
extern short dest_personalities[40];
extern location source_locs[6];
extern location dest_locs[40] ;
@@ -102,6 +103,7 @@ extern short store_selling_values[8];
extern short combat_posing_monster, current_working_monster; // 0-5 PC 100 + x - monster x
extern bool supressing_some_spaces;
extern location ok_space[4];
extern GWorldPtr bg_gworld;
short text_pc_has_abil_equip(short pc_num,short abil)
{
@@ -134,9 +136,9 @@ void put_pc_screen()
SetPort( pc_stats_gworld);
// First clean up gworld with pretty patterns
FillCRect(&erase_rect,bg[6]);
tileImage(erase_rect,bg_gworld,bg[6]);
for (i = 0; i < 3; i++)
FillCRect(&small_erase_rects[i],bg[7]);
tileImage(small_erase_rects[i],bg_gworld,bg[7]);
ForeColor(whiteColor);
// Put food, gold, day
@@ -277,16 +279,16 @@ void put_item_screen(short screen_num,short suppress_buttons)
SetPort( item_stats_gworld);
// First clean up gworld with pretty patterns
FillCRect(&erase_rect,bg[6]);
tileImage(erase_rect,bg_gworld,bg[6]);
if (suppress_buttons == 0)
for (i = 0; i < 6; i++)
FillCRect(&item_screen_button_rects[i],bg[7]);
FillCRect(&upper_frame_rect,bg[7]);
tileImage(item_screen_button_rects[i],bg_gworld,bg[7]);
tileImage(upper_frame_rect,bg_gworld,bg[7]);
// Draw buttons at bottom
if (suppress_buttons == 0) {
for (i = 0; i < 6; i++)
FillCRect(&item_screen_button_rects[i],bg[7]);
tileImage(item_screen_button_rects[i],bg_gworld,bg[7]);
}
item_offset = GetControlValue(item_sbar);
@@ -1340,7 +1342,7 @@ void print_buf ()
// First clean up gworld with pretty patterns
InsetRect(&erase_rect,1,1); ////
erase_rect.right++;
FillCRect(&erase_rect,bg[6]);
tileImage(erase_rect,bg_gworld,bg[6]);
ctrl_val = 58 - GetControlValue(text_sbar);
start_print_point = buf_pointer - LINES_IN_TEXT_WIN - ctrl_val;