- 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:
@@ -1,4 +1,5 @@
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <cstring>
|
||||
#include <cstdio>
|
||||
|
||||
@@ -45,13 +46,14 @@ short monsters_faces[190] = {0,1,2,3,4,5,6,7,8,9,
|
||||
extern Point ul;
|
||||
extern Rect windRect;
|
||||
extern long anim_ticks;
|
||||
extern PixPatHandle bg[];
|
||||
extern Rect bg[];
|
||||
extern WindowPtr mainPtr;
|
||||
extern short dungeon_font_num,geneva_font_num,town_type,which_combat_type;
|
||||
extern eGameMode overall_mode;
|
||||
extern bool play_sounds,boom_anim_active,cartoon_happening,in_startup_mode;
|
||||
extern GWorldPtr fields_gworld,boom_gworld,dlg_buttons_gworld[NUM_BUTTONS][2],terrain_screen_gworld,missiles_gworld,invenbtn_gworld;
|
||||
//extern party_record_type party;
|
||||
extern GWorldPtr bg_gworld;
|
||||
extern Rect sbar_rect,item_sbar_rect,shop_sbar_rect;
|
||||
extern ControlHandle text_sbar,item_sbar,shop_sbar;
|
||||
extern location center;
|
||||
@@ -811,7 +813,7 @@ char *cost_strs[] = {"Extremely Cheap","Very Reasonable","Pretty Average","Somew
|
||||
GetPortBounds(talk_gworld,&area_rect);
|
||||
FrameRect(&area_rect);
|
||||
InsetRect(&area_rect,1,1);
|
||||
FillCRect(&area_rect,bg[12]);
|
||||
tileImage(area_rect,bg_gworld,bg[12]);
|
||||
|
||||
FrameRect(&shop_frame);
|
||||
|
||||
@@ -1130,7 +1132,7 @@ void place_talk_str(char *str_to_place,char *str_to_place2,short color,Rect c_re
|
||||
GetPortBounds(talk_gworld,&area_rect);
|
||||
FrameRect(&area_rect);
|
||||
InsetRect(&area_rect,1,1);
|
||||
FillCRect(&area_rect,bg[12]);
|
||||
tileImage(area_rect,bg_gworld,bg[12]);
|
||||
|
||||
// Put help button
|
||||
GetPortBounds(dlg_buttons_gworld[3][0], &help_from);
|
||||
|
Reference in New Issue
Block a user