- 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:
@@ -9,6 +9,7 @@
|
||||
#define MOUSE_REGION 0L
|
||||
#define IN_FRONT (WindowPtr)-1L
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <cmath>
|
||||
#include <stdexcept>
|
||||
#include <boost/type_traits/is_pointer.hpp>
|
||||
@@ -18,6 +19,7 @@
|
||||
using namespace std;
|
||||
using namespace ticpp;
|
||||
|
||||
extern GWorldPtr bg_gworld;
|
||||
extern bool play_sounds;
|
||||
const short cDialog::BG_DARK = 5, cDialog::BG_LIGHT = 16;
|
||||
|
||||
@@ -979,7 +981,7 @@ void cDialog::draw(){
|
||||
GrafPtr old_port;
|
||||
GetPort(&old_port);
|
||||
SetPortWindowPort(win);
|
||||
FillCRect(&winRect,::bg[bg]);
|
||||
tileImage(winRect,bg_gworld,::bg[bg]);
|
||||
|
||||
ctrlIter iter = controls.begin();
|
||||
while(iter != controls.end()){
|
||||
|
Reference in New Issue
Block a user