openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity
Files
269d6b05721763c13aab4ca1251df768b8580dc1
oboe/osx/dialogxml/pict.h
Celtic Minstrel 269d6b0572 - Removed the SLEEP_TICKS and MOUSE_REGION macros (note: SLEEP_TICKS was at 2L, but I've changed it to 0; I think this should be fine, but I'm not sure) 
- Stripped out the copying of external files (such as graphics, scenarios, bladbase) into a separate target which the other three are dependent on.
- Graphics.exd no longer included by reference; now the individual files are included directly.
- Added a recalcRect function to ledGroup, since it's a container.
- Added a special case to cLedGroup::setSelected to avoid a crash when no LED is initially selected.
- Added a few initializers to constructors.
- Changes to cDialog::parse<cPict> which were intended to prevent an access violation; unfortunately it doesn't work yet.
- Add cases to cDialog::parse<cPict> to handle PI_TER_MAP and PIC_STATUS.
- Fixed a stupid error in all specializations of cDialog::parse which resulted in an infinite loop.
- Fixed errors in some specializations of cDialog::parse in which an else statement belonged to a different if than it should have.
- Added code to cDialog::loadFromFile to turn the relative path in the argument into an absolute path.
- Fixed errors in cDialog::loadFromFile relating to incorrect use of the parser.
- Added exit statements to the catch clauses in cDialog::loadFromFile.
- Added definition of cDialog::init;
- Enclosed the WaitNextEvent call in cDialog::run in an if statement to ignore null events if they occur (I suspect they won't anyway though)
- Fixed errors in the Edit Terrain dialog definition which caused an exception to be thrown when parsing it: bold was changed to silom, key= was changed to def-key=
- Added status to the list of nullified GWorlPtrs in cPict::init.
- Changed the type of cPict::drawPict from map<ePicType,void(*)(short,GWorldPtr,Rect)> to void(*[])(short,GWorldPtr,Rect) - ie, it was changed from a map to an array because the map was causing an error for some reason.
- Fixed up the load_strings function, which didn't work at all due to a stupid logic error.

git-svn-id: http://openexile.googlecode.com/svn/trunk@96 4ebdad44-0ea0-11de-aab3-ff745001d230
2009-06-16 22:43:51 +00:00

169 lines
8.3 KiB
C++
Raw Blame History

/*
* pict.h
* BoE
*
* Created by Celtic Minstrel on 11/05/09.
*
*/
#ifndef PICT_H
#define PICT_H
#include <vector>
#include <map>
#include "graphtool.h" // for pic_num_t
enum ePicType {
PIC_TER = 1, // 28x36 terrain graphic from the preset sheets
PIC_TER_ANIM = 2, // 28x36 terrain graphic from the preset animated terrain sheet
PIC_MONST = 3, // 28x36 monster graphic from the preset sheets
PIC_DLOG = 4, // 36x36 dialog graphic from the preset sheet
PIC_TALK = 5, // 32x32 talking portrait from the preset sheet
PIC_SCEN = 6, // 32x32 scenario graphic from the scenario sheet
PIC_ITEM = 7, // 28x36 item graphic from the large item sheet, or 18x18 item graphic from the small sheet centred in a 28x36 space
PIC_PC = 8, // 28x36 pc graphic from the player sheet
PIC_FIELD = 9, // 28x36 field graphic from the fields sheet
PIC_BOOM = 10, // 28x36 boom graphic from the booms sheet
PIC_FULL = 11, // entire sheet graphic; number is the resource ID
PIC_MISSILE = 12, // 18x18 missile graphic from the missiles sheet
PIC_DLOG_LG = 13, // 72x72 dialog graphic from the dialog sheet
PIC_SCEN_LG = 14, // 64x64 scenario graphic (currently each is on its own sheet)
PIC_TER_MAP = 15, // 12x12 map graphic... or should it be 6x6?
PIC_STATUS = 16, // 12x12 status icon
PIC_MONST_WIDE = 23, // 56x36 monster graphic from the preset sheets, resized to fit and centred in a 28x36 space
PIC_MONST_TALL = 43, // 28x72 monster graphic from the preset sheets, resized to fit and centred in a 28x36 space
PIC_MONST_LG = 63, // 56x72 monster graphic from the preset sheets, resized to fit in a 28x36 space
PIC_CUSTOM_TER = 101, // 28x36 custom graphic from the custom sheets
PIC_CUSTOM_TER_ANIM = 102,
PIC_CUSTOM_MONST = 103,
PIC_CUSTOM_DLOG = 104, // 36x36 dialog graphic drawn from two 18x26 halves in the custom sheets
PIC_CUSTOM_TALK = 105, // 32x32 talking portrait drawn from two 16x32 halves in the custom sheets
PIC_CUSTOM_SCEN = 106, // 32x32 scenario portrait loading from scenname.exr/scenario.png
PIC_CUSTOM_ITEM = 107,
PIC_CUSTOM_FULL = 111, // entire sheet graphic, drawn from scenname.exr/sheetxxx.png where xxx is the number
PIC_CUSTOM_MISSILE = 112, // 18x18 missile graphic drawn from the the custom sheets
PIC_CUSTOM_DLOG_LG = 113, // 72x72 dialog graphic from the custom sheet, taken from 8 successive slots
PIC_CUSTOM_TER_MAP = 115, // 12x12 map graphic (should it be 6x6?) taken from the custom sheet
PIC_CUSTOM_MONST_WIDE = 123, // 56x36 monster graphic from the custom sheets, resized to fit and centred in a 28x36 space
PIC_CUSTOM_MONST_TALL = 143, // 28x72 monster graphic from the custom sheets, resized to fit and centred in a 28x36 space
PIC_CUSTOM_MONST_LG = 163, // 56x72 monster graphic from the custom sheets, resized to fit in a 28x36 space
PIC_PARTY_MONST = 203, // 28x36 graphic drawn from the savegame sheet
PIC_PARTY_SCEN = 206, // 32x32 graphic drawn from the scenario headers sheet
PIC_PARTY_ITEM = 207,
PIC_PARTY_PC = 208,
PIC_PARTY_MONST_WIDE = 223, // 56x36 monster graphic from the savegame sheet, resized to fit and centred in a 28x36 space
PIC_PARTY_MONST_TALL = 243, // 28x72 monster graphic from the savegame sheet, resized to fit and centred in a 28x36 space
PIC_PARTY_MONST_LG = 263, // 56x72 monster graphic from the savegame sheet, resized to fit in a 28x36 space
NUM_PIC_TYPES
};
enum ePicTypeMod {
// Can be added to or subtracted from ePicType enums, returning an ePicType.
PIC_PRESET = 0, // just for good measure
PIC_WIDE = 20, // if applied to any derivative of PIC_MONST, makes the x-dimension 2 instead of 1
PIC_TALL = 40, // if applied to any derivative of PIC_MONST, makes the y-dimension 2 instead of 1
PIC_CUSTOM = 100, // if applied to any customizable graphic, makes it custom instead of preset
PIC_PARTY = 200, // similar to above
};
enum eSheetType {
SHEET_TER,
SHEET_TER_ANIM,
SHEET_MONST,
SHEET_DLOG,
SHEET_TALK,
SHEET_SCEN,
SHEET_SCEN_LG,
SHEET_ITEM,
SHEET_TINY_ITEM,
SHEET_PC,
SHEET_FIELD,
SHEET_BOOM,
SHEET_MISSILE,
SHEET_PARTY,
SHEET_HEADER,
SHEET_TER_MAP,
SHEET_FULL,
SHEET_STATUS,
SHEET_CUSTOM,
};
class cPict : public cControl {
public:
static void init();
void attachClickHandler(click_callback_t f) throw();
void attachFocusHandler(focus_callback_t f) throw(xHandlerNotSupported);
bool triggerClickHandler(cDialog& me, std::string id, eKeyMod mods, Point where);
void setFormat(eFormat prop, short val) throw(xUnsupportedProp);
short getFormat(eFormat prop) throw(xUnsupportedProp);
static void setSheet(eSheetType type, short n, GWorldPtr sheet);
static bool isSheetSet(eSheetType type, size_t n);
void setPict(pic_num_t num, ePicType type);
pic_num_t getPicNum();
ePicType getPicType();
explicit cPict(cDialog* parent);
bool isClickable();
static void advanceAnim();
virtual ~cPict();
protected:
void draw();
private:
static short animFrame;
short picNum;
ePicType picType;
bool clickable, drawFramed;
friend class cDialog;
static GWorldPtr teranim, dlog, talk, scen, largeScen, item, tinyItem, pc, field, boom, missile, save, header, map, status;
static std::vector<GWorldPtr> ter, monst, customSheets;
static std::map<size_t,GWorldPtr> largeSheets; // map instead of vector because it'll be a sparse array
static void drawPresetTer(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetTerAnim(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetMonstSm(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetMonstWide(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetMonstTall(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetMonstLg(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetDlog(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetDlogLg(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetTalk(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetScen(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetScenLg(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetItem(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetPc(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetField(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetBoom(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetMissile(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPresetTerMap(short num, GWorldPtr to_gw, Rect to_rect);
static void drawStatusIcon(short num, GWorldPtr to_gw, Rect to_rect);
static void drawFullSheet(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomTer(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomTerAnim(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomMonstSm(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomMonstWide(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomMonstTall(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomMonstLg(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomDlog(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomDlogLg(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomTalk(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomItem(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomMissile(short num, GWorldPtr to_gw, Rect to_rect);
static void drawCustomTerMap(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyMonstSm(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyMonstWide(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyMonstTall(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyMonstLg(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyScen(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyItem(short num, GWorldPtr to_gw, Rect to_rect);
static void drawPartyPc(short num, GWorldPtr to_gw, Rect to_rect);
//static std::map<ePicType,void(*)(short,GWorldPtr,Rect)> drawPict;
static void(* drawPict[NUM_PIC_TYPES])(short,GWorldPtr,Rect);
click_callback_t onClick;
};
ePicType operator + (ePicType lhs, ePicTypeMod rhs);
ePicType operator - (ePicType lhs, ePicTypeMod rhs);
ePicType operator + (ePicTypeMod lhs, ePicType rhs);
ePicType operator - (ePicTypeMod lhs, ePicType rhs);
ePicType&operator +=(ePicType&lhs, ePicTypeMod rhs);
ePicType&operator -=(ePicType&lhs, ePicTypeMod rhs);
#endif
Reference in New Issue View Git Blame Copy Permalink