Skip to content

Instantly share code, notes, and snippets.

@selaux

selaux/800x600_svn46.patch

Created May 6, 2012 19:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save selaux/2623946 to your computer and use it in GitHub Desktop.
Save selaux/2623946 to your computer and use it in GitHub Desktop.
Download ZIP
JA2 Stracciatella 800x600 Patch, Fixes
Raw
800x600_svn46.patch
diff -Nru a/800x600MOD_changelog.txt b/800x600MOD_changelog.txt
--- a/800x600MOD_changelog.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/800x600MOD_changelog.txt 2010-02-24 00:51:49.764757000 +0100
@@ -0,0 +1,22 @@
+Changelog of JA2 Stracciatella 800x600 Mod
+
+
+v0.04 Beta
+-----------------------------------------
+- Merged with the latest Stracciatella revision 7059
+- Made all data files and folder to lowercase to match base code changes
+
+
+v0.03 Beta
+------------------------------------------
+Strategic:
+ - Resized strategic map to fill empty space for 800x600 res.
+ - Resized strategic map inventory to fill whole new map area.
+ - Resized most of the startegic map graphics to fit new map size.
+
+General:
+ - Merged with Stracciatella code r4823 (the final version at this point)
+
+
+
+
\ No newline at end of file
diff -Nru a/Build/Credits.cc b/Build/Credits.cc
--- a/Build/Credits.cc 2009-10-11 18:06:15.736498000 +0200
+++ b/Build/Credits.cc 2010-02-24 00:51:49.764757000 +0100
@@ -197,7 +197,11 @@
static BOOLEAN EnterCreditsScreen(void)
try
{
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiCreditBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/credits_800x600.sti");
+#else
guiCreditBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/credits.sti");
+#endif
guiCreditFaces = AddVideoObjectFromFile(INTERFACEDIR "/credit faces.sti");
guiCreditScreenActiveFont = FONT12ARIAL;
@@ -370,7 +374,7 @@
//write the string onto the surface
SetFontDestBuffer(vs);
DisplayWrappedString(0, 1, CRDT_WIDTH_OF_TEXT_AREA, 2, uiFontToUse, uiColorToUse, pString, 0, gubCrdtJustification);
- SetFontDestBuffer(FRAME_BUFFER);
+ SetFontDestBuffer(FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
if (g_credits_tail == NULL)
{
diff -Nru a/Build/Editor/EditorItems.cc b/Build/Editor/EditorItems.cc
--- a/Build/Editor/EditorItems.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Editor/EditorItems.cc 2010-02-24 00:49:48.723575000 +0100
@@ -316,7 +316,7 @@
swprintf(pStr, lengthof(pStr), L"%hs", LockTable[i].ubEditorName);
DisplayWrappedString(x, y + 25, 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, CENTER_JUSTIFIED | MARK_DIRTY);
- DrawItemCentered(Item[item_id], eInfo.uiBuffer, x, y + 2, SGP_TRANSPARENT);
+ DrawItemCentered(Item[item_id], eInfo.uiBuffer, x, y + 2, TRANSPARENT);
//cycle through the various slot positions (0,0), (0,40), (60,0), (60,40), (120,0)...
if( y == 0 )
@@ -444,7 +444,7 @@
}
DisplayWrappedString(x, y + 25, 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, CENTER_JUSTIFIED | MARK_DIRTY);
- DrawItemCentered(*item, eInfo.uiBuffer, x, y + 2, SGP_TRANSPARENT);
+ DrawItemCentered(*item, eInfo.uiBuffer, x, y + 2, TRANSPARENT);
//cycle through the various slot positions (0,0), (0,40), (60,0), (60,40), (120,0)...
if( y == 0 )
diff -Nru a/Build/Editor/EditorMercs.cc b/Build/Editor/EditorMercs.cc
--- a/Build/Editor/EditorMercs.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Editor/EditorMercs.cc 2010-02-24 00:49:48.723575000 +0100
@@ -2163,7 +2163,7 @@
//now draw the fullsize item into the temp buffer
INVTYPE const& item = Item[gusMercsNewItemIndex];
SGPVObject const& vo = GetInterfaceGraphicForItem(item);
- BltVideoObjectOutline(uiSrcID, &vo, item.ubGraphicNum, 0, 0, SGP_TRANSPARENT);
+ BltVideoObjectOutline(uiSrcID, &vo, item.ubGraphicNum, 0, 0, TRANSPARENT);
//crop the source image
ETRLEObject const& pObject = vo.SubregionProperties(item.ubGraphicNum);
diff -Nru a/Build/GameInitOptionsScreen.cc b/Build/GameInitOptionsScreen.cc
--- a/Build/GameInitOptionsScreen.cc 2010-05-18 09:13:22.298177000 +0200
+++ b/Build/GameInitOptionsScreen.cc 2010-05-25 16:29:06.194575000 +0200
@@ -38,13 +38,13 @@
#define GIO_TOGGLE_TEXT_COLOR FONT_MCOLOR_WHITE
//buttons
-#define GIO_BTN_OK_X 141
-#define GIO_BTN_OK_Y 418
-#define GIO_CANCEL_X 379
+#define GIO_BTN_OK_X (SCREEN_WIDTH/2)-179//141
+#define GIO_BTN_OK_Y (SCREEN_HEIGHT/2)+ 178 //418
+#define GIO_CANCEL_X GIO_BTN_OK_X + 238 //379
//main title
#define GIO_MAIN_TITLE_X 0
-#define GIO_MAIN_TITLE_Y 68
+#define GIO_MAIN_TITLE_Y (SCREEN_HEIGHT/2-172)//68
#define GIO_MAIN_TITLE_WIDTH SCREEN_WIDTH
//radio box locations
@@ -53,12 +53,12 @@
#define GIO_OFFSET_TO_TOGGLE_BOX 155//200
#define GIO_OFFSET_TO_TOGGLE_BOX_Y 9
-#define GIO_DIF_SETTINGS_X 80
-#define GIO_DIF_SETTINGS_Y 150
+#define GIO_DIF_SETTINGS_X (SCREEN_WIDTH/2-240)//80
+#define GIO_DIF_SETTINGS_Y (SCREEN_HEIGHT/2-90) //150
#define GIO_DIF_SETTINGS_WIDTH GIO_OFFSET_TO_TOGGLE_BOX - GIO_OFFSET_TO_TEXT //230
-#define GIO_GAME_SETTINGS_X 350
-#define GIO_GAME_SETTINGS_Y 300//280//150
+#define GIO_GAME_SETTINGS_X (SCREEN_WIDTH/2+30)//350
+#define GIO_GAME_SETTINGS_Y (SCREEN_HEIGHT/2+60) //300//280//150
#define GIO_GAME_SETTINGS_WIDTH GIO_DIF_SETTINGS_WIDTH
#define GIO_GUN_SETTINGS_X GIO_GAME_SETTINGS_X
@@ -274,7 +274,12 @@
SetCurrentCursorFromDatabase(CURSOR_NORMAL);
+ // load the Main trade screen backgroiund image
+#if (SCREEN_WIDTH == 800 && SCREEN_HEIGHT == 600)
+ guiGIOMainBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/optionsscreenbackground_800x600.sti");
+#else
guiGIOMainBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/optionsscreenbackground.sti");
+#endif
// Ok button
giGIODoneBtnImage = LoadButtonImage(INTERFACEDIR "/preferencesbuttons.sti", 0, 2);
@@ -440,7 +445,8 @@
BltVideoObject(FRAME_BUFFER, guiGIOMainBackGroundImage, 0, 0, 0);
//Shade the background
- FRAME_BUFFER->ShadowRect(48, 55, 592, 378); //358
+ FRAME_BUFFER->ShadowRect((SCREEN_WIDTH/2-272), (SCREEN_HEIGHT/2-185), (SCREEN_WIDTH/2+252), (SCREEN_HEIGHT/2+138)); //358
+// FRAME_BUFFER->ShadowRect(48, 55, 592, 378); //358
//Display the title
diff -Nru a/Build/GameLoop.cc b/Build/GameLoop.cc
--- a/Build/GameLoop.cc 2010-07-27 09:39:49.537036000 +0200
+++ b/Build/GameLoop.cc 2010-02-24 00:51:49.764757000 +0100
@@ -208,7 +208,7 @@
MouseSystemHook(MOUSE_POS, MousePos.iX, MousePos.iY);
MusicPoll();
- while (DequeueSpecificEvent(&InputEvent, MOUSE_EVENTS))
+ while (DequeueSpecificEvent(&InputEvent, INPUT_MOUSE))
{
MouseSystemHook(InputEvent.usEvent, MousePos.iX, MousePos.iY);
}
diff -Nru a/Build/GameVersion.cc b/Build/GameVersion.cc
--- a/Build/GameVersion.cc 2009-06-12 13:57:05.894461000 +0200
+++ b/Build/GameVersion.cc 2010-02-24 00:51:49.764757000 +0100
@@ -8,14 +8,14 @@
const char g_version_label[] =
#ifdef JA2BETAVERSION
//BETA/TEST BUILD VERSION
- "Beta v. 0.98";
+ "v0.12 - Walnut with 800x600 Mod v0.04b";
#else
//RELEASE BUILD VERSION
- "Release v0.12 - Walnut";
+ "Release v0.12 - Walnut with 800x600 Mod v0.04b";
#endif
-char const g_version_number[16] = "Build 04.12.02";
-CASSERT(lengthof(g_version_number) == 16)
+char const g_version_number[16] = "Build 22.02.10";
+CASSERT(lengthof(g_version_number) <= 16);
//
diff -Nru a/Build/Intro.cc b/Build/Intro.cc
--- a/Build/Intro.cc 2009-08-14 07:27:33.021298000 +0200
+++ b/Build/Intro.cc 2010-02-24 00:51:49.764757000 +0100
@@ -407,7 +407,11 @@
static void DisplaySirtechSplashScreen(void)
{
FRAME_BUFFER->Fill(0);
- BltVideoObjectOnce(FRAME_BUFFER, INTERFACEDIR "/sirtechsplash.sti", 0, 0, 0);
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ BltVideoObjectOnce(FRAME_BUFFER, INTERFACEDIR "/sirtechsplash_800x600.sti", 0, 0, 0);
+#else
+ BltVideoObjectOnce(FRAME_BUFFER, IINTERFACEDIR "/sirtechsplash.sti", 0, 0, 0);
+#endif
InvalidateScreen();
RefreshScreen();
}
diff -Nru a/Build/JAScreens.cc b/Build/JAScreens.cc
--- a/Build/JAScreens.cc 2009-09-06 18:52:18.013265000 +0200
+++ b/Build/JAScreens.cc 2010-02-24 00:51:49.764757000 +0100
@@ -259,6 +259,7 @@
SetUIKeyboardHook(PalEditKeyboardHook);
guiBackgroundRect = RegisterBackgroundRect(BGND_FLAG_PERMANENT, 50, 10, 550, 390);
+// guiBackgroundRect = RegisterBackgroundRect(BGND_FLAG_PERMANENT, 50, 10, 600 , 400);
}
else
{
diff -Nru a/Build/Laptop/AIM.cc b/Build/Laptop/AIM.cc
--- a/Build/Laptop/AIM.cc 2009-10-11 18:06:16.524925000 +0200
+++ b/Build/Laptop/AIM.cc 2010-02-24 00:46:14.777008000 +0100
@@ -44,10 +44,11 @@
#define LINK_SIZE_X 101
#define LINK_SIZE_Y 76
-#define MEMBERCARD_X IMAGE_OFFSET_X + 118
+#define MEMBERCARD_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-202)
+//#define MEMBERCARD_X IMAGE_OFFSET_X + 118
#define MEMBERCARD_Y IMAGE_OFFSET_Y + 190
-#define POLICIES_X IMAGE_OFFSET_X + 284
+#define POLICIES_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-36)
#define POLICIES_Y MEMBERCARD_Y
#define HISTORY_X MEMBERCARD_X
@@ -56,7 +57,8 @@
#define LINKS_X POLICIES_X
#define LINKS_Y HISTORY_Y
-#define WARNING_X IMAGE_OFFSET_X + 126
+#define WARNING_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-194)
+//#define WARNING_X IMAGE_OFFSET_X + 126
#define WARNING_Y IMAGE_OFFSET_Y + 80 -1
#define MEMBERS_TEXT_Y MEMBERCARD_Y + 77
@@ -86,7 +88,8 @@
#define AIM_AD_BOTTOM_RIGHT_X AIM_AD_TOP_LEFT_X + 248
#define AIM_AD_BOTTOM_RIGHT_Y AIM_AD_TOP_LEFT_Y + 110
-#define AIM_COPYRIGHT_X 160
+#define AIM_COPYRIGHT_X (SCREEN_WIDTH/2-160)
+//#define AIM_COPYRIGHT_X 160
#define AIM_COPYRIGHT_Y 396 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_COPYRIGHT_WIDTH 400
#define AIM_COPYRIGHT_GAP 9
@@ -389,8 +392,11 @@
void InitAimDefaults()
{
// load the Rust bacground graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiRustBackGround = AddVideoObjectFromFile(LAPTOPDIR "/rustbackground_800x600.sti");
+#else
guiRustBackGround = AddVideoObjectFromFile(LAPTOPDIR "/rustbackground.sti");
-
+#endif
// load the Aim Symbol graphic and add it
const char* const ImageFile = GetMLGFilename(MLG_AIMSYMBOL);
guiAimSymbol = AddVideoObjectFromFile(ImageFile);
@@ -411,6 +417,9 @@
void DrawAimDefaults()
{
+// Mythrell - Made AIM use same function as other pages except IMP for background
+ WebPageTileBackground(4, 4, RUSTBACKGROUND_SIZE_X, RUSTBACKGROUND_SIZE_Y, guiRustBackGround);
+/*
UINT16 x,y, uiPosX, uiPosY;
uiPosY = RUSTBACKGROUND_1_Y;
@@ -424,7 +433,7 @@
}
uiPosY += RUSTBACKGROUND_SIZE_Y;
}
-
+*/
BltVideoObject(FRAME_BUFFER, guiAimSymbol, 0, AIM_SYMBOL_X, AIM_SYMBOL_Y);
}
diff -Nru a/Build/Laptop/AIM.h b/Build/Laptop/AIM.h
--- a/Build/Laptop/AIM.h 2009-10-11 18:06:16.524925000 +0200
+++ b/Build/Laptop/AIM.h 2010-02-24 00:49:27.484372000 +0100
@@ -14,7 +14,8 @@
#define IMAGE_OFFSET_Y LAPTOP_SCREEN_WEB_UL_Y//24
-#define AIM_LOGO_TEXT_X 175
+#define AIM_LOGO_TEXT_X (SCREEN_WIDTH/2-145)
+//#define AIM_LOGO_TEXT_X 175
#define AIM_LOGO_TEXT_Y 77 + LAPTOP_SCREEN_WEB_DELTA_Y + 4
#define AIM_LOGO_TEXT_WIDTH 360
@@ -22,7 +23,8 @@
#define AIM_SYMBOL_SIZE_Y 51
//262, 28
-#define AIM_SYMBOL_X IMAGE_OFFSET_X + 149
+#define AIM_SYMBOL_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-171)
+//#define AIM_SYMBOL_X IMAGE_OFFSET_X + 149
#define AIM_SYMBOL_Y IMAGE_OFFSET_Y + 3
#define AIM_SYMBOL_WIDTH 203
#define AIM_SYMBOL_HEIGHT 51
@@ -38,7 +40,8 @@
#define NUM_AIM_BOTTOMBUTTONS 6
#define BOTTOM_BUTTON_START_WIDTH 75
#define BOTTOM_BUTTON_START_HEIGHT 18
-#define BOTTOM_BUTTON_START_X LAPTOP_SCREEN_UL_X + 25
+#define BOTTOM_BUTTON_START_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-295)
+//#define BOTTOM_BUTTON_START_X LAPTOP_SCREEN_UL_X + 25
#define BOTTOM_BUTTON_START_Y LAPTOP_SCREEN_WEB_LR_Y - BOTTOM_BUTTON_START_HEIGHT - 3
#define BOTTOM_BUTTON_AMOUNT NUM_AIM_SCREENS
diff -Nru a/Build/Laptop/AIMArchives.cc b/Build/Laptop/AIMArchives.cc
--- a/Build/Laptop/AIMArchives.cc 2009-09-20 22:47:40.336434000 +0200
+++ b/Build/Laptop/AIMArchives.cc 2010-02-24 00:46:14.777008000 +0100
@@ -39,7 +39,8 @@
#define AIM_ALUMNI_NUM_FACE_ROWS 4
#define MAX_NUMBER_OLD_MERCS_ON_PAGE (AIM_ALUMNI_NUM_FACE_ROWS * AIM_ALUMNI_NUM_FACE_COLS)
-#define AIM_ALUMNI_START_GRID_X LAPTOP_SCREEN_UL_X + 37
+#define AIM_ALUMNI_START_GRID_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-283)
+//#define AIM_ALUMNI_START_GRID_X LAPTOP_SCREEN_UL_X + 37
#define AIM_ALUMNI_START_GRID_Y LAPTOP_SCREEN_WEB_UL_Y + 68
#define AIM_ALUMNI_GRID_OFFSET_X 90
@@ -55,11 +56,14 @@
#define AIM_ALUMNI_NAME_OFFSET_Y 55
#define AIM_ALUMNI_NAME_WIDTH AIM_ALUMNI_ALUMNI_FRAME_WIDTH - AIM_ALUMNI_NAME_OFFSET_X * 2
-#define AIM_ALUMNI_PAGE1_X LAPTOP_SCREEN_UL_X + 100
-#define AIM_ALUMNI_PAGE1_Y LAPTOP_SCREEN_WEB_UL_Y + 357
+#define AIM_ALUMNI_PAGE1_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-230)
+//#define AIM_ALUMNI_PAGE1_X LAPTOP_SCREEN_UL_X + 100
+#define AIM_ALUMNI_PAGE1_Y LAPTOP_SCREEN_WEB_UL_Y + (SCREEN_HEIGHT-123)
+//#define AIM_ALUMNI_PAGE1_Y LAPTOP_SCREEN_WEB_UL_Y + 357
#define AIM_ALUMNI_PAGE_GAP BOTTOM_BUTTON_START_WIDTH + 25
-#define AIM_ALUMNI_TITLE_X IMAGE_OFFSET_X + 149
+#define AIM_ALUMNI_TITLE_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-171)
+//#define AIM_ALUMNI_TITLE_X IMAGE_OFFSET_X + 149
#define AIM_ALUMNI_TITLE_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y // + 2
#define AIM_ALUMNI_TITLE_WIDTH AIM_SYMBOL_WIDTH
@@ -67,8 +71,10 @@
#define AIM_POPUP_TEXT_WIDTH 296
#define AIM_POPUP_SECTION_HEIGHT 9
-#define AIM_POPUP_X LAPTOP_SCREEN_UL_X + (500-AIM_POPUP_WIDTH)/2
-#define AIM_POPUP_Y 120 + LAPTOP_SCREEN_WEB_DELTA_Y
+#define AIM_POPUP_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH-140-AIM_POPUP_WIDTH)/2
+//#define AIM_POPUP_X LAPTOP_SCREEN_UL_X + (500-AIM_POPUP_WIDTH)/2
+//#define AIM_POPUP_Y 120 + LAPTOP_SCREEN_WEB_DELTA_Y
+#define AIM_POPUP_Y (SCREEN_WIDTH/2-200) + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_POPUP_SHADOW_GAP 4
diff -Nru a/Build/Laptop/AIMFacialIndex.cc b/Build/Laptop/AIMFacialIndex.cc
--- a/Build/Laptop/AIMFacialIndex.cc 2009-10-11 18:06:13.848935000 +0200
+++ b/Build/Laptop/AIMFacialIndex.cc 2010-02-24 00:46:14.777008000 +0100
@@ -33,7 +33,7 @@
#define AIM_FI_PORTRAIT_WIDTH 52
#define AIM_FI_PORTRAIT_HEIGHT 48
-#define AIM_FI_FIRST_MUGSHOT_X IMAGE_OFFSET_X + 6
+#define AIM_FI_FIRST_MUGSHOT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-314)//6
#define AIM_FI_FIRST_MUGSHOT_Y IMAGE_OFFSET_Y + 69//67//70 //68 //65
#define AIM_FI_MUGSHOT_GAP_X 10
#define AIM_FI_MUGSHOT_GAP_Y 13
@@ -43,7 +43,7 @@
#define AIM_FI_NNAME_OFFSET_Y AIM_FI_PORTRAIT_HEIGHT+1
#define AIM_FI_NNAME_WIDTH AIM_FI_PORTRAIT_WIDTH+4
-#define AIM_FI_MEMBER_TEXT_X IMAGE_OFFSET_X + 155
+#define AIM_FI_MEMBER_TEXT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-165) //155
#define AIM_FI_MEMBER_TEXT_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y + 1
#define AIM_FI_MEMBER_TEXT_WIDTH 190
diff -Nru a/Build/Laptop/AIMFacialIndex.h b/Build/Laptop/AIMFacialIndex.h
--- a/Build/Laptop/AIMFacialIndex.h 2009-10-11 18:06:13.848935000 +0200
+++ b/Build/Laptop/AIMFacialIndex.h 2010-02-24 00:49:27.484372000 +0100
@@ -2,12 +2,12 @@
#define __AIMFACIALINDEX_H_
-#define AIM_FI_LEFT_CLICK_TEXT_X 116
+#define AIM_FI_LEFT_CLICK_TEXT_X (SCREEN_WIDTH/2-204) //116
#define AIM_FI_LEFT_CLICK_TEXT_Y 35 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_FI_CLICK_DESC_TEXT_Y_OFFSET 16
-#define AIM_FI_RIGHT_CLICK_TEXT_X 500
+#define AIM_FI_RIGHT_CLICK_TEXT_X (SCREEN_WIDTH-140) //500
#define AIM_FI_CLICK_TEXT_WIDTH 110
diff -Nru a/Build/Laptop/AIMHistory.cc b/Build/Laptop/AIMHistory.cc
--- a/Build/Laptop/AIMHistory.cc 2009-10-11 18:06:26.148711000 +0200
+++ b/Build/Laptop/AIMHistory.cc 2010-02-24 00:46:14.777008000 +0100
@@ -28,21 +28,23 @@
#define AIM_HISTORY_PARAGRAPH_TITLE_COLOR FONT_MCOLOR_WHITE
-#define AIM_HISTORY_MENU_X LAPTOP_SCREEN_UL_X + 40
+#define AIM_HISTORY_MENU_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-280)//40
#define AIM_HISTORY_MENU_Y 370 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_HISTORY_MENU_BUTTON_AMOUNT 4
#define AIM_HISTORY_GAP_X 40 + BOTTOM_BUTTON_START_WIDTH
+#define AIM_HISTORY_MENU_END_X AIM_HISTORY_MENU_X + AIM_HISTORY_GAP_X * (AIM_HISTORY_MENU_BUTTON_AMOUNT+2)
+#define AIM_HISTORY_MENU_END_Y AIM_HISTORY_MENU_Y + BOTTOM_BUTTON_START_HEIGHT
-#define AIM_HISTORY_TEXT_X IMAGE_OFFSET_X + 149
+#define AIM_HISTORY_TEXT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-171)//149
#define AIM_HISTORY_TEXT_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y + 45
#define AIM_HISTORY_TEXT_WIDTH AIM_SYMBOL_WIDTH
-#define AIM_HISTORY_PARAGRAPH_X LAPTOP_SCREEN_UL_X + 20
+#define AIM_HISTORY_PARAGRAPH_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-300)//20
#define AIM_HISTORY_PARAGRAPH_Y AIM_HISTORY_SUBTITLE_Y + 18
#define AIM_HISTORY_SUBTITLE_Y 150 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_HISTORY_PARAGRAPH_WIDTH 460
-#define AIM_HISTORY_CONTENTBUTTON_X 259
+#define AIM_HISTORY_CONTENTBUTTON_X (SCREEN_WIDTH/2-61) //259
#define AIM_HISTORY_CONTENTBUTTON_Y AIM_HISTORY_SUBTITLE_Y
#define AIM_HISTORY_TOC_X AIM_HISTORY_CONTENTBUTTON_X
diff -Nru a/Build/Laptop/AIMLinks.cc b/Build/Laptop/AIMLinks.cc
--- a/Build/Laptop/AIMLinks.cc 2009-10-11 18:06:17.304681000 +0200
+++ b/Build/Laptop/AIMLinks.cc 2010-02-24 00:46:14.777008000 +0100
@@ -22,7 +22,8 @@
#define AIM_LINK_LINK_WIDTH 420
#define AIM_LINK_LINK_HEIGHT 70
-#define AIM_LINK_BOBBY_LINK_X LAPTOP_SCREEN_UL_X + 40
+#define AIM_LINK_BOBBY_LINK_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-280)
+//#define AIM_LINK_BOBBY_LINK_X LAPTOP_SCREEN_UL_X + 40
#define AIM_LINK_BOBBY_LINK_Y LAPTOP_SCREEN_WEB_UL_Y + 91
#define AIM_LINK_FUNERAL_LINK_X AIM_LINK_BOBBY_LINK_X
@@ -31,7 +32,8 @@
#define AIM_LINK_INSURANCE_LINK_X AIM_LINK_BOBBY_LINK_X
#define AIM_LINK_INSURANCE_LINK_Y AIM_LINK_FUNERAL_LINK_Y + AIM_LINK_LINK_OFFSET_Y
-#define AIM_LINK_TITLE_X IMAGE_OFFSET_X + 149
+#define AIM_LINK_TITLE_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-171)
+//#define AIM_LINK_TITLE_X IMAGE_OFFSET_X + 149
#define AIM_LINK_TITLE_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y + 10
#define AIM_LINK_TITLE_WIDTH AIM_SYMBOL_WIDTH
diff -Nru a/Build/Laptop/AIMMembers.cc b/Build/Laptop/AIMMembers.cc
--- a/Build/Laptop/AIMMembers.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Laptop/AIMMembers.cc 2010-05-25 16:29:06.194575000 +0200
@@ -91,14 +91,14 @@
#define NUMBER_HATED_MERCS_ONTEAM 3
-#define STATS_X IMAGE_OFFSET_X + 121
+#define STATS_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-199)//121
#define STATS_Y IMAGE_OFFSET_Y + 66//69
-#define PRICE_X IMAGE_OFFSET_X + 377
+#define PRICE_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2+57) //377
#define PRICE_Y STATS_Y
#define PRICE_WIDTH 116
-#define PORTRAIT_X IMAGE_OFFSET_X + 8
+#define PORTRAIT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-312) //8
#define PORTRAIT_Y STATS_Y
#define PORTRAIT_WIDTH 110
#define PORTRAIT_HEIGHT 126
@@ -109,7 +109,7 @@
#define FACE_HEIGHT 122
-#define WEAPONBOX_X IMAGE_OFFSET_X + 6
+#define WEAPONBOX_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-314) //6
#define WEAPONBOX_Y IMAGE_OFFSET_Y + 296//299
#define WEAPONBOX_SIZE_X 61
#define WEAPONBOX_SIZE_Y 31
@@ -149,12 +149,12 @@
#define ONEWEEK_X AIM_CONTRACT_X
#define TWOWEEK_X AIM_CONTRACT_X
-#define PREVIOUS_X 224
-#define CONTACT_X 331
-#define NEXT_X 431
+#define PREVIOUS_X (SCREEN_WIDTH/2-96) //224
+#define CONTACT_X (SCREEN_WIDTH/2+11) //331
+#define NEXT_X (SCREEN_WIDTH/2+111) //431
#define BTN_BOX_Y (386 + LAPTOP_SCREEN_WEB_DELTA_Y - 4)
-#define AIM_MERC_INFO_X 124
+#define AIM_MERC_INFO_X (SCREEN_WIDTH/2-196) //124
#define AIM_MERC_INFO_Y 223 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_MERC_ADD_X AIM_MERC_ADD_INFO_X
@@ -168,7 +168,7 @@
#define AIM_MEDICAL_DEPOSIT_Y LEADERSHIP_Y
#define AIM_MEDICAL_DEPOSIT_WIDTH PRICE_WIDTH - 6
-#define AIM_MEMBER_ACTIVE_TEXT_X IMAGE_OFFSET_X + 149
+#define AIM_MEMBER_ACTIVE_TEXT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-171) //149
#define AIM_MEMBER_ACTIVE_TEXT_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y - 1 // + 1
#define AIM_MEMBER_ACTIVE_TEXT_WIDTH AIM_SYMBOL_WIDTH
@@ -896,7 +896,7 @@
// Blt the shadow of the item
BltVideoObjectOutlineShadow(FRAME_BUFFER, &item_vo, item.ubGraphicNum, sCenX - 2, sCenY + 2);
// Blt the item
- BltVideoObjectOutline( FRAME_BUFFER, &item_vo, item.ubGraphicNum, sCenX, sCenY, SGP_TRANSPARENT);
+ BltVideoObjectOutline( FRAME_BUFFER, &item_vo, item.ubGraphicNum, sCenX, sCenY, TRANSPARENT);
/* If there are more then 1 piece of equipment in the current slot, display
* how many there are */
diff -Nru a/Build/Laptop/AIMPolicies.cc b/Build/Laptop/AIMPolicies.cc
--- a/Build/Laptop/AIMPolicies.cc 2009-10-11 18:06:31.807545000 +0200
+++ b/Build/Laptop/AIMPolicies.cc 2010-02-24 00:46:14.777008000 +0100
@@ -30,17 +30,17 @@
#define AIM_POLICY_AGREE_TOC_COLOR_ON FONT_MCOLOR_WHITE
#define AIM_POLICY_AGREE_TOC_COLOR_OFF FONT_MCOLOR_DKWHITE
-#define AIM_POLICY_MENU_X LAPTOP_SCREEN_UL_X + 40
+#define AIM_POLICY_MENU_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-280) //40
#define AIM_POLICY_MENU_Y 390 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_POLICY_MENU_BUTTON_AMOUNT 4
#define AIM_POLICY_GAP_X 40 + BOTTOM_BUTTON_START_WIDTH
-#define AIM_POLICY_TITLE_X IMAGE_OFFSET_X + 149
+#define AIM_POLICY_TITLE_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-171) //149
#define AIM_POLICY_TITLE_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y + 11
#define AIM_POLICY_TITLE_WIDTH AIM_SYMBOL_WIDTH
#define AIM_POLICY_TITLE_STATEMENT_WIDTH 300
-#define AIM_POLICY_TITLE_STATEMENT_X IMAGE_OFFSET_X + (500 - AIM_POLICY_TITLE_STATEMENT_WIDTH) / 2 +5//80
+#define AIM_POLICY_TITLE_STATEMENT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-215) //(500 - AIM_POLICY_TITLE_STATEMENT_WIDTH) / 2 +5//80
#define AIM_POLICY_TITLE_STATEMENT_Y AIM_SYMBOL_Y + AIM_SYMBOL_SIZE_Y + 75
#define AIM_POLICY_SUBTITLE_NUMBER AIM_POLICY_TITLE_STATEMENT_X - 75
@@ -55,14 +55,14 @@
#define AIM_POLICY_SUBPARAGRAPH_NUMBER AIM_POLICY_PARAGRAPH_X
#define AIM_POLICY_SUBPARAGRAPH_X AIM_POLICY_SUBPARAGRAPH_NUMBER + 25
-#define AIM_POLICY_TOC_X 259
+#define AIM_POLICY_TOC_X (SCREEN_WIDTH/2-61) //259
#define AIM_POLICY_TOC_Y AIM_POLICY_SUBTITLE_Y
#define AIM_POLICY_TOC_GAP_Y 25
#define AIM_POLICY_TOC_TEXT_OFFSET_X 5
#define AIM_POLICY_TOC_TEXT_OFFSET_Y 5
-#define AIM_POLICY_AGREEMENT_X IMAGE_OFFSET_X + 150
+#define AIM_POLICY_AGREEMENT_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-170) //150
#define AIM_POLICY_AGREEMENT_Y 350 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_POLICY_TOC_PAGE 1
@@ -358,6 +358,8 @@
static void InitAimPolicyMenuBar()
{
+ UINT16 i, usPosX;
+
if (gfAimPolicyMenuBarLoaded) return;
gfAimPolicyMenuBarLoaded = TRUE;
diff -Nru a/Build/Laptop/AIMSort.cc b/Build/Laptop/AIMSort.cc
--- a/Build/Laptop/AIMSort.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/AIMSort.cc 2010-02-24 00:46:14.777008000 +0100
@@ -31,10 +31,10 @@
#define AIM_SORT_ON 0
#define AIM_SORT_OFF 1
-#define AIM_SORT_SORT_BY_X IMAGE_OFFSET_X + 155
+#define AIM_SORT_SORT_BY_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-165) //155
#define AIM_SORT_SORT_BY_Y IMAGE_OFFSET_Y + 96
-#define AIM_SORT_TO_MUGSHOTS_X IMAGE_OFFSET_X + 89
+#define AIM_SORT_TO_MUGSHOTS_X IMAGE_OFFSET_X + (SCREEN_WIDTH/2-231) //89
#define AIM_SORT_TO_MUGSHOTS_Y IMAGE_OFFSET_Y + 184
#define AIM_SORT_TO_MUGSHOTS_SIZE 54
@@ -56,7 +56,7 @@
#define AIM_SORT_ASC_DESC_WIDTH 100
-#define AIM_SORT_MUGSHOT_TEXT_X 266
+#define AIM_SORT_MUGSHOT_TEXT_X (SCREEN_WIDTH/2-54) //266
#define AIM_SORT_MUGSHOT_TEXT_Y 230 + LAPTOP_SCREEN_WEB_DELTA_Y
#define AIM_SORT_MERC_STATS_TEXT_X AIM_SORT_MUGSHOT_TEXT_X
diff -Nru a/Build/Laptop/BobbyR.cc b/Build/Laptop/BobbyR.cc
--- a/Build/Laptop/BobbyR.cc 2009-09-20 22:47:49.250837000 +0200
+++ b/Build/Laptop/BobbyR.cc 2010-02-24 00:46:35.526935000 +0100
@@ -310,7 +310,11 @@
void InitBobbyRWoodBackground()
{
// load the Wood bacground graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiWoodBackground = AddVideoObjectFromFile(LAPTOPDIR "/bobbywood_800x600.sti");
+#else
guiWoodBackground = AddVideoObjectFromFile(LAPTOPDIR "/bobbywood.sti");
+#endif
}
@@ -324,6 +328,15 @@
{
UINT16 x,y, uiPosX, uiPosY;
+ // Mythrell - Ugly hack, won't be dynamic
+ // Replaced 125x100 tile with a full screen pic since I couldn't figure out how to make
+ // it fit without going over the laptop border GFX
+ if(SCREEN_WIDTH==800)
+ {
+ BltVideoObject(FRAME_BUFFER, guiWoodBackground, 0, BOBBY_WOOD_BACKGROUND_X, BOBBY_WOOD_BACKGROUND_Y);
+ }
+ else
+ {
uiPosY = BOBBY_WOOD_BACKGROUND_Y;
for(y=0; y<4; y++)
{
@@ -335,6 +348,7 @@
}
uiPosY += BOBBY_WOOD_BACKGROUND_HEIGHT;
}
+ }
}
diff -Nru a/Build/Laptop/BobbyR.h b/Build/Laptop/BobbyR.h
--- a/Build/Laptop/BobbyR.h 2009-08-08 19:54:16.444195000 +0200
+++ b/Build/Laptop/BobbyR.h 2010-02-24 00:49:27.484372000 +0100
@@ -17,7 +17,7 @@
#define BOBBYR_NUM_HORIZONTAL_TILES 4
#define BOBBYR_NUM_VERTICAL_TILES 4
-#define BOBBYR_GRIDLOC_X LAPTOP_SCREEN_UL_X + 4
+#define BOBBYR_GRIDLOC_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-316) //4
#define BOBBYR_GRIDLOC_Y LAPTOP_SCREEN_WEB_UL_Y + 45
diff -Nru a/Build/Laptop/BobbyRAmmo.cc b/Build/Laptop/BobbyRAmmo.cc
--- a/Build/Laptop/BobbyRAmmo.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/BobbyRAmmo.cc 2010-02-24 00:46:35.526935000 +0100
@@ -18,8 +18,11 @@
void EnterBobbyRAmmo()
{
// load the background graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiAmmoBackground = AddVideoObjectFromFile(LAPTOPDIR "/ammobackground_800x600.sti");
+#else
guiAmmoBackground = AddVideoObjectFromFile(LAPTOPDIR "/ammobackground.sti");
-
+#endif
// load the gunsgrid graphic and add it
guiAmmoGrid = AddVideoObjectFromFile(LAPTOPDIR "/ammogrid.sti");
diff -Nru a/Build/Laptop/BobbyRArmour.cc b/Build/Laptop/BobbyRArmour.cc
--- a/Build/Laptop/BobbyRArmour.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/BobbyRArmour.cc 2010-02-24 00:46:35.526935000 +0100
@@ -17,8 +17,11 @@
void EnterBobbyRArmour()
{
// load the background graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiArmourBackground = AddVideoObjectFromFile(LAPTOPDIR "/armourbackground_800x600.sti");
+#else
guiArmourBackground = AddVideoObjectFromFile(LAPTOPDIR "/armourbackground.sti");
-
+#endif
// load the gunsgrid graphic and add it
guiArmourGrid = AddVideoObjectFromFile(LAPTOPDIR "/armourgrid.sti");
diff -Nru a/Build/Laptop/BobbyRGuns.cc b/Build/Laptop/BobbyRGuns.cc
--- a/Build/Laptop/BobbyRGuns.cc 2009-10-11 18:06:33.385190000 +0200
+++ b/Build/Laptop/BobbyRGuns.cc 2010-02-24 00:46:35.526935000 +0100
@@ -51,22 +51,22 @@
#define NUM_CATALOGUE_BUTTONS 5
#define BOBBYR_NUM_WEAPONS_ON_PAGE 4
-#define BOBBYR_BRTITLE_X LAPTOP_SCREEN_UL_X + 4
+#define BOBBYR_BRTITLE_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-316) //4
#define BOBBYR_BRTITLE_Y LAPTOP_SCREEN_WEB_UL_Y + 3
#define BOBBYR_BRTITLE_WIDTH 46
#define BOBBYR_BRTITLE_HEIGHT 42
-#define BOBBYR_TO_ORDER_TITLE_X 195
+#define BOBBYR_TO_ORDER_TITLE_X (SCREEN_WIDTH/2-125) //195
#define BOBBYR_TO_ORDER_TITLE_Y 42 + LAPTOP_SCREEN_WEB_DELTA_Y
#define BOBBYR_TO_ORDER_TEXT_X BOBBYR_TO_ORDER_TITLE_X + 75
#define BOBBYR_TO_ORDER_TEXT_Y 33 + LAPTOP_SCREEN_WEB_DELTA_Y
#define BOBBYR_TO_ORDER_TEXT_WIDTH 330
-#define BOBBYR_PREVIOUS_BUTTON_X LAPTOP_SCREEN_UL_X + 5 //BOBBYR_HOME_BUTTON_X + BOBBYR_CATALOGUE_BUTTON_WIDTH + 5
+#define BOBBYR_PREVIOUS_BUTTON_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-315) //5 //BOBBYR_HOME_BUTTON_X + BOBBYR_CATALOGUE_BUTTON_WIDTH + 5
#define BOBBYR_PREVIOUS_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 340 //BOBBYR_HOME_BUTTON_Y
-#define BOBBYR_NEXT_BUTTON_X LAPTOP_SCREEN_UL_X + 412 //BOBBYR_ORDER_FORM_X + BOBBYR_ORDER_FORM_WIDTH + 5
+#define BOBBYR_NEXT_BUTTON_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2+98) //412 //BOBBYR_ORDER_FORM_X + BOBBYR_ORDER_FORM_WIDTH + 5
#define BOBBYR_NEXT_BUTTON_Y BOBBYR_PREVIOUS_BUTTON_Y //BOBBYR_PREVIOUS_BUTTON_Y
#define BOBBYR_CATALOGUE_BUTTON_START_X BOBBYR_PREVIOUS_BUTTON_X + 92 //LAPTOP_SCREEN_UL_X + 93 - BOBBYR_CATALOGUE_BUTTON_WIDTH/2
@@ -74,7 +74,7 @@
#define BOBBYR_CATALOGUE_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 340
#define BOBBYR_CATALOGUE_BUTTON_WIDTH 56//75
-#define BOBBYR_HOME_BUTTON_X 120
+#define BOBBYR_HOME_BUTTON_X (SCREEN_WIDTH/2-200) //120
#define BOBBYR_HOME_BUTTON_Y 400 + LAPTOP_SCREEN_WEB_DELTA_Y
#define BOBBYR_CATALOGUE_BUTTON_TEXT_Y BOBBYR_CATALOGUE_BUTTON_Y + 5
@@ -120,11 +120,11 @@
#define BOBBY_RAY_NOT_PURCHASED 255
#define BOBBY_RAY_MAX_AMOUNT_OF_ITEMS_TO_PURCHASE 200
-#define BOBBYR_ORDER_FORM_X LAPTOP_SCREEN_UL_X + 200//204
+#define BOBBYR_ORDER_FORM_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-120) //200//204
#define BOBBYR_ORDER_FORM_Y LAPTOP_SCREEN_WEB_UL_Y + 367
#define BOBBYR_ORDER_FORM_WIDTH 95
-#define BOBBYR_ORDER_SUBTOTAL_X 490
+#define BOBBYR_ORDER_SUBTOTAL_X (SCREEN_WIDTH/2+170) //490
#define BOBBYR_ORDER_SUBTOTAL_Y BOBBYR_ORDER_FORM_Y+2//BOBBYR_HOME_BUTTON_Y
#define BOBBYR_PERCENT_FUNTCIONAL_X BOBBYR_ORDER_SUBTOTAL_X
@@ -208,8 +208,11 @@
gfBigImageMouseRegionCreated = FALSE;
// load the background graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiGunBackground = AddVideoObjectFromFile(LAPTOPDIR "/gunbackground_800x600.sti");
+#else
guiGunBackground = AddVideoObjectFromFile(LAPTOPDIR "/gunbackground.sti");
-
+#endif
// load the gunsgrid graphic and add it
guiGunsGrid = AddVideoObjectFromFile(LAPTOPDIR "/gunsgrid.sti");
diff -Nru a/Build/Laptop/BobbyRMailOrder.cc b/Build/Laptop/BobbyRMailOrder.cc
--- a/Build/Laptop/BobbyRMailOrder.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/BobbyRMailOrder.cc 2010-02-24 00:46:35.526935000 +0100
@@ -98,24 +98,24 @@
#define BOBBYR_DROPDOWN_FONT FONT12ARIAL
-#define BOBBYR_ORDERGRID_X LAPTOP_SCREEN_UL_X + 2
+#define BOBBYR_ORDERGRID_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-318) //2
#define BOBBYR_ORDERGRID_Y LAPTOP_SCREEN_WEB_UL_Y + 62
-#define BOBBYR_BOBBY_RAY_TITLE_X LAPTOP_SCREEN_UL_X + 171
+#define BOBBYR_BOBBY_RAY_TITLE_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-149) //171
#define BOBBYR_BOBBY_RAY_TITLE_Y LAPTOP_SCREEN_WEB_UL_Y + 3
#define BOBBYR_BOBBY_RAY_TITLE_WIDTH 160
#define BOBBYR_BOBBY_RAY_TITLE_HEIGHT 35
-#define BOBBYR_LOCATION_BOX_X LAPTOP_SCREEN_UL_X + 276
+#define BOBBYR_LOCATION_BOX_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-44) //276
#define BOBBYR_LOCATION_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 62
-#define BOBBYR_DELIVERYSPEED_X LAPTOP_SCREEN_UL_X + 276
+#define BOBBYR_DELIVERYSPEED_X BOBBYR_LOCATION_BOX_X //LAPTOP_SCREEN_UL_X + 276
#define BOBBYR_DELIVERYSPEED_Y LAPTOP_SCREEN_WEB_UL_Y + 149
-#define BOBBYR_CLEAR_ORDER_X LAPTOP_SCREEN_UL_X + 309
+#define BOBBYR_CLEAR_ORDER_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-11) //309
#define BOBBYR_CLEAR_ORDER_Y LAPTOP_SCREEN_WEB_UL_Y + 268 //LAPTOP_SCREEN_WEB_UL_Y + 252
-#define BOBBYR_ACCEPT_ORDER_X LAPTOP_SCREEN_UL_X + 299
+#define BOBBYR_ACCEPT_ORDER_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-21) //299
#define BOBBYR_ACCEPT_ORDER_Y LAPTOP_SCREEN_WEB_UL_Y + 303 //LAPTOP_SCREEN_WEB_UL_Y + 288
#define BOBBYR_GRID_ROW_OFFSET 20
@@ -162,10 +162,10 @@
#define BOBBYR_ORDER_FORM_TITLE_Y BOBBYR_BOBBY_RAY_TITLE_Y + 37
#define BOBBYR_ORDER_FORM_TITLE_WIDTH 159
-#define BOBBYR_BACK_BUTTON_X 130
+#define BOBBYR_BACK_BUTTON_X (SCREEN_WIDTH/2-190) //130
#define BOBBYR_BACK_BUTTON_Y 400 + LAPTOP_SCREEN_WEB_DELTA_Y + 4
-#define BOBBYR_HOME_BUTTON_X 515
+#define BOBBYR_HOME_BUTTON_X (SCREEN_WIDTH/2+195) //515
#define BOBBYR_HOME_BUTTON_Y BOBBYR_BACK_BUTTON_Y
#define BOBBYR_SHIPMENT_BUTTON_X ( LAPTOP_SCREEN_UL_X + ( LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X - 75 ) / 2)
@@ -209,7 +209,7 @@
#define BOBBYR_TOTAL_SAVED_AREA_X BOBBYR_ORDERGRID_X + 221
#define BOBBYR_TOTAL_SAVED_AREA_Y BOBBYR_ORDERGRID_Y + 237
-#define BOBBYR_USED_WARNING_X 122
+#define BOBBYR_USED_WARNING_X (SCREEN_WIDTH/2-198) //122
#define BOBBYR_USED_WARNING_Y 382 + LAPTOP_SCREEN_WEB_DELTA_Y
@@ -220,9 +220,9 @@
-UINT16 gShippingSpeedAreas[] = {585, 218 + LAPTOP_SCREEN_WEB_DELTA_Y,
- 585, 238 + LAPTOP_SCREEN_WEB_DELTA_Y,
- 585, 258 + LAPTOP_SCREEN_WEB_DELTA_Y};
+UINT16 gShippingSpeedAreas[] = {(SCREEN_WIDTH/2+265), 218 + LAPTOP_SCREEN_WEB_DELTA_Y,
+ (SCREEN_WIDTH/2+265), 238 + LAPTOP_SCREEN_WEB_DELTA_Y,
+ (SCREEN_WIDTH/2+265), 258 + LAPTOP_SCREEN_WEB_DELTA_Y};
// Identifier for the images
static SGPVObject* guiBobbyRayTitle;
@@ -967,7 +967,9 @@
DrawTextToScreen(sTemp, usGridX + BOBBYR_GRID_FIFTH_COLUMN_X - 2, usGridY + BOBBYR_GRAND_TOTAL_Y, BOBBYR_GRID_FIFTH_COLUMN_WIDTH, BOBBYR_ORDER_DYNAMIC_TEXT_FONT, BOBBYR_ORDER_DYNAMIC_TEXT_COLOR, FONT_MCOLOR_BLACK, RIGHT_JUSTIFIED);
}
- InvalidateRegion(333,326,374,400);
+ // Mythrell - Res fix
+ InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
+ // InvalidateRegion(333,326,374,400);
}
@@ -1017,7 +1019,8 @@
else
ColorFillVideoSurfaceArea( FRAME_BUFFER, gShippingSpeedAreas[4], gShippingSpeedAreas[5], gShippingSpeedAreas[4]+SHIPPING_SPEED_LIGHT_WIDTH, gShippingSpeedAreas[5]+SHIPPING_SPEED_LIGHT_HEIGHT, Get16BPPColor( FROMRGB( 0, 0, 0 ) ) );
- InvalidateRegion(585, 218, 594, 287);
+ InvalidateRegion((SCREEN_WIDTH/2+265), 218, (SCREEN_WIDTH/2+274), 287);
+ //InvalidateRegion(585, 218, 594, 287);
}
diff -Nru a/Build/Laptop/BobbyRMisc.cc b/Build/Laptop/BobbyRMisc.cc
--- a/Build/Laptop/BobbyRMisc.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/BobbyRMisc.cc 2010-02-24 00:46:35.526935000 +0100
@@ -17,8 +17,11 @@
void EnterBobbyRMisc()
{
// load the background graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiMiscBackground = AddVideoObjectFromFile(LAPTOPDIR "/miscbackground_800x600.sti");
+#else
guiMiscBackground = AddVideoObjectFromFile(LAPTOPDIR "/miscbackground.sti");
-
+#endif
// load the gunsgrid graphic and add it
guiMiscGrid = AddVideoObjectFromFile(LAPTOPDIR "/miscgrid.sti");
diff -Nru a/Build/Laptop/BobbyRShipments.cc b/Build/Laptop/BobbyRShipments.cc
--- a/Build/Laptop/BobbyRShipments.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/BobbyRShipments.cc 2010-02-24 00:46:35.526935000 +0100
@@ -22,30 +22,30 @@
#define BOBBYR_SHIPMENT_STATIC_TEXT_COLOR 145
-#define BOBBYR_BOBBY_RAY_TITLE_X LAPTOP_SCREEN_UL_X + 171
+#define BOBBYR_BOBBY_RAY_TITLE_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-149) //171
#define BOBBYR_BOBBY_RAY_TITLE_Y LAPTOP_SCREEN_WEB_UL_Y + 3
#define BOBBYR_ORDER_FORM_TITLE_X BOBBYR_BOBBY_RAY_TITLE_X
#define BOBBYR_ORDER_FORM_TITLE_Y BOBBYR_BOBBY_RAY_TITLE_Y + 37
#define BOBBYR_ORDER_FORM_TITLE_WIDTH 159
-#define BOBBYR_SHIPMENT_DELIVERY_GRID_X LAPTOP_SCREEN_UL_X + 2
+#define BOBBYR_SHIPMENT_DELIVERY_GRID_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-318) // 2
#define BOBBYR_SHIPMENT_DELIVERY_GRID_Y BOBBYR_SHIPMENT_ORDER_GRID_Y
#define BOBBYR_SHIPMENT_DELIVERY_GRID_WIDTH 183
-#define BOBBYR_SHIPMENT_ORDER_GRID_X LAPTOP_SCREEN_UL_X + 223
+#define BOBBYR_SHIPMENT_ORDER_GRID_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-97) //223
#define BOBBYR_SHIPMENT_ORDER_GRID_Y LAPTOP_SCREEN_WEB_UL_Y + 62
-#define BOBBYR_SHIPMENT_BACK_BUTTON_X 130
-#define BOBBYR_SHIPMENT_HOME_BUTTON_X 515
+#define BOBBYR_SHIPMENT_BACK_BUTTON_X (SCREEN_WIDTH/2-190) //130
+#define BOBBYR_SHIPMENT_HOME_BUTTON_X (SCREEN_WIDTH/2+195) //515
#define BOBBYR_SHIPMENT_BUTTON_Y (400 + LAPTOP_SCREEN_WEB_DELTA_Y + 4)
#define BOBBYR_SHIPMENT_NUM_PREVIOUS_SHIPMENTS 13
-#define BOBBYR_SHIPMENT_ORDER_NUM_X 116//LAPTOP_SCREEN_UL_X + 9
+#define BOBBYR_SHIPMENT_ORDER_NUM_X (SCREEN_WIDTH/2-204) //116//LAPTOP_SCREEN_UL_X + 9
#define BOBBYR_SHIPMENT_ORDER_NUM_START_Y 144
#define BOBBYR_SHIPMENT_ORDER_NUM_WIDTH 64
@@ -55,7 +55,7 @@
#define BOBBYR_SHIPMENT_SHIPMENT_ORDER_NUM_X BOBBYR_SHIPMENT_ORDER_NUM_X
#define BOBBYR_SHIPMENT_SHIPMENT_ORDER_NUM_Y 117
-#define BOBBYR_SHIPMENT_NUM_ITEMS_X 183//BOBBYR_SHIPMENT_ORDER_NUM_X+BOBBYR_SHIPMENT_ORDER_NUM_WIDTH+2
+#define BOBBYR_SHIPMENT_NUM_ITEMS_X (SCREEN_WIDTH/2-137) //183//BOBBYR_SHIPMENT_ORDER_NUM_X+BOBBYR_SHIPMENT_ORDER_NUM_WIDTH+2
#define BOBBYR_SHIPMENT_NUM_ITEMS_Y BOBBYR_SHIPMENT_SHIPMENT_ORDER_NUM_Y
#define BOBBYR_SHIPMENT_NUM_ITEMS_WIDTH 116
diff -Nru a/Build/Laptop/BobbyRUsed.cc b/Build/Laptop/BobbyRUsed.cc
--- a/Build/Laptop/BobbyRUsed.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/BobbyRUsed.cc 2010-02-24 00:46:35.526935000 +0100
@@ -18,8 +18,11 @@
void EnterBobbyRUsed()
{
// load the background graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiUsedBackground = AddVideoObjectFromFile(LAPTOPDIR "/usedbackground_800x600.sti");
+#else
guiUsedBackground = AddVideoObjectFromFile(LAPTOPDIR "/usedbackground.sti");
-
+#endif
// load the gunsgrid graphic and add it
guiUsedGrid = AddVideoObjectFromFile(LAPTOPDIR "/usedgrid.sti");
diff -Nru a/Build/Laptop/CharProfile.cc b/Build/Laptop/CharProfile.cc
--- a/Build/Laptop/CharProfile.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/CharProfile.cc 2010-02-24 00:46:51.676422000 +0100
@@ -583,7 +583,8 @@
giIMPButton[0] = CreateIconAndTextButton( giIMPButtonImage[0], pImpButtonText[ 19 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 15, LAPTOP_SCREEN_WEB_UL_Y + 360, MSYS_PRIORITY_HIGH,
+ LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-305, LAPTOP_SCREEN_WEB_UL_Y + 360, MSYS_PRIORITY_HIGH,
+// LAPTOP_SCREEN_UL_X + 15, LAPTOP_SCREEN_WEB_UL_Y + 360, MSYS_PRIORITY_HIGH,
BtnIMPCancelCallback);
giIMPButton[0]->SpecifyTextSubOffsets(0, -1, FALSE);
diff -Nru a/Build/Laptop/EMail.cc b/Build/Laptop/EMail.cc
--- a/Build/Laptop/EMail.cc 2010-08-11 08:25:18.448518000 +0200
+++ b/Build/Laptop/EMail.cc 2010-02-24 00:46:51.676422000 +0100
@@ -28,7 +28,7 @@
#define MAX_MESSAGES_PAGE 18 // max number of messages per page
-#define VIEWER_X 155
+#define VIEWER_X (SCREEN_WIDTH/2-165) //155
#define VIEWER_Y 70 + 21
#define MAIL_STRING_SIZE 320
@@ -95,15 +95,15 @@
#define EMAIL_LIST_WINDOW_Y 22
// email columns
-#define SENDER_X LAPTOP_SCREEN_UL_X+65
+#define SENDER_X LAPTOP_SCREEN_UL_X+(SCREEN_WIDTH/2-255) //65
-#define DATE_X LAPTOP_SCREEN_UL_X+428
+#define DATE_X LAPTOP_SCREEN_UL_X+(SCREEN_WIDTH/2+108) //428
-#define SUBJECT_X LAPTOP_SCREEN_UL_X+175
+#define SUBJECT_X LAPTOP_SCREEN_UL_X+(SCREEN_WIDTH/2-145) //175
#define SUBJECT_WIDTH 254 //526-245
-#define INDIC_X 128
+#define INDIC_X (SCREEN_WIDTH/2-192)//128
-#define LINE_WIDTH 592-121
+#define LINE_WIDTH LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X //592-121
#define MESSAGE_X 5 //17
#define MESSAGE_WIDTH 528-125//150
@@ -115,7 +115,7 @@
#define MESSAGE_HEADER_X VIEWER_X+4
-#define EMAIL_WARNING_X 210
+#define EMAIL_WARNING_X (SCREEN_WIDTH/2-110) //210
#define EMAIL_WARNING_Y 140
#define EMAIL_WARNING_WIDTH 254
#define EMAIL_WARNING_HEIGHT 138
@@ -133,18 +133,18 @@
// the max number of pages to an email
#define MAX_NUMBER_EMAIL_PAGES 100
-#define NEXT_PAGE_X LAPTOP_UL_X + 562
+#define NEXT_PAGE_X LAPTOP_SCREEN_LR_X-22 //562
#define NEXT_PAGE_Y 51
#define PREVIOUS_PAGE_X NEXT_PAGE_X - 21
-#define ENVELOPE_BOX_X 116
+#define ENVELOPE_BOX_X (SCREEN_WIDTH/2-204) //116
-#define FROM_BOX_X 166
+#define FROM_BOX_X (SCREEN_WIDTH/2-154)//166
-#define SUBJECT_BOX_X 276
+#define SUBJECT_BOX_X (SCREEN_WIDTH/2-44) //276
-#define DATE_BOX_X 530
+#define DATE_BOX_X (SCREEN_WIDTH/2+210) //530
#define FROM_BOX_Y 51 + EMAIL_TOP_BAR_HEIGHT
@@ -160,7 +160,7 @@
#define INDENT_X_WIDTH ( 544 - 481 )
// the position of the page number being displayed in the email program
-#define PAGE_NUMBER_X 516
+#define PAGE_NUMBER_X PREVIOUS_PAGE_X-46 //516
#define PAGE_NUMBER_Y 58
// defines for location of message 'title'/'headers'
@@ -294,11 +294,17 @@
iCurrentPage = LaptopSaveInfo.iCurrentEmailPage;
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ // title bar
+ guiEmailTitle = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar_800x600.sti");
+ // the list background
+ guiEmailBackground = AddVideoObjectFromFile(LAPTOPDIR "/mailwindow_800x600.sti");
+#else
// title bar
guiEmailTitle = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar.sti");
-
// the list background
guiEmailBackground = AddVideoObjectFromFile(LAPTOPDIR "/mailwindow.sti");
+#endif
// the indication/notification box
guiEmailIndicator = AddVideoObjectFromFile(LAPTOPDIR "/mailindicator.sti");
@@ -1063,8 +1069,8 @@
{
if (giMessagePage == 0) return;
--giMessagePage;
+ RenderEmail();
MarkButtonsDirty();
- fReDrawScreenFlag = TRUE;
}
@@ -1120,7 +1126,7 @@
UINT16 const y = VIEWER_MESSAGE_BODY_START_Y + iViewerPositionY;
UINT16 const w = MESSAGE_WIDTH + 3;
UINT16 const h = 227;
- MSYS_DefineRegion(&g_mail_scroll_region, x, y, x + w, y + h, MSYS_PRIORITY_HIGHEST - 2, MSYS_NO_CURSOR, NULL, MailScrollRegionCallback);
+ MSYS_DefineRegion(&g_mail_scroll_region, x, y, x + w, y + h, MSYS_PRIORITY_HIGHEST - 1, MSYS_NO_CURSOR, NULL, MailScrollRegionCallback);
}
gfPageButtonsWereCreated = TRUE;
}
diff -Nru a/Build/Laptop/Files.cc b/Build/Laptop/Files.cc
--- a/Build/Laptop/Files.cc 2009-10-11 18:06:02.587030000 +0200
+++ b/Build/Laptop/Files.cc 2010-02-24 00:46:51.676422000 +0100
@@ -81,9 +81,9 @@
#define FILES_LIST_H 12
#define LENGTH_OF_ENRICO_FILE 68
#define MAX_FILE_MESSAGE_PAGE_SIZE 325
-#define PREVIOUS_FILE_PAGE_BUTTON_X 553
+#define PREVIOUS_FILE_PAGE_BUTTON_X (LAPTOP_SCREEN_LR_X-55) //553
#define PREVIOUS_FILE_PAGE_BUTTON_Y 53
-#define NEXT_FILE_PAGE_BUTTON_X 577
+#define NEXT_FILE_PAGE_BUTTON_X PREVIOUS_FILE_PAGE_BUTTON_X+24 //577
#define NEXT_FILE_PAGE_BUTTON_Y PREVIOUS_FILE_PAGE_BUTTON_Y
#define FILES_COUNTER_1_WIDTH 7
@@ -312,11 +312,20 @@
{
// load files video objects into memory
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ // title bar
+ guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar_800x600.sti");
+ // top portion of the screen background
+ guiTOP = AddVideoObjectFromFile(LAPTOPDIR "/fileviewer_800x600.sti");
+ // top portion of the screen background
+#else
// title bar
guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar.sti");
// top portion of the screen background
guiTOP = AddVideoObjectFromFile(LAPTOPDIR "/fileviewer.sti");
+#endif
+
}
diff -Nru a/Build/Laptop/Finances.cc b/Build/Laptop/Finances.cc
--- a/Build/Laptop/Finances.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/Finances.cc 2010-02-24 00:46:51.676422000 +0100
@@ -41,6 +41,8 @@
// the global defines
// graphical positions
+// Mythrell - Resolution offset, could use some dynamic way to do this
+#define RESOLUTION_OFFSET_X 165
#define TOP_X 0+LAPTOP_SCREEN_UL_X
#define TOP_Y LAPTOP_SCREEN_UL_Y
#define BLOCK_HEIGHT 10
@@ -85,7 +87,7 @@
#define RECORD_HEADER_Y 90
-#define PAGE_NUMBER_X TOP_X+297 //345
+#define PAGE_NUMBER_X TOP_X+RESOLUTION_OFFSET_X+297//TOP_X+297 //345
#define PAGE_NUMBER_Y TOP_Y+33
@@ -100,10 +102,10 @@
// button positions
-#define FIRST_PAGE_X 505
-#define NEXT_BTN_X 553//577
-#define PREV_BTN_X 529//553
-#define LAST_PAGE_X 577
+#define NEXT_BTN_X (LAPTOP_SCREEN_LR_X-55) //553//577
+#define FIRST_PAGE_X NEXT_BTN_X - 48 //505
+#define PREV_BTN_X FIRST_PAGE_X+24 //529//553
+#define LAST_PAGE_X NEXT_BTN_X+24 //577
#define BTN_Y 53
@@ -328,11 +330,17 @@
{
// load Finance video objects into memory
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ // title bar
+ guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar_800x600.sti");
+ // top portion of the screen background
+ guiTOP = AddVideoObjectFromFile(LAPTOPDIR "/financeswindow_800x600.sti");
+#else
// title bar
guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar.sti");
-
// top portion of the screen background
guiTOP = AddVideoObjectFromFile(LAPTOPDIR "/financeswindow.sti");
+#endif
// black divider line - long ( 480 length)
guiLONGLINE = AddVideoObjectFromFile(LAPTOPDIR "/divisionline480.sti");
diff -Nru a/Build/Laptop/Florist.cc b/Build/Laptop/Florist.cc
--- a/Build/Laptop/Florist.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/Florist.cc 2010-02-24 00:46:51.676422000 +0100
@@ -24,32 +24,32 @@
#define FLORIST_BACKGROUND_WIDTH 125
#define FLORIST_BACKGROUND_HEIGHT 100
-#define FLORIST_BIG_TITLE_X LAPTOP_SCREEN_UL_X + 113
+#define FLORIST_BIG_TITLE_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 207//113
#define FLORIST_BIG_TITLE_Y LAPTOP_SCREEN_WEB_UL_Y + 0
-#define FLORIST_SMALL_TITLE_X LAPTOP_SCREEN_UL_X + 195
+#define FLORIST_SMALL_TITLE_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 125//195
#define FLORIST_SMALL_TITLE_Y LAPTOP_SCREEN_WEB_UL_Y + 0
#define FLORIST_SMALL_TITLE_WIDTH 100
#define FLORIST_SMALL_TITLE_HEIGHT 49
-#define FLORIST_FIRST_BULLET_X LAPTOP_SCREEN_UL_X + 5
+#define FLORIST_FIRST_BULLET_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 315//5
#define FLORIST_FIRST_BULLET_Y LAPTOP_SCREEN_WEB_UL_Y + 135
#define FLORIST_BULLET_OFFSET_Y 54
#define FLORIST_NUMBER_OF_BULLETS 4
-#define FLORIST_GALLERY_BUTTON_X LAPTOP_SCREEN_UL_X + 210
+#define FLORIST_GALLERY_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 110//210
#define FLORIST_GALLERY_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 360
-#define FLORIST_FIRST_SENTENCE_COLUMN_TEXT_X LAPTOP_SCREEN_UL_X + 53
+#define FLORIST_FIRST_SENTENCE_COLUMN_TEXT_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-267//53
#define FLORIST_FIRST_SENTENCE_COLUMN_TEXT_WIDTH 136
-#define FLORIST_SECOND_SENTENCE_COLUMN_TEXT_X LAPTOP_SCREEN_UL_X + 200
+#define FLORIST_SECOND_SENTENCE_COLUMN_TEXT_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-120//200
#define FLORIST_SECOND_SENTENCE_COLUMN_TEXT_WIDTH 300
-#define FLORIST_COMPANY_INFO_TEXT_X LAPTOP_SCREEN_UL_X + 117
+#define FLORIST_COMPANY_INFO_TEXT_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-203//117
#define FLORIST_COMPANY_INFO_TEXT_WIDTH 290
#define FLORIST_COMPANY_INFO_LINE_1_Y LAPTOP_SCREEN_WEB_UL_Y + 79
@@ -162,9 +162,12 @@
void InitFloristDefaults()
{
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
// load the Florist background graphic and add it
+ guiFloristBackground = AddVideoObjectFromFile(LAPTOPDIR "/leafback_800x600.sti");
+#else
guiFloristBackground = AddVideoObjectFromFile(LAPTOPDIR "/leafback.sti");
-
+#endif
//if its the first page
if( guiCurrentLaptopMode == LAPTOP_MODE_FLORIST )
{
diff -Nru a/Build/Laptop/Florist_Cards.cc b/Build/Laptop/Florist_Cards.cc
--- a/Build/Laptop/Florist_Cards.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/Florist_Cards.cc 2010-02-24 00:46:51.676422000 +0100
@@ -17,7 +17,7 @@
#define FLORIST_CARDS_SENTENCE_FONT FONT12ARIAL
#define FLORIST_CARDS_SENTENCE_COLOR FONT_MCOLOR_WHITE
-#define FLORIST_CARD_FIRST_POS_X LAPTOP_SCREEN_UL_X + 7
+#define FLORIST_CARD_FIRST_POS_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-313 //7
#define FLORIST_CARD_FIRST_POS_Y LAPTOP_SCREEN_WEB_UL_Y + 72
#define FLORIST_CARD_FIRST_OFFSET_X 174
#define FLORIST_CARD_FIRST_OFFSET_Y 109
@@ -32,7 +32,7 @@
#define FLORIST_CARD_TITLE_SENTENCE_Y LAPTOP_SCREEN_WEB_UL_Y + 53
#define FLORIST_CARD_TITLE_SENTENCE_WIDTH LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X
-#define FLORIST_CARD_BACK_BUTTON_X LAPTOP_SCREEN_UL_X + 8
+#define FLORIST_CARD_BACK_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-312//8
#define FLORIST_CARD_BACK_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 12
#define FLORIST_CARD_
diff -Nru a/Build/Laptop/Florist_Gallery.cc b/Build/Laptop/Florist_Gallery.cc
--- a/Build/Laptop/Florist_Gallery.cc 2009-09-06 16:59:59.698273000 +0200
+++ b/Build/Laptop/Florist_Gallery.cc 2010-02-24 00:46:51.676422000 +0100
@@ -30,11 +30,11 @@
#define FLOR_GALLERY_FLOWER_DESC_TEXT_FONT FONT12ARIAL
#define FLOR_GALLERY_FLOWER_DESC_TEXT_COLOR FONT_MCOLOR_WHITE
-#define FLOR_GALLERY_BACK_BUTTON_X (LAPTOP_SCREEN_UL_X + 8)
-#define FLOR_GALLERY_NEXT_BUTTON_X (LAPTOP_SCREEN_UL_X + 420)
+#define FLOR_GALLERY_BACK_BUTTON_X (LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-312) //8)
+#define FLOR_GALLERY_NEXT_BUTTON_X (LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2+100) //420)
#define FLOR_GALLERY_BUTTON_Y (LAPTOP_SCREEN_WEB_UL_Y + 12)
-#define FLOR_GALLERY_FLOWER_BUTTON_X LAPTOP_SCREEN_UL_X + 7
+#define FLOR_GALLERY_FLOWER_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-313//7
#define FLOR_GALLERY_FLOWER_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 74
//#define FLOR_GALLERY_FLOWER_BUTTON_OFFSET_X 250
diff -Nru a/Build/Laptop/Florist_Order_Form.cc b/Build/Laptop/Florist_Order_Form.cc
--- a/Build/Laptop/Florist_Order_Form.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/Florist_Order_Form.cc 2010-02-24 00:46:51.676422000 +0100
@@ -34,39 +34,39 @@
#define FLOWER_ORDER_STATIC_TEXT_COLOR 76
-#define FLOWER_ORDER_FLOWER_BOX_X LAPTOP_SCREEN_UL_X + 7
+#define FLOWER_ORDER_FLOWER_BOX_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-313//7
#define FLOWER_ORDER_FLOWER_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 63
#define FLOWER_ORDER_FLOWER_BOX_WIDTH 75
#define FLOWER_ORDER_FLOWER_BOX_HEIGHT 100
-#define FLOWER_ORDER_SENTIMENT_BOX_X LAPTOP_SCREEN_UL_X + 14
+#define FLOWER_ORDER_SENTIMENT_BOX_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-306//14
#define FLOWER_ORDER_SENTIMENT_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 226
-#define FLOWER_ORDER_NAME_BOX_X LAPTOP_SCREEN_UL_X + 60
+#define FLOWER_ORDER_NAME_BOX_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-260 //60
#define FLOWER_ORDER_NAME_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 314 - FLOWER_ORDER_SMALLER_PS_OFFSET_Y
#define FLOWER_ORDER_SMALLER_PS_OFFSET_Y 27
-#define FLOWER_ORDER_DELIVERY_LOCATION_X LAPTOP_SCREEN_UL_X + 205
+#define FLOWER_ORDER_DELIVERY_LOCATION_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-115//205
#define FLOWER_ORDER_DELIVERY_LOCATION_Y LAPTOP_SCREEN_WEB_UL_Y + 143
#define FLOWER_ORDER_DELIVERY_LOCATION_WIDTH 252
#define FLOWER_ORDER_DELIVERY_LOCATION_HEIGHT 20
-#define FLOWER_ORDER_BACK_BUTTON_X LAPTOP_SCREEN_UL_X + 8
+#define FLOWER_ORDER_BACK_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-312//8
#define FLOWER_ORDER_BACK_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 12
-#define FLOWER_ORDER_SEND_BUTTON_X LAPTOP_SCREEN_UL_X + 124
+#define FLOWER_ORDER_SEND_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-196 //124
#define FLOWER_ORDER_SEND_BUTTON_Y LAPTOP_SCREEN_WEB_UL_Y + 364
-#define FLOWER_ORDER_CLEAR_BUTTON_X LAPTOP_SCREEN_UL_X + 215
+#define FLOWER_ORDER_CLEAR_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-105//215
#define FLOWER_ORDER_CLEAR_BUTTON_Y FLOWER_ORDER_SEND_BUTTON_Y
-#define FLOWER_ORDER_GALLERY_BUTTON_X LAPTOP_SCREEN_UL_X + 305
+#define FLOWER_ORDER_GALLERY_BUTTON_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-15//305
#define FLOWER_ORDER_GALLERY_BUTTON_Y FLOWER_ORDER_SEND_BUTTON_Y
-#define FLOWER_ORDER_FLOWER_NAME_X LAPTOP_SCREEN_UL_X + 94
+#define FLOWER_ORDER_FLOWER_NAME_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-226 //94
#define FLOWER_ORDER_FLOWER_NAME_Y LAPTOP_SCREEN_WEB_UL_Y + 68
#define FLOWER_ORDER_BOUQUET_NAME_X FLOWER_ORDER_FLOWER_NAME_X
@@ -107,16 +107,16 @@
#define FLOWER_ORDER_CHECK_WIDTH 20
#define FLOWER_ORDER_CHECK_HEIGHT 17
-#define FLOWER_ORDER_CHECK_BOX_0_X LAPTOP_SCREEN_UL_X + 186
+#define FLOWER_ORDER_CHECK_BOX_0_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-134 //186
#define FLOWER_ORDER_CHECK_BOX_0_Y FLOWER_ORDER_DATE_Y - 3
-#define FLOWER_ORDER_CHECK_BOX_1_X LAPTOP_SCREEN_UL_X + 270
+#define FLOWER_ORDER_CHECK_BOX_1_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 50 //270
#define FLOWER_ORDER_CHECK_BOX_1_Y FLOWER_ORDER_CHECK_BOX_0_Y
-#define FLOWER_ORDER_CHECK_BOX_2_X LAPTOP_SCREEN_UL_X + 123
+#define FLOWER_ORDER_CHECK_BOX_2_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 197 //123
#define FLOWER_ORDER_CHECK_BOX_2_Y FLOWER_ORDER_ADDITIONAL_SERVICES_Y
-#define FLOWER_ORDER_CHECK_BOX_3_X LAPTOP_SCREEN_UL_X + 269
+#define FLOWER_ORDER_CHECK_BOX_3_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 51 //269
#define FLOWER_ORDER_CHECK_BOX_3_Y FLOWER_ORDER_CHECK_BOX_2_Y
#define FLOWER_ORDER_CHECK_BOX_4_X FLOWER_ORDER_CHECK_BOX_2_X
diff -Nru a/Build/Laptop/Funeral.cc b/Build/Laptop/Funeral.cc
--- a/Build/Laptop/Funeral.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/Funeral.cc 2010-02-24 00:46:51.676422000 +0100
@@ -26,19 +26,19 @@
#define FUNERAL_RIP_SHADOW_COLOR FONT_MCOLOR_DKWHITE
-#define FUNERAL_MCGILICUTTYS_SIGN_X LAPTOP_SCREEN_UL_X + 92
+#define FUNERAL_MCGILICUTTYS_SIGN_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-228 //92
#define FUNERAL_MCGILICUTTYS_SIGN_Y LAPTOP_SCREEN_WEB_UL_Y + 0
-#define FUNERAL_MORTUARY_SIGN_X LAPTOP_SCREEN_UL_X + 58
+#define FUNERAL_MORTUARY_SIGN_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-262//58
#define FUNERAL_MORTUARY_SIGN_Y LAPTOP_SCREEN_WEB_UL_Y + 43
-#define FUNERAL_LEFT_COLUMN_X LAPTOP_SCREEN_UL_X + 0
-#define FUNERAL_LEFT_COLUMN_Y LAPTOP_SCREEN_WEB_UL_Y + 43
+#define FUNERAL_LEFT_COLUMN_X LAPTOP_SCREEN_UL_X + 0
+#define FUNERAL_LEFT_COLUMN_Y LAPTOP_SCREEN_WEB_UL_Y //+ 43
-#define FUNERAL_RIGHT_COLUMN_X LAPTOP_SCREEN_UL_X + 442
-#define FUNERAL_RIGHT_COLUMN_Y LAPTOP_SCREEN_WEB_UL_Y + 43
+#define FUNERAL_RIGHT_COLUMN_X LAPTOP_SCREEN_LR_X - 116 // LAPTOP_SCREEN_UL_X + 442
+#define FUNERAL_RIGHT_COLUMN_Y LAPTOP_SCREEN_WEB_UL_Y //+ 43
-#define FUNERAL_LINK_1_X LAPTOP_SCREEN_UL_X + 37
+#define FUNERAL_LINK_1_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-283//37
#define FUNERAL_LINK_1_Y LAPTOP_SCREEN_WEB_UL_Y + 329
#define FUNERAL_LINK_1_WIDTH 85
#define FUNERAL_LINK_1_HEIGHT 60
@@ -56,8 +56,8 @@
#define FUNERAL_SENTENCE_WIDTH 380
-#define FUNERAL_SENTENCE_1_X LAPTOP_SCREEN_UL_X + 60
-#define FUNERAL_SENTENCE_1_Y LAPTOP_SCREEN_WEB_UL_Y + 164
+#define FUNERAL_SENTENCE_1_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-260 //60
+#define FUNERAL_SENTENCE_1_Y LAPTOP_SCREEN_WEB_UL_Y + 164
#define FUNERAL_SENTENCE_2_X FUNERAL_SENTENCE_1_X
#define FUNERAL_SENTENCE_2_Y LAPTOP_SCREEN_WEB_UL_Y + 198
@@ -72,7 +72,7 @@
#define FUNERAL_SENTENCE_5_Y LAPTOP_SCREEN_WEB_UL_Y + 303
-#define FUNERAL_CLOSED_RIP_SIGN_X LAPTOP_SCREEN_UL_X + 72
+#define FUNERAL_CLOSED_RIP_SIGN_X LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-248//72
#define FUNERAL_CLOSED_RIP_SIGN_Y LAPTOP_SCREEN_WEB_UL_Y + 151
#define FUNERAL_CLOSED_WIDTH 364
#define FUNERAL_CLOSED_HEIGHT 204
@@ -117,14 +117,20 @@
guiClosedSign = AddVideoObjectFromFile(ImageFile);
// load the Left column graphic and add it
+ // load the Marble graphic and add it
+ // load the right column graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiLeftColumn = AddVideoObjectFromFile(LAPTOPDIR "/leftcolumn_800x600.sti");
+ guiMarbleBackground = AddVideoObjectFromFile(LAPTOPDIR "/marble_800x600.sti");
+ guiRightColumn = AddVideoObjectFromFile(LAPTOPDIR "/rightcolumn_800x600.sti");
+#else
guiLeftColumn = AddVideoObjectFromFile(LAPTOPDIR "/leftcolumn.sti");
-
+ guiMarbleBackground = AddVideoObjectFromFile(LAPTOPDIR "/marble.sti");
+ guiRightColumn = AddVideoObjectFromFile(LAPTOPDIR "/rightcolumn.sti");
+#endif
// load the Link carving graphic and add it
guiLinkCarving = AddVideoObjectFromFile(LAPTOPDIR "/linkcarving.sti");
- // load the Marble graphic and add it
- guiMarbleBackground = AddVideoObjectFromFile(LAPTOPDIR "/marble.sti");
-
// load the McGillicuttys sign graphic and add it
ImageFile = GetMLGFilename(MLG_MCGILLICUTTYS);
guiMcGillicuttys = AddVideoObjectFromFile(ImageFile);
@@ -133,8 +139,7 @@
ImageFile = GetMLGFilename(MLG_MORTUARY);
guiMortuary = AddVideoObjectFromFile(ImageFile);
- // load the right column graphic and add it
- guiRightColumn = AddVideoObjectFromFile(LAPTOPDIR "/rightcolumn.sti");
+
usPosX = FUNERAL_LINK_1_X;
diff -Nru a/Build/Laptop/History.cc b/Build/Laptop/History.cc
--- a/Build/Laptop/History.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/History.cc 2010-02-24 00:46:51.676422000 +0100
@@ -66,8 +66,8 @@
#define SIZE_OF_HISTORY_FILE_RECORD ( sizeof( UINT8 ) + sizeof( UINT8 ) + sizeof( UINT32 ) + sizeof( UINT16 ) + sizeof( UINT16 ) + sizeof( UINT8 ) + sizeof( UINT8 ) )
// button positions
-#define NEXT_BTN_X 577
-#define PREV_BTN_X 553
+#define PREV_BTN_X (LAPTOP_SCREEN_LR_X-55) //553
+#define NEXT_BTN_X PREV_BTN_X + 24//577
#define BTN_Y 53
// graphics handles
@@ -204,11 +204,17 @@
{
// load History video objects into memory
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ // title bar
+ guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar_800x600.sti");
+ // top portion of the screen background
+ guiTOP = AddVideoObjectFromFile(LAPTOPDIR "/historywindow_800x600.sti");
+#else
// title bar
guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar.sti");
-
// top portion of the screen background
guiTOP = AddVideoObjectFromFile(LAPTOPDIR "/historywindow.sti");
+#endif
// shaded line
guiSHADELINE = AddVideoObjectFromFile(LAPTOPDIR "/historylines.sti");
diff -Nru a/Build/Laptop/IMPVideoObjects.cc b/Build/Laptop/IMPVideoObjects.cc
--- a/Build/Laptop/IMPVideoObjects.cc 2009-09-06 16:59:59.698273000 +0200
+++ b/Build/Laptop/IMPVideoObjects.cc 2010-02-24 00:47:47.723863000 +0100
@@ -53,7 +53,11 @@
void LoadProfileBackGround(void)
{
// this procedure will load in the graphics for the generic background
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiBACKGROUND = AddVideoObjectFromFile(LAPTOPDIR "/metalbackground_800x600.sti");
+#else
guiBACKGROUND = AddVideoObjectFromFile(LAPTOPDIR "/metalbackground.sti");
+#endif
}
@@ -66,7 +70,9 @@
void RenderProfileBackGround( void )
{
- INT32 iCounter = 0;
+ WebPageTileBackground(4, 4, CHAR_PROFILE_BACKGROUND_TILE_WIDTH, CHAR_PROFILE_BACKGROUND_TILE_HEIGHT, guiBACKGROUND);
+/*
+ INT32 iCounter = 0;
// this procedure will render the generic backgound to the screen
@@ -81,8 +87,8 @@
BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 1 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 2 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 3 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
- }
-
+ }
+*/
// dirty buttons
MarkButtonsDirty( );
@@ -346,7 +352,8 @@
BltVideoObject(FRAME_BUFFER, guiATTRIBUTEFRAME, 2, LAPTOP_SCREEN_UL_X + sX + 134, LAPTOP_SCREEN_WEB_UL_Y + sY + sCurrentY);
- RenderAttrib2IndentFrame(350, 42 );
+ RenderAttrib2IndentFrame(SCREEN_WIDTH / 2 + 30, 42 );
+// RenderAttrib2IndentFrame(350, 42 );
// amt of bonus pts
DrawBonusPointsRemaining( );
diff -Nru a/Build/Laptop/IMP_AboutUs.cc b/Build/Laptop/IMP_AboutUs.cc
--- a/Build/Laptop/IMP_AboutUs.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_AboutUs.cc 2010-02-24 00:47:47.723863000 +0100
@@ -52,12 +52,16 @@
RenderProfileBackGround( );
// the IMP symbol
- RenderIMPSymbol( 106, 1 );
+ RenderIMPSymbol( (SCREEN_WIDTH/2-214), 1 ); // 106, 1
// about us indent
- RenderAboutUsIndentFrame( 8, 130 );
- // about us indent
- RenderAboutUsIndentFrame( 258, 130 );
+ RenderAboutUsIndentFrame( (SCREEN_WIDTH/2-312), 130 );
+// RenderAboutUsIndentFrame( 8, 130 );
+
+ // about us indent
+ RenderAboutUsIndentFrame( (SCREEN_WIDTH/2-62), 130 );
+// RenderAboutUsIndentFrame( 258, 130 );
+
}
@@ -76,8 +80,9 @@
giIMPAboutUsButton[0] = CreateIconAndTextButton( giIMPAboutUsButtonImage[0], pImpButtonText[6], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 216, LAPTOP_SCREEN_WEB_UL_Y + 360, MSYS_PRIORITY_HIGH,
- BtnIMPBackCallback);
+ LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-104), LAPTOP_SCREEN_WEB_UL_Y + 360, MSYS_PRIORITY_HIGH,
+//LAPTOP_SCREEN_UL_X + 216, LAPTOP_SCREEN_WEB_UL_Y + 360, MSYS_PRIORITY_HIGH,
+ BtnIMPBackCallback);
giIMPAboutUsButton[0]->SetCursor(CURSOR_WWW);
}
diff -Nru a/Build/Laptop/IMP_Attribute_Entrance.cc b/Build/Laptop/IMP_Attribute_Entrance.cc
--- a/Build/Laptop/IMP_Attribute_Entrance.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_Attribute_Entrance.cc 2010-02-24 00:47:47.723863000 +0100
@@ -34,7 +34,8 @@
RenderProfileBackGround( );
// avg merc indent
- RenderAvgMercIndentFrame(90, 40 );
+ RenderAvgMercIndentFrame(SCREEN_WIDTH/2-230, 40 );
+ // RenderAvgMercIndentFrame(90, 40 );
}
@@ -61,7 +62,8 @@
giIMPAttributeEntranceButton[0] = CreateIconAndTextButton( giIMPAttributeEntranceButtonImage[ 0 ], pImpButtonText[ 13 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 136, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+// LAPTOP_SCREEN_UL_X + 136, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+ LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-184, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
BtnIMPAttributeBeginCallback);
giIMPAttributeEntranceButton[0]->SetCursor(CURSOR_WWW);
diff -Nru a/Build/Laptop/IMP_Attribute_Finish.cc b/Build/Laptop/IMP_Attribute_Finish.cc
--- a/Build/Laptop/IMP_Attribute_Finish.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_Attribute_Finish.cc 2010-02-24 00:47:47.723863000 +0100
@@ -45,7 +45,8 @@
RenderProfileBackGround( );
// indent for text
- RenderBeginIndent( 110, 93 );
+ RenderBeginIndent( SCREEN_WIDTH/2-220, 93 );
+ // RenderBeginIndent( 110, 93 );
}
@@ -69,7 +70,8 @@
giIMPAttributeFinishButtonImage[idx] = img;
const INT16 text_col = FONT_WHITE;
const INT16 shadow_col = DEFAULT_SHADOW;
- GUIButtonRef const btn = CreateIconAndTextButton(img, text, FONT12ARIAL, text_col, shadow_col, text_col, shadow_col, LAPTOP_SCREEN_UL_X + 130, y, MSYS_PRIORITY_HIGH, click);
+ GUIButtonRef const btn = CreateIconAndTextButton(img, text, FONT12ARIAL, text_col, shadow_col, text_col, shadow_col, LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-190, y, MSYS_PRIORITY_HIGH, click);
+// GUIButtonRef const btn = CreateIconAndTextButton(img, text, FONT12ARIAL, text_col, shadow_col, text_col, shadow_col, LAPTOP_SCREEN_UL_X + 130, y, MSYS_PRIORITY_HIGH, click);
giIMPAttributeFinishButton[idx] = btn;
btn->SetCursor(CURSOR_WWW);
}
diff -Nru a/Build/Laptop/IMP_Attribute_Selection.cc b/Build/Laptop/IMP_Attribute_Selection.cc
--- a/Build/Laptop/IMP_Attribute_Selection.cc 2009-10-11 18:06:04.147458000 +0200
+++ b/Build/Laptop/IMP_Attribute_Selection.cc 2010-02-24 00:47:47.723863000 +0100
@@ -134,11 +134,14 @@
void RenderIMPAttributeSelection(void)
{
RenderProfileBackGround();
- RenderAttributeFrame(51, 87);
+ RenderAttributeFrame(SCREEN_WIDTH/2-269, 87);
+// RenderAttributeFrame(51, 87);
RenderAttributeBoxes();
- RenderAttrib1IndentFrame(51, 30);
+ RenderAttrib1IndentFrame(SCREEN_WIDTH/2-269, 30);
+// RenderAttrib1IndentFrame(51, 30);
- if (!fReviewStats) RenderAttrib2IndentFrame(350, 42);
+ if (!fReviewStats) RenderAttrib2IndentFrame(SCREEN_WIDTH/2+30, 42);
+// if (!fReviewStats) RenderAttrib2IndentFrame(350, 42);
// reset rerender flag
fHasAnySlidingBarMoved = FALSE;
@@ -242,8 +245,10 @@
}
else
{
- RenderAttributeFrameForIndex(51, 87, uiBarToReRender);
-/*
+ RenderAttributeFrameForIndex(SCREEN_WIDTH/2-269, 87, uiBarToReRender);
+// RenderAttributeFrameForIndex(51, 87, uiBarToReRender);
+
+ /*
// print text for screen
PrintImpText();
@@ -379,7 +384,8 @@
giIMPAttributeSelectionButtonImage[0], pImpButtonText[11], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 136, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+ LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 184, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+// LAPTOP_SCREEN_UL_X + 136, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
BtnIMPAttributeFinishCallback
);
giIMPAttributeSelectionButton[0]->SetCursor(CURSOR_WWW);
@@ -453,8 +459,10 @@
{
const INT16 y = LAPTOP_SCREEN_WEB_UL_Y + (99 + iCounter / 2 * 20);
// left/right buttons - decrement/increment stat
- giIMPAttributeSelectionSliderButton[iCounter ] = QuickCreateButton(giIMPAttributeSelectionSliderButtonImage[0], LAPTOP_SCREEN_UL_X + 163, y, MSYS_PRIORITY_HIGHEST - 1, BtnIMPAttributeSliderLeftCallback);
- giIMPAttributeSelectionSliderButton[iCounter + 1] = QuickCreateButton(giIMPAttributeSelectionSliderButtonImage[1], LAPTOP_SCREEN_UL_X + 419, y, MSYS_PRIORITY_HIGHEST - 1, BtnIMPAttributeSliderRightCallback);
+ giIMPAttributeSelectionSliderButton[iCounter ] = QuickCreateButton(giIMPAttributeSelectionSliderButtonImage[0], LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 157, y, MSYS_PRIORITY_HIGHEST - 1, BtnIMPAttributeSliderLeftCallback);
+ giIMPAttributeSelectionSliderButton[iCounter + 1] = QuickCreateButton(giIMPAttributeSelectionSliderButtonImage[1], LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 + 99, y, MSYS_PRIORITY_HIGHEST - 1, BtnIMPAttributeSliderRightCallback);
+// giIMPAttributeSelectionSliderButton[iCounter ] = QuickCreateButton(giIMPAttributeSelectionSliderButtonImage[0], LAPTOP_SCREEN_UL_X + 163, y, MSYS_PRIORITY_HIGHEST - 1, BtnIMPAttributeSliderLeftCallback);
+// giIMPAttributeSelectionSliderButton[iCounter + 1] = QuickCreateButton(giIMPAttributeSelectionSliderButtonImage[1], LAPTOP_SCREEN_UL_X + 419, y, MSYS_PRIORITY_HIGHEST - 1, BtnIMPAttributeSliderRightCallback);
giIMPAttributeSelectionSliderButton[iCounter ]->SetCursor(CURSOR_WWW);
giIMPAttributeSelectionSliderButton[iCounter + 1]->SetCursor(CURSOR_WWW);
@@ -734,9 +742,10 @@
// just reviewing, don't blit stats
if (fReviewStats) return;
+ // set font color
SetFontAttributes(FONT12ARIAL, FONT_WHITE);
- mprintf(LAPTOP_SCREEN_UL_X + 425, LAPTOP_SCREEN_WEB_UL_Y + 51, L"%d", iCurrentBonusPoints);
- InvalidateRegion(LAPTOP_SCREEN_UL_X + 425, LAPTOP_SCREEN_WEB_UL_Y + 51, LAPTOP_SCREEN_UL_X + 475, LAPTOP_SCREEN_WEB_UL_Y + 71);
+ mprintf(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 + 105, LAPTOP_SCREEN_WEB_UL_Y + 51, L"%d", iCurrentBonusPoints);
+ InvalidateRegion(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 + 105, LAPTOP_SCREEN_WEB_UL_Y + 51, LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 + 155, LAPTOP_SCREEN_WEB_UL_Y + 71);
}
diff -Nru a/Build/Laptop/IMP_Attribute_Selection.h b/Build/Laptop/IMP_Attribute_Selection.h
--- a/Build/Laptop/IMP_Attribute_Selection.h 2007-08-19 00:28:16.922386000 +0200
+++ b/Build/Laptop/IMP_Attribute_Selection.h 2008-07-10 14:59:40.080965000 +0200
@@ -13,7 +13,7 @@
extern BOOLEAN fReturnStatus;
// starting point of skill boxes on bar
-#define SKILL_SLIDE_START_X 186
+#define SKILL_SLIDE_START_X SCREEN_WIDTH/2-134//186
#define SKILL_SLIDE_START_Y 100
#define SKILL_SLIDE_HEIGHT 20
diff -Nru a/Build/Laptop/IMP_Begin_Screen.cc b/Build/Laptop/IMP_Begin_Screen.cc
--- a/Build/Laptop/IMP_Begin_Screen.cc 2009-11-28 21:01:38.434574000 +0100
+++ b/Build/Laptop/IMP_Begin_Screen.cc 2010-02-24 00:47:47.723863000 +0100
@@ -38,11 +38,11 @@
#define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138
#define NICK_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 195
-#define MALE_BOX_X 2 + 192 + LAPTOP_SCREEN_UL_X
+#define MALE_BOX_X 2 + LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 128//192
#define MALE_BOX_Y 254 + LAPTOP_SCREEN_WEB_UL_Y
#define MALE_BOX_WIDTH 24 - 2
#define MALE_BOX_HEIGHT 24 - 2
-#define FEMALE_BOX_X 2 + 302 + LAPTOP_SCREEN_UL_X
+#define FEMALE_BOX_X 2 + LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 + 18//302
#define MAX_FULL_NAME 29
#define MAX_NICK_NAME 8
#define FULL_NAME_REGION_WIDTH 230
@@ -82,8 +82,8 @@
UINT8 ubTextEnterMode =0;
// cursor position
-UINT32 uiNickNameCursorPosition =196 + LAPTOP_SCREEN_UL_X;
-UINT32 uiFullNameCursorPosition =196 + LAPTOP_SCREEN_UL_X;
+UINT32 uiNickNameCursorPosition = LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 124;//196;
+UINT32 uiFullNameCursorPosition = LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2 - 124;//196 ;
// whther a new char has been entered ( to force redraw)
BOOLEAN fNewCharInString = FALSE;
@@ -111,8 +111,10 @@
wcscpy( pNickNameString, pNickName );
uiFullNameCharacterPosition = wcslen( pFullNameString );
uiNickNameCharacterPosition = wcslen( pNickNameString );
- uiFullNameCursorPosition = 196 + LAPTOP_SCREEN_UL_X + StringPixLength( pFullNameString, FONT14ARIAL );
- uiNickNameCursorPosition = 196 + LAPTOP_SCREEN_UL_X + StringPixLength( pNickNameString, FONT14ARIAL );
+ uiFullNameCursorPosition = SCREEN_WIDTH/2-124 + LAPTOP_SCREEN_UL_X + StringPixLength( pFullNameString, FONT14ARIAL );
+ uiNickNameCursorPosition = SCREEN_WIDTH/2-124 + LAPTOP_SCREEN_UL_X + StringPixLength( pNickNameString, FONT14ARIAL );
+// uiFullNameCursorPosition = 196 + LAPTOP_SCREEN_UL_X + StringPixLength( pFullNameString, FONT14ARIAL );
+// uiNickNameCursorPosition = 196 + LAPTOP_SCREEN_UL_X + StringPixLength( pNickNameString, FONT14ARIAL );
// set gender too
bGenderFlag = fCharacterIsMale;
@@ -120,8 +122,11 @@
}
else
{
- uiNickNameCursorPosition =196 + LAPTOP_SCREEN_UL_X;
- uiFullNameCursorPosition =196 + LAPTOP_SCREEN_UL_X;
+ // Mythrell - Res fixes
+ uiNickNameCursorPosition =SCREEN_WIDTH/2-124 + LAPTOP_SCREEN_UL_X;
+ uiFullNameCursorPosition =SCREEN_WIDTH/2-124 + LAPTOP_SCREEN_UL_X;
+// uiNickNameCursorPosition =196 + LAPTOP_SCREEN_UL_X;
+// uiFullNameCursorPosition =196 + LAPTOP_SCREEN_UL_X;
uiFullNameCharacterPosition = 0;
uiNickNameCharacterPosition = 0;
bGenderFlag = -1;
@@ -167,18 +172,26 @@
RenderProfileBackGround( );
// fourth button image 3X
- RenderButton4Image( 64, 118 );
+
+ RenderButton4Image( SCREEN_WIDTH / 2 - 256, 118 );
+ RenderButton4Image( SCREEN_WIDTH / 2 - 256, 178 );
+ RenderButton4Image( SCREEN_WIDTH / 2 - 256, 238 );
+
+/* RenderButton4Image( 64, 118 );
RenderButton4Image( 64, 178 );
- RenderButton4Image( 64, 238 );
+ RenderButton4Image( 64, 238 );*/
// the begin screen indents
- RenderBeginIndent( 105, 58);
+ RenderBeginIndent( SCREEN_WIDTH/2-215, 58);
+ // RenderBeginIndent( 105, 58);
// full name indent
- RenderNameIndent( 194, 132);
+ RenderNameIndent( SCREEN_WIDTH/2-126, 132);
+// RenderNameIndent( 194, 132);
// nick name
- RenderNickNameIndent( 194, 192);
+ RenderNickNameIndent( SCREEN_WIDTH/2-126, 192);
+// RenderNickNameIndent( 194, 192);
// render warning string
Print8CharacterOnlyString( );
@@ -261,7 +274,8 @@
giIMPBeginScreenButton[0] = CreateIconAndTextButton( giIMPBeginScreenButtonImage[ 0 ], pImpButtonText[ 6 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 134, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+ LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-186, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+// LAPTOP_SCREEN_UL_X + 134, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
BtnIMPBeginScreenDoneCallback);
giIMPBeginScreenButton[0]->SetCursor(CURSOR_WWW);
@@ -364,7 +378,7 @@
{
if (pos_char >= buf_len) break;
UINT32 const new_pos_cursor = pos_cursor + GetCharWidth(FONT14ARIAL, c);
- if (new_pos_cursor > LAPTOP_SCREEN_UL_X + 196 + max_w) break;
+ if (new_pos_cursor > LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124 + max_w) break;
pos_cursor = new_pos_cursor;
buf[ pos_char] = c;
buf[++pos_char] = L'\0';
@@ -521,12 +535,16 @@
}
// restore background
- RenderNameIndent( 194, 132);
- RenderNickNameIndent(194, 192);
+ RenderNameIndent( SCREEN_WIDTH/2-126, 132);
+ RenderNickNameIndent( SCREEN_WIDTH/2-126, 192);
+// RenderNameIndent( 194, 132);
+// RenderNickNameIndent(194, 192);
SetFontAttributes(FONT14ARIAL, 184);
- MPrint(LAPTOP_SCREEN_UL_X + 196, FULL_NAME_CURSOR_Y + 1, pFullNameString);
- MPrint(LAPTOP_SCREEN_UL_X + 196, NICK_NAME_CURSOR_Y + 4, pNickNameString);
+
+ MPrint(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124, FULL_NAME_CURSOR_Y + 1, pFullNameString);
+ MPrint(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124, NICK_NAME_CURSOR_Y + 4, pNickNameString);
+// MPrint(LAPTOP_SCREEN_UL_X + 196, NICK_NAME_CURSOR_Y + 4, pNickNameString);
fNewCharInString = FALSE;
fReDrawScreenFlag = TRUE;
@@ -621,12 +639,12 @@
return;
// full name region
- MSYS_DefineRegion(&gIMPBeginScreenMouseRegions[ 0 ] , LAPTOP_SCREEN_UL_X + 196, LAPTOP_SCREEN_WEB_UL_Y + 135, LAPTOP_SCREEN_UL_X + 196 + FULL_NAME_REGION_WIDTH, LAPTOP_SCREEN_WEB_UL_Y + 135 + 24, MSYS_PRIORITY_HIGH, CURSOR_WWW,
+ MSYS_DefineRegion(&gIMPBeginScreenMouseRegions[ 0 ] , LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124, LAPTOP_SCREEN_WEB_UL_Y + 135, LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124 + FULL_NAME_REGION_WIDTH, LAPTOP_SCREEN_WEB_UL_Y + 135 + 24, MSYS_PRIORITY_HIGH, CURSOR_WWW,
MSYS_NO_CALLBACK, SelectFullNameRegionCallBack);
// nick name region
- MSYS_DefineRegion(&gIMPBeginScreenMouseRegions[ 1 ] , LAPTOP_SCREEN_UL_X + 196, LAPTOP_SCREEN_WEB_UL_Y + 195, LAPTOP_SCREEN_UL_X + 196 + NICK_NAME_REGION_WIDTH, LAPTOP_SCREEN_WEB_UL_Y + 195 + 24, MSYS_PRIORITY_HIGH, CURSOR_WWW,
+ MSYS_DefineRegion(&gIMPBeginScreenMouseRegions[ 1 ] , LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124, LAPTOP_SCREEN_WEB_UL_Y + 195, LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-124 + NICK_NAME_REGION_WIDTH, LAPTOP_SCREEN_WEB_UL_Y + 195 + 24, MSYS_PRIORITY_HIGH, CURSOR_WWW,
MSYS_NO_CALLBACK, SelectNickNameRegionCallBack);
// IMP_MALE gender area
@@ -723,8 +741,10 @@
static void RenderGender(void)
{
// this procedure will render the gender of the character int he appropriate box
- RenderGenderIndent(192, 252);
- RenderGenderIndent(302, 252);
+ RenderGenderIndent(SCREEN_WIDTH/2-128, 252);
+ RenderGenderIndent(SCREEN_WIDTH/2+18, 252);
+// RenderGenderIndent(192, 252);
+// RenderGenderIndent(302, 252);
INT32 x;
switch (bGenderFlag)
@@ -742,7 +762,10 @@
static void Print8CharacterOnlyString(void)
{
SetFontAttributes(FONT12ARIAL, FONT_BLACK, NO_SHADOW);
- MPrint(430, LAPTOP_SCREEN_WEB_DELTA_Y + 228, pIMPBeginScreenStrings);
+ MPrint(SCREEN_WIDTH/2+110, LAPTOP_SCREEN_WEB_DELTA_Y + 228, pIMPBeginScreenStrings);
+// MPrint(430, LAPTOP_SCREEN_WEB_DELTA_Y + 228, pIMPBeginScreenStrings);
+
+ // reset shadow
SetFontShadow(DEFAULT_SHADOW);
}
diff -Nru a/Build/Laptop/IMP_Confirm.cc b/Build/Laptop/IMP_Confirm.cc
--- a/Build/Laptop/IMP_Confirm.cc 2009-09-30 23:57:08.623888000 +0200
+++ b/Build/Laptop/IMP_Confirm.cc 2010-02-24 00:47:47.723863000 +0100
@@ -86,7 +86,8 @@
RenderProfileBackGround( );
// indent
- RenderAvgMercIndentFrame(90, 40 );
+ RenderAvgMercIndentFrame(SCREEN_WIDTH / 2 - 230, 40 );
+// RenderAvgMercIndentFrame(90, 40 );
// highlight answer
PrintImpText( );
@@ -114,7 +115,8 @@
giIMPConfirmButtonImage[idx] = img;
const INT16 text_col = FONT_WHITE;
const INT16 shadow_col = DEFAULT_SHADOW;
- GUIButtonRef const btn = CreateIconAndTextButton(img, text, FONT12ARIAL, text_col, shadow_col, text_col, shadow_col, LAPTOP_SCREEN_UL_X + 136, y, MSYS_PRIORITY_HIGH, click);
+ GUIButtonRef const btn = CreateIconAndTextButton(img, text, FONT12ARIAL, text_col, shadow_col, text_col, shadow_col, LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 184, y, MSYS_PRIORITY_HIGH, click);
+// GUIButtonRef const btn = CreateIconAndTextButton(img, text, FONT12ARIAL, text_col, shadow_col, text_col, shadow_col, LAPTOP_SCREEN_UL_X + 136, y, MSYS_PRIORITY_HIGH, click);
giIMPConfirmButton[idx] = btn;
btn->SetCursor(CURSOR_WWW);
}
diff -Nru a/Build/Laptop/IMP_Finish.cc b/Build/Laptop/IMP_Finish.cc
--- a/Build/Laptop/IMP_Finish.cc 2009-08-10 21:54:43.584768000 +0200
+++ b/Build/Laptop/IMP_Finish.cc 2010-02-24 00:47:47.723863000 +0100
@@ -77,7 +77,8 @@
RenderCharFullName( );
// indent for text
- RenderBeginIndent( 110, 50 );
+ RenderBeginIndent( SCREEN_WIDTH/2-210, 50 );
+ // RenderBeginIndent( 110, 50 );
}
@@ -126,27 +127,33 @@
const INT16 dy = LAPTOP_SCREEN_WEB_UL_Y;
// the start over button button
- MakeButton(0, LAPTOPDIR "/button_2.sti", pImpButtonText[7], dx + 136, dy + 174, BtnIMPFinishStartOverCallback);
+ MakeButton(0, LAPTOPDIR "/button_2.sti", pImpButtonText[7], dx + SCREEN_WIDTH / 2 - 184, dy + 174, BtnIMPFinishStartOverCallback);
+// MakeButton(0, "LAPTOP/button_2.sti", pImpButtonText[7], dx + 136, dy + 174, BtnIMPFinishStartOverCallback);
// the done button
- MakeButton(1, LAPTOPDIR "/button_2.sti", pImpButtonText[6], dx + 136, dy + 114, BtnIMPFinishDoneCallback);
+ MakeButton(1, LAPTOPDIR "/button_2.sti", pImpButtonText[6], dx + SCREEN_WIDTH / 2 - 184, dy + 114, BtnIMPFinishDoneCallback);
+// MakeButton(1, "LAPTOP/button_2.sti", pImpButtonText[6], dx + 136, dy + 114, BtnIMPFinishDoneCallback);
// the personality button
- MakeButton(2, LAPTOPDIR "/button_8.sti", pImpButtonText[2], dx + 13, dy + 245, BtnIMPFinishPersonalityCallback);
+ MakeButton(2, LAPTOPDIR "/button_8.sti", pImpButtonText[2], dx + SCREEN_WIDTH / 2 - 307, dy + 245, BtnIMPFinishPersonalityCallback);
+// MakeButton(2, "LAPTOP/button_8.sti", pImpButtonText[2], dx + 13, dy + 245, BtnIMPFinishPersonalityCallback);
giIMPFinishButton[2]->SpecifyIcon(guiANALYSE, 0, 33, 23, FALSE);
// the attribs button
- MakeButton(3, LAPTOPDIR "/button_8.sti", pImpButtonText[3], dx + 133, dy + 245, BtnIMPFinishAttributesCallback);
+ MakeButton(3, LAPTOPDIR "/button_8.sti", pImpButtonText[3], dx + SCREEN_WIDTH / 2 - 187, dy + 245, BtnIMPFinishAttributesCallback);
+// MakeButton(3, "LAPTOP/button_8.sti", pImpButtonText[3], dx + 133, dy + 245, BtnIMPFinishAttributesCallback);
giIMPFinishButton[3]->SpecifyIcon(guiATTRIBUTEGRAPH, 0, 25, 25, FALSE);
// the portrait button
- MakeButton(4, LAPTOPDIR "/button_8.sti", pImpButtonText[4], dx + 253, dy + 245, BtnIMPMainPagePortraitCallback);
+ MakeButton(4, LAPTOPDIR "/button_8.sti", pImpButtonText[4], dx + SCREEN_WIDTH / 2 - 67, dy + 245, BtnIMPMainPagePortraitCallback);
+// MakeButton(4, "LAPTOP/button_8.sti", pImpButtonText[4], dx + 253, dy + 245, BtnIMPMainPagePortraitCallback);
giIMPFinishButton[4]->SpecifyIcon(guiCHARACTERPORTRAIT, 0, 33, 23, FALSE);
// the voice button
wchar_t sString[128];
swprintf(sString, lengthof(sString), pImpButtonText[5], iCurrentVoices + 1);
- MakeButton(5, LAPTOPDIR "/button_8.sti", sString, dx + 373, dy + 245, BtnIMPMainPageVoiceCallback);
+ MakeButton(5, LAPTOPDIR "/button_8.sti", sString, dx + SCREEN_WIDTH / 2 + 53, dy + 245, BtnIMPMainPageVoiceCallback);
+// MakeButton(5, "LAPTOP/button_8.sti", sString, dx + 373, dy + 245, BtnIMPMainPageVoiceCallback);
giIMPFinishButton[5]->SpecifyIcon(guiSMALLSILHOUETTE, 0, 33, 23, FALSE);
}
diff -Nru a/Build/Laptop/IMP_HomePage.cc b/Build/Laptop/IMP_HomePage.cc
--- a/Build/Laptop/IMP_HomePage.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_HomePage.cc 2010-02-24 00:47:47.723863000 +0100
@@ -40,7 +40,7 @@
static void BtnIMPAboutUsCallback(GUI_BUTTON *btn, INT32 reason);
// position defines
-#define IMP_PLAYER_ACTIVATION_STRING_X LAPTOP_SCREEN_UL_X + 261
+#define IMP_PLAYER_ACTIVATION_STRING_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-59) //261
#define IMP_PLAYER_ACTIVATION_STRING_Y LAPTOP_SCREEN_WEB_UL_Y + 336
#define CURSOR_Y IMP_PLAYER_ACTIVATION_STRING_Y - 5
@@ -92,19 +92,24 @@
RenderProfileBackGround( );
// the IMP symbol
- RenderIMPSymbol( 107, 45 );
+ RenderIMPSymbol( (SCREEN_WIDTH/2-213), 45 );
+// RenderIMPSymbol( 107, 45 );
// the second button image
- RenderButton2Image( 134, 314);
+ RenderButton2Image( (SCREEN_WIDTH/2-186), 314);
+// RenderButton2Image( 134, 314);
// render the indents
//activation indents
- RenderActivationIndent( 257, 328 );
+ RenderActivationIndent( (SCREEN_WIDTH/2-63), 328 );
+// RenderActivationIndent( 257, 328 );
// the two font page indents
- RenderFrontPageIndent( 3, 64 );
- RenderFrontPageIndent( 396,64 );
+// RenderFrontPageIndent( 3, 64 );
+// RenderFrontPageIndent( 396,64 );
+ RenderFrontPageIndent( (SCREEN_WIDTH/2-317), 64 );
+ RenderFrontPageIndent( (SCREEN_WIDTH/2+76),64 );
// render the activation string
@@ -157,7 +162,8 @@
}
// restore background
- RenderActivationIndent( 257, 328 );
+// RenderActivationIndent( 257, 328 );
+ RenderActivationIndent( (SCREEN_WIDTH/2-63), 328 );
SetFontAttributes(FONT14ARIAL, 184);
MPrint(IMP_PLAYER_ACTIVATION_STRING_X, IMP_PLAYER_ACTIVATION_STRING_Y, pPlayerActivationString);
@@ -360,7 +366,8 @@
giIMPHomePageButton[0] = CreateIconAndTextButton( giIMPHomePageButtonImage[0], pImpButtonText[ 0 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 286 - 106, LAPTOP_SCREEN_WEB_UL_Y + 248 - 48, MSYS_PRIORITY_HIGH,
+ LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-34) - 106, LAPTOP_SCREEN_WEB_UL_Y + 248 - 48, MSYS_PRIORITY_HIGH,
+// LAPTOP_SCREEN_UL_X + 286 - 106, LAPTOP_SCREEN_WEB_UL_Y + 248 - 48, MSYS_PRIORITY_HIGH,
BtnIMPAboutUsCallback);
giIMPHomePageButton[0]->SetCursor(CURSOR_WWW);
diff -Nru a/Build/Laptop/IMP_MainPage.cc b/Build/Laptop/IMP_MainPage.cc
--- a/Build/Laptop/IMP_MainPage.cc 2009-10-11 18:06:18.837506000 +0200
+++ b/Build/Laptop/IMP_MainPage.cc 2010-02-24 00:47:47.723863000 +0100
@@ -3,6 +3,7 @@
#include "IMP_MainPage.h"
#include "CharProfile.h"
#include "IMPVideoObjects.h"
+#include "Local.h"
#include "MessageBoxScreen.h"
#include "Overhead.h"
#include "Text.h"
@@ -105,7 +106,9 @@
// the IMP symbol
//RenderIMPSymbol( 106, 1 );
// indent
- RenderMainIndentFrame( 164, 74 );
+// Mythrell - Resolution fix
+// RenderMainIndentFrame( 164, 74 );
+ RenderMainIndentFrame( (SCREEN_WIDTH/2-156), 74 );
}
@@ -153,21 +156,28 @@
const INT16 dy = LAPTOP_SCREEN_WEB_UL_Y;
// the back button button
- MakeButton(0, LAPTOPDIR "/button_3.sti", pImpButtonText[19], dx + 15, dy + 360, BtnIMPMainPageBackCallback);
+
+// Mythrell - This function has many of my resolution fixes
+ MakeButton(0, LAPTOPDIR "/button_3.sti", pImpButtonText[19], dx + (SCREEN_WIDTH/2-305), dy + 360, BtnIMPMainPageBackCallback);
+ // MakeButton(0, "LAPTOP/button_3.sti", pImpButtonText[19], dx + 15, dy + 360, BtnIMPMainPageBackCallback);
giIMPMainPageButton[0]->SpecifyTextSubOffsets(0, -1, FALSE);
// the begin profiling button
const wchar_t* const profiling_text = (iCurrentProfileMode == 0 || iCurrentProfileMode > 2 ? pImpButtonText[1] : pImpButtonText[22]);
- MakeButton(1, LAPTOPDIR "/button_2.sti", profiling_text, dx + 136, dy + 174, BtnIMPMainPageBeginCallback);
+ MakeButton(1, LAPTOPDIR "/button_2.sti", profiling_text, dx + (SCREEN_WIDTH/2-184), dy + 174, BtnIMPMainPageBeginCallback);
+// MakeButton(1, "LAPTOP/button_2.sti", profiling_text, dx + 136, dy + 174, BtnIMPMainPageBeginCallback);
// the personality button
- MakeButton(2, LAPTOPDIR "/button_8.sti", pImpButtonText[2], dx + 13, dy + 245, BtnIMPMainPagePersonalityCallback);
+ MakeButton(2, LAPTOPDIR "/button_8.sti", pImpButtonText[2], dx + (SCREEN_WIDTH/2-307), dy + 245, BtnIMPMainPagePersonalityCallback);
+// MakeButton(2, "LAPTOP/button_8.sti", pImpButtonText[2], dx + 13, dy + 245, BtnIMPMainPagePersonalityCallback);
// the attribs button
- MakeButton(3, LAPTOPDIR "/button_8.sti", pImpButtonText[3], dx + 133, dy + 245, BtnIMPMainPageAttributesCallback);
+ MakeButton(3, LAPTOPDIR "/button_8.sti", pImpButtonText[3], dx + (SCREEN_WIDTH/2-307)+120, dy + 245, BtnIMPMainPageAttributesCallback);
+// MakeButton(3, "LAPTOP/button_8.sti", pImpButtonText[3], dx + 133, dy + 245, BtnIMPMainPageAttributesCallback);
// the portrait button
- MakeButton(4, LAPTOPDIR "/button_8.sti", pImpButtonText[4], dx + 253, dy + 245, BtnIMPMainPagePortraitCallback);
+ MakeButton(4, LAPTOPDIR "/button_8.sti", pImpButtonText[4], dx + (SCREEN_WIDTH/2-307)+120*2, dy + 245, BtnIMPMainPagePortraitCallback);
+// MakeButton(4, "LAPTOP/button_8.sti", pImpButtonText[4], dx + 253, dy + 245, BtnIMPMainPagePortraitCallback);
// the voice button
wchar_t sString[128];
@@ -179,7 +189,8 @@
{
swprintf(sString, lengthof(sString), pImpButtonText[25]);
}
- MakeButton(5, LAPTOPDIR "/button_8.sti", sString, dx + 373, dy + 245, BtnIMPMainPageVoiceCallback);
+ MakeButton(5, LAPTOPDIR "/button_8.sti", sString, dx + (SCREEN_WIDTH/2-307)+120*3, dy + 245, BtnIMPMainPageVoiceCallback);
+// MakeButton(5, "LAPTOP/button_8.sti", sString, dx + 373, dy + 245, BtnIMPMainPageVoiceCallback);
}
@@ -439,7 +450,7 @@
// this procedure will create masks for the char generation main page
/* create masks for the personality, attrib, portrait and page buttons on the
* character generation main page */
- UINT16 x = LAPTOP_SCREEN_UL_X + 13;
+ UINT16 x = LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-307);
UINT16 const y = LAPTOP_SCREEN_WEB_UL_Y + 245;
UINT16 const w = 115;
UINT16 const h = 93;
diff -Nru a/Build/Laptop/IMP_Personality_Entrance.cc b/Build/Laptop/IMP_Personality_Entrance.cc
--- a/Build/Laptop/IMP_Personality_Entrance.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_Personality_Entrance.cc 2010-02-24 00:47:47.723863000 +0100
@@ -37,7 +37,9 @@
//RenderIMPSymbol( 112, 30 );
// indent
- RenderAvgMercIndentFrame(90, 40 );
+ // Mythrell - Resolution fix - Text backround indent pic
+ RenderAvgMercIndentFrame(SCREEN_WIDTH/2-230, 40 );
+ //RenderAvgMercIndentFrame(90, 40 );
}
@@ -65,7 +67,8 @@
giIMPPersonalityEntranceButton[0] = CreateIconAndTextButton( giIMPPersonalityEntranceButtonImage[0], pImpButtonText[ 1 ], FONT12ARIAL,
FONT_WHITE, DEFAULT_SHADOW,
FONT_WHITE, DEFAULT_SHADOW,
- LAPTOP_SCREEN_UL_X + 136, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+ LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-184, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
+// LAPTOP_SCREEN_UL_X + 136, LAPTOP_SCREEN_WEB_UL_Y + 314, MSYS_PRIORITY_HIGH,
BtnIMPPersonalityEntranceDoneCallback);
giIMPPersonalityEntranceButton[0]->SetCursor(CURSOR_WWW);
diff -Nru a/Build/Laptop/IMP_Personality_Finish.cc b/Build/Laptop/IMP_Personality_Finish.cc
--- a/Build/Laptop/IMP_Personality_Finish.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_Personality_Finish.cc 2010-02-24 00:47:47.723863000 +0100
@@ -60,7 +60,8 @@
RenderProfileBackGround( );
// indent for text
- RenderBeginIndent( 110, 93 );
+ RenderBeginIndent( SCREEN_WIDTH/2-210, 93 );
+// RenderBeginIndent( 110, 93 );
// check confirm flag to decide if we have to display appropriate response to button action
if( fConfirmHasBeenSelectedFlag )
@@ -160,8 +161,10 @@
static void CreateIMPPersonalityFinishButtons(void)
{
// this function will create the buttons needed for the IMP personality Finish Page
- MakeButton(0, pImpButtonText[ 9], LAPTOP_SCREEN_UL_X + 90, BtnIMPPersonalityFinishYesCallback); // Yes button
- MakeButton(1, pImpButtonText[10], LAPTOP_SCREEN_UL_X + 276, BtnIMPPersonalityFinishNoCallback); // No button
+ MakeButton(0, pImpButtonText[ 9], LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 230, BtnIMPPersonalityFinishYesCallback); // Yes button
+ MakeButton(1, pImpButtonText[10], LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 44, BtnIMPPersonalityFinishNoCallback); // No button
+// MakeButton(0, pImpButtonText[ 9], LAPTOP_SCREEN_UL_X + 90, BtnIMPPersonalityFinishYesCallback); // Yes button
+// MakeButton(1, pImpButtonText[10], LAPTOP_SCREEN_UL_X + 276, BtnIMPPersonalityFinishNoCallback); // No button
}
@@ -241,7 +244,8 @@
static void CreatePersonalityFinishOkButton(void)
{
// create personality button finish button
- MakeButton(0, pImpButtonText[24], LAPTOP_SCREEN_UL_X + 186, BtnIMPPersonalityFinishOkCallback);
+ MakeButton(0, pImpButtonText[24], LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 134, BtnIMPPersonalityFinishOkCallback);
+// MakeButton(0, pImpButtonText[24], LAPTOP_SCREEN_UL_X + 186, BtnIMPPersonalityFinishOkCallback);
}
diff -Nru a/Build/Laptop/IMP_Personality_Quiz.cc b/Build/Laptop/IMP_Personality_Quiz.cc
--- a/Build/Laptop/IMP_Personality_Quiz.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_Personality_Quiz.cc 2010-02-24 00:47:47.723863000 +0100
@@ -42,8 +42,8 @@
BOOLEAN fStartOverFlag = FALSE;
-#define BTN_FIRST_COLUMN_X 15
-#define BTN_SECOND_COLUMN_X 256
+#define BTN_FIRST_COLUMN_X SCREEN_WIDTH/2-305 //15
+#define BTN_SECOND_COLUMN_X SCREEN_WIDTH / 2 - 64 //256
#define INDENT_OFFSET 55
@@ -174,17 +174,17 @@
// ths Done button
giIMPPersonalityQuizButtonImage[0] = LoadButtonImage(LAPTOPDIR "/button_7.sti", 0, 1);
- giIMPPersonalityQuizButton[0] = MakeButton(giIMPPersonalityQuizButtonImage[0], pImpButtonText[8], dx + 197, dy + 302, BtnIMPPersonalityQuizAnswerConfirmCallback);
+ giIMPPersonalityQuizButton[0] = MakeButton(giIMPPersonalityQuizButtonImage[0], pImpButtonText[8], dx + BTN_FIRST_COLUMN_X + 182, dy + 302, BtnIMPPersonalityQuizAnswerConfirmCallback);
// start over
giIMPPersonalityQuizButtonImage[1] = LoadButtonImage(LAPTOPDIR "/button_5.sti", 0, 1);
giIMPPersonalityQuizButton[1] = MakeButton(giIMPPersonalityQuizButtonImage[1], pImpButtonText[7], dx + BTN_FIRST_COLUMN_X, dy + 302, BtnIMPPersonalityQuizStartOverCallback);
giPreviousQuestionButtonImage = LoadButtonImage(LAPTOPDIR "/button_3.sti", 0, 1);
- giPreviousQuestionButton = MakeButton(giPreviousQuestionButtonImage, pImpButtonText[12], dx + 197, dy + 361, PreviousQuestionButtonCallback);
+ giPreviousQuestionButton = MakeButton(giPreviousQuestionButtonImage, pImpButtonText[12], dx + BTN_FIRST_COLUMN_X + 182, dy + 361, PreviousQuestionButtonCallback);
giNextQuestionButtonImage = LoadButtonImage(LAPTOPDIR "/button_3.sti", 0, 1);
- giNextQuestionButton = MakeButton(giNextQuestionButtonImage, pImpButtonText[13], dx + 417, dy + 361, NextQuestionButtonCallback);
+ giNextQuestionButton = MakeButton(giNextQuestionButtonImage, pImpButtonText[13], dx + BTN_FIRST_COLUMN_X + 402, dy + 361, NextQuestionButtonCallback);
giNextQuestionButton->SpecifyTextSubOffsets( 0, -1, FALSE);
giPreviousQuestionButton->SpecifyTextSubOffsets(0, -1, FALSE);
@@ -570,7 +570,8 @@
// the question indent
- RenderQtnIndentFrame( 15, 20 );
+ RenderQtnIndentFrame( SCREEN_WIDTH / 2 - 305, 20 );
+// RenderQtnIndentFrame( 15, 20 );
// the answers
@@ -754,10 +755,12 @@
SetFontAttributes(FONT12ARIAL, FONT_WHITE);
// print current question number
- mprintf(LAPTOP_SCREEN_UL_X + 345, LAPTOP_SCREEN_WEB_UL_Y + 370, L"%d", giCurrentPersonalityQuizQuestion + 1);
+// mprintf(LAPTOP_SCREEN_UL_X + 345, LAPTOP_SCREEN_WEB_UL_Y + 370, L"%d", giCurrentPersonalityQuizQuestion + 1);
+ mprintf(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2+25, LAPTOP_SCREEN_WEB_UL_Y + 370, L"%d", giCurrentPersonalityQuizQuestion + 1);
// total number of questions
- MPrint(LAPTOP_SCREEN_UL_X + 383, LAPTOP_SCREEN_WEB_UL_Y + 370, L"16");
+ MPrint(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2+63, LAPTOP_SCREEN_WEB_UL_Y + 370, L"16");
+// MPrint(LAPTOP_SCREEN_UL_X + 383, LAPTOP_SCREEN_WEB_UL_Y + 370, L"16");
}
diff -Nru a/Build/Laptop/IMP_Portraits.cc b/Build/Laptop/IMP_Portraits.cc
--- a/Build/Laptop/IMP_Portraits.cc 2009-08-10 21:45:11.365218000 +0200
+++ b/Build/Laptop/IMP_Portraits.cc 2010-02-24 00:47:47.723863000 +0100
@@ -56,13 +56,16 @@
RenderProfileBackGround( );
// the Voices frame
- RenderPortraitFrame( 191, 167 );
+ RenderPortraitFrame( SCREEN_WIDTH/2-129, 167 );
+// RenderPortraitFrame( 191, 167 );
// render the current portrait
- RenderPortrait( 200, 176 );
+// RenderPortrait( 200, 176 );
+ RenderPortrait( SCREEN_WIDTH/2-120, 176 );
// indent for the text
- RenderAttrib1IndentFrame( 128, 65);
+ RenderAttrib1IndentFrame( SCREEN_WIDTH/2-192, 65);
+// RenderAttrib1IndentFrame( 128, 65);
// text
PrintImpText( );
@@ -150,9 +153,12 @@
// will create buttons need for the IMP portrait screen
const INT16 dx = LAPTOP_SCREEN_UL_X;
const INT16 dy = LAPTOP_SCREEN_WEB_UL_Y;
- MakeButton(0, LAPTOPDIR "/voicearrows.sti", 1, 3, pImpButtonText[13], dx + 343, dy + 205, BtnIMPPortraitNextCallback); // Next button
- MakeButton(1, LAPTOPDIR "/voicearrows.sti", 0, 2, pImpButtonText[12], dx + 93, dy + 205, BtnIMPPortraitPreviousCallback); // Previous button
- MakeButton(2, LAPTOPDIR "/button_5.sti", 0, 1, pImpButtonText[11], dx + 187, dy + 330, BtnIMPPortraitDoneCallback); // Done button
+ MakeButton(0, LAPTOPDIR "/voicearrows.sti", 1, 3, pImpButtonText[13], dx + (SCREEN_WIDTH / 2 + 23), dy + 205, BtnIMPPortraitNextCallback); // Next button
+ MakeButton(1, LAPTOPDIR "/voicearrows.sti", 0, 2, pImpButtonText[12], dx + (SCREEN_WIDTH / 2 - 227), dy + 205, BtnIMPPortraitPreviousCallback); // Previous button
+ MakeButton(2, LAPTOPDIR "/button_5.sti", 0, 1, pImpButtonText[11], dx + (SCREEN_WIDTH / 2 - 133), dy + 330, BtnIMPPortraitDoneCallback); // Done button
+// MakeButton(0, "LAPTOP/voicearrows.sti", 1, 3, pImpButtonText[13], dx + 343, dy + 205, BtnIMPPortraitNextCallback); // Next button
+// MakeButton(1, "LAPTOP/voicearrows.sti", 0, 2, pImpButtonText[12], dx + 93, dy + 205, BtnIMPPortraitPreviousCallback); // Previous button
+// MakeButton(2, "LAPTOP/button_5.sti", 0, 1, pImpButtonText[11], dx + 187, dy + 330, BtnIMPPortraitDoneCallback); // Done button
}
diff -Nru a/Build/Laptop/IMP_Text_System.cc b/Build/Laptop/IMP_Text_System.cc
--- a/Build/Laptop/IMP_Text_System.cc 2009-09-06 19:12:19.309594000 +0200
+++ b/Build/Laptop/IMP_Text_System.cc 2010-02-24 00:47:47.723863000 +0100
@@ -16,10 +16,12 @@
#define IMP_SEEK_AMOUNT (5 * 80)
-#define IMP_LEFT_IDENT_TEXT_X 116
-#define IMP_RIGHT_IDENT_TEXT_X 509
+#define IMP_LEFT_IDENT_TEXT_X (SCREEN_WIDTH/2-204) //116
+#define IMP_RIGHT_IDENT_TEXT_X (SCREEN_WIDTH/2+189) //509
#define IMP_IDENT_WIDTH 96
+#define IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION (SCREEN_WIDTH/2)-(320-
+
// the length of persona questions
static const INT32 iIMPQuestionLengths[25] =
@@ -28,8 +30,8 @@
};
-#define QTN_FIRST_COLUMN_X 80
-#define QTN_SECOND_COLUMN_X 320
+#define QTN_FIRST_COLUMN_X SCREEN_WIDTH/2-240 // 80
+#define QTN_SECOND_COLUMN_X SCREEN_WIDTH/2 //320
static void LoadAndDisplayIMPText(INT16 sStartX, INT16 sStartY, INT16 sLineLength, INT16 sIMPTextRecordNumber, Font const font, UINT8 ubColor, BOOLEAN fShadow, UINT32 uiFlags)
@@ -68,24 +70,25 @@
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_DELTA_Y + 208, sWidth, IMP_HOME_3, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
LoadAndDisplayIMPText(IMP_LEFT_IDENT_TEXT_X, LAPTOP_SCREEN_WEB_DELTA_Y + 99, IMP_IDENT_WIDTH, IMP_HOME_7, FONT10ARIAL, 142, TRUE, CENTER_JUSTIFIED);
LoadAndDisplayIMPText(IMP_RIGHT_IDENT_TEXT_X, LAPTOP_SCREEN_WEB_DELTA_Y + 99, IMP_IDENT_WIDTH, IMP_HOME_8, FONT10ARIAL, 142, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(258, LAPTOP_SCREEN_WEB_DELTA_Y + 362, 640, IMP_HOME_5, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ LoadAndDisplayIMPText((SCREEN_WIDTH/2-62), LAPTOP_SCREEN_WEB_DELTA_Y + 362, 640, IMP_HOME_5, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+// LoadAndDisplayIMPText(258, LAPTOP_SCREEN_WEB_DELTA_Y + 362, 640, IMP_HOME_5, FONT14ARIAL, FONT_BLACK, FALSE, 0);
LoadAndDisplayIMPText(IMP_LEFT_IDENT_TEXT_X, LAPTOP_SCREEN_WEB_DELTA_Y + 188, IMP_IDENT_WIDTH, IMP_HOME_9, FONT10ARIAL, 142, TRUE, RIGHT_JUSTIFIED);
LoadAndDisplayIMPText(IMP_RIGHT_IDENT_TEXT_X, LAPTOP_SCREEN_WEB_DELTA_Y + 188, IMP_IDENT_WIDTH, IMP_HOME_10, FONT10ARIAL, 142, TRUE, RIGHT_JUSTIFIED);
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_DELTA_Y + 402, sWidth, IMP_HOME_6, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
break;
case IMP_ABOUT_US:
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 17, LAPTOP_SCREEN_WEB_UL_Y + 137, 640 , IMP_ABOUT_US_1 , FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 25, LAPTOP_SCREEN_WEB_UL_Y + 154, 337 - 124, IMP_ABOUT_US_2, FONT10ARIAL, 142, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 25, LAPTOP_SCREEN_WEB_UL_Y + 235, 337 - 124, IMP_ABOUT_US_3, FONT10ARIAL, 142, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 17, LAPTOP_SCREEN_WEB_UL_Y + 260, 640 , IMP_ABOUT_US_10, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 25, LAPTOP_SCREEN_WEB_UL_Y + 280, 337 - 124, IMP_ABOUT_US_4, FONT10ARIAL, 142, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 267, LAPTOP_SCREEN_WEB_UL_Y + 137, 640 , IMP_ABOUT_US_11, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 275, LAPTOP_SCREEN_WEB_UL_Y + 154, 337 - 129, IMP_ABOUT_US_5, FONT10ARIAL, 142, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 267, LAPTOP_SCREEN_WEB_UL_Y + 227, 640 , IMP_ABOUT_US_8, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 275, LAPTOP_SCREEN_WEB_UL_Y + 247, 337 - 129, IMP_ABOUT_US_6, FONT10ARIAL, 142, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 267, LAPTOP_SCREEN_WEB_UL_Y + 277, 640 , IMP_ABOUT_US_9, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 275, LAPTOP_SCREEN_WEB_UL_Y + 297, 337 - 129, IMP_ABOUT_US_7, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 17), LAPTOP_SCREEN_WEB_UL_Y + 137, 640 , IMP_ABOUT_US_1 , FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 25), LAPTOP_SCREEN_WEB_UL_Y + 154, 337 - 124, IMP_ABOUT_US_2, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 25), LAPTOP_SCREEN_WEB_UL_Y + 235, 337 - 124, IMP_ABOUT_US_3, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 17), LAPTOP_SCREEN_WEB_UL_Y + 260, 640 , IMP_ABOUT_US_10, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 25), LAPTOP_SCREEN_WEB_UL_Y + 280, 337 - 124, IMP_ABOUT_US_4, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 267), LAPTOP_SCREEN_WEB_UL_Y + 137, 640 , IMP_ABOUT_US_11, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 275), LAPTOP_SCREEN_WEB_UL_Y + 154, 337 - 129, IMP_ABOUT_US_5, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 267), LAPTOP_SCREEN_WEB_UL_Y + 227, 640 , IMP_ABOUT_US_8, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 275), LAPTOP_SCREEN_WEB_UL_Y + 247, 337 - 129, IMP_ABOUT_US_6, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 267), LAPTOP_SCREEN_WEB_UL_Y + 277, 640 , IMP_ABOUT_US_9, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + IMP_IDENT_TEXT_FOR_DYNAMIC_RESOLUTION 275), LAPTOP_SCREEN_WEB_UL_Y + 297, 337 - 129, IMP_ABOUT_US_7, FONT10ARIAL, 142, TRUE, 0);
break;
case IMP_MAIN_PAGE:
@@ -94,7 +97,7 @@
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 19, sWidth, IMP_MAIN_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
// set up for IMP text for title box area
- UINT16 const x = LAPTOP_SCREEN_UL_X + 173;
+ UINT16 const x = LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-147);
UINT16 const y = LAPTOP_SCREEN_WEB_UL_Y + 91;
UINT16 const w = 329 - 173;
switch (iCurrentProfileMode)
@@ -112,34 +115,45 @@
// title
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_BEGIN_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 105, LAPTOP_SCREEN_WEB_UL_Y + 67, 390 - 105, IMP_BEGIN_2, FONT10ARIAL, 142, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-215, LAPTOP_SCREEN_WEB_UL_Y + 67, 390 - 105, IMP_BEGIN_2, FONT10ARIAL, 142, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 105, LAPTOP_SCREEN_WEB_UL_Y + 67, 390 - 105, IMP_BEGIN_2, FONT10ARIAL, 142, TRUE, CENTER_JUSTIFIED);
// fullname
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 139, 640, IMP_BEGIN_3, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-239, LAPTOP_SCREEN_WEB_UL_Y + 139, 640, IMP_BEGIN_3, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 139, 640, IMP_BEGIN_3, FONT14ARIAL, FONT_BLACK, FALSE, 0);
// nick name
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 199, 640, IMP_BEGIN_4, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-239, LAPTOP_SCREEN_WEB_UL_Y + 199, 640, IMP_BEGIN_4, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 199, 640, IMP_BEGIN_4, FONT14ARIAL, FONT_BLACK, FALSE, 0);
// gender
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_6, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-239, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_6, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_6, FONT14ARIAL, FONT_BLACK, FALSE, 0);
// male
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 240, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-90, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 240, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0);
// female
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 360, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2+50, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0);
+ // LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 360, LAPTOP_SCREEN_WEB_UL_Y + 259, 640, IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0);
break;
case IMP_PERSONALITY:
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 130, LAPTOP_SCREEN_WEB_UL_Y + 60, 456 - 200, IMP_PERS_1, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 130, LAPTOP_SCREEN_WEB_UL_Y + 130, 456 - 200, IMP_PERS_2, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-190), LAPTOP_SCREEN_WEB_UL_Y + 60, 456 - 200, IMP_PERS_1, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-190), LAPTOP_SCREEN_WEB_UL_Y + 130, 456 - 200, IMP_PERS_2, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 130, LAPTOP_SCREEN_WEB_UL_Y + 60, 456 - 200, IMP_PERS_1, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 130, LAPTOP_SCREEN_WEB_UL_Y + 130, 456 - 200, IMP_PERS_2, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+
break;
case IMP_PERSONALITY_QUIZ:
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 5, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 293, LAPTOP_SCREEN_WEB_UL_Y + 370, 456 - 200, IMP_PERS_11, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 363, LAPTOP_SCREEN_WEB_UL_Y + 370, 456 - 200, IMP_PERS_12, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-27, LAPTOP_SCREEN_WEB_UL_Y + 370, 456 - 200, IMP_PERS_11, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2+43, LAPTOP_SCREEN_WEB_UL_Y + 370, 456 - 200, IMP_PERS_12, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 293, LAPTOP_SCREEN_WEB_UL_Y + 370, 456 - 200, IMP_PERS_11, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 363, LAPTOP_SCREEN_WEB_UL_Y + 370, 456 - 200, IMP_PERS_12, FONT12ARIAL, FONT_WHITE, TRUE, 0);
// print the question and suitable answers
PrintIMPPersonalityQuizQuestionAndAnswers();
@@ -149,17 +163,23 @@
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_PERS_6, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
switch( bPersonalityEndState )
{
- case 0: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
+ case 0: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-195, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
+ case 1: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-195, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F4, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
+ case 2: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-195, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F5, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
+/* case 0: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
case 1: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F4, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
- case 2: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F5, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break;
+ case 2: LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_PERS_F5, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED); break; */
}
break;
case IMP_ATTRIBUTE_ENTRANCE:
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 50, 300, IMP_ATTRIB_5, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 130, 300, IMP_ATTRIB_6, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 200, 300, IMP_ATTRIB_7, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-210, LAPTOP_SCREEN_WEB_UL_Y + 50, 300, IMP_ATTRIB_5, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-210, LAPTOP_SCREEN_WEB_UL_Y + 130, 300, IMP_ATTRIB_6, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-210, LAPTOP_SCREEN_WEB_UL_Y + 200, 300, IMP_ATTRIB_7, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 50, 300, IMP_ATTRIB_5, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 130, 300, IMP_ATTRIB_6, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 110, LAPTOP_SCREEN_WEB_UL_Y + 200, 300, IMP_ATTRIB_7, FONT12ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
break;
case IMP_ATTRIBUTE_PAGE:
@@ -168,14 +188,28 @@
// don't blit bonus if reviewing
if (!fReviewStats)
{
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 355, LAPTOP_SCREEN_WEB_UL_Y + 51, 640, IMP_ATTRIB_SA_2 - 1, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 56, LAPTOP_SCREEN_WEB_UL_Y + 33, 240, IMP_ATTRIB_SA_15, FONT10ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 + 35, LAPTOP_SCREEN_WEB_UL_Y + 51, 640, IMP_ATTRIB_SA_2 - 1, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 264, LAPTOP_SCREEN_WEB_UL_Y + 33, 240, IMP_ATTRIB_SA_15, FONT10ARIAL, FONT_WHITE, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 355, LAPTOP_SCREEN_WEB_UL_Y + 51, 640, IMP_ATTRIB_SA_2 - 1, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 56, LAPTOP_SCREEN_WEB_UL_Y + 33, 240, IMP_ATTRIB_SA_15, FONT10ARIAL, FONT_WHITE, TRUE, 0);
}
else
{
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 56, LAPTOP_SCREEN_WEB_UL_Y + 33, 240, IMP_ATTRIB_SA_18, FONT10ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 264, LAPTOP_SCREEN_WEB_UL_Y + 33, 240, IMP_ATTRIB_SA_18, FONT10ARIAL, FONT_WHITE, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 56, LAPTOP_SCREEN_WEB_UL_Y + 33, 240, IMP_ATTRIB_SA_18, FONT10ARIAL, FONT_WHITE, TRUE, 0);
}
// stats
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 0 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_6 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // health
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 1 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_8 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // dex
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 2 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_7 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // agili
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 3 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_9 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // str
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 4 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_11 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // wisdom
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 5 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_10 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // lead
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 6 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_12 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // marks
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 7 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_14 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // med
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 8 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_15 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // expl
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 260, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 9 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_13 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // mech
+/*
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 60, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 0 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_6 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // health
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 60, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 1 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_8 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // dex
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 60, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 2 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_7 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // agili
@@ -186,34 +220,39 @@
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 60, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 7 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_14 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // med
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 60, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 8 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_15 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // expl
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 60, LAPTOP_SCREEN_WEB_UL_Y + SKILL_SLIDE_START_Y + 9 * SKILL_SLIDE_HEIGHT, 100, IMP_ATTRIB_SA_13 - 1, FONT12ARIAL, FONT_WHITE, TRUE, RIGHT_JUSTIFIED); // mech
-
+*/
// should we display zero warning or nowmal ' come on herc..' text
break;
case IMP_ATTRIBUTE_FINISH:
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_ATTRIB_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_AF_2 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 195, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_AF_2 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 125, LAPTOP_SCREEN_WEB_UL_Y + 100, 356 - 100, IMP_AF_2 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
break;
case IMP_PORTRAIT:
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_POR_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 135, LAPTOP_SCREEN_WEB_UL_Y + 68, 240, IMP_POR_2 - 1, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 185, LAPTOP_SCREEN_WEB_UL_Y + 68, 240, IMP_POR_2 - 1, FONT10ARIAL, 142, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 135, LAPTOP_SCREEN_WEB_UL_Y + 68, 240, IMP_POR_2 - 1, FONT10ARIAL, 142, TRUE, 0);
break;
case IMP_VOICE:
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_VOC_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 135, LAPTOP_SCREEN_WEB_UL_Y + 70, 240, IMP_VOC_2 - 1, FONT10ARIAL, 142, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 185, LAPTOP_SCREEN_WEB_UL_Y + 70, 240, IMP_VOC_2 - 1, FONT10ARIAL, 142, TRUE, 0);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 135, LAPTOP_SCREEN_WEB_UL_Y + 70, 240, IMP_VOC_2 - 1, FONT10ARIAL, 142, TRUE, 0);
break;
case IMP_FINISH:
- //LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 7, 640, IMP_FIN_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 150, LAPTOP_SCREEN_WEB_UL_Y + 55, 200, IMP_FIN_2 - 1, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ //LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 150, LAPTOP_SCREEN_WEB_UL_Y + 7, 640, IMP_FIN_1 - 1, FONT14ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 170, LAPTOP_SCREEN_WEB_UL_Y + 55, 200, IMP_FIN_2 - 1, FONT12ARIAL, FONT_WHITE, TRUE, 0);
break;
case IMP_CONFIRM:
LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y + 7, sWidth, IMP_CON_1, FONT14ARIAL, FONT_WHITE, TRUE, CENTER_JUSTIFIED);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 60, 200, IMP_CON_2, FONT12ARIAL, FONT_WHITE, TRUE, 0);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 145, 200, IMP_CON_3, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 160, LAPTOP_SCREEN_WEB_UL_Y + 60, 200, IMP_CON_2, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH / 2 - 160, LAPTOP_SCREEN_WEB_UL_Y + 60, 200, IMP_CON_2, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ //LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 145, 200, IMP_CON_3, FONT12ARIAL, FONT_WHITE, TRUE, 0);
+ //LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 160, LAPTOP_SCREEN_WEB_UL_Y + 145, 200, IMP_CON_3, FONT12ARIAL, FONT_WHITE, TRUE, 0);
break;
}
}
@@ -249,7 +288,8 @@
// question is at IMP_QUESTION_1 + iOffset and there are n - 1 answers afterwards
BltAnswerIndents(n - 1);
- LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 20, LAPTOP_SCREEN_WEB_UL_Y + 30, 460, IMP_QUESTION_1 + iOffset, FONT10ARIAL, FONT_WHITE, TRUE, LEFT_JUSTIFIED);
+ LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + SCREEN_WIDTH/2-300, LAPTOP_SCREEN_WEB_UL_Y + 30, 460, IMP_QUESTION_1 + iOffset, FONT10ARIAL, FONT_WHITE, TRUE, LEFT_JUSTIFIED);
+// LoadAndDisplayIMPText(LAPTOP_SCREEN_UL_X + 20, LAPTOP_SCREEN_WEB_UL_Y + 30, 460, IMP_QUESTION_1 + iOffset, FONT10ARIAL, FONT_WHITE, TRUE, LEFT_JUSTIFIED);
// use extra wide columns for 4 or less answers
INT16 w = (n - 1 <= 4 ? 390 : 160);
diff -Nru a/Build/Laptop/IMP_Voices.cc b/Build/Laptop/IMP_Voices.cc
--- a/Build/Laptop/IMP_Voices.cc 2009-08-10 21:33:13.806891000 +0200
+++ b/Build/Laptop/IMP_Voices.cc 2010-02-24 00:47:47.723863000 +0100
@@ -69,13 +69,16 @@
RenderProfileBackGround( );
// the Voices frame
- RenderPortraitFrame( 191, 167 );
+ RenderPortraitFrame( SCREEN_WIDTH/2 - 129, 167 );
+// RenderPortraitFrame( 191, 167 );
// the sillouette
- RenderLargeSilhouette( 200, 176 );
+ RenderLargeSilhouette( SCREEN_WIDTH / 2 - 120, 176 );
+// RenderLargeSilhouette( 200, 176 );
// indent for the text
- RenderAttrib1IndentFrame( 128, 65);
+ RenderAttrib1IndentFrame( SCREEN_WIDTH/2-192, 65);
+// RenderAttrib1IndentFrame( 128, 65);
// render voice index value
RenderVoiceIndex( );
@@ -161,9 +164,12 @@
// will create buttons need for the IMP Voices screen
const INT16 dx = LAPTOP_SCREEN_UL_X;
const INT16 dy = LAPTOP_SCREEN_WEB_UL_Y;
- MakeButton(0, LAPTOPDIR "/voicearrows.sti", 1, 3, pImpButtonText[13], dx + 343, dy + 205, BtnIMPVoicesNextCallback); // Next button
- MakeButton(1, LAPTOPDIR "/voicearrows.sti", 0, 2, pImpButtonText[12], dx + 93, dy + 205, BtnIMPVoicesPreviousCallback); // Previous button
- MakeButton(2, LAPTOPDIR "/button_5.sti", 0, 1, pImpButtonText[11], dx + 187, dy + 330, BtnIMPVoicesDoneCallback); // Done button
+ MakeButton(0, LAPTOPDIR "/voicearrows.sti", 1, 3, pImpButtonText[13], dx + (SCREEN_WIDTH / 2 + 23), dy + 205, BtnIMPVoicesNextCallback); // Next button
+ MakeButton(1, LAPTOPDIR "/voicearrows.sti", 0, 2, pImpButtonText[12], dx + (SCREEN_WIDTH / 2 - 227), dy + 205, BtnIMPVoicesPreviousCallback); // Previous button
+ MakeButton(2, LAPTOPDIR "/button_5.sti", 0, 1, pImpButtonText[11], dx + (SCREEN_WIDTH / 2 - 133), dy + 330, BtnIMPVoicesDoneCallback); // Done button
+// MakeButton(0, "LAPTOP/voicearrows.sti", 1, 3, pImpButtonText[13], dx + 343, dy + 205, BtnIMPVoicesNextCallback); // Next button
+// MakeButton(1, "LAPTOP/voicearrows.sti", 0, 2, pImpButtonText[12], dx + 93, dy + 205, BtnIMPVoicesPreviousCallback); // Previous button
+// MakeButton(2, "LAPTOP/button_5.sti", 0, 1, pImpButtonText[11], dx + 187, dy + 330, BtnIMPVoicesDoneCallback); // Done button
}
@@ -275,8 +281,11 @@
static void CreateIMPVoiceMouseRegions(void)
{
// will create mouse regions needed for the IMP voices page
- MSYS_DefineRegion( &gVoicePortraitRegion, LAPTOP_SCREEN_UL_X + 200, LAPTOP_SCREEN_WEB_UL_Y + 176 ,LAPTOP_SCREEN_UL_X + 200 + 100, LAPTOP_SCREEN_WEB_UL_Y + 176 + 100,MSYS_PRIORITY_HIGH,
+ MSYS_DefineRegion( &gVoicePortraitRegion, LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-120), LAPTOP_SCREEN_WEB_UL_Y + 176 ,LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-120) + 100, LAPTOP_SCREEN_WEB_UL_Y + 176 + 100,MSYS_PRIORITY_HIGH,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, IMPPortraitRegionButtonCallback );
+// MSYS_DefineRegion( &gVoicePortraitRegion, LAPTOP_SCREEN_UL_X + 200, LAPTOP_SCREEN_WEB_UL_Y + 176 ,LAPTOP_SCREEN_UL_X + 200 + 100, LAPTOP_SCREEN_WEB_UL_Y + 176 + 100,MSYS_PRIORITY_HIGH,
+// MSYS_NO_CURSOR, MSYS_NO_CALLBACK, IMPPortraitRegionButtonCallback );
+
}
@@ -308,7 +317,9 @@
// render the voice index value on the the blank portrait
swprintf(sString, lengthof(sString), L"%ls %d", pIMPVoicesStrings, iCurrentVoices + 1);
- FindFontCenterCoordinates( 290 + LAPTOP_UL_X, 0, 100, 0, sString, FONT12ARIAL, &sX, &sY );
+
+ FindFontCenterCoordinates( SCREEN_WIDTH/2-30+ LAPTOP_UL_X, 0, 100, 0, sString, FONT12ARIAL, &sX, &sY );
+// FindFontCenterCoordinates( 290 + LAPTOP_UL_X, 0, 100, 0, sString, FONT12ARIAL, &sX, &sY );
SetFontAttributes(FONT12ARIAL, FONT_WHITE);
MPrint(sX, 320, sString);
}
diff -Nru a/Build/Laptop/Insurance.cc b/Build/Laptop/Insurance.cc
--- a/Build/Laptop/Insurance.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/Insurance.cc 2010-02-24 00:48:41.885564000 +0100
@@ -208,10 +208,15 @@
void InitInsuranceDefaults()
{
// load the Flower Account Box graphic and add it
- guiInsuranceBackGround = AddVideoObjectFromFile(LAPTOPDIR "/backgroundtile.sti");
// load the red bar on the side of the page and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiInsuranceBackGround = AddVideoObjectFromFile(LAPTOPDIR "/backgroundtile_800x600.sti");
+ guiInsuranceRedBarImage = AddVideoObjectFromFile(LAPTOPDIR "/lefttile.sti");
+#else
+ guiInsuranceBackGround = AddVideoObjectFromFile(LAPTOPDIR "/backgroundtile.sti");
guiInsuranceRedBarImage = AddVideoObjectFromFile(LAPTOPDIR "/lefttile.sti");
+#endif
// load the red bar on the side of the page and add it
guiInsuranceBigRedLineImage = AddVideoObjectFromFile(LAPTOPDIR "/largebar.sti");
diff -Nru a/Build/Laptop/Laptop.cc b/Build/Laptop/Laptop.cc
--- a/Build/Laptop/Laptop.cc 2009-10-11 18:06:06.712544000 +0200
+++ b/Build/Laptop/Laptop.cc 2010-02-24 00:48:22.522976000 +0100
@@ -126,8 +126,11 @@
#define FAST_UNIT_TIME 3
#define FASTEST_UNIT_TIME 2
#define ALMOST_FAST_UNIT_TIME 25
-#define DOWNLOAD_X 300
-#define DOWNLOAD_Y 200
+
+// Mythrell - Resolution fix
+#define DOWNLOAD_X (SCREEN_WIDTH/2-20) //300
+#define DOWNLOAD_Y (SCREEN_HEIGHT/2-40) //200
+
#define LAPTOP_WINDOW_X DOWNLOAD_X + 12
#define LAPTOP_WINDOW_Y DOWNLOAD_Y + 25
#define LAPTOP_BAR_Y LAPTOP_WINDOW_Y + 2
@@ -144,12 +147,14 @@
#define NUMBER_OF_LAPTOP_TITLEBAR_ITERATIONS 18
-#define LAPTOP_TITLE_BAR_WIDTH 500
+#define LAPTOP_TITLE_BAR_WIDTH LAPTOP_SCREEN_WIDTH //(SCREEN_WIDTH-140)
+//#define LAPTOP_TITLE_BAR_WIDTH 500
#define LAPTOP_TITLE_BAR_HEIGHT 24
#define LAPTOP_TITLE_BAR_TOP_LEFT_X 111
#define LAPTOP_TITLE_BAR_TOP_LEFT_Y 25
-#define LAPTOP_TITLE_BAR_TOP_RIGHT_X 610
+#define LAPTOP_TITLE_BAR_TOP_RIGHT_X (SCREEN_WIDTH-30)
+//#define LAPTOP_TITLE_BAR_TOP_RIGHT_X 610
#define LAPTOP_TITLE_BAR_ICON_OFFSET_X 5
#define LAPTOP_TITLE_BAR_ICON_OFFSET_Y 2
@@ -491,13 +496,20 @@
giCurrentSubPage = 0;
// load the laptop graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiLAPTOP = AddVideoObjectFromFile(LAPTOPDIR "/laptop3_800x600.sti");
+ // background for panel
+ guiLaptopBACKGROUND = AddVideoObjectFromFile(LAPTOPDIR "/taskbar_800x600.sti");
+ // background for panel
+ guiTITLEBARLAPTOP = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar_800x600.sti");
+#else
guiLAPTOP = AddVideoObjectFromFile(LAPTOPDIR "/laptop3.sti");
-
// background for panel
guiLaptopBACKGROUND = AddVideoObjectFromFile(LAPTOPDIR "/taskbar.sti");
-
// background for panel
guiTITLEBARLAPTOP = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar.sti");
+#endif
+
// lights for power and HD
guiLIGHTS = AddVideoObjectFromFile(LAPTOPDIR "/lights.sti");
@@ -1053,11 +1065,13 @@
//Mapscreen source rect
SGPRect SrcRect1;
- SrcRect1.iLeft = 464 * iPercentage / 100;
+ SrcRect1.iLeft = (SCREEN_WIDTH-176) * iPercentage / 100;
+// SrcRect1.iLeft = 464 * iPercentage / 100;
SrcRect1.iRight = SCREEN_WIDTH - 163 * iPercentage / 100;
- SrcRect1.iTop = 417 * iPercentage / 100;
+ SrcRect1.iTop = (SCREEN_HEIGHT-63) * iPercentage / 100;
SrcRect1.iBottom = SCREEN_HEIGHT - 55 * iPercentage / 100;
//Laptop source rect
+ // Myth - this is where the laptop "zoom in" starts
INT32 iScalePercentage;
if (iPercentage < 99)
{
@@ -1069,9 +1083,11 @@
}
const INT32 iWidth = 12 * iScalePercentage / 100;
const INT32 iHeight = 9 * iScalePercentage / 100;
- const INT32 iX = 472 - (472 - 320) * iScalePercentage / 5333;
- const INT32 iY = 424 - (424 - 240) * iScalePercentage / 5333;
-
+// Mythrell - res fix
+ const INT32 iX = (SCREEN_WIDTH-168)-((SCREEN_WIDTH-168)-SCREEN_WIDTH/2) * iScalePercentage / 5333;
+ const INT32 iY = (SCREEN_HEIGHT-56)-((SCREEN_HEIGHT-56)-SCREEN_HEIGHT/2) * iScalePercentage / 5333;
+// const INT32 iX = 472 - (472 - 320) * iScalePercentage / 5333;
+// const INT32 iY = 424 - (424 - 240) * iScalePercentage / 5333;
SGPBox const SrcRect2 = { iX - iWidth / 2, iY - iHeight / 2, iWidth, iHeight };
//SrcRect2.iLeft = 464 - 464 * iScalePercentage / 100;
//SrcRect2.iRight = 477 + 163 * iScalePercentage / 100;
@@ -1468,8 +1484,12 @@
}
const INT32 iWidth = 12 * iScalePercentage / 100;
const INT32 iHeight = 9 * iScalePercentage / 100;
- const INT32 iX = 472 - (472 - 320) * iScalePercentage / 5333;
- const INT32 iY = 424 - (424 - 240) * iScalePercentage / 5333;
+// Mythrell - res fix
+ const INT32 iX = (SCREEN_WIDTH-168)-((SCREEN_WIDTH-168)-SCREEN_WIDTH/2) * iScalePercentage / 5333;
+ const INT32 iY = (SCREEN_HEIGHT-56)-((SCREEN_HEIGHT-56)-SCREEN_HEIGHT/2) * iScalePercentage / 5333;
+
+// const INT32 iX = 472 - (472 - 320) * iScalePercentage / 5333;
+// const INT32 iY = 424 - (424 - 240) * iScalePercentage / 5333;
SGPBox const SrcRect2 = { iX - iWidth / 2, iY - iHeight / 2, iWidth, iHeight };
//SrcRect2.iLeft = 464 - 464 * iScalePercentage / 100;
@@ -2016,7 +2036,10 @@
const wchar_t* const str = (fFastLoadFlag ? pDownloadString[1] : pDownloadString[0]);
INT16 sXPosition = 0;
INT16 sYPosition = 0;
- FindFontCenterCoordinates(328, 0, 446 - 328, 0, str, DOWNLOAD_FONT, &sXPosition, &sYPosition);
+
+// Mythrell - Resolution changes
+ FindFontCenterCoordinates((SCREEN_WIDTH/2+8), 0, 446 - 328, 0, str, DOWNLOAD_FONT, &sXPosition, &sYPosition);
+// FindFontCenterCoordinates(328, 0, 446 - 328, 0, str, DOWNLOAD_FONT, &sXPosition, &sYPosition);
MPrint(sXPosition, DOWN_STRING_Y, str);
BltVideoObject(FRAME_BUFFER, guiGRAPHWINDOW, 0, LAPTOP_WINDOW_X, LAPTOP_WINDOW_Y);
@@ -2237,6 +2260,13 @@
//places a tileable pattern down
void WebPageTileBackground(const UINT8 ubNumX, const UINT8 ubNumY, const UINT16 usWidth, const UINT16 usHeight, const SGPVObject* const background)
{
+// Mythrell - Yet another laptop tile uglyness, nothing I can do about them :(
+ if(SCREEN_WIDTH==800)
+ {
+ BltVideoObject(FRAME_BUFFER, background, 0, LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_WEB_UL_Y);
+ }
+ else
+ {
UINT16 uiPosY = LAPTOP_SCREEN_WEB_UL_Y;
for (UINT16 y = 0; y < ubNumY; ++y)
{
@@ -2248,6 +2278,7 @@
}
uiPosY += usHeight;
}
+ }
}
@@ -2458,8 +2489,10 @@
static void ShowLights(void)
{
// will show lights depending on state
- BltVideoObject(FRAME_BUFFER, guiLIGHTS, fPowerLightOn ? 0 : 1, 44, 466);
- BltVideoObject(FRAME_BUFFER, guiLIGHTS, fHardDriveLightOn ? 0 : 1, 88, 466);
+ BltVideoObject(FRAME_BUFFER, guiLIGHTS, fPowerLightOn ? 0 : 1, 44, (SCREEN_HEIGHT-14));
+ BltVideoObject(FRAME_BUFFER, guiLIGHTS, fHardDriveLightOn ? 0 : 1, 88, (SCREEN_HEIGHT-14));
+// BltVideoObject(FRAME_BUFFER, guiLIGHTS, fHardDriveLightOn ? 0 : 1, 88, 466);
+
}
@@ -2493,7 +2526,8 @@
if (fLoadPendingFlag) iTotalDifference = 0;
fHardDriveLightOn = (Random(2) == 0);
- InvalidateRegion(88, 466, 102, 477);
+ InvalidateRegion(88, (SCREEN_HEIGHT-14), 102, (SCREEN_HEIGHT-3));
+// InvalidateRegion(88, 466, 102, 477);
}
}
@@ -2585,7 +2619,8 @@
static void CreateMinimizeButtonForCurrentMode(void)
{
// create minimize button
- gLaptopMinButton = QuickCreateButtonImg(LAPTOPDIR "/x.sti", 0, 1, 590, 30, MSYS_PRIORITY_HIGH, LaptopMinimizeProgramButtonCallback);
+ gLaptopMinButton = QuickCreateButtonImg(LAPTOPDIR "/x.sti", -1, 0, -1, 1, -1, (SCREEN_WIDTH-50), 30, MSYS_PRIORITY_HIGH, LaptopMinimizeProgramButtonCallback);
+// gLaptopMinButton = QuickCreateButtonImg("LAPTOP/x.sti", -1, 0, -1, 1, -1, 590, 30, MSYS_PRIORITY_HIGH, LaptopMinimizeProgramButtonCallback);
gLaptopMinButton->SetCursor(CURSOR_LAPTOP_SCREEN);
}
@@ -3013,8 +3048,11 @@
void RenderWWWProgramTitleBar(void)
{
// will render the title bar for the www program
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ BltVideoObjectOnce(FRAME_BUFFER, LAPTOPDIR "/programtitlebar_800x600.sti", 0, LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_UL_Y - 2);
+#else
BltVideoObjectOnce(FRAME_BUFFER, LAPTOPDIR "/programtitlebar.sti", 0, LAPTOP_SCREEN_UL_X, LAPTOP_SCREEN_UL_Y - 2);
-
+#endif
// now slapdown text
SetFontAttributes(FONT14ARIAL, FONT_WHITE);
diff -Nru a/Build/Laptop/Laptop.h b/Build/Laptop/Laptop.h
--- a/Build/Laptop/Laptop.h 2009-08-08 20:53:12.417825000 +0200
+++ b/Build/Laptop/Laptop.h 2010-02-24 00:48:22.522976000 +0100
@@ -5,6 +5,8 @@
#include "MouseSystem.h"
#include "ScreenIDs.h"
#include "Types.h"
+// Mythrell - Needed for resolution
+#include "Local.h"
void ExitLaptop(void);
@@ -105,9 +107,11 @@
#define LAPTOP_SCREEN_UL_X 111
-#define LAPTOP_SCREEN_UL_Y 27
-#define LAPTOP_SCREEN_LR_X 613
-#define LAPTOP_SCREEN_LR_Y 427
+#define LAPTOP_SCREEN_UL_Y 27
+#define LAPTOP_SCREEN_LR_X (SCREEN_WIDTH-27)
+//#define LAPTOP_SCREEN_LR_X 613
+#define LAPTOP_SCREEN_LR_Y (SCREEN_HEIGHT-53)
+//#define LAPTOP_SCREEN_LR_Y 427
#define LAPTOP_UL_X 24
#define LAPTOP_UL_Y 27
#define LAPTOP_SCREEN_WIDTH LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X
diff -Nru a/Build/Laptop/Mercs.cc b/Build/Laptop/Mercs.cc
--- a/Build/Laptop/Mercs.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Laptop/Mercs.cc 2010-02-24 00:48:22.522976000 +0100
@@ -40,16 +40,16 @@
#define MERC_BACKGROUND_WIDTH 125
#define MERC_BACKGROUND_HEIGHT 100
-#define MERC_TITLE_X LAPTOP_SCREEN_UL_X + 135
+#define MERC_TITLE_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-185) //135
#define MERC_TITLE_Y LAPTOP_SCREEN_WEB_UL_Y + 20
-#define MERC_PORTRAIT_X LAPTOP_SCREEN_UL_X + 198
+#define MERC_PORTRAIT_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-122) //198
#define MERC_PORTRAIT_Y LAPTOP_SCREEN_WEB_UL_Y + 96
#define MERC_PORTRAIT_TEXT_X MERC_PORTRAIT_X
#define MERC_PORTRAIT_TEXT_Y MERC_PORTRAIT_Y + 109
#define MERC_PORTRAIT_TEXT_WIDTH 115
-#define MERC_ACCOUNT_BOX_X LAPTOP_SCREEN_UL_X + 138
+#define MERC_ACCOUNT_BOX_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-182) //138
#define MERC_ACCOUNT_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 251
#define MERC_ACCOUNT_BOX_TEXT_X MERC_ACCOUNT_BOX_X
@@ -542,7 +542,11 @@
void InitMercBackGround()
{
// load the Merc background graphic and add it
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiMercBackGround = AddVideoObjectFromFile(LAPTOPDIR "/mercbackground_800x600.sti");
+#else
guiMercBackGround = AddVideoObjectFromFile(LAPTOPDIR "/mercbackground.sti");
+#endif
}
diff -Nru a/Build/Laptop/Mercs_Account.cc b/Build/Laptop/Mercs_Account.cc
--- a/Build/Laptop/Mercs_Account.cc 2009-09-06 16:59:59.698273000 +0200
+++ b/Build/Laptop/Mercs_Account.cc 2010-02-24 00:48:22.522976000 +0100
@@ -32,14 +32,14 @@
#define MERC_ACCOUNT_DYNAMIC_TEXT_COLOR FONT_MCOLOR_WHITE
#define MERC_ACCOUNT_DEAD_TEXT_COLOR FONT_MCOLOR_RED
-#define MERC_AC_ORDER_GRID_X LAPTOP_SCREEN_UL_X + 23
+#define MERC_AC_ORDER_GRID_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-297) //23
#define MERC_AC_ORDER_GRID_Y LAPTOP_SCREEN_WEB_UL_Y + 59
-#define MERC_AC_ACCOUNT_NUMBER_X LAPTOP_SCREEN_UL_X + 23
+#define MERC_AC_ACCOUNT_NUMBER_X MERC_AC_ORDER_GRID_X //LAPTOP_SCREEN_UL_X + 23
#define MERC_AC_ACCOUNT_NUMBER_Y LAPTOP_SCREEN_WEB_UL_Y + 13
-#define MERC_AC_AUTHORIZE_BUTTON_X 128
-#define MERC_AC_CANCEL_BUTTON_X 490
+#define MERC_AC_AUTHORIZE_BUTTON_X (SCREEN_WIDTH/2-192) // 128
+#define MERC_AC_CANCEL_BUTTON_X (SCREEN_WIDTH/2+170) //490
#define MERC_AC_BUTTON_Y 380
#define MERC_AC_ACCOUNT_NUMBER_TEXT_X MERC_AC_ACCOUNT_NUMBER_X + 5
diff -Nru a/Build/Laptop/Mercs_Files.cc b/Build/Laptop/Mercs_Files.cc
--- a/Build/Laptop/Mercs_Files.cc 2010-05-18 09:13:22.298177000 +0200
+++ b/Build/Laptop/Mercs_Files.cc 2010-05-25 16:29:06.194575000 +0200
@@ -48,7 +48,7 @@
#define MERC_DYNAMIC_STATS_COLOR FONT_MCOLOR_WHITE
-#define MERC_FILES_PORTRAIT_BOX_X LAPTOP_SCREEN_UL_X + 16
+#define MERC_FILES_PORTRAIT_BOX_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-304) //16
#define MERC_FILES_PORTRAIT_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 17
#define MERC_FACE_X MERC_FILES_PORTRAIT_BOX_X + 2
@@ -56,17 +56,17 @@
#define MERC_FACE_WIDTH 106
#define MERC_FACE_HEIGHT 122
-#define MERC_FILES_STATS_BOX_X LAPTOP_SCREEN_UL_X + 164
+#define MERC_FILES_STATS_BOX_X LAPTOP_SCREEN_UL_X + (SCREEN_WIDTH/2-156) //164
#define MERC_FILES_STATS_BOX_Y MERC_FILES_PORTRAIT_BOX_Y
#define MERC_FILES_BIO_BOX_X MERC_FILES_PORTRAIT_BOX_X
#define MERC_FILES_BIO_BOX_Y LAPTOP_SCREEN_WEB_UL_Y + 155
-#define MERC_FILES_PREV_BUTTON_X 128
-#define MERC_FILES_NEXT_BUTTON_X 490
-#define MERC_FILES_HIRE_BUTTON_X 260
-#define MERC_FILES_BACK_BUTTON_X 380
+#define MERC_FILES_PREV_BUTTON_X (SCREEN_WIDTH/2-192)//128
+#define MERC_FILES_NEXT_BUTTON_X (SCREEN_WIDTH/2+170) //490
+#define MERC_FILES_HIRE_BUTTON_X (SCREEN_WIDTH/2-60) //260
+#define MERC_FILES_BACK_BUTTON_X (SCREEN_WIDTH/2+60) //380
#define MERC_FILES_BUTTON_Y 380
#define MERC_NAME_X MERC_FILES_STATS_BOX_X + 50
diff -Nru a/Build/Laptop/Personnel.cc b/Build/Laptop/Personnel.cc
--- a/Build/Laptop/Personnel.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Laptop/Personnel.cc 2010-02-24 00:48:22.522976000 +0100
@@ -379,11 +379,17 @@
{
// load graphics needed for personnel screen
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ // title bar
+ guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar_800x600.sti");
+ // the background grpahics
+ guiSCREEN = AddVideoObjectFromFile(LAPTOPDIR "/personnelwindow_800x600.sti");
+#else
// title bar
guiTITLE = AddVideoObjectFromFile(LAPTOPDIR "/programtitlebar.sti");
-
// the background grpahics
guiSCREEN = AddVideoObjectFromFile(LAPTOPDIR "/personnelwindow.sti");
+#endif
guiPersonnelInventory = AddVideoObjectFromFile(LAPTOPDIR "/personnel_inventory.sti");
}
@@ -1163,7 +1169,7 @@
ETRLEObject const& pTrav = gfx.SubregionProperties(item.ubGraphicNum);
INT16 const cen_x = PosX + abs(57 - pTrav.usWidth) / 2 - pTrav.sOffsetX;
INT16 const cen_y = PosY + abs(22 - pTrav.usHeight) / 2 - pTrav.sOffsetY;
- BltVideoObjectOutline(FRAME_BUFFER, &gfx, item.ubGraphicNum, cen_x, cen_y, SGP_TRANSPARENT);
+ BltVideoObjectOutline(FRAME_BUFFER, &gfx, item.ubGraphicNum, cen_x, cen_y, TRANSPARENT);
SetFontDestBuffer(FRAME_BUFFER);
diff -Nru a/Build/Laptop/background.h b/Build/Laptop/background.h
--- a/Build/Laptop/background.h 1970-01-01 01:00:00.000000000 +0100
+++ b/Build/Laptop/background.h 2008-07-10 14:59:40.080965000 +0200
@@ -0,0 +1,45 @@
+#define CHAR_PROFILE_BACKGROUND_TILE_WIDTH 125
+#define CHAR_PROFILE_BACKGROUND_TILE_HEIGHT 100
+
+void DrawWWWBakcground(const);
+/*
+void DrawWWWBackground(*hHandle)
+{
+ INT32 iCounter = 0;
+ INT32 iCountTo = 4;
+
+ if(SCREEN_WIDTH==800)
+ {
+ iCountTo=5;
+ }
+ for(iCounter = 0; iCounter < iCountTo; iCounter++)
+ {
+
+ // blt background to screen from left to right
+// const INT32 x = LAPTOP_SCREEN_UL_X;
+// Mythrell - Ugly hack for background fixing, dunno how to do it otherwise
+// Building the background from left to right to hide extra behind the lefthand menupanel
+// if the screen width is 800... still isn't perfect but a lot better (empty line at the bottom)
+ if(SCREEN_WIDTH == 800)
+ {
+ const INT32 x = LAPTOP_SCREEN_LR_X-123;
+ const INT32 y = LAPTOP_SCREEN_WEB_UL_Y + 3 + iCounter * CHAR_PROFILE_BACKGROUND_TILE_HEIGHT;
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 0 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x - 1 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x - 2 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x - 3 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x - 4 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x - 5 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ }
+ else
+ {
+ const INT32 x = LAPTOP_SCREEN_UL_X;
+ const INT32 y = LAPTOP_SCREEN_WEB_UL_Y + iCounter * CHAR_PROFILE_BACKGROUND_TILE_HEIGHT;
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 0 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 1 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 2 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ BltVideoObject(FRAME_BUFFER, hHandle, 0, x + 3 * CHAR_PROFILE_BACKGROUND_TILE_WIDTH, y);
+ }
+ }
+}
+*/
\ No newline at end of file
diff -Nru a/Build/Loading_Screen.cc b/Build/Loading_Screen.cc
--- a/Build/Loading_Screen.cc 2009-10-13 15:37:26.447550000 +0200
+++ b/Build/Loading_Screen.cc 2010-02-24 00:51:49.764757000 +0100
@@ -144,6 +144,51 @@
case LOADINGSCREEN_BASEMENT: filename = INTERFACEDIR "/loadscreen4.sti"; break;
case LOADINGSCREEN_CAVE: filename = INTERFACEDIR "/loadscreen5.sti"; break;
default: filename = INTERFACEDIR "/loadscreen1.sti"; break;
+#elif (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ case LOADINGSCREEN_NOTHING: filename = LOADSCREENSDIR "/ls_heli_800x600.sti"; break;
+ case LOADINGSCREEN_DAYGENERIC: filename = LOADSCREENSDIR "/ls_daygeneric_800x600.sti"; break;
+ case LOADINGSCREEN_DAYTOWN1: filename = LOADSCREENSDIR "/ls_daytown1_800x600.sti"; break;
+ case LOADINGSCREEN_DAYTOWN2: filename = LOADSCREENSDIR "/ls_daytown2_800x600.sti"; break;
+ case LOADINGSCREEN_DAYWILD: filename = LOADSCREENSDIR "/ls_daywild_800x600.sti"; break;
+ case LOADINGSCREEN_DAYTROPICAL: filename = LOADSCREENSDIR "/ls_daytropical_800x600.sti"; break;
+ case LOADINGSCREEN_DAYFOREST: filename = LOADSCREENSDIR "/ls_dayforest_800x600.sti"; break;
+ case LOADINGSCREEN_DAYDESERT: filename = LOADSCREENSDIR "/ls_daydesert_800x600.sti"; break;
+ case LOADINGSCREEN_DAYPALACE: filename = LOADSCREENSDIR "/ls_daypalace_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTGENERIC: filename = LOADSCREENSDIR "/ls_nightgeneric_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTWILD: filename = LOADSCREENSDIR "/ls_nightwild_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTTOWN1: filename = LOADSCREENSDIR "/ls_nighttown1_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTTOWN2: filename = LOADSCREENSDIR "/ls_nighttown2_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTFOREST: filename = LOADSCREENSDIR "/ls_nightforest_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTTROPICAL: filename = LOADSCREENSDIR "/ls_nighttropical_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTDESERT: filename = LOADSCREENSDIR "/ls_nightdesert_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTPALACE: filename = LOADSCREENSDIR "/ls_nightpalace_800x600.sti"; break;
+ case LOADINGSCREEN_HELI: filename = LOADSCREENSDIR "/ls_heli_800x600.sti"; break;
+ case LOADINGSCREEN_BASEMENT: filename = LOADSCREENSDIR "/ls_basement_800x600.sti"; break;
+ case LOADINGSCREEN_MINE: filename = LOADSCREENSDIR "/ls_mine_800x600.sti"; break;
+ case LOADINGSCREEN_CAVE: filename = LOADSCREENSDIR "/ls_cave_800x600.sti"; break;
+ case LOADINGSCREEN_DAYPINE: filename = LOADSCREENSDIR "/ls_daypine_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTPINE: filename = LOADSCREENSDIR "/ls_nightpine_800x600.sti"; break;
+ case LOADINGSCREEN_DAYMILITARY: filename = LOADSCREENSDIR "/ls_daymilitary_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTMILITARY: filename = LOADSCREENSDIR "/ls_nightmilitary_800x600.sti"; break;
+ case LOADINGSCREEN_DAYSAM: filename = LOADSCREENSDIR "/ls_daysam_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTSAM: filename = LOADSCREENSDIR "/ls_nightsam_800x600.sti"; break;
+ case LOADINGSCREEN_DAYPRISON: filename = LOADSCREENSDIR "/ls_dayprison_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTPRISON: filename = LOADSCREENSDIR "/ls_nightprison_800x600.sti"; break;
+ case LOADINGSCREEN_DAYHOSPITAL: filename = LOADSCREENSDIR "/ls_dayhospital_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTHOSPITAL: filename = LOADSCREENSDIR "/ls_nighthospital_800x600.sti"; break;
+ case LOADINGSCREEN_DAYAIRPORT: filename = LOADSCREENSDIR "/ls_dayairport_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTAIRPORT: filename = LOADSCREENSDIR "/ls_nightairport_800x600.sti"; break;
+ case LOADINGSCREEN_DAYLAB: filename = LOADSCREENSDIR "/ls_daylab_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTLAB: filename = LOADSCREENSDIR "/ls_nightlab_800x600.sti"; break;
+ case LOADINGSCREEN_DAYOMERTA: filename = LOADSCREENSDIR "/ls_dayomerta_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTOMERTA: filename = LOADSCREENSDIR "/ls_nightomerta_800x600.sti"; break;
+ case LOADINGSCREEN_DAYCHITZENA: filename = LOADSCREENSDIR "/ls_daychitzena_800x600.sti"; break;
+ case LOADINGSCREEN_NIGHTCHITZENA: filename = LOADSCREENSDIR "/ls_nightchitzena_800x600.sti"; break;
+ case LOADINGSCREEN_DAYMINE: filename = LOADSCREENSDIR "/ls_daymine_800x600.sti" ; break;
+ case LOADINGSCREEN_NIGHTMINE: filename = LOADSCREENSDIR "/ls_nightmine_800x600.sti" ; break;
+ case LOADINGSCREEN_DAYBALIME: filename = LOADSCREENSDIR "/ls_daybalime_800x600.sti" ; break;
+ case LOADINGSCREEN_NIGHTBALIME: filename = LOADSCREENSDIR "/ls_nightbalime_800x600.sti"; break;
+ default: filename = LOADSCREENSDIR "/ls_heli_800x600.sti"; break;
#else
case LOADINGSCREEN_NOTHING: filename = LOADSCREENSDIR "/ls_heli.sti"; break;
case LOADINGSCREEN_DAYGENERIC: filename = LOADSCREENSDIR "/ls_daygeneric.sti"; break;
diff -Nru a/Build/Local.h b/Build/Local.h
--- a/Build/Local.h 2007-03-11 10:54:19.348854000 +0100
+++ b/Build/Local.h 2008-07-10 14:59:40.080965000 +0200
@@ -11,8 +11,8 @@
// Basic defines for the video manager. These represent the starting values
//
-#define SCREEN_WIDTH 640
-#define SCREEN_HEIGHT 480
+#define SCREEN_WIDTH 800
+#define SCREEN_HEIGHT 600
#define PIXEL_DEPTH 16
#endif
diff -Nru a/Build/MainMenuScreen.cc b/Build/MainMenuScreen.cc
--- a/Build/MainMenuScreen.cc 2010-05-18 09:13:22.298177000 +0200
+++ b/Build/MainMenuScreen.cc 2010-05-25 16:29:06.194575000 +0200
@@ -212,7 +212,12 @@
#else
# define GFX_DIR LOADSCREENSDIR
#endif
+
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiMainMenuBackGroundImage = AddVideoObjectFromFile(GFX_DIR "/mainmenubackground_800x600.sti");
+#else
guiMainMenuBackGroundImage = AddVideoObjectFromFile(GFX_DIR "/mainmenubackground.sti");
+#endif
guiJa2LogoImage = AddVideoObjectFromFile(GFX_DIR "/ja2logo.sti");
#undef GFX_DIR
@@ -376,7 +381,8 @@
static void RenderMainMenu(void)
{
BltVideoObject(guiSAVEBUFFER, guiMainMenuBackGroundImage, 0, 0, 0);
- BltVideoObject(guiSAVEBUFFER, guiJa2LogoImage, 0, 188, 15);
+ BltVideoObject(guiSAVEBUFFER, guiJa2LogoImage, 0, (SCREEN_WIDTH-256)/2, 15);
+// BltVideoObject(guiSAVEBUFFER, guiJa2LogoImage, 0, 188, 15);
RestoreExternBackgroundRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
diff -Nru a/Build/Options_Screen.cc b/Build/Options_Screen.cc
--- a/Build/Options_Screen.cc 2009-09-30 23:57:23.578433000 +0200
+++ b/Build/Options_Screen.cc 2010-02-24 00:51:49.764757000 +0100
@@ -49,16 +49,16 @@
#define OPTIONS_SCREEN_HEIGHT 400
-#define OPTIONS__TOP_LEFT_X 100
-#define OPTIONS__TOP_LEFT_Y 40
-#define OPTIONS__BOTTOM_RIGHT_X OPTIONS__TOP_LEFT_X + OPTIONS_SCREEN_WIDTH
-#define OPTIONS__BOTTOM_RIGHT_Y OPTIONS__TOP_LEFT_Y + OPTIONS_SCREEN_HEIGHT
-
-#define OPT_SAVE_BTN_X 51
-#define OPT_LOAD_BTN_X 190
-#define OPT_QUIT_BTN_X 329
-#define OPT_DONE_BTN_X 469
-#define OPT_BTN_Y 438
+#define OPTIONS__TOP_LEFT_X (SCREEN_WIDTH/2-220) //100
+#define OPTIONS__TOP_LEFT_Y (SCREEN_HEIGHT/2-200) //40
+#define OPTIONS__BOTTOM_RIGHT_X OPTIONS__TOP_LEFT_X + OPTIONS_SCREEN_WIDTH
+#define OPTIONS__BOTTOM_RIGHT_Y OPTIONS__TOP_LEFT_Y + OPTIONS_SCREEN_HEIGHT
+
+#define OPT_SAVE_BTN_X (SCREEN_WIDTH/2-269) // 51
+#define OPT_LOAD_BTN_X OPT_SAVE_BTN_X + 139 //190
+#define OPT_QUIT_BTN_X OPT_LOAD_BTN_X + 139 //329
+#define OPT_DONE_BTN_X OPT_QUIT_BTN_X + 139 //469
+#define OPT_BTN_Y (SCREEN_HEIGHT/2+198) //438
#define OPT_GAP_BETWEEN_TOGGLE_BOXES 31//40
@@ -73,9 +73,9 @@
#define OPT_SPACE_BETWEEN_TEXT_AND_TOGGLE_BOX 30//220
#define OPT_TOGGLE_TEXT_OFFSET_Y 2//3
-#define OPT_TOGGLE_BOX_FIRST_COLUMN_X 265 //257 //OPT_TOGGLE_BOX_TEXT_X + OPT_SPACE_BETWEEN_TEXT_AND_TOGGLE_BOX
-#define OPT_TOGGLE_BOX_SECOND_COLUMN_X 428 //OPT_TOGGLE_BOX_TEXT_X + OPT_SPACE_BETWEEN_TEXT_AND_TOGGLE_BOX
-#define OPT_TOGGLE_BOX_START_Y 89
+#define OPT_TOGGLE_BOX_FIRST_COLUMN_X (SCREEN_WIDTH/2-55) // 265 //257 //OPT_TOGGLE_BOX_TEXT_X + OPT_SPACE_BETWEEN_TEXT_AND_TOGGLE_BOX
+#define OPT_TOGGLE_BOX_SECOND_COLUMN_X (SCREEN_WIDTH/2+108) //428 //OPT_TOGGLE_BOX_TEXT_X + OPT_SPACE_BETWEEN_TEXT_AND_TOGGLE_BOX
+#define OPT_TOGGLE_BOX_START_Y (SCREEN_HEIGHT/2-151) //89
#define OPT_TOGGLE_BOX_TEXT_WIDTH OPT_TOGGLE_BOX_SECOND_COLUMN_X - OPT_TOGGLE_BOX_FIRST_COLUMN_X - 20
@@ -84,22 +84,24 @@
#define OPT_SLIDER_TEXT_WIDTH 45
-#define OPT_SOUND_FX_TEXT_X 38
-#define OPT_SOUND_FX_TEXT_Y 87//116//110
+#define OPT_SOUND_FX_TEXT_X (SCREEN_WIDTH/2-282) //38
+#define OPT_SOUND_FX_TEXT_Y (SCREEN_HEIGHT/2-153) //87//116//110
-#define OPT_SPEECH_TEXT_X 85//OPT_SOUND_FX_TEXT_X + OPT_SLIDER_TEXT_WIDTH
-#define OPT_SPEECH_TEXT_Y OPT_SOUND_FX_TEXT_Y
+#define OPT_SPEECH_TEXT_X (SCREEN_WIDTH/2-235) //85//OPT_SOUND_FX_TEXT_X + OPT_SLIDER_TEXT_WIDTH
+#define OPT_SPEECH_TEXT_Y OPT_SOUND_FX_TEXT_Y//OPT_SOUND_FX_TEXT_Y + OPT_GAP_BETWEEN_SLIDER_BARS
-#define OPT_MUSIC_TEXT_X 137
-#define OPT_MUSIC_TEXT_Y OPT_SOUND_FX_TEXT_Y
+#define OPT_MUSIC_TEXT_X (SCREEN_WIDTH/2-183) //137
+#define OPT_MUSIC_TEXT_Y OPT_SOUND_FX_TEXT_Y//OPT_SPEECH_TEXT_Y + OPT_GAP_BETWEEN_SLIDER_BARS
-#define OPT_SOUND_EFFECTS_SLIDER_X 56
-#define OPT_SOUND_EFFECTS_SLIDER_Y 126
+#define OPT_TEXT_TO_SLIDER_OFFSET_Y 25
-#define OPT_SPEECH_SLIDER_X 107
+#define OPT_SOUND_EFFECTS_SLIDER_X (SCREEN_WIDTH/2-264) //56
+#define OPT_SOUND_EFFECTS_SLIDER_Y (SCREEN_HEIGHT/2-114) //126//110 + OPT_TEXT_TO_SLIDER_OFFSET_Y
+
+#define OPT_SPEECH_SLIDER_X (SCREEN_WIDTH/2- 213) //107
#define OPT_SPEECH_SLIDER_Y OPT_SOUND_EFFECTS_SLIDER_Y
-#define OPT_MUSIC_SLIDER_X 158
+#define OPT_MUSIC_SLIDER_X (SCREEN_WIDTH/2-162) //158
#define OPT_MUSIC_SLIDER_Y OPT_SOUND_EFFECTS_SLIDER_Y
#define OPT_MUSIC_SLIDER_PLAY_SOUND_DELAY 75
@@ -261,8 +263,11 @@
gfExitOptionsDueToMessageBox = FALSE;
// load the options screen background graphic and add it
+#if (SCREEN_WIDTH == 800 && SCREEN_HEIGHT == 600)
+ guiOptionBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/optionscreenbase_800x600.sti");
+#else
guiOptionBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/optionscreenbase.sti");
-
+#endif
// load button, title graphic and add it
const char* const ImageFile = GetMLGFilename(MLG_OPTIONHEADER);
guiOptionsAddOnImages = AddVideoObjectFromFile(ImageFile);
@@ -459,8 +464,10 @@
BltVideoObject(FRAME_BUFFER, guiOptionBackGroundImage, 0, 0, 0);
//Get and display the titla image
- BltVideoObject(FRAME_BUFFER, guiOptionsAddOnImages, 0, 0, 0);
- BltVideoObject(FRAME_BUFFER, guiOptionsAddOnImages, 1, 0, 434);
+ BltVideoObject(FRAME_BUFFER, guiOptionsAddOnImages, 0, (SCREEN_WIDTH/2-320), (SCREEN_HEIGHT/2-240));
+ BltVideoObject(FRAME_BUFFER, guiOptionsAddOnImages, 1, (SCREEN_WIDTH/2-320), (SCREEN_HEIGHT/2+194)); //434);
+// BltVideoObject(FRAME_BUFFER, guiOptionsAddOnImages, 0, 0, 0);
+// BltVideoObject(FRAME_BUFFER, guiOptionsAddOnImages, 1, 0, 434);
//
// Text for the toggle boxes
diff -Nru a/Build/SaveLoadScreen.cc b/Build/SaveLoadScreen.cc
--- a/Build/SaveLoadScreen.cc 2010-05-18 09:13:22.298177000 +0200
+++ b/Build/SaveLoadScreen.cc 2010-05-25 16:29:06.194575000 +0200
@@ -79,10 +79,10 @@
#define SLG_SELECTED_COLOR FONT_MCOLOR_WHITE
#define SLG_UNSELECTED_COLOR FONT_MCOLOR_DKWHITE
-#define SLG_SAVELOCATION_WIDTH 605
-#define SLG_SAVELOCATION_HEIGHT 30//46
-#define SLG_FIRST_SAVED_SPOT_X 17
-#define SLG_FIRST_SAVED_SPOT_Y 49
+#define SLG_SAVELOCATION_WIDTH 605
+#define SLG_SAVELOCATION_HEIGHT 30//46
+#define SLG_FIRST_SAVED_SPOT_X (SCREEN_WIDTH/2-303)//17
+#define SLG_FIRST_SAVED_SPOT_Y (SCREEN_HEIGHT/2-191) //49
#define SLG_GAP_BETWEEN_LOCATIONS 35//47
@@ -100,13 +100,13 @@
#define SLG_SAVE_GAME_DESC_X 318//320//204
#define SLG_SAVE_GAME_DESC_Y SLG_DATE_OFFSET_Y//SLG_DATE_OFFSET_Y + 7
-#define SLG_TITLE_POS_X 0
-#define SLG_TITLE_POS_Y 0
+#define SLG_TITLE_POS_X (SCREEN_WIDTH/2-320)//0
+#define SLG_TITLE_POS_Y (SCREEN_HEIGHT/2-240)//0
-#define SLG_SAVE_CANCEL_POS_X 226//329
-#define SLG_LOAD_CANCEL_POS_X 329
-#define SLG_SAVE_LOAD_BTN_POS_X 123
-#define SLG_BTN_POS_Y 438
+#define SLG_SAVE_CANCEL_POS_X (SCREEN_WIDTH/2-94)//226//329
+#define SLG_LOAD_CANCEL_POS_X (SCREEN_WIDTH/2+9) //329
+#define SLG_SAVE_LOAD_BTN_POS_X (SCREEN_WIDTH/2-197) //123
+#define SLG_BTN_POS_Y (SCREEN_HEIGHT/2+198) //438
#define SLG_SELECTED_SLOT_GRAPHICS_NUMBER 3
#define SLG_UNSELECTED_SLOT_GRAPHICS_NUMBER 2
@@ -380,7 +380,11 @@
}
// Load main background and add ons graphic
+#if (SCREEN_WIDTH == 800 && SCREEN_HEIGHT == 600)
+ guiSlgBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/loadscreen_800x600.sti");
+#else
guiSlgBackGroundImage = AddVideoObjectFromFile(INTERFACEDIR "/loadscreen.sti");
+#endif
guiBackGroundAddOns = AddVideoObjectFromFile(GetMLGFilename(MLG_LOADSAVEHEADER));
guiSlgButtonImage = LoadButtonImage(INTERFACEDIR "/loadscreenaddons.sti", 6, 9);
diff -Nru a/Build/Strategic/Assignments.cc b/Build/Strategic/Assignments.cc
--- a/Build/Strategic/Assignments.cc 2010-07-26 21:13:05.374793000 +0200
+++ b/Build/Strategic/Assignments.cc 2010-02-24 00:51:49.764757000 +0100
@@ -2954,11 +2954,12 @@
if (remove_char == -1) return FALSE;
const SOLDIERTYPE* const s = gCharactersList[remove_char].merc;
if (s->bLife != 0 && s->bAssignment != ASSIGNMENT_POW) return FALSE;
+
+ bSelectedAssignChar = remove_char;
}
// dead guy handle menu stuff
- bSelectedAssignChar = remove_char;
- fShowRemoveMenu = fShowAssignmentMenu | fShowContractMenu;
+ fShowRemoveMenu = fShowAssignmentMenu | fShowContractMenu;
CreateDestroyMouseRegionsForRemoveMenu();
return TRUE;
}
diff -Nru a/Build/Strategic/Game_Clock.cc b/Build/Strategic/Game_Clock.cc
--- a/Build/Strategic/Game_Clock.cc 2009-10-11 18:06:13.100692000 +0200
+++ b/Build/Strategic/Game_Clock.cc 2010-02-24 00:51:49.764757000 +0100
@@ -56,7 +56,7 @@
#define SECONDS_PER_COMPRESSION 1 // 1/2 minute passes every 1 second of real time
-#define CLOCK_X 554
+#define CLOCK_X (SCREEN_WIDTH - 85)
#define CLOCK_Y (SCREEN_HEIGHT - 23)
#define CLOCK_HEIGHT 13
#define CLOCK_WIDTH 66
diff -Nru a/Build/Strategic/MapScreen.cc b/Build/Strategic/MapScreen.cc
--- a/Build/Strategic/MapScreen.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Strategic/MapScreen.cc 2010-02-24 00:51:49.764757000 +0100
@@ -189,10 +189,10 @@
#define DEST_ETA_WIDTH 217 - DEST_ETA_X
#define TIME_REMAINING_X 222
#define TIME_REMAINING_WIDTH 250 - TIME_REMAINING_X
-#define CLOCK_Y_START 298
-#define CLOCK_ETA_X 463 - 15 + 6 + 30
-#define CLOCK_HOUR_X_START 463 + 25 + 30
-#define CLOCK_MIN_X_START 463 + 45 + 30
+#define CLOCK_Y_START (SCREEN_HEIGHT-182) //298
+#define CLOCK_ETA_X (MAP_VIEW_START_X + MAP_VIEW_WIDTH/2) //463 - 15 + 6 + 30
+#define CLOCK_HOUR_X_START CLOCK_ETA_X + 34 //463 + 25 + 30
+#define CLOCK_MIN_X_START CLOCK_HOUR_X_START + 20 //463 + 45 + 30
// contract
@@ -712,7 +712,7 @@
SOLDIERTYPE const* const s = GetSelectedInfoChar();
if (!s || s->bLife == 0) return;
- INVRenderItem(guiSAVEBUFFER, s, s->inv[HANDPOS], SOLDIER_HAND_X, SOLDIER_HAND_Y, 58, 23, DIRTYLEVEL2, 0, SGP_TRANSPARENT);
+ INVRenderItem(guiSAVEBUFFER, s, s->inv[HANDPOS], SOLDIER_HAND_X, SOLDIER_HAND_Y, 58, 23, DIRTYLEVEL2, 0, TRANSPARENT);
}
@@ -2797,7 +2797,7 @@
}
else if (fShowInventoryFlag)
{
- if (!fMapInventoryItem && !InItemStackPopup())
+ if (gMPanelRegion.Cursor != EXTERN_CURSOR && !InItemStackPopup())
{
fEndShowInventoryFlag = TRUE;
}
@@ -5596,8 +5596,8 @@
MapscreenMarkButtonsDirty();
- RestoreExternBackgroundRect(261, 0, SCREEN_WIDTH - 261, 359);
-
+ //RestoreExternBackgroundRect(261, 0, SCREEN_WIDTH - 261, 359);
+ RestoreExternBackgroundRect(261, 0, SCREEN_WIDTH - 261, SCREEN_HEIGHT-121);
// don't bother if showing sector inventory instead of the map!!!
if( !fShowMapInventoryPool )
{
@@ -5641,8 +5641,13 @@
fTeamPanelDirty = FALSE;
gfRenderPBInterface = TRUE;
- MarkAllBoxesAsAltered();
- RestoreExternBackgroundRect(0, 107, 261 - 0, 359 - 107);
+ // mark all pop ups as dirty
+ MarkAllBoxesAsAltered( );
+
+ // restore background for area
+ RestoreExternBackgroundRect( 0, 107, 261 - 0, SCREEN_HEIGHT - 106 - 121 );
+ // RestoreExternBackgroundRect( 0, 107, 261 - 0, 359 - 107 );
+
MapscreenMarkButtonsDirty();
}
@@ -6757,9 +6762,32 @@
{
guiSleepIcon = AddVideoObjectFromFile(INTERFACEDIR "/sleepicon.sti");
guiCHARINFO = AddVideoObjectFromFile(INTERFACEDIR "/charinfo.sti");
+ #if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiCHARLIST = AddVideoObjectFromFile(INTERFACEDIR "/newgoldpiece3_800x600.sti");
+ #else
guiCHARLIST = AddVideoObjectFromFile(INTERFACEDIR "/newgoldpiece3.sti");
+ #endif
- guiMAPINV = AddVideoObjectFromFile(INTERFACEDIR "/mapinv.sti");
+/* #if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiBIGMAP = AddVideoSurfaceFromFile(INTERFACEDIR "/b_map_800x600.pcx");
+ guiCHARLIST = AddVideoObjectFromFile(INTERFACEDIR "/newgoldpiece3_800x600.sti");
+
+ // the sublevels
+ guiSubLevel1 = AddVideoObjectFromFile(INTERFACEDIR "/mine_1_800x600.sti");
+ guiSubLevel2 = AddVideoObjectFromFile(INTERFACEDIR "/mine_2_800x600.sti");
+ guiSubLevel3 = AddVideoObjectFromFile(INTERFACEDIR "/mine_3_800x600.sti");
+#else
+ guiBIGMAP = AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.PCX");
+ guiCHARLIST = AddVideoObjectFromFile(INTERFACEDIR "/newgoldpiece3.sti");
+ // the sublevels
+ guiSubLevel1 = AddVideoObjectFromFile(INTERFACEDIR "/mine_1.sti");
+ guiSubLevel2 = AddVideoObjectFromFile(INTERFACEDIR "/mine_2.sti");
+ guiSubLevel3 = AddVideoObjectFromFile(INTERFACEDIR "/mine_3.sti");
+#endif
+ guiCHARICONS = AddVideoObjectFromFile(INTERFACEDIR "/boxes.sti");
+ guiCROSS = AddVideoObjectFromFile(INTERFACEDIR "/incross.sti");
+*/
+ guiMAPINV = AddVideoObjectFromFile(INTERFACEDIR "/mapinv.sti");
// the upper left corner piece icons
guiULICONS = AddVideoObjectFromFile(INTERFACEDIR "/top_left_corner_icons.sti");
@@ -7351,20 +7379,24 @@
{
if (guiMapBottomExitButtons[MAP_EXIT_TO_LAPTOP]->Clicked())
{ //button is down, so offset the icon
- BltVideoObject(FRAME_BUFFER, guiNewMailIcons, 1, 465, 418);
- InvalidateRegion( 465, 418, 480, 428 );
+ BltVideoObject(FRAME_BUFFER, guiNewMailIcons, 1, (SCREEN_WIDTH-175), (SCREEN_HEIGHT-62) ); // old x 465 y 418
+ InvalidateRegion( (SCREEN_WIDTH-175), (SCREEN_HEIGHT-62), (SCREEN_WIDTH-160), (SCREEN_HEIGHT-52) );
+// InvalidateRegion( 465, 418, 480, 428 );
}
else
{ //button is up, so draw the icon normally
- BltVideoObject(FRAME_BUFFER, guiNewMailIcons, 0, 464, 417);
- if (!guiMapBottomExitButtons[MAP_EXIT_TO_LAPTOP]->Enabled())
+ BltVideoObject(FRAME_BUFFER, guiNewMailIcons, 0, (SCREEN_WIDTH-176), (SCREEN_HEIGHT-63)); // old x 464 y 417
+ if (!(guiMapBottomExitButtons[MAP_EXIT_TO_LAPTOP]->uiFlags & BUTTON_ENABLED))
{
- SGPRect area = { 463, 417, 477, 425 };
+ SGPRect area = { (SCREEN_WIDTH-177), (SCREEN_HEIGHT-63),(SCREEN_WIDTH-163), (SCREEN_HEIGHT-55)};
+// SGPRect area = { 463, 417, 477, 425 };
SGPVSurface::Lock l(FRAME_BUFFER);
Blt16BPPBufferHatchRect(l.Buffer<UINT16>(), l.Pitch(), &area);
}
- InvalidateRegion( 463, 417, 481, 430 );
+ InvalidateRegion( (SCREEN_WIDTH-177), (SCREEN_HEIGHT-63), (SCREEN_WIDTH-159), (SCREEN_HEIGHT-50));
+
+// InvalidateRegion( 463, 417, 481, 430 );
}
}
diff -Nru a/Build/Strategic/Map_Screen_Interface.cc b/Build/Strategic/Map_Screen_Interface.cc
--- a/Build/Strategic/Map_Screen_Interface.cc 2009-10-15 09:15:26.487437000 +0200
+++ b/Build/Strategic/Map_Screen_Interface.cc 2010-02-24 00:51:49.764757000 +0100
@@ -4434,7 +4434,11 @@
void LoadMapScreenInterfaceGraphics()
{
+#if SCREEN_WIDTH == 800
+ guiSectorLocatorGraphicID = AddVideoObjectFromFile(INTERFACEDIR "/hilite_800x600.sti");
+#else
guiSectorLocatorGraphicID = AddVideoObjectFromFile(INTERFACEDIR "/hilite.sti");
+#endif
guiSelectedCharArrow = AddVideoObjectFromFile(INTERFACEDIR "/selectedchararrow.sti");
}
diff -Nru a/Build/Strategic/Map_Screen_Interface.h b/Build/Strategic/Map_Screen_Interface.h
--- a/Build/Strategic/Map_Screen_Interface.h 2009-10-15 09:15:26.487437000 +0200
+++ b/Build/Strategic/Map_Screen_Interface.h 2010-02-24 00:51:49.764757000 +0100
@@ -21,7 +21,9 @@
// max number of characters
//Character List Length
-#define MAX_CHARACTER_COUNT 20
+#define MAX_CHARACTER_COUNT 32//20
+// the first vehicle slot int he list
+#define FIRST_VEHICLE 30 //18
// map screen font
#define MAP_SCREEN_FONT BLOCKFONT2
@@ -162,10 +164,6 @@
#define TACT_UPDATE_MERC_X_OFFSET 4
-// the first vehicle slot int he list
-#define FIRST_VEHICLE 18
-
-
extern BOOLEAN fShowAssignmentMenu;
extern BOOLEAN fShowTrainingMenu ;
extern BOOLEAN fShowAttributeMenu;
diff -Nru a/Build/Strategic/Map_Screen_Interface_Border.cc b/Build/Strategic/Map_Screen_Interface_Border.cc
--- a/Build/Strategic/Map_Screen_Interface_Border.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Border.cc 2010-02-24 00:51:49.764757000 +0100
@@ -1,6 +1,8 @@
#include "Directories.h"
#include "Font_Control.h"
#include "Interface.h"
+// Mythrell - Resolution changes
+#include "Local.h"
#include "Types.h"
#include "VObject.h"
#include "VSurface.h"
@@ -35,17 +37,22 @@
# define MAP_LEVEL_MARKER_X 485
#else
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+# define MAP_BORDER_FILE INTERFACEDIR "/mbs_800x600.sti"
+#else
# define MAP_BORDER_FILE INTERFACEDIR "/mbs.sti"
-# define BTN_TOWN_X 299
-# define BTN_MINE_X 342
-# define BTN_TEAMS_X 385
-# define BTN_MILITIA_X 428
-# define BTN_AIR_X 471
-# define BTN_ITEM_X 514
-
-# define MAP_LEVEL_MARKER_X 565
#endif
-#define MAP_LEVEL_MARKER_Y 323
+# define BTN_TOWN_X (SCREEN_WIDTH-341)//299
+# define BTN_MINE_X (SCREEN_WIDTH-298)//342
+# define BTN_TEAMS_X (SCREEN_WIDTH-255)//385
+# define BTN_MILITIA_X (SCREEN_WIDTH-212)//428
+# define BTN_AIR_X (SCREEN_WIDTH-169)//471
+# define BTN_ITEM_X (SCREEN_WIDTH-126) //514
+// Mythrell - Resolution changes
+# define MAP_LEVEL_MARKER_X (SCREEN_WIDTH - 75)
+// # define MAP_LEVEL_MARKER_X 565
+#endif
+#define MAP_LEVEL_MARKER_Y (SCREEN_HEIGHT - 157) //323
#define MAP_LEVEL_MARKER_DELTA 8
#define MAP_LEVEL_MARKER_WIDTH 55
@@ -53,7 +60,8 @@
#define MAP_BORDER_X 261
#define MAP_BORDER_Y 0
-#define MAP_BORDER_CORNER_X 584
+// Mythrell - Resolution changes
+#define MAP_BORDER_CORNER_X (SCREEN_HEIGHT-55) //584
#define MAP_BORDER_CORNER_Y 279
@@ -164,6 +172,8 @@
}
BltVideoObject(guiSAVEBUFFER, guiMapBorder, 0, MAP_BORDER_X, MAP_BORDER_Y);
+ // Mythrell - Resolution fix
+ RestoreExternBackgroundRect( MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X, SCREEN_HEIGHT );
// show the level marker
DisplayCurrentLevelMarker( );
@@ -212,9 +222,11 @@
return;
}
- BltVideoObject(FRAME_BUFFER, guiMapBorderEtaPopUp, 0, MAP_BORDER_X + 215, 291);
+ BltVideoObject(FRAME_BUFFER, guiMapBorderEtaPopUp, 0, MAP_BORDER_X + MAP_VIEW_WIDTH/2, SCREEN_HEIGHT-189);
+// BltVideoObject(FRAME_BUFFER, guiMapBorderEtaPopUp, 0, MAP_BORDER_X + 215, 291);
- InvalidateRegion( MAP_BORDER_X + 215, 291, MAP_BORDER_X + 215 + 100 , 310);
+ InvalidateRegion( MAP_BORDER_X + MAP_VIEW_WIDTH/2, (SCREEN_HEIGHT-189), MAP_BORDER_X + MAP_VIEW_WIDTH/2 + 100 , (SCREEN_HEIGHT-189) + 19);
+// InvalidateRegion( MAP_BORDER_X + 215, 291, MAP_BORDER_X + 215 + 100 , 310);
}
@@ -222,7 +234,9 @@
{
BUTTON_PICS* const img = LoadButtonImage(INTERFACEDIR "/map_border_buttons.sti", gfx, gfx + 9);
giMapBorderButtonsImage[idx] = img;
- GUIButtonRef const btn = QuickCreateButtonNoMove(img, x, 323, MSYS_PRIORITY_HIGH, click);
+// Mythrell - Resolution fix
+ GUIButtonRef const btn = QuickCreateButtonNoMove(img, x, (SCREEN_HEIGHT-157), MSYS_PRIORITY_HIGH, click);
+// GUIButtonRef const btn = QuickCreateButtonNoMove(img, x, 323, MSYS_PRIORITY_HIGH, click);
giMapBorderButtons[idx] = btn;
btn->SetFastHelpText(help);
btn->SetCursor(MSYS_NO_CURSOR);
diff -Nru a/Build/Strategic/Map_Screen_Interface_Border.h b/Build/Strategic/Map_Screen_Interface_Border.h
--- a/Build/Strategic/Map_Screen_Interface_Border.h 2009-10-11 18:06:09.135649000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Border.h 2010-02-24 00:51:49.764757000 +0100
@@ -5,7 +5,7 @@
#include "Types.h"
-#define MAP_BORDER_START_X 261
+#define MAP_BORDER_START_X (SCREEN_WIDTH-378) // 261
#define MAP_BORDER_START_Y 0
diff -Nru a/Build/Strategic/Map_Screen_Interface_Bottom.cc b/Build/Strategic/Map_Screen_Interface_Bottom.cc
--- a/Build/Strategic/Map_Screen_Interface_Bottom.cc 2009-10-11 18:06:11.758205000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Bottom.cc 2010-02-24 00:51:49.764757000 +0100
@@ -52,17 +52,22 @@
#define MAP_BOTTOM_X 0
-#define MAP_BOTTOM_Y 359
+#define MAP_BOTTOM_Y (SCREEN_HEIGHT-121)
+
+// Mythrell: Start of currently selected sector text under radar screen
+#define SECTOR_TEXT_START_X (SCREEN_WIDTH-92)
+#define SECTOR_TEXT_START_Y (SCREEN_HEIGHT-54)
+// #define MAP_BOTTOM_Y 359
#define MESSAGE_BOX_X 17
-#define MESSAGE_BOX_Y 377
+#define MESSAGE_BOX_Y (SCREEN_HEIGHT-102)
#define MESSAGE_BOX_W 301
#define MESSAGE_BOX_H 86
#define MESSAGE_SCROLL_AREA_START_X 330
#define MESSAGE_SCROLL_AREA_WIDTH 15
-#define MESSAGE_SCROLL_AREA_START_Y 390
+#define MESSAGE_SCROLL_AREA_START_Y (SCREEN_HEIGHT-90)
#define MESSAGE_SCROLL_AREA_HEIGHT 59
#define SLIDER_HEIGHT 11
@@ -150,8 +155,11 @@
{
// will load the graphics needed for the mapscreen interface bottom
// will create buttons for interface bottom
+#if SCREEN_WIDTH == 800 && SCREEN_HEIGHT==600
+ guiMAPBOTTOMPANEL = AddVideoObjectFromFile(INTERFACEDIR "/map_screen_bottom_800x600.sti");
+#else
guiMAPBOTTOMPANEL = AddVideoObjectFromFile(INTERFACEDIR "/map_screen_bottom.sti");
-
+#endif
// load slider bar icon
LoadMessageSliderBar( );
}
@@ -292,17 +300,29 @@
static void CreateButtonsForMapScreenInterfaceBottom(void)
{
- guiMapBottomExitButtons[MAP_EXIT_TO_LAPTOP] = MakeExitButton( 6, 15, 456, 410, BtnLaptopCallback, pMapScreenBottomFastHelp[0]);
- guiMapBottomExitButtons[MAP_EXIT_TO_TACTICAL] = MakeExitButton( 7, 16, 496, 410, BtnTacticalCallback, pMapScreenBottomFastHelp[1]);
- guiMapBottomExitButtons[MAP_EXIT_TO_OPTIONS] = MakeExitButton(18, 19, 458, 372, BtnOptionsFromMapScreenCallback, pMapScreenBottomFastHelp[2]);
+ // Mythrell - Fixed for dynamic res. changes
+ guiMapBottomExitButtons[MAP_EXIT_TO_LAPTOP] = MakeExitButton( 6, 15, (SCREEN_WIDTH-184), (SCREEN_HEIGHT-70), BtnLaptopCallback, pMapScreenBottomFastHelp[0]);
+ guiMapBottomExitButtons[MAP_EXIT_TO_TACTICAL] = MakeExitButton( 7, 16, (SCREEN_WIDTH-144), (SCREEN_HEIGHT-70), BtnTacticalCallback, pMapScreenBottomFastHelp[1]);
+ guiMapBottomExitButtons[MAP_EXIT_TO_OPTIONS] = MakeExitButton(18, 19, (SCREEN_WIDTH-182), (SCREEN_HEIGHT-108), BtnOptionsFromMapScreenCallback, pMapScreenBottomFastHelp[2]);
+
+ /* guiMapBottomExitButtons[MAP_EXIT_TO_LAPTOP] = MakeExitButton( 6, 15, 456, 410, BtnLaptopCallback, pMapScreenBottomFastHelp[0]);
+ guiMapBottomExitButtons[MAP_EXIT_TO_TACTICAL] = MakeExitButton( 7, 16, 496, 410, BtnTacticalCallback, pMapScreenBottomFastHelp[1]);
+ guiMapBottomExitButtons[MAP_EXIT_TO_OPTIONS] = MakeExitButton(18, 19, 458, 372, BtnOptionsFromMapScreenCallback, pMapScreenBottomFastHelp[2]);*/
// time compression buttons
- guiMapBottomTimeButtons[MAP_TIME_COMPRESS_MORE] = MakeArrowButton(10, 1, 3, 528, 456, BtnTimeCompressMoreMapScreenCallback, pMapScreenBottomFastHelp[3]);
- guiMapBottomTimeButtons[MAP_TIME_COMPRESS_LESS] = MakeArrowButton( 9, 0, 2, 466, 456, BtnTimeCompressLessMapScreenCallback, pMapScreenBottomFastHelp[4]);
+
+ guiMapBottomTimeButtons[MAP_TIME_COMPRESS_MORE] = MakeArrowButton(10, 1, 3, (SCREEN_WIDTH-112), (SCREEN_HEIGHT-24), BtnTimeCompressMoreMapScreenCallback, pMapScreenBottomFastHelp[3]);
+ guiMapBottomTimeButtons[MAP_TIME_COMPRESS_LESS] = MakeArrowButton( 9, 0, 2, (SCREEN_WIDTH-174), (SCREEN_HEIGHT-24), BtnTimeCompressLessMapScreenCallback, pMapScreenBottomFastHelp[4]);
+
+ // guiMapBottomTimeButtons[MAP_TIME_COMPRESS_MORE] = MakeArrowButton(10, 1, 3, 528, 456, BtnTimeCompressMoreMapScreenCallback, pMapScreenBottomFastHelp[3]);
+// guiMapBottomTimeButtons[MAP_TIME_COMPRESS_LESS] = MakeArrowButton( 9, 0, 2, 466, 456, BtnTimeCompressLessMapScreenCallback, pMapScreenBottomFastHelp[4]);
// scroll buttons
- guiMapMessageScrollButtons[MAP_SCROLL_MESSAGE_UP] = MakeArrowButton(11, 4, 6, 331, 371, BtnMessageUpMapScreenCallback, pMapScreenBottomFastHelp[5]);
- guiMapMessageScrollButtons[MAP_SCROLL_MESSAGE_DOWN] = MakeArrowButton(12, 5, 7, 331, 452, BtnMessageDownMapScreenCallback, pMapScreenBottomFastHelp[6]);
+ guiMapMessageScrollButtons[MAP_SCROLL_MESSAGE_UP] = MakeArrowButton(11, 4, 6, 331, (SCREEN_HEIGHT-109), BtnMessageUpMapScreenCallback, pMapScreenBottomFastHelp[5]);
+ guiMapMessageScrollButtons[MAP_SCROLL_MESSAGE_DOWN] = MakeArrowButton(12, 5, 7, 331, (SCREEN_HEIGHT-28), BtnMessageDownMapScreenCallback, pMapScreenBottomFastHelp[6]);
+
+// guiMapMessageScrollButtons[MAP_SCROLL_MESSAGE_UP] = MakeArrowButton(11, 4, 6, 331, 371, BtnMessageUpMapScreenCallback, pMapScreenBottomFastHelp[5]);
+// guiMapMessageScrollButtons[MAP_SCROLL_MESSAGE_DOWN] = MakeArrowButton(12, 5, 7, 331, 452, BtnMessageDownMapScreenCallback, pMapScreenBottomFastHelp[6]);
}
@@ -374,7 +394,7 @@
INT16 x;
INT16 y;
- FindFontCenterCoordinates(548, 426, 80, 16, buf, font, &x, &y);
+ FindFontCenterCoordinates(SECTOR_TEXT_START_X, SECTOR_TEXT_START_Y, 80, 16, buf, font, &x, &y);
MPrint(x, y, buf);
}
@@ -592,7 +612,9 @@
abort(); // XXX HACK000E
}
- RestoreExternBackgroundRect( 489, 456, 522 - 489, 467 - 454 );
+ RestoreExternBackgroundRect( (SCREEN_WIDTH - 151), (SCREEN_HEIGHT - 24), 522 - 489, 467 - 454 );
+
+// RestoreExternBackgroundRect( 489, 456, 522 - 489, 467 - 454 );
SetFontDestBuffer(FRAME_BUFFER);
if( GetJA2Clock() - guiCompressionStringBaseTime >= PAUSE_GAME_TIMER )
@@ -615,14 +637,15 @@
}
SetFontAttributes(COMPFONT, usColor);
- FindFontCenterCoordinates(489, 456, 522 - 489, 467 - 454, Time, COMPFONT, &sX, &sY);
+ FindFontCenterCoordinates((SCREEN_WIDTH - 151), (SCREEN_HEIGHT - 24), 522 - 489, 467 - 454, Time, COMPFONT, &sX, &sY);
+// FindFontCenterCoordinates(489, 456, 522 - 489, 467 - 454, Time, COMPFONT, &sX, &sY);
MPrint(sX, sY, Time);
}
static void CreateCompressModePause(void)
{
- MSYS_DefineRegion( &gMapPauseRegion, 487, 456, 522, 467, MSYS_PRIORITY_HIGH,
+ MSYS_DefineRegion( &gMapPauseRegion, (SCREEN_WIDTH - 153), (SCREEN_HEIGHT - 24), (SCREEN_WIDTH - 118), (SCREEN_HEIGHT - 13), MSYS_PRIORITY_HIGH,
MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressModeClickCallback );
gMapPauseRegion.SetFastHelpText(pMapScreenBottomFastHelp[7]);
}
@@ -944,11 +967,13 @@
SetFontAttributes(COMPFONT, MAP_BOTTOM_FONT_COLOR);
sString = pMapScreenBottomText;
- FindFontCenterCoordinates(359, 387 - 14, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+ FindFontCenterCoordinates(359, (SCREEN_HEIGHT - 107), 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+ // FindFontCenterCoordinates(359, 387 - 14, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
MPrint(sFontX, sFontY, sString);
sString = zMarksMapScreenText[2];
- FindFontCenterCoordinates(359, 433 - 14, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+ FindFontCenterCoordinates(359, (SCREEN_HEIGHT - 61), 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+// FindFontCenterCoordinates(359, 433 - 14, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
MPrint(sFontX, sFontY, sString);
SetFontDestBuffer(FRAME_BUFFER);
@@ -964,7 +989,8 @@
SetFontDestBuffer(FRAME_BUFFER);
SetFontAttributes(COMPFONT, 183);
SPrintMoney(sString, LaptopSaveInfo.iCurrentBalance);
- FindFontCenterCoordinates(359, 387 + 2, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+ FindFontCenterCoordinates(359, (SCREEN_HEIGHT - 91), 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+// FindFontCenterCoordinates(359, 387 + 2, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
MPrint(sFontX, sFontY, sString);
}
@@ -1025,7 +1051,8 @@
SetFontDestBuffer(FRAME_BUFFER);
SetFontAttributes(COMPFONT, 183);
SPrintMoney(sString, iRate);
- FindFontCenterCoordinates(359, 433 + 2, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+ FindFontCenterCoordinates(359, (SCREEN_HEIGHT - 45), 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
+// FindFontCenterCoordinates(359, 433 + 2, 437 - 359, 10, sString, COMPFONT, &sFontX, &sFontY);
MPrint(sFontX, sFontY, sString);
}
diff -Nru a/Build/Strategic/Map_Screen_Interface_Map.cc b/Build/Strategic/Map_Screen_Interface_Map.cc
--- a/Build/Strategic/Map_Screen_Interface_Map.cc 2010-05-04 09:45:41.165415000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Map.cc 2010-05-25 16:29:06.194575000 +0200
@@ -79,14 +79,14 @@
#define VERT_SCROLL 10
// the pop up for helicopter stuff
-#define MAP_HELICOPTER_ETA_POPUP_X 400
-#define MAP_HELICOPTER_ETA_POPUP_Y 250
+#define MAP_HELICOPTER_ETA_POPUP_X (SCREEN_WIDTH-240)//400
+#define MAP_HELICOPTER_ETA_POPUP_Y (SCREEN_HEIGHT-230)//250
#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y 50
#define MAP_HELICOPTER_ETA_POPUP_WIDTH 120
#define MAP_HELICOPTER_ETA_POPUP_HEIGHT 68
-#define MAP_LEVEL_STRING_X 432
-#define MAP_LEVEL_STRING_Y 305
+#define MAP_LEVEL_STRING_X (MAP_VIEW_START_X + MAP_VIEW_WIDTH/2 - 6)//432
+#define MAP_LEVEL_STRING_Y (MAP_VIEW_START_Y + MAP_VIEW_HEIGHT - 3) //305
// font
#define MAP_FONT BLOCKFONT2
@@ -628,7 +628,13 @@
}
else
{
+// BltVideoSurfaceHalf(guiSAVEBUFFER, guiBIGMAP, MAP_VIEW_START_X + MAP_GRID_X, MAP_VIEW_START_Y + MAP_GRID_Y - 2, NULL);
+//
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT == 600)
+ BltVideoSurface(guiSAVEBUFFER, guiBIGMAP, MAP_VIEW_START_X + 1, MAP_VIEW_START_Y, NULL);
+#else
BltVideoSurfaceHalf(guiSAVEBUFFER, guiBIGMAP, MAP_VIEW_START_X + 1, MAP_VIEW_START_Y, NULL);
+#endif
}
// shade map sectors (must be done after Tixa/Orta/Mine icons have been blitted, but before icons!)
@@ -985,6 +991,15 @@
// compensate for original BIG_MAP blit being done at MAP_VIEW_START_X + 1
sScreenX += 1;
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ SGPBox const clip =
+ {
+ (sScreenX - (MAP_VIEW_START_X + 1)),
+ (sScreenY - MAP_VIEW_START_Y ),
+ MAP_GRID_X,
+ MAP_GRID_Y
+ };
+#else
SGPBox const clip =
{
2 * (sScreenX - (MAP_VIEW_START_X + 1)),
@@ -992,7 +1007,7 @@
2 * MAP_GRID_X,
2 * MAP_GRID_Y
};
-
+#endif
// non-airspace
if (iColor == MAP_SHADE_BLACK) sScreenY -= 1;
@@ -1021,7 +1036,11 @@
map->p16BPPPalette = pal;
//mine->p16BPPPalette = pal;
//sam->p16BPPPalette = pal;
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT == 600)
+ BltVideoSurface(guiSAVEBUFFER, guiBIGMAP, sScreenX, sScreenY, &clip);
+#else
BltVideoSurfaceHalf(guiSAVEBUFFER, guiBIGMAP, sScreenX, sScreenY, &clip);
+#endif
map->p16BPPPalette = org_pal;
//mine->p16BPPPalette = org_pal;
//sam->p16BPPPalette = org_pal;
@@ -1114,7 +1133,8 @@
void InitializePalettesForMap(void)
{
#ifndef JA2DEMO
- AutoSGPVSurface uiTempMap(AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.pcx"));
+ AutoSGPVSurface uiTempMap(AddVideoSurfaceFromFile(INTERFACEDIR "/b_map_800x600.pcx"));
+// AutoSGPVSurface uiTempMap(AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.pcx"));
SGPPaletteEntry const* const pal = uiTempMap->GetPalette();
@@ -2866,7 +2886,7 @@
// mvt icon offset defines
-#define SOUTH_Y_MVT_OFFSET +10
+#define SOUTH_Y_MVT_OFFSET + ( MAP_GRID_Y - 8) //+10
#define SOUTH_X_MVT_OFFSET 0
#define NORTH_Y_MVT_OFFSET -10
#define NORTH_X_MVT_OFFSET +10
@@ -2879,11 +2899,11 @@
#define NORTH_X_MVT_OFFSET_ZOOM +25
#define NORTH_SOUTH_CENTER_OFFSET_ZOOM +15
-#define EAST_Y_MVT_OFFSET + 8
-#define EAST_X_MVT_OFFSET 15
-#define WEST_Y_MVT_OFFSET -2
-#define WEST_X_MVT_OFFSET -8
-#define EAST_WEST_CENTER_OFFSET +2
+#define EAST_Y_MVT_OFFSET + 9//8
+#define EAST_X_MVT_OFFSET ( MAP_GRID_X -6) //15
+#define WEST_Y_MVT_OFFSET - 2
+#define WEST_X_MVT_OFFSET - 8
+#define EAST_WEST_CENTER_OFFSET + 2
#define EAST_Y_MVT_OFFSET_ZOOM +24
#define EAST_X_MVT_OFFSET_ZOOM +36
@@ -3233,12 +3253,16 @@
maxY = ( sY );
}
*/
-
- AssertMsg(minX < 640, String("DisplayPositionOfHelicopter: Invalid minX = %d", minX));
+// Mythrell - Helicopter and bigger map resolution fix
+ AssertMsg(minX < SCREEN_WIDTH, String("DisplayPositionOfHelicopter: Invalid minX = %d", minX));
+ AssertMsg(maxX < SCREEN_WIDTH, String("DisplayPositionOfHelicopter: Invalid maxX = %d", maxX));
+ AssertMsg(minY < SCREEN_HEIGHT, String("DisplayPositionOfHelicopter: Invalid minY = %d", minY));
+ AssertMsg(maxY < SCREEN_HEIGHT, String("DisplayPositionOfHelicopter: Invalid maxY = %d", maxY));
+/* AssertMsg(minX < 640, String("DisplayPositionOfHelicopter: Invalid minX = %d", minX));
AssertMsg(maxX < 640, String("DisplayPositionOfHelicopter: Invalid maxX = %d", maxX));
AssertMsg(minY < 640, String("DisplayPositionOfHelicopter: Invalid minY = %d", minY));
AssertMsg(maxY < 640, String("DisplayPositionOfHelicopter: Invalid maxY = %d", maxY));
-
+*/
// IMPORTANT: Since min can easily be larger than max, we gotta cast to as signed value
x = ( UINT32 )( minX + flRatio * ( ( INT16 ) maxX - ( INT16 ) minX ) );
y = ( UINT32 )( minY + flRatio * ( ( INT16 ) maxY - ( INT16 ) minY ) );
@@ -3694,12 +3718,27 @@
void LoadMapScreenInterfaceMapGraphics()
{
#ifndef JA2DEMO
- guiBIGMAP = AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.pcx");
+#if SCREEN_WIDTH == 800
+ guiBIGMAP = AddVideoSurfaceFromFile(INTERFACEDIR "/b_map_800x600.pcx");
+ guiSAMICON = AddVideoObjectFromFile(INTERFACEDIR "/sam.sti");
+ guiBULLSEYE = AddVideoObjectFromFile(INTERFACEDIR "/bullseye.sti");
+#else
guiBULLSEYE = AddVideoObjectFromFile(INTERFACEDIR "/bullseye.sti");
guiSAMICON = AddVideoObjectFromFile(INTERFACEDIR "/sam.sti");
+ guiBIGMAP = AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.pcx");
+#endif
#endif
guiCHARBETWEENSECTORICONS = AddVideoObjectFromFile(INTERFACEDIR "/merc_between_sector_icons.sti");
guiCHARBETWEENSECTORICONSCLOSE = AddVideoObjectFromFile(INTERFACEDIR "/merc_mvt_green_arrows.sti");
+#if SCREEN_WIDTH == 800
+ guiSubLevel1 = AddVideoObjectFromFile(INTERFACEDIR "/mine_1_800x600.sti");
+ guiSubLevel2 = AddVideoObjectFromFile(INTERFACEDIR "/mine_2_800x600.sti");
+ guiSubLevel3 = AddVideoObjectFromFile(INTERFACEDIR "/mine_3_800x600.sti");
+#else
+ guiSubLevel1 = AddVideoObjectFromFile(INTERFACEDIR "/mine_1.sti");
+ guiSubLevel2 = AddVideoObjectFromFile(INTERFACEDIR "/mine_2.sti");
+ guiSubLevel3 = AddVideoObjectFromFile(INTERFACEDIR "/mine_3.sti");
+#endif
guiCHARICONS = AddVideoObjectFromFile(INTERFACEDIR "/boxes.sti");
guiHelicopterIcon = AddVideoObjectFromFile(INTERFACEDIR "/helicop.sti");
guiMAPCURSORS = AddVideoObjectFromFile(INTERFACEDIR "/mapcursr.sti");
@@ -3710,9 +3749,6 @@
guiMilitiaSectorHighLight = AddVideoObjectFromFile(INTERFACEDIR "/militiamapsectoroutline2.sti");
guiMilitiaSectorOutline = AddVideoObjectFromFile(INTERFACEDIR "/militiamapsectoroutline.sti");
guiORTAICON = AddVideoObjectFromFile(INTERFACEDIR "/map_item.sti");
- guiSubLevel1 = AddVideoObjectFromFile(INTERFACEDIR "/mine_1.sti");
- guiSubLevel2 = AddVideoObjectFromFile(INTERFACEDIR "/mine_2.sti");
- guiSubLevel3 = AddVideoObjectFromFile(INTERFACEDIR "/mine_3.sti");
guiTIXAICON = AddVideoObjectFromFile(INTERFACEDIR "/prison.sti");
}
@@ -4492,7 +4528,8 @@
}
// handle the blt of the sublevel
- BltVideoObject(guiSAVEBUFFER, vo, 0, MAP_VIEW_START_X + 21, MAP_VIEW_START_Y + 17);
+ BltVideoObject(guiSAVEBUFFER, vo, 0, MAP_VIEW_START_X + MAP_GRID_X, MAP_VIEW_START_Y + MAP_GRID_Y - 1);
+// BltVideoObject(guiSAVEBUFFER, vo, 0, MAP_VIEW_START_X + 21, MAP_VIEW_START_Y + 17);
// handle shading of sublevels
ShadeSubLevelsNotVisited( );
@@ -4866,8 +4903,9 @@
INT16 sX, sY;
GetScreenXYFromMapXY(SECTORX(g_merc_arrive_sector), SECTORY(g_merc_arrive_sector), &sX, &sY);
- sY -= 2;
-
+// sY -= 2;
+ sX += (MAP_GRID_X - 21)/2;
+ sY += (MAP_GRID_Y - 20)/2;
BltVideoObject(guiSAVEBUFFER, guiBULLSEYE, 0, sX, sY);
#endif
}
diff -Nru a/Build/Strategic/Map_Screen_Interface_Map.h b/Build/Strategic/Map_Screen_Interface_Map.h
--- a/Build/Strategic/Map_Screen_Interface_Map.h 2009-10-11 18:06:38.944885000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Map.h 2010-02-24 00:51:49.764757000 +0100
@@ -121,8 +121,10 @@
// size of squares on the map
-#define MAP_GRID_X 21
-#define MAP_GRID_Y 18
+#define MAP_GRID_X 30//29//28
+#define MAP_GRID_Y 25//24//23
+//#define MAP_GRID_X 21
+//#define MAP_GRID_Y 18
// scroll bounds
@@ -134,8 +136,8 @@
// map view region
#define MAP_VIEW_START_X 270
#define MAP_VIEW_START_Y 10
-#define MAP_VIEW_WIDTH 336
-#define MAP_VIEW_HEIGHT 298
+#define MAP_VIEW_WIDTH 480//464//436 //336
+#define MAP_VIEW_HEIGHT 409//400//396//356 //298
// zoomed in grid sizes
#define MAP_GRID_ZOOM_X MAP_GRID_X*2
diff -Nru a/Build/Strategic/Map_Screen_Interface_Map_Inventory.cc b/Build/Strategic/Map_Screen_Interface_Map_Inventory.cc
--- a/Build/Strategic/Map_Screen_Interface_Map_Inventory.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Map_Inventory.cc 2010-02-24 00:51:49.764757000 +0100
@@ -1,4 +1,5 @@
#include "Auto_Resolve.h"
+#include "Local.h"
#include "Buffer.h"
#include "Directories.h"
#include "Font.h"
@@ -54,19 +55,28 @@
#define MAP_IVEN_FONT SMALLCOMPFONT
// inventory pool slot positions and sizes
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+#define MAP_INV_SLOT_ROWS 12
+#else
#define MAP_INV_SLOT_ROWS 9
-
+#endif
static const SGPBox g_sector_inv_box = { 261, 0, 379, 360 };
-static const SGPBox g_sector_inv_title_box = { 266, 5, 370, 29 };
+static const SGPBox g_sector_inv_title_box = { (SCREEN_WIDTH/2)-54, 5, 370, 29 };
static const SGPBox g_sector_inv_slot_box = { 274, 37, 72, 32 };
static const SGPBox g_sector_inv_region_box = { 0, 0, 67, 31 }; // relative to g_sector_inv_slot_box
static const SGPBox g_sector_inv_item_box = { 6, 0, 61, 24 }; // relative to g_sector_inv_slot_box
static const SGPBox g_sector_inv_bar_box = { 2, 2, 2, 20 }; // relative to g_sector_inv_slot_box
static const SGPBox g_sector_inv_name_box = { 0, 24, 67, 7 }; // relative to g_sector_inv_slot_box
-static const SGPBox g_sector_inv_loc_box = { 326, 337, 39, 10 };
-static const SGPBox g_sector_inv_count_box = { 437, 337, 39, 10 };
-static const SGPBox g_sector_inv_page_box = { 505, 337, 50, 10 };
+static const SGPBox g_sector_inv_loc_box = { SCREEN_WIDTH-314, SCREEN_HEIGHT-143, 39, 10 };
+static const SGPBox g_sector_inv_count_box = { SCREEN_WIDTH-203, SCREEN_HEIGHT-143, 39, 10 };
+static const SGPBox g_sector_inv_page_box = { SCREEN_WIDTH-135, SCREEN_HEIGHT-143, 50, 10 };
+//static const SGPBox g_sector_inv_box = { 261, 0, 379, 360 };
+//static const SGPBox g_sector_inv_title_box = { 266, 5, 370, 29 };
+//static const SGPBox g_sector_inv_slot_box = { 274, 37, 72, 32 };
+//static const SGPBox g_sector_inv_page_box = { 505, 337, 50, 10 };
+//static const SGPBox g_sector_inv_loc_box = { 326, 337, 39, 10 };
+//static const SGPBox g_sector_inv_count_box = { 437, 337, 39, 10 };
// the current highlighted item
@@ -116,7 +126,11 @@
void LoadInventoryPoolGraphic(void)
{
// add to V-object index
+#if (SCREEN_WIDTH == 800 && SCREEN_HEIGHT == 600)
+ guiMapInventoryPoolBackground = AddVideoObjectFromFile(INTERFACEDIR "/sector_inventory_800x600.sti");
+#else
guiMapInventoryPoolBackground = AddVideoObjectFromFile(INTERFACEDIR "/sector_inventory.sti");
+#endif
}
@@ -205,7 +219,7 @@
SetFontDestBuffer(guiSAVEBUFFER);
const SGPBox* const item_box = &g_sector_inv_item_box;
- const UINT16 outline = fMapInventoryItemCompatable[iCurrentSlot] ? Get16BPPColor(FROMRGB(255, 255, 255)) : SGP_TRANSPARENT;
+ const UINT16 outline = (fMapInventoryItemCompatable[iCurrentSlot] ? Get16BPPColor(FROMRGB(255, 255, 255)) : TRANSPARENT);
INVRenderItem(guiSAVEBUFFER, NULL, item->o, dx + item_box->x, dy + item_box->y, item_box->w, item_box->h, DIRTYLEVEL2, 0, outline);
// draw bar for condition
@@ -653,8 +667,10 @@
static void CreateMapInventoryButtons(void)
{
- guiMapInvenButton[0] = QuickCreateButtonImg(INTERFACEDIR "/map_screen_bottom_arrows.sti", 10, 1, -1, 3, -1, 559, 336, MSYS_PRIORITY_HIGHEST, MapInventoryPoolNextBtn);
- guiMapInvenButton[1] = QuickCreateButtonImg(INTERFACEDIR "/map_screen_bottom_arrows.sti", 9, 0, -1, 2, -1, 487, 336, MSYS_PRIORITY_HIGHEST, MapInventoryPoolPrevBtn);
+ guiMapInvenButton[0] = QuickCreateButtonImg(INTERFACEDIR "/map_screen_bottom_arrows.sti", 10, 1, -1, 3, -1, SCREEN_WIDTH-81, SCREEN_HEIGHT-144, MSYS_PRIORITY_HIGHEST, MapInventoryPoolNextBtn);
+ guiMapInvenButton[1] = QuickCreateButtonImg(INTERFACEDIR "/map_screen_bottom_arrows.sti", 9, 0, -1, 2, -1, SCREEN_WIDTH-153, SCREEN_HEIGHT-144, MSYS_PRIORITY_HIGHEST, MapInventoryPoolPrevBtn);
+// guiMapInvenButton[0] = QuickCreateButtonImg("INTERFACE/map_screen_bottom_arrows.sti", 10, 1, -1, 3, -1, 559, 336, MSYS_PRIORITY_HIGHEST, MapInventoryPoolNextBtn);
+// guiMapInvenButton[1] = QuickCreateButtonImg("INTERFACE/map_screen_bottom_arrows.sti", 9, 0, -1, 2, -1, 487, 336, MSYS_PRIORITY_HIGHEST, MapInventoryPoolPrevBtn);
//reset the current inventory page to be the first page
iCurrentInventoryPoolPage = 0;
@@ -1132,7 +1148,8 @@
static void CreateMapInventoryPoolDoneButton(void)
{
// create done button
- guiMapInvenButton[2] = QuickCreateButtonImg(INTERFACEDIR "/done_button.sti", 0, 1, 587, 333, MSYS_PRIORITY_HIGHEST, MapInventoryPoolDoneBtn);
+ guiMapInvenButton[2] = QuickCreateButtonImg(INTERFACEDIR "/done_button.sti", -1, 0, -1, 1, -1, SCREEN_WIDTH-53, SCREEN_HEIGHT - 147, MSYS_PRIORITY_HIGHEST, MapInventoryPoolDoneBtn);
+// guiMapInvenButton[2] = QuickCreateButtonImg("INTERFACE/done_button.sti", -1, 0, -1, 1, -1, 587, 333, MSYS_PRIORITY_HIGHEST, MapInventoryPoolDoneBtn);
}
@@ -1195,11 +1212,13 @@
//Calculate the height of the string, as it needs to be vertically centered.
usStringHeight = DisplayWrappedString(268, 342, 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[0], FONT_BLACK, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT);
- DisplayWrappedString(268, 342 - (usStringHeight / 2), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[0], FONT_BLACK, RIGHT_JUSTIFIED);
+ DisplayWrappedString(SCREEN_WIDTH-372, SCREEN_HEIGHT-144, 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[0], FONT_BLACK, RIGHT_JUSTIFIED);
+// DisplayWrappedString(268, 342 - (usStringHeight / 2), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[0], FONT_BLACK, RIGHT_JUSTIFIED);
//Calculate the height of the string, as it needs to be vertically centered.
usStringHeight = DisplayWrappedString(369, 342, 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[1], FONT_BLACK, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT);
- DisplayWrappedString( 369, 342 - (usStringHeight / 2), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[1], FONT_BLACK, RIGHT_JUSTIFIED);
+ DisplayWrappedString( SCREEN_WIDTH-271, SCREEN_HEIGHT-144, 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[1], FONT_BLACK, RIGHT_JUSTIFIED);
+// DisplayWrappedString( 369, 342 - (usStringHeight / 2), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[1], FONT_BLACK, RIGHT_JUSTIFIED);
DrawTextOnSectorInventory( );
diff -Nru a/Build/Strategic/Map_Screen_Interface_Map_Inventory.h b/Build/Strategic/Map_Screen_Interface_Map_Inventory.h
--- a/Build/Strategic/Map_Screen_Interface_Map_Inventory.h 2008-05-25 21:26:35.765181000 +0200
+++ b/Build/Strategic/Map_Screen_Interface_Map_Inventory.h 2008-07-11 19:46:35.159991000 +0200
@@ -5,8 +5,11 @@
#include "World_Items.h"
// number of inventory slots
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+#define MAP_INVENTORY_POOL_SLOT_COUNT 84
+#else
#define MAP_INVENTORY_POOL_SLOT_COUNT 45
-
+#endif
// whether we are showing the inventory pool graphic
extern BOOLEAN fShowMapInventoryPool;
diff -Nru a/Build/Strategic/Strategic_AI.cc b/Build/Strategic/Strategic_AI.cc
--- a/Build/Strategic/Strategic_AI.cc 2010-07-29 08:32:18.487659000 +0200
+++ b/Build/Strategic/Strategic_AI.cc 2010-05-25 16:29:06.194575000 +0200
@@ -247,7 +247,7 @@
M(ALMA_DEFENCE, 74, 15, 85, 0, 11, 20),
M(ALMA_MINE, 80, 20, 80, 45, 15, 20),
M(CAMBRIA_DEFENCE, 50, 0, 100, 30, 10, 6),
- M(CAMBRIA_MINE, 60, 15, 85, 40, 11, 6),
+ M(CAMBRIA_MINE, 60, 15, 90, 40, 11, 6),
M(CHITZENA_DEFENCE, 30, 0, 100, 75, 12, 10),
M(CHITZENA_MINE, 40, 0, 100, 75, 10, 10),
M(CHITZENA_SAMSITE, 75, 10, 90, 0, 9, 9),
diff -Nru a/Build/Tactical/Faces.cc b/Build/Tactical/Faces.cc
--- a/Build/Tactical/Faces.cc 2009-09-20 16:45:27.398326000 +0200
+++ b/Build/Tactical/Faces.cc 2010-05-25 16:29:06.194575000 +0200
@@ -78,7 +78,7 @@
{ ROBOT, 0, 0, 0, 0 }, // THE RAT ( 62 )
{ HAMOUS, 8, 7, 8, 23 },
{ SLAY, 8, 8, 8, 22 },
- { RPC65, 0, 0, 0, 0 },
+ { RPC65, 16, 15, 5, 24 },
{ DYNAMO, 9, 4, 7, 22 },
{ SHANK, 8, 8, 8, 25 },
{ IGGY, 4, 6, 5, 22 },
@@ -86,8 +86,8 @@
{ CONRAD, 4, 7, 5, 25 },
{ RPC71, 9, 7, 8, 22 }, // CARL ( 71 )
{ MADDOG, 9, 7, 9, 25 },
- { DARREL, 0, 0, 0, 0 },
- { PERKO, 0, 0, 0, 0 },
+ { DARREL, 8, 3, 12, 24 },
+ { PERKO, 10, 7, 12, 23 },
{ MARIA, 9, 3, 8, 23 },
diff -Nru a/Build/Tactical/Interface.cc b/Build/Tactical/Interface.cc
--- a/Build/Tactical/Interface.cc 2009-09-20 16:27:31.748395000 +0200
+++ b/Build/Tactical/Interface.cc 2010-02-24 00:51:49.764757000 +0100
@@ -69,7 +69,7 @@
static INT32 giMenuAnchorY;
-static const SGPBox g_progress_bar_box = { 5, 2, 630, 12 };
+static const SGPBox g_progress_bar_box = { 5, 2, SCREEN_WIDTH-13, 12 };
static BOOLEAN gfProgBarActive = FALSE;
static UINT8 gubProgNumEnemies = 0;
@@ -1709,21 +1709,39 @@
case COMPUTER_INTERRUPT_MESSAGE:
case MILITIA_INTERRUPT_MESSAGE:
case AIR_RAID_TURN_MESSAGE:
- bar_file = INTERFACEDIR "/rect.sti";
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ bar_file = INTERFACEDIR "/rect_800x600.sti";
+#else
+ bar_file = INTERFACEDIR "/rect.sti";
+#endif
foreground = FONT_MCOLOR_WHITE;
shadow = DEFAULT_SHADOW;
fDoLimitBar = TRUE;
break;
case PLAYER_INTERRUPT_MESSAGE:
- bar_file = INTERFACEDIR "/timebaryellow.sti";
+ if(SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ {
+ bar_file = INTERFACEDIR "/timebaryellow_800x600.sti";
+ }
+ else
+ {
+ bar_file = INTERFACEDIR "/timebaryellow.sti";
+ }
foreground = FONT_MCOLOR_BLACK;
shadow = NO_SHADOW;
if (gGameOptions.fTurnTimeLimit) fDoLimitBar = TRUE;
break;
case PLAYER_TURN_MESSAGE:
- bar_file = INTERFACEDIR "/timebargreen.sti";
+ if(SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ {
+ bar_file = INTERFACEDIR "/timebargreen_800x600.sti";
+ }
+ else
+ {
+ bar_file = INTERFACEDIR "/timebargreen.sti";
+ }
foreground = FONT_MCOLOR_BLACK;
shadow = NO_SHADOW;
if (gGameOptions.fTurnTimeLimit)
diff -Nru a/Build/Tactical/Interface_Items.cc b/Build/Tactical/Interface_Items.cc
--- a/Build/Tactical/Interface_Items.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Tactical/Interface_Items.cc 2010-05-25 16:29:06.194575000 +0200
@@ -800,7 +800,7 @@
MOUSE_REGION& r = gSMInvRegion[pocket];
bool hatch_out = false;
- UINT16 outline = SGP_TRANSPARENT;
+ UINT16 outline = TRANSPARENT;
if (dirty_level == DIRTYLEVEL2)
{
wchar_t buf[150];
@@ -2296,7 +2296,7 @@
INT16 const item_y = agi.item_box.y + y;
INT16 const item_w = agi.item_box.w;
INT16 const item_h = agi.item_box.h;
- INVRenderItem(guiSAVEBUFFER, NULL, obj, item_x, item_y, item_w, item_h, DIRTYLEVEL2, RENDER_ITEM_ATTACHMENT1 + i, SGP_TRANSPARENT);
+ INVRenderItem(guiSAVEBUFFER, NULL, obj, item_x, item_y, item_w, item_h, DIRTYLEVEL2, RENDER_ITEM_ATTACHMENT1 + i, TRANSPARENT);
INT16 const bar_x = agi.bar_box.x + x;
INT16 const bar_h = agi.bar_box.h;
@@ -3870,7 +3870,7 @@
INT16 sX = gsItemPopupX + cnt * usWidth + 11;
INT16 sY = gsItemPopupY + 3;
- INVRenderItem(FRAME_BUFFER, NULL, *gpItemPopupObject, sX, sY, 29, 23, DIRTYLEVEL2, RENDER_ITEM_NOSTATUS, SGP_TRANSPARENT);
+ INVRenderItem(FRAME_BUFFER, NULL, *gpItemPopupObject, sX, sY, 29, 23, DIRTYLEVEL2, RENDER_ITEM_NOSTATUS, TRANSPARENT);
// Do status bar here...
INT16 sNewX = gsItemPopupX + cnt * usWidth + 7;
@@ -4047,7 +4047,7 @@
o.usItem = FIRST_KEY + LockTable[key->ubKeyID].usKeyItem;
DrawItemUIBarEx(o, 0, x + 7, y + 24, ITEM_BAR_HEIGHT, Get16BPPColor(STATUS_BAR), Get16BPPColor(STATUS_BAR_SHADOW), FRAME_BUFFER);
- INVRenderItem(FRAME_BUFFER, NULL, o, x + 8, y, box_w - 8, box_h - 2, DIRTYLEVEL2, 0, SGP_TRANSPARENT);
+ INVRenderItem(FRAME_BUFFER, NULL, o, x + 8, y, box_w - 8, box_h - 2, DIRTYLEVEL2, 0, TRANSPARENT);
}
InvalidateRegion(dx, dy, dx + gsKeyRingPopupInvWidth, dy + gsKeyRingPopupInvHeight);
@@ -4731,7 +4731,7 @@
// ATE: Adjust to basic shade.....
te->hTileSurface->CurrentShade(4);
- UINT16 const outline = menu.pfSelectedArray[cnt + menu.ubScrollAnchor] ? outline_col : SGP_TRANSPARENT;
+ UINT16 const outline = (menu.pfSelectedArray[cnt + menu.ubScrollAnchor] ? outline_col : TRANSPARENT);
Blt8BPPDataTo16BPPBufferOutline(pDestBuf, uiDestPitchBYTES, te->hTileSurface, sX, sY, te->usRegionIndex, outline);
if (o.ubNumberOfObjects > 1)
diff -Nru a/Build/Tactical/Interface_Panels.cc b/Build/Tactical/Interface_Panels.cc
--- a/Build/Tactical/Interface_Panels.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Tactical/Interface_Panels.cc 2010-05-25 16:29:06.194575000 +0200
@@ -134,9 +134,9 @@
#define SM_LOOKB_Y 108
#define SM_STEALTHMODE_X 187
#define SM_STEALTHMODE_Y 73
-#define SM_DONE_X 543
+#define SM_DONE_X (SCREEN_WIDTH-97) //543
#define SM_DONE_Y 4
-#define SM_MAPSCREEN_X 589
+#define SM_MAPSCREEN_X (SCREEN_WIDTH-51) //589
#define SM_MAPSCREEN_Y 4
@@ -197,11 +197,11 @@
#define TM_FACE_WIDTH 48
#define TM_FACE_HEIGHT 43
-#define TM_ENDTURN_X 507
+#define TM_ENDTURN_X (SCREEN_WIDTH-131) //507
#define TM_ENDTURN_Y 9
-#define TM_ROSTERMODE_X 507
+#define TM_ROSTERMODE_X (SCREEN_WIDTH-131) //507
#define TM_ROSTERMODE_Y 45
-#define TM_DISK_X 507
+#define TM_DISK_X (SCREEN_WIDTH-131) //507
#define TM_DISK_Y 81
#define TM_NAME_X 11
@@ -859,7 +859,12 @@
void InitializeSMPanel(void)
{
- guiSMPanel = AddVideoObjectFromFile(INTERFACEDIR "/inventory_bottom_panel.sti");
+ // failing the CHECKF after this will cause you to lose your mouse
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiSMPanel = AddVideoObjectFromFile(INTERFACEDIR "/inventory_bottom_panel_800x600.sti");
+#else
+ guiSMPanel = AddVideoObjectFromFile(INTERFACEDIR "/inventory_bottom_panel.STI");
+#endif
guiSMObjects = AddVideoObjectFromFile(INTERFACEDIR "/inventory_gold_front.sti");
guiSMObjects2 = AddVideoObjectFromFile(INTERFACEDIR "/inv_frn.sti");
@@ -2208,8 +2213,11 @@
// Set global mouse regions
// Define region for viewport
MSYS_DefineRegion(&gViewportRegion, 0, 0, gsVIEWPORT_END_X, gsVIEWPORT_END_Y, MSYS_PRIORITY_NORMAL, VIDEO_NO_CURSOR, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK);
-
- guiTEAMPanel = AddVideoObjectFromFile(INTERFACEDIR "/bottom_bar.sti");
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ guiTEAMPanel = AddVideoObjectFromFile(INTERFACEDIR "/bottom_bar_800x600.sti");
+#else
+ guiTEAMPanel = AddVideoObjectFromFile(INTERFACEDIR "/bottom_bar.sti");
+#endif
guiTEAMObjects = AddVideoObjectFromFile(INTERFACEDIR "/gold_front.sti");
guiVEHINV = AddVideoObjectFromFile(INTERFACEDIR "/inventor.sti");
@@ -2946,7 +2954,7 @@
}
else
{ // Look in primary hand
- INVRenderItem(buf, &s, s.inv[HANDPOS], x, y, w, h, dirty_level, 0, SGP_TRANSPARENT);
+ INVRenderItem(buf, &s, s.inv[HANDPOS], x, y, w, h, dirty_level, 0, TRANSPARENT);
}
y += TM_INV_HAND_SEPY;
@@ -2957,7 +2965,7 @@
}
else
{ // Do secondary hand
- INVRenderItem(buf, &s, s.inv[SECONDHANDPOS], x, y, w, h, dirty_level, 0, SGP_TRANSPARENT);
+ INVRenderItem(buf, &s, s.inv[SECONDHANDPOS], x, y, w, h, dirty_level, 0, TRANSPARENT);
}
}
@@ -3109,7 +3117,8 @@
SetFontAttributes(COMPFONT, 183);
GetSectorIDString( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, zTownIDString, lengthof(zTownIDString), TRUE );
ReduceStringLength( zTownIDString, lengthof(zTownIDString), 80, COMPFONT );
- FindFontCenterCoordinates(548, SCREEN_HEIGHT - 55, 80, 16, zTownIDString, COMPFONT, &sFontX, &sFontY);
+ FindFontCenterCoordinates(SCREEN_WIDTH-92, SCREEN_HEIGHT - 55, 80, 16, zTownIDString, COMPFONT, &sFontX, &sFontY);
+// FindFontCenterCoordinates(548, SCREEN_HEIGHT - 55, 80, 16, zTownIDString, COMPFONT, &sFontX, &sFontY);
MPrint(sFontX, sFontY, zTownIDString);
}
diff -Nru a/Build/Tactical/ShopKeeper_Interface.cc b/Build/Tactical/ShopKeeper_Interface.cc
--- a/Build/Tactical/ShopKeeper_Interface.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/Tactical/ShopKeeper_Interface.cc 2010-05-25 16:29:06.194575000 +0200
@@ -2053,7 +2053,7 @@
}
else if (gubSkiDirtyLevel != SKI_DIRTY_LEVEL0)
{
- outline = SGP_TRANSPARENT;
+ outline = TRANSPARENT;
}
else
{ // The item is not highlighted and we are not rerendering the screen
diff -Nru a/Build/TacticalAI/NPC.cc b/Build/TacticalAI/NPC.cc
--- a/Build/TacticalAI/NPC.cc 2010-07-29 08:32:21.166993000 +0200
+++ b/Build/TacticalAI/NPC.cc 2010-02-24 00:51:49.764757000 +0100
@@ -851,7 +851,7 @@
{
UINT8 const room = GetRoom(kingpin->sGridNo);
// first boxer, bring kingpin over
- if (IN_KINGPIN_HOUSE(room)) id = 18;
+ if (IN_KINGPIN_HOUSE(room)) id = 17;
}
return UseQuote(pNPCQuoteInfoArray, ppResultQuoteInfo, pubQuoteNum, id);
diff -Nru a/Build/TileEngine/Overhead_Map.cc b/Build/TileEngine/Overhead_Map.cc
--- a/Build/TileEngine/Overhead_Map.cc 2009-09-20 16:27:41.522092000 +0200
+++ b/Build/TileEngine/Overhead_Map.cc 2010-02-24 00:51:49.764757000 +0100
@@ -86,6 +86,8 @@
static INT16 gsStartRestrictedY;
static INT16 gsOveritemPoolGridNo = NOWHERE;
+UINT16 iOffsetHorizontal; // Horizontal start postion of the overview map
+UINT16 iOffsetVertical; // Vertical start position of the overview map
static void CopyOverheadDBShadetablesFromTileset(void);
@@ -158,8 +160,8 @@
INT16 sY1;
INT16 sX2;
INT16 sY2;
- CalculateRestrictedMapCoords(NORTH, &sX1, &sY1, &sX2, &gsStartRestrictedY, SCREEN_WIDTH, 320);
- CalculateRestrictedMapCoords(WEST, &sX1, &sY1, &gsStartRestrictedX, &sY2, SCREEN_WIDTH, 320);
+ CalculateRestrictedMapCoords(NORTH, &sX1, &sY1, &sX2, &gsStartRestrictedY, iOffsetHorizontal + 640, iOffsetVertical + 320);
+ CalculateRestrictedMapCoords(WEST, &sX1, &sY1, &gsStartRestrictedX, &sY2, iOffsetHorizontal + 640, iOffsetVertical + 320);
}
// Copy over shade tables from main tileset
@@ -260,7 +262,7 @@
INT16 sY;
SetFontAttributes(TINYFONT1, FONT_MCOLOR_WHITE);
FindFontCenterCoordinates(x, y, 1, 1, s.name, TINYFONT1, &sX, &sY);
- GDirtyPrint(sX, sY, s.name);
+ GDirtyPrint(sX+iOffsetHorizontal, sY+iOffsetVertical, s.name);
}
@@ -278,7 +280,11 @@
RestoreBackgroundRects();
- RenderOverheadMap(0, WORLD_COLS / 2, 0, 0, SCREEN_WIDTH, 320, FALSE);
+ // Mythrell - Renders the overhead map, also defines it's size
+// RenderOverheadMap(0, WORLD_COLS / 2, (SCREEN_WIDTH/2-320), (SCREEN_HEIGHT/2-240), 640 + iOffset, 320, FALSE);
+ RenderOverheadMap( 0, (WORLD_COLS / 2), iOffsetHorizontal,
+ iOffsetVertical, 640 + iOffsetHorizontal, 320 + iOffsetVertical, FALSE );
+ // RenderOverheadMap(0, WORLD_COLS / 2, 0, 0, SCREEN_WIDTH, 320, FALSE);
HandleTalkingAutoFaces();
@@ -388,13 +394,25 @@
gfInOverheadMap = TRUE;
- MSYS_DefineRegion(&OverheadBackgroundRegion, 0, 0, SCREEN_WIDTH, 360, MSYS_PRIORITY_HIGH, CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK);
+ // Overview map should be centered in the middle of the tactical screen.
+ iOffsetHorizontal = (SCREEN_WIDTH / 2) - (640 / 2); // Horizontal start postion of the overview map
+ iOffsetVertical = (SCREEN_HEIGHT - 160) / 2 - 160; // Vertical start position of the overview map
- MSYS_DefineRegion(&OverheadRegion, 0, 0, gsVIEWPORT_END_X, 320, MSYS_PRIORITY_HIGH, CURSOR_NORMAL, MSYS_NO_CALLBACK, ClickOverheadRegionCallback);
+ MSYS_DefineRegion(&OverheadBackgroundRegion, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - 120, MSYS_PRIORITY_HIGH, CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK);
+
+ MSYS_DefineRegion( &OverheadRegion, iOffsetHorizontal, iOffsetVertical, gsVIEWPORT_END_X - iOffsetHorizontal, iOffsetVertical + 320, MSYS_PRIORITY_HIGH, CURSOR_NORMAL, MSYS_NO_CALLBACK, ClickOverheadRegionCallback );
+/* MSYS_DefineRegion(&OverheadBackgroundRegion, 0, 0, SCREEN_WIDTH, 360, MSYS_PRIORITY_HIGH, CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK);
+
+ MSYS_DefineRegion( &OverheadRegion, 0, 0 ,gsVIEWPORT_END_X, 320, MSYS_PRIORITY_HIGH,
+ CURSOR_NORMAL, MoveOverheadRegionCallback, ClickOverheadRegionCallback );
+*/
// LOAD CLOSE ANIM
+#if (SCREEN_WIDTH == 800 && SCREEN_HEIGHT == 600)
+ uiOVERMAP = AddVideoObjectFromFile(INTERFACEDIR "/map_bord_800x600.sti");
+#else
uiOVERMAP = AddVideoObjectFromFile(INTERFACEDIR "/map_bord.sti");
-
+#endif
// LOAD PERSONS
uiPERSONS = AddVideoObjectFromFile(INTERFACEDIR "/persons.sti");
@@ -784,6 +802,10 @@
s.sHeightAdjustment ? 1 : // On roof
0;
marker->CurrentShade(shade);
+ // Mythrell: resolution fix
+
+ sX += iOffsetHorizontal;
+ sY += iOffsetVertical;
#ifdef JA2EDITOR
if (gfEditMode && gpSelected && gpSelected->pSoldier == &s)
@@ -821,7 +843,11 @@
//adjust for position.
sY += 6;
+ // Mythrell: resolution fix
+ sX += iOffsetHorizontal;
+ sY += iOffsetVertical;
+
UINT32 col;
if (gsOveritemPoolGridNo == wi->sGridNo)
{
@@ -859,8 +885,8 @@
if (reason & MSYS_CALLBACK_REASON_LBUTTON_UP)
{
- sWorldScreenX = ( gusMouseXPos - gsStartRestrictedX ) * 5;
- sWorldScreenY = ( gusMouseYPos - gsStartRestrictedY ) * 5;
+ sWorldScreenX = ( gusMouseXPos - gsStartRestrictedX - iOffsetHorizontal) * 5;
+ sWorldScreenY = ( gusMouseYPos - gsStartRestrictedY - iOffsetVertical ) * 5;
// Get new proposed center location.
const GridNo pos = GetMapPosFromAbsoluteScreenXY(sWorldScreenX, sWorldScreenY);
@@ -884,9 +910,31 @@
if (!(OverheadRegion.uiFlags & MSYS_MOUSE_IN_AREA)) return NOWHERE;
// ATE: Adjust alogrithm values a tad to reflect map positioning
- INT16 const sWorldScreenX = (gusMouseXPos - gsStartRestrictedX - 5) * 5;
- INT16 sWorldScreenY = (gusMouseYPos - gsStartRestrictedY + dy) * 5;
+ INT16 const sWorldScreenX = (gusMouseXPos - gsStartRestrictedX - 5) * 5 - iOffsetHorizontal * 5;
+ INT16 sWorldScreenY = (gusMouseYPos - gsStartRestrictedY + dy) * 5 - iOffsetVertical * 5;
+ // Smaller maps
+/*
+ if (gsStartRestrictedX > 0)
+ {
+ INT16 const sWorldScreenX = (gusMouseXPos - gsStartRestrictedX - 5) * 5;
+ }
+ // Full size maps
+ else
+ {
+ INT16 const sWorldScreenX = (gusMouseXPos - gsStartRestrictedX - 5) * 5 - iOffsetHorizontal * 5;
+ }
+ // Smaller maps
+ if (gsStartRestrictedY > 0)
+ {
+ INT16 sWorldScreenY = (gusMouseYPos - gsStartRestrictedY + dy) * 5;
+ }
+ // Full size maps
+ else
+ {
+ INT16 sWorldScreenY = (gusMouseYPos - gsStartRestrictedY + dy) * 5 - iOffsetVertical * 5;
+ }
+*/
// Get new proposed center location.
const GridNo grid_no = GetMapPosFromAbsoluteScreenXY(sWorldScreenX, sWorldScreenY);
@@ -916,33 +964,33 @@
{
case NORTH:
- *psX1 = 0;
+ *psX1 = iOffsetHorizontal;
*psX2 = sEndXS;
- *psY1 = 0;
- *psY2 = ( abs( NORMAL_MAP_SCREEN_TY - gsTLY ) / 5 );
+ *psY1 = iOffsetVertical;
+ *psY2 = ( abs( NORMAL_MAP_SCREEN_TY - gsTLY ) / 5 )+ iOffsetVertical;
break;
case WEST:
- *psX1 = 0;
- *psX2 = ( abs( -NORMAL_MAP_SCREEN_X - gsTLX ) / 5 );
- *psY1 = 0;
+ *psX1 = iOffsetHorizontal;
+ *psX2 = ( abs( -NORMAL_MAP_SCREEN_X - gsTLX ) / 5 ) + iOffsetHorizontal;
+ *psY1 = iOffsetVertical;
*psY2 = sEndYS;
break;
case SOUTH:
- *psX1 = 0;
+ *psX1 = iOffsetHorizontal;
*psX2 = sEndXS;
- *psY1 = ( NORMAL_MAP_SCREEN_HEIGHT - abs( NORMAL_MAP_SCREEN_BY - gsBLY ) ) / 5;
+ *psY1 = ( NORMAL_MAP_SCREEN_HEIGHT - abs( NORMAL_MAP_SCREEN_BY - gsBLY ) ) / 5 + iOffsetVertical;
*psY2 = sEndYS;
break;
case EAST:
- *psX1 = ( NORMAL_MAP_SCREEN_WIDTH - abs( NORMAL_MAP_SCREEN_X - gsTRX ) ) / 5;
+ *psX1 = ( NORMAL_MAP_SCREEN_WIDTH - abs( NORMAL_MAP_SCREEN_X - gsTRX ) ) / 5 + iOffsetHorizontal;
*psX2 = sEndXS;
- *psY1 = 0;
+ *psY1 = iOffsetVertical;
*psY2 = sEndYS;
break;
diff -Nru a/Build/TileEngine/Radar_Screen.h b/Build/TileEngine/Radar_Screen.h
--- a/Build/TileEngine/Radar_Screen.h 2008-05-06 10:40:39.801846000 +0200
+++ b/Build/TileEngine/Radar_Screen.h 2010-02-24 00:51:49.764757000 +0100
@@ -7,7 +7,7 @@
void LoadRadarScreenBitmap(const char* filename);
// RADAR WINDOW DEFINES
-#define RADAR_WINDOW_X 543
+#define RADAR_WINDOW_X SCREEN_WIDTH-97 // Mythrell resolution fix old value 543
#define RADAR_WINDOW_TM_Y INTERFACE_START_Y + 13
#define RADAR_WINDOW_SM_Y INV_INTERFACE_START_Y + 13
#define RADAR_WINDOW_WIDTH 88
diff -Nru a/Build/TileEngine/RenderWorld.cc b/Build/TileEngine/RenderWorld.cc
--- a/Build/TileEngine/RenderWorld.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/Build/TileEngine/RenderWorld.cc 2010-02-24 00:51:49.764757000 +0100
@@ -1280,7 +1280,7 @@
}
else if (bBlitClipVal == TRUE)
{
- Blt8BPPDataTo16BPPBufferOutlineClip(pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex, SGP_TRANSPARENT, &gClippingRect);
+ Blt8BPPDataTo16BPPBufferOutlineClip(pDestBuf, uiDestPitchBYTES, hVObject, sXPos, sYPos, usImageIndex, TRANSPARENT, &gClippingRect);
}
}
}
diff -Nru a/Build/TileEngine/Tactical_Placement_GUI.cc b/Build/TileEngine/Tactical_Placement_GUI.cc
--- a/Build/TileEngine/Tactical_Placement_GUI.cc 2009-09-20 16:27:31.748395000 +0200
+++ b/Build/TileEngine/Tactical_Placement_GUI.cc 2010-02-24 00:51:49.764757000 +0100
@@ -69,6 +69,9 @@
};
GUIButtonRef iTPButtons[NUM_TP_BUTTONS];
+extern UINT16 iOffsetHorizontal;
+extern UINT16 iOffsetVertical;
+
UINT8 gubDefaultButton = CLEAR_BUTTON;
BOOLEAN gfTacticalPlacementGUIActive = FALSE;
BOOLEAN gfTacticalPlacementFirstTime = FALSE;
@@ -233,7 +236,12 @@
GoIntoOverheadMap();
+ //Load the images
+#if (SCREEN_WIDTH == 800 && SCREEN_HEIGHT == 600)
+ giOverheadPanelImage = AddVideoObjectFromFile(INTERFACEDIR "/overheadinterface_800x600.sti");
+#else
giOverheadPanelImage = AddVideoObjectFromFile(INTERFACEDIR "/overheadinterface.sti");
+#endif
giMercPanelImage = AddVideoObjectFromFile(INTERFACEDIR "/panels.sti");
BUTTON_PICS* const img = LoadButtonImage(INTERFACEDIR "/overheaduibuttons.sti", 0, 1);
@@ -242,11 +250,17 @@
giOverheadButtonImages[GROUP_BUTTON] = UseLoadedButtonImage(img, 0, 1);
giOverheadButtonImages[CLEAR_BUTTON] = UseLoadedButtonImage(img, 0, 1);
- // Create the buttons which provide automatic placements.
- MakeButton(CLEAR_BUTTON, 332, ClearPlacementsCallback, gpStrategicString[STR_TP_CLEAR], gpStrategicString[STR_TP_CLEARHELP]);
+ //Create the buttons which provide automatic placements.
+ MakeButton(CLEAR_BUTTON, (SCREEN_HEIGHT-148), ClearPlacementsCallback, gpStrategicString[STR_TP_CLEAR], gpStrategicString[STR_TP_CLEARHELP]);
+ MakeButton(SPREAD_BUTTON, SCREEN_HEIGHT - 113, SpreadPlacementsCallback, gpStrategicString[STR_TP_SPREAD], gpStrategicString[STR_TP_SPREADHELP]);
+ MakeButton(GROUP_BUTTON, SCREEN_HEIGHT - 78, GroupPlacementsCallback, gpStrategicString[STR_TP_GROUP], gpStrategicString[STR_TP_GROUPHELP]);
+ MakeButton(DONE_BUTTON, SCREEN_HEIGHT - 43, DoneOverheadPlacementClickCallback, gpStrategicString[STR_TP_DONE], gpStrategicString[STR_TP_DONEHELP]);
+
+/* MakeButton(CLEAR_BUTTON, 332, ClearPlacementsCallback, gpStrategicString[STR_TP_CLEAR], gpStrategicString[STR_TP_CLEARHELP]);
MakeButton(SPREAD_BUTTON, 367, SpreadPlacementsCallback, gpStrategicString[STR_TP_SPREAD], gpStrategicString[STR_TP_SPREADHELP]);
MakeButton(GROUP_BUTTON, 402, GroupPlacementsCallback, gpStrategicString[STR_TP_GROUP], gpStrategicString[STR_TP_GROUPHELP]);
MakeButton(DONE_BUTTON, 437, DoneOverheadPlacementClickCallback, gpStrategicString[STR_TP_DONE], gpStrategicString[STR_TP_DONEHELP]);
+*/
iTPButtons[DONE_BUTTON]->AllowDisabledFastHelp();
GROUP const& bg = *gpBattleGroup;
@@ -297,7 +311,8 @@
m.fPlaced = FALSE;
m.uiVObjectID = Load65Portrait(GetProfile(m.pSoldier->ubProfile));
INT32 const x = 91 + i / 2 * 54;
- INT32 const y = 361 + i % 2 * 51;
+ INT32 const y = SCREEN_HEIGHT - 119 + i % 2 * 51;
+// INT32 const y = 361 + i % 2 * 51;
MSYS_DefineRegion(&m.region, x, y, x + 54, y + 62, MSYS_PRIORITY_HIGH, 0, MercMoveCallback, MercClickCallback);
#ifdef JA2BETAVERSION
@@ -353,7 +368,7 @@
if (!gfTacticalPlacementGUIDirty && gbHilightedMercID != -1)
{
INT32 const x = 91 + gbHilightedMercID / 2 * 54;
- INT32 const y = 361 + gbHilightedMercID % 2 * 51;
+ INT32 const y = SCREEN_HEIGHT - 119 + gbHilightedMercID % 2 * 51;
if (gusMouseXPos < x || x + 54 < gusMouseXPos ||
gusMouseYPos < y || y + 62 < gusMouseYPos)
{
@@ -368,15 +383,18 @@
// If the display is dirty render the entire panel.
if (gfTacticalPlacementGUIDirty)
{
- BltVideoObject(buf, giOverheadPanelImage, 0, 0, 320);
- InvalidateRegion(0, 0, 320, SCREEN_HEIGHT);
+ BltVideoObject( buf, giOverheadPanelImage, 0, 0, SCREEN_HEIGHT - 160);
+ InvalidateRegion( 0, SCREEN_HEIGHT - 160, 320, SCREEN_HEIGHT );
+// BltVideoObject(FRAME_BUFFER, giOverheadPanelImage, 0, 0, 320);
+// InvalidateRegion(0, 0, 320, SCREEN_HEIGHT);
gfTacticalPlacementGUIDirty = FALSE;
MarkButtonsDirty();
for (INT32 i = 0; i != giPlacements; ++i)
{ // Render the mercs
MERCPLACEMENT const& m = gMercPlacement[i];
INT32 const x = 95 + i / 2 * 54;
- INT32 const y = 371 + i % 2 * 51;
+ INT32 const y = SCREEN_HEIGHT - 109 + i % 2 * 51;
+// INT32 const y = 371 + i % 2 * 51;
ColorFillVideoSurfaceArea(buf, x + 36, y + 2, x + 44, y + 30, 0);
BltVideoObject(buf, giMercPanelImage, 0, x, y);
BltVideoObject(buf, m.uiVObjectID, 0, x + 2, y + 2);
@@ -394,37 +412,41 @@
SetFontAttributes(BLOCKFONT, FONT_BEIGE);
wchar_t str[128];
GetSectorIDString(gubPBSectorX, gubPBSectorY, gubPBSectorZ, str, lengthof(str), TRUE);
- mprintf(120, 335, L"%ls %ls -- %ls...", gpStrategicString[STR_TP_SECTOR], str, gpStrategicString[STR_TP_CHOOSEENTRYPOSITIONS]);
+ mprintf(120, SCREEN_HEIGHT - 145, L"%ls %ls -- %ls...", gpStrategicString[STR_TP_SECTOR], str, gpStrategicString[STR_TP_CHOOSEENTRYPOSITIONS]);
+// mprintf(120, 335, L"%ls %ls -- %ls...", gpStrategicString[STR_TP_SECTOR], str, gpStrategicString[STR_TP_CHOOSEENTRYPOSITIONS]);
// Shade out the part of the tactical map that isn't considered placable.
- BlitBufferToBuffer(buf, guiSAVEBUFFER, 0, 320, SCREEN_WIDTH, 160);
+ BlitBufferToBuffer(buf, guiSAVEBUFFER, 0, SCREEN_HEIGHT - 160, SCREEN_WIDTH, 160);
}
if (gfValidLocationsChanged)
{
gfValidLocationsChanged = FALSE;
- BlitBufferToBuffer(guiSAVEBUFFER, buf, 4, 4, 636, 320);
- InvalidateRegion(4, 4, 636, 320);
+ BlitBufferToBuffer( guiSAVEBUFFER, buf, iOffsetHorizontal, iOffsetVertical, 640, 320 );
+ InvalidateRegion( iOffsetHorizontal, iOffsetVertical, iOffsetHorizontal + 640, iOffsetVertical + 320 );
+// BlitBufferToBuffer(guiSAVEBUFFER, buf, 4, 4, 636, 320);
+// InvalidateRegion(4, 4, 636, 320);
UINT16 const hatch_colour =
DayTime() ? 0 : // 6AM to 9PM is black
Get16BPPColor(FROMRGB(63, 31, 31)); // 9PM to 6AM is gray (black is too dark to distinguish)
- SGPRect clip = { 4, 4, 636, 320 };
+ SGPRect clip = { iOffsetHorizontal, iOffsetVertical, iOffsetHorizontal + 640, iOffsetVertical + 320 };
+// SGPRect clip = { 4, 4, 636, 320 };
if (gbCursorMercID == -1)
{
- if (gfNorth) clip.iTop = 30;
- if (gfEast) clip.iRight = 610;
- if (gfSouth) clip.iBottom = 290;
- if (gfWest) clip.iLeft = 30;
+ if (gfNorth) clip.iTop = iOffsetVertical + 30;
+ if (gfEast) clip.iRight = iOffsetHorizontal + 610;
+ if (gfSouth) clip.iBottom = iOffsetVertical + 290;
+ if (gfWest) clip.iLeft = iOffsetHorizontal + 30;
}
else
{
switch (gMercPlacement[gbCursorMercID].ubStrategicInsertionCode)
{
- case INSERTION_CODE_NORTH: clip.iTop = 30; break;
- case INSERTION_CODE_EAST: clip.iRight = 610; break;
- case INSERTION_CODE_SOUTH: clip.iBottom = 290; break;
- case INSERTION_CODE_WEST: clip.iLeft = 30; break;
+ case INSERTION_CODE_NORTH: clip.iTop = iOffsetVertical + 30; break;
+ case INSERTION_CODE_EAST: clip.iRight = iOffsetHorizontal + 10; break;
+ case INSERTION_CODE_SOUTH: clip.iBottom = iOffsetVertical + 290; break;
+ case INSERTION_CODE_WEST: clip.iLeft = iOffsetHorizontal + 30; break;
}
}
SGPVSurface::Lock l(buf);
@@ -439,7 +461,7 @@
for (INT32 i = 0; i != giPlacements; ++i)
{ // Render the merc's names
INT32 const x = 95 + i / 2 * 54;
- INT32 const y = 371 + i % 2 * 51;
+ INT32 const y = (i % 2) ? SCREEN_HEIGHT - 58 : SCREEN_HEIGHT - 109;
MERCPLACEMENT const& m = gMercPlacement[i];
SOLDIERTYPE const& s = *m.pSoldier;
@@ -543,11 +565,34 @@
}
}
gfValidCursor = FALSE;
- if( gbSelectedMercID != -1 && gusMouseYPos < 320 )
+ // Mythrell: Checking if mouse is indeed inside of map since the resolution changes made it more complex
+ if( gbSelectedMercID != -1 && gusMouseYPos < (iOffsetVertical + 320) && gusMouseYPos > iOffsetVertical
+ && gusMouseXPos > iOffsetHorizontal && gusMouseXPos < (iOffsetHorizontal + 640))
+// if( gbSelectedMercID != -1 && gusMouseYPos < 320 )
{
switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode )
{
case INSERTION_CODE_NORTH:
+ if( gusMouseYPos <= (iOffsetVertical + 30) ) // 40
+ gfValidCursor = TRUE;
+ break;
+ case INSERTION_CODE_EAST:
+ if( gusMouseXPos >= (iOffsetHorizontal + 610) ) // 600
+ gfValidCursor = TRUE;
+ break;
+ case INSERTION_CODE_SOUTH:
+ if( gusMouseYPos >= (iOffsetVertical + 290) ) // 280
+ gfValidCursor = TRUE;
+ break;
+ case INSERTION_CODE_WEST:
+ if( gusMouseXPos <= (iOffsetHorizontal + 30) ) // 40
+ gfValidCursor = TRUE;
+ break;
+ }
+/*
+ switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode )
+ {
+ case INSERTION_CODE_NORTH:
if( gusMouseYPos <= 40 )
gfValidCursor = TRUE;
break;
@@ -563,7 +608,7 @@
if( gusMouseXPos <= 40 )
gfValidCursor = TRUE;
break;
- }
+ }*/
if( gubDefaultButton == GROUP_BUTTON )
{
if( gfValidCursor )
diff -Nru a/Build/Utils/Animated_ProgressBar.cc b/Build/Utils/Animated_ProgressBar.cc
--- a/Build/Utils/Animated_ProgressBar.cc 2009-02-08 10:38:46.161110000 +0100
+++ b/Build/Utils/Animated_ProgressBar.cc 2010-02-24 00:51:49.764757000 +0100
@@ -1,6 +1,7 @@
#include "Font.h"
#include "HImage.h"
#include "Types.h"
+#include "Local.h"
#include "Animated_ProgressBar.h"
#include "MemMan.h"
#include "Debug.h"
@@ -47,7 +48,14 @@
void CreateLoadingScreenProgressBar()
{
- CreateProgressBar(0, 162, 427, 318, 16);
+if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ {
+ CreateProgressBar(0, 202, 533, 318, 16);
+ }
+ else
+ {
+ CreateProgressBar(0, 162, 427, 318, 16);
+ }
pBar[0]->flags |= PROGRESS_LOAD_BAR;
}
diff -Nru a/Build/Utils/Message.cc b/Build/Utils/Message.cc
--- a/Build/Utils/Message.cc 2009-09-26 18:59:41.535156000 +0200
+++ b/Build/Utils/Message.cc 2010-02-24 00:51:49.764757000 +0100
@@ -1,6 +1,7 @@
#include "Buffer.h"
#include "Debug.h"
#include "Directories.h"
+#include "Local.h"
#include "Font.h"
#include "LoadSaveData.h"
#include "PODObj.h"
@@ -38,7 +39,9 @@
#define MAX_LINE_COUNT 6
#define X_START 2
-#define Y_START 330
+// Mythrell - Starting point of messages in tactical
+// #define Y_START 330
+#define Y_START (SCREEN_HEIGHT-149)
#define MAX_AGE 10000
#define LINE_WIDTH 320
#define MAP_LINE_WIDTH 300
@@ -575,7 +578,8 @@
void DisplayStringsInMapScreenMessageList(void)
{
- SetFontDestBuffer(FRAME_BUFFER, 17, 360 + 6, 407, 360 + 101);
+ SetFontDestBuffer(FRAME_BUFFER, 17, (SCREEN_HEIGHT - 114), 407, (SCREEN_HEIGHT - 120)+101);
+// SetFontDestBuffer(FRAME_BUFFER, 17, 360 + 6, 407, 360 + 101);
SetFont(MAP_SCREEN_MESSAGE_FONT);
SetFontBackground(FONT_BLACK);
@@ -583,7 +587,9 @@
UINT8 ubCurrentStringIndex = gubCurrentMapMessageString;
- INT16 sY = 377;
+// INT16 sY = 377;
+ INT16 sY = (SCREEN_HEIGHT - 103);
+
UINT16 usSpacing = GetFontHeight(MAP_SCREEN_MESSAGE_FONT);
for (UINT8 ubLinesPrinted = 0; ubLinesPrinted < MAX_MESSAGES_ON_MAP_BOTTOM; ubLinesPrinted++)
diff -Nru a/Build/Utils/Multi_Language_Graphic_Utils.cc b/Build/Utils/Multi_Language_Graphic_Utils.cc
--- a/Build/Utils/Multi_Language_Graphic_Utils.cc 2009-09-06 16:59:59.698273000 +0200
+++ b/Build/Utils/Multi_Language_Graphic_Utils.cc 2010-02-24 00:51:49.764757000 +0100
@@ -2,6 +2,7 @@
#include "Directories.h"
#include "Multi_Language_Graphic_Utils.h"
+#include "Local.h"
char const* GetMLGFilename(MultiLanguageGraphic const id)
@@ -15,7 +16,11 @@
case MLG_BOBBYRAYLINK: return LAPTOPDIR "/bobbyraylink.sti";
case MLG_CLOSED: return LAPTOPDIR "/closed.sti";
case MLG_CONFIRMORDER: return LAPTOPDIR "/confirmorder.sti";
+#if (SCREEN_WIDTH==800 && SCREEN_HEIGHT==600)
+ case MLG_DESKTOP: return LAPTOPDIR "/desktop_800x600.pcx";
+#else
case MLG_DESKTOP: return LAPTOPDIR "/desktop.pcx";
+#endif
case MLG_FUNERALAD9: return LAPTOPDIR "/funeralad_9.sti";
case MLG_GOLDPIECEBUTTONS: return INTERFACEDIR "/goldpiecebuttons.sti";
case MLG_HISTORY: return LAPTOPDIR "/history.sti";
diff -Nru a/Changelog b/Changelog
--- a/Changelog 2010-08-11 08:25:18.448518000 +0200
+++ b/Changelog 2010-05-25 16:29:06.194575000 +0200
@@ -1,8 +1,3 @@
-(r7072) Fix a vanilla glitch: When scrolling back in an email, the email delete window was not redrawn properly.
-(r7071) Fix a glitch in r4977: The yes/no buttons in the email delete window could not be clicked, when the email had more than one page.
-(r7070) Fix a vanilla bug: Darren used the wrong quote for the first fight on a day, if there were fights on previous days.
-(r7069) Fix a vanilla bug: The sum of fractions for troops and elites was more than 100% for one army composition.
-(r7066) Fix a bug in r3615, which caused an assertion failure/null-pointer access when removing a dead merc via the contract menu.
(r7062) Fix a vanilla bug: When a player group arrives in a sector, in some cases it was checked on the wrong (out of bounds) side, whether enemies noticed them.
(r7056) Fix a vanilla bug, which prevented enemies from climbing roofs.
(r7055) Fix a vanilla bug: When a soldier changed team (e.g. getting hostile), he lost his camouflage.
diff -Nru a/sgp/Cursor_Control.cc b/sgp/Cursor_Control.cc
--- a/sgp/Cursor_Control.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/sgp/Cursor_Control.cc 2010-02-24 00:51:49.764757000 +0100
@@ -206,7 +206,7 @@
UINT16 const usEffHeight = pTrav.usHeight + pTrav.sOffsetY;
UINT16 const usEffWidth = pTrav.usWidth + pTrav.sOffsetX;
- BltVideoObjectOutline(MOUSE_BUFFER, guiExternVo, gusExternVoSubIndex, 0, 0, SGP_TRANSPARENT);
+ BltVideoObjectOutline(MOUSE_BUFFER, guiExternVo, gusExternVoSubIndex, 0, 0, TRANSPARENT);
// Hook into hook function
if (gMouseBltOverride != NULL) gMouseBltOverride();
diff -Nru a/sgp/Input.h b/sgp/Input.h
--- a/sgp/Input.h 2010-07-27 09:39:49.537036000 +0200
+++ b/sgp/Input.h 2010-02-24 00:51:49.764757000 +0100
@@ -18,7 +18,7 @@
#define MOUSE_POS 0x0400
#define MOUSE_WHEEL_UP 0x0800
#define MOUSE_WHEEL_DOWN 0x1000
-#define MOUSE_EVENTS 0x1FF8
+#define INPUT_MOUSE 0x1FF8
#define SHIFT_DOWN 0x01
#define CTRL_DOWN 0x02
diff -Nru a/sgp/Types.h b/sgp/Types.h
--- a/sgp/Types.h 2010-07-27 09:39:53.378866000 +0200
+++ b/sgp/Types.h 2010-02-24 00:51:49.764757000 +0100
@@ -140,7 +140,7 @@
typedef SGPFile* HWFILE;
-#define SGP_TRANSPARENT ((UINT16)0)
+#define TRANSPARENT ((UINT16)0)
#ifdef __cplusplus
diff -Nru a/sgp/VObject_Blitters.cc b/sgp/VObject_Blitters.cc
--- a/sgp/VObject_Blitters.cc 2010-07-27 09:39:53.378866000 +0200
+++ b/sgp/VObject_Blitters.cc 2010-02-24 00:51:49.764757000 +0100
@@ -6653,7 +6653,7 @@
}
-// ATE New blitter for rendering a differrent color for value 254. Can be transparent if outline is SGP_TRANSPARENT
+// ATE New blitter for rendering a differrent color for value 254. Can be transparent if outline is TRANSPARENT
void Blt8BPPDataTo16BPPBufferOutline(UINT16* const buf, UINT32 const uiDestPitchBYTES, SGPVObject const* const hSrcVObject, INT32 const iX, INT32 const iY, UINT16 const usIndex, INT16 const outline)
{
Assert(hSrcVObject);
@@ -6699,7 +6699,7 @@
{
*dst = pal[px];
}
- else if (outline != SGP_TRANSPARENT)
+ else if (outline != TRANSPARENT)
{
*dst = outline;
}
@@ -6783,7 +6783,7 @@
}
-// ATE New blitter for rendering a differrent color for value 254. Can be transparent if s16BPPColor is SGP_TRANSPARENT
+// ATE New blitter for rendering a differrent color for value 254. Can be transparent if s16BPPColor is TRANSPARENT
void Blt8BPPDataTo16BPPBufferOutlineClip(UINT16* const pBuffer, const UINT32 uiDestPitchBYTES, const SGPVObject* const hSrcVObject, const INT32 iX, const INT32 iY, const UINT16 usIndex, const INT16 s16BPPColor, const SGPRect* const clipregion)
{
UINT32 Unblitted;
@@ -6920,7 +6920,7 @@
{
*(UINT16*)DestPtr = p16BPPPalette[src];
}
- else if (s16BPPColor != SGP_TRANSPARENT)
+ else if (s16BPPColor != TRANSPARENT)
{
*(UINT16*)DestPtr = s16BPPColor;
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment