mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
Removed some unnecessary anonymous structures
Fixed print-screen for full-screen mode git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -46,9 +46,9 @@
|
|||||||
#define BUTTON_INIT 1
|
#define BUTTON_INIT 1
|
||||||
#define BUTTON_WAS_CLICKED 2
|
#define BUTTON_WAS_CLICKED 2
|
||||||
|
|
||||||
//effects how the button is rendered.
|
//affects how the button is rendered.
|
||||||
#define BUTTON_TYPES ( BUTTON_QUICK | BUTTON_GENERIC | BUTTON_HOT_SPOT | BUTTON_CHECKBOX )
|
#define BUTTON_TYPES ( BUTTON_QUICK | BUTTON_GENERIC | BUTTON_HOT_SPOT | BUTTON_CHECKBOX )
|
||||||
//effects how the button is processed
|
//affects how the button is processed
|
||||||
#define BUTTON_TYPE_MASK (BUTTON_NO_TOGGLE| BUTTON_ALLOW_DISABLED_CALLBACK | BUTTON_CHECKBOX | BUTTON_IGNORE_CLICKS )
|
#define BUTTON_TYPE_MASK (BUTTON_NO_TOGGLE| BUTTON_ALLOW_DISABLED_CALLBACK | BUTTON_CHECKBOX | BUTTON_IGNORE_CLICKS )
|
||||||
|
|
||||||
//button flags
|
//button flags
|
||||||
|
|||||||
@@ -105,23 +105,23 @@ typedef struct
|
|||||||
// data strucutre of the compresssed format, once developed.
|
// data strucutre of the compresssed format, once developed.
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct
|
//struct
|
||||||
{
|
//{
|
||||||
PTR pImageData;
|
PTR pImageData;
|
||||||
};
|
//};
|
||||||
struct
|
//struct
|
||||||
{
|
//{
|
||||||
PTR pCompressedImageData;
|
PTR pCompressedImageData;
|
||||||
};
|
//};
|
||||||
struct
|
//struct
|
||||||
{
|
//{
|
||||||
UINT8 *p8BPPData;
|
UINT8 *p8BPPData;
|
||||||
};
|
//};
|
||||||
struct
|
//struct
|
||||||
{
|
//{
|
||||||
|
|
||||||
UINT16 *p16BPPData;
|
UINT16 *p16BPPData;
|
||||||
};
|
//};
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
UINT8 * pPixData8;
|
UINT8 * pPixData8;
|
||||||
|
|||||||
@@ -162,6 +162,9 @@ INT32 FAR PASCAL WindowProcedure(HWND hWindow, UINT16 Message, WPARAM wParam, LP
|
|||||||
// if( 1==iScreenMode )
|
// if( 1==iScreenMode )
|
||||||
{
|
{
|
||||||
GetClientRect(hWindow, &rcWindow);
|
GetClientRect(hWindow, &rcWindow);
|
||||||
|
// Go ahead and clamp the client width and height
|
||||||
|
rcWindow.right = SCREEN_WIDTH;
|
||||||
|
rcWindow.bottom = SCREEN_HEIGHT;
|
||||||
ClientToScreen(hWindow, (LPPOINT)&rcWindow);
|
ClientToScreen(hWindow, (LPPOINT)&rcWindow);
|
||||||
ClientToScreen(hWindow, (LPPOINT)&rcWindow+1);
|
ClientToScreen(hWindow, (LPPOINT)&rcWindow+1);
|
||||||
int xPos = (int)(short) LOWORD(lParam);
|
int xPos = (int)(short) LOWORD(lParam);
|
||||||
|
|||||||
@@ -113,14 +113,14 @@ typedef struct
|
|||||||
UINT32 fCreateFlags; // Specifies creation flags like from file or not
|
UINT32 fCreateFlags; // Specifies creation flags like from file or not
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct
|
//struct
|
||||||
{
|
//{
|
||||||
SGPFILENAME ImageFile; // Filename of image data to use
|
SGPFILENAME ImageFile; // Filename of image data to use
|
||||||
};
|
//};
|
||||||
struct
|
//struct
|
||||||
{
|
//{
|
||||||
HIMAGE hImage;
|
HIMAGE hImage;
|
||||||
};
|
//};
|
||||||
};
|
};
|
||||||
UINT8 ubBitDepth; // BPP, ignored if given from file
|
UINT8 ubBitDepth; // BPP, ignored if given from file
|
||||||
} VOBJECT_DESC;
|
} VOBJECT_DESC;
|
||||||
|
|||||||
Reference in New Issue
Block a user