libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Remove some global constructors in intrface.cpp

Browse Source
This commit is contained in:
a/ 2021-06-30 00:51:09 +09:00 committed by Eugene Sandulenko
parent deb8ee29a4
commit e1b48b6215
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
engines/saga2/intrface.cpp
View File

@ -256,37 +256,37 @@ bool userControlsSetup = false;
* ===================================================================== */
// position arrays for all buttons on the individual panels
Rect16 topBox[numButtons] = {
/* portrait */ Rect16(489, 22 + (yContOffset * 0), 65, 72),
/* agress */ Rect16(559, 86 + (yContOffset * 0), 28, 27),
/* jump */ Rect16(592, 86 + (yContOffset * 0), 28, 27),
/* center */ Rect16(559, 56 + (yContOffset * 0), 28, 27),
/* banding */ Rect16(592, 56 + (yContOffset * 0), 28, 27),
/* namePlates */ Rect16(488, 94 + (yFaceOffset * 0), 65, 15),
/* namePlateFrames */ Rect16(487, 20 + (yFaceOffset * 0), 69, 92)
static const StaticRect topBox[numButtons] = {
/* portrait */ { 489, 22 + (yContOffset * 0), 65, 72 },
/* agress */ { 559, 86 + (yContOffset * 0), 28, 27 },
/* jump */ { 592, 86 + (yContOffset * 0), 28, 27 },
/* center */ { 559, 56 + (yContOffset * 0), 28, 27 },
/* banding */ { 592, 56 + (yContOffset * 0), 28, 27 },
/* namePlates */ { 488, 94 + (yFaceOffset * 0), 65, 15 },
/* namePlateFrames */ { 487, 20 + (yFaceOffset * 0), 69, 92 }
};
Rect16 midBox[numButtons] = {
Rect16(489, 22 + (yContOffset * 1), 65, 72),
Rect16(559, 86 + (yContOffset * 1), 28, 27),
Rect16(592, 86 + (yContOffset * 1), 28, 27),
Rect16(559, 56 + (yContOffset * 1), 28, 27),
Rect16(592, 56 + (yContOffset * 1), 28, 27),
Rect16(488, 94 + (yFaceOffset * 1), 65, 15),
Rect16(487, 20 + (yFaceOffset * 1), 69, 92)
static const StaticRect midBox[numButtons] = {
{ 489, 22 + (yContOffset * 1), 65, 72 },
{ 559, 86 + (yContOffset * 1), 28, 27 },
{ 592, 86 + (yContOffset * 1), 28, 27 },
{ 559, 56 + (yContOffset * 1), 28, 27 },
{ 592, 56 + (yContOffset * 1), 28, 27 },
{ 488, 94 + (yFaceOffset * 1), 65, 15 },
{ 487, 20 + (yFaceOffset * 1), 69, 92 }
};
Rect16 botBox[numButtons] = {
Rect16(489, 22 + (yContOffset * 2), 65, 72),
Rect16(559, 86 + (yContOffset * 2), 28, 27),
Rect16(592, 86 + (yContOffset * 2), 28, 27),
Rect16(559, 56 + (yContOffset * 2), 28, 27),
Rect16(592, 56 + (yContOffset * 2), 28, 27),
Rect16(488, 94 + (yFaceOffset * 2), 65, 15),
Rect16(487, 20 + (yFaceOffset * 2), 69, 92)
static const StaticRect botBox[numButtons] = {
{ 489, 22 + (yContOffset * 2), 65, 72 },
{ 559, 86 + (yContOffset * 2), 28, 27 },
{ 592, 86 + (yContOffset * 2), 28, 27 },
{ 559, 56 + (yContOffset * 2), 28, 27 },
{ 592, 56 + (yContOffset * 2), 28, 27 },
{ 488, 94 + (yFaceOffset * 2), 65, 15 },
{ 487, 20 + (yFaceOffset * 2), 69, 92 }
};
@ -363,22 +363,22 @@ const uint32 containerGroupID = MKTAG('C', 'O', 'N', 'T');
// button position views
// topBox, midBox, and botBox are defined in uimetrcs.h
Rect16 *views[] = { topBox, midBox, botBox };
static const StaticRect *views[] = { topBox, midBox, botBox };
// individual indicators/buttons
Rect16 menConBtnRect = Rect16(485, 265, 44, 43);
static const StaticRect menConBtnRect = { 485, 265, 44, 43 };
// options button
Rect16 optBtnRect = Rect16(20, 445, 26, 15);
static const StaticRect optBtnRect = { 20, 445, 26, 15 };
// enchantment display
Rect16 enchDispRect = Rect16(0, 0, 630, 18);
static const StaticRect enchDispRect = { 0, 0, 630, 18 };
// brother buttons and frame
Rect16 broBtnRect = Rect16(481, 450, 144, 11);
Rect16 julBtnRect = Rect16(482, 451, 44, 9);
Rect16 phiBtnRect = Rect16(531, 451, 44, 9);
Rect16 kevBtnRect = Rect16(580, 451, 44, 9);
static const StaticRect broBtnRect = { 481, 450, 144, 11 };
static const StaticRect julBtnRect = { 482, 451, 44, 9 };
static const StaticRect phiBtnRect = { 531, 451, 44, 9 };
static const StaticRect kevBtnRect = { 580, 451, 44, 9 };
textPallete genericTextPal(9 + 15, 20, 14, 11, 23, 17);

4
engines/saga2/uimetrcs.h
View File

@ -47,10 +47,6 @@ const int backWidth = 42,
const int16 numButtons = 7;
const int16 yContOffset = 150;
// position arrays for all buttons on the individual panels
extern Rect16 topBox[], midBox[], botBox[];
// facial button position defines
const int16 yFaceOffset = 150;