eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix load/save game window position 

See #3
This commit is contained in:
Alexander Batalov 2022-05-21 21:03:48 +03:00
parent e177b11d0d
commit c0b9290e73
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/loadsave.cc
View File

@ -52,6 +52,9 @@
#define LS_PREVIEW_HEIGHT 133 #define LS_PREVIEW_HEIGHT 133
#define LS_PREVIEW_SIZE ((LS_PREVIEW_WIDTH) * (LS_PREVIEW_HEIGHT)) #define LS_PREVIEW_SIZE ((LS_PREVIEW_WIDTH) * (LS_PREVIEW_HEIGHT))
#define LS_COMMENT_WINDOW_X 169
#define LS_COMMENT_WINDOW_Y 116
// 0x47B7C0 // 0x47B7C0
const int gLoadSaveFrmIds[LOAD_SAVE_FRM_COUNT] = { const int gLoadSaveFrmIds[LOAD_SAVE_FRM_COUNT] = {
237, // lsgame.frm - load/save game 237, // lsgame.frm - load/save game
@ -407,11 +410,11 @@ int lsgSaveGame(int mode)
break; break;
case 502: case 502:
if (1) { if (1) {
int x; int mouseX;
int y; int mouseY;
mouseGetPosition(&x, &y); mouseGetPositionInWindow(gLoadSaveWindow, &mouseX, &mouseY);
_slot_cursor = (y - 79) / (3 * fontGetLineHeight() + 4); _slot_cursor = (mouseY - 79) / (3 * fontGetLineHeight() + 4);
if (_slot_cursor < 0) { if (_slot_cursor < 0) {
_slot_cursor = 0; _slot_cursor = 0;
} }
@ -648,7 +651,14 @@ int lsgLoadGame(int mode)
} }
if (mode == LOAD_SAVE_MODE_QUICK && _quick_done) { if (mode == LOAD_SAVE_MODE_QUICK && _quick_done) {
int window = windowCreate(0, 0, LS_WINDOW_WIDTH, LS_WINDOW_HEIGHT, 256, 18); int quickSaveWindowX = (screenGetWidth() - LS_WINDOW_WIDTH) / 2;
int quickSaveWindowY = (screenGetHeight() - LS_WINDOW_HEIGHT) / 2;
int window = windowCreate(quickSaveWindowX,
quickSaveWindowY,
LS_WINDOW_WIDTH,
LS_WINDOW_HEIGHT,
256,
WINDOW_FLAG_0x10 | WINDOW_FLAG_0x02);
if (window != -1) { if (window != -1) {
unsigned char* windowBuffer = windowGetBuffer(window); unsigned char* windowBuffer = windowGetBuffer(window);
bufferFill(windowBuffer, LS_WINDOW_WIDTH, LS_WINDOW_HEIGHT, LS_WINDOW_WIDTH, _colorTable[0]); bufferFill(windowBuffer, LS_WINDOW_WIDTH, LS_WINDOW_HEIGHT, LS_WINDOW_WIDTH, _colorTable[0]);
@ -799,10 +809,10 @@ int lsgLoadGame(int mode)
break; break;
case 502: case 502:
do { do {
int v103; int mouseX;
int v102; int mouseY;
mouseGetPosition(&v103, &v102); mouseGetPositionInWindow(gLoadSaveWindow, &mouseX, &mouseY);
int v41 = (v102 - 79) / (3 * fontGetLineHeight() + 4); int v41 = (mouseY - 79) / (3 * fontGetLineHeight() + 4);
if (v41 < 0) { if (v41 < 0) {
v41 = 0; v41 = 0;
} else if (v41 > 9) { } else if (v41 > 9) {
@ -1115,7 +1125,14 @@ int lsgWindowInit(int windowType)
} }
} }
gLoadSaveWindow = windowCreate(0, 0, LS_WINDOW_WIDTH, LS_WINDOW_HEIGHT, 256, 20); int lsWindowX = (screenGetWidth() - LS_WINDOW_WIDTH) / 2;
int lsWindowY = (screenGetHeight() - LS_WINDOW_HEIGHT) / 2;
gLoadSaveWindow = windowCreate(lsWindowX,
lsWindowY,
LS_WINDOW_WIDTH,
LS_WINDOW_HEIGHT,
256,
WINDOW_FLAG_0x10 | WINDOW_FLAG_0x04);
if (gLoadSaveWindow == -1) { if (gLoadSaveWindow == -1) {
// FIXME: Leaking frms. // FIXME: Leaking frms.
internal_free(_snapshot); internal_free(_snapshot);
@ -1832,8 +1849,15 @@ int _LoadTumbSlot(int a1)
// 0x47ED5C // 0x47ED5C
int _GetComment(int a1) int _GetComment(int a1)
{ {
int window = windowCreate(169, // Maintain original position in original resolution, otherwise center it.
116, int commentWindowX = screenGetWidth() != 640
? (screenGetWidth() - gLoadSaveFrmSizes[LOAD_SAVE_FRM_BOX].width) / 2
: LS_COMMENT_WINDOW_X;
int commentWindowY = screenGetHeight() != 480
? (screenGetHeight() - gLoadSaveFrmSizes[LOAD_SAVE_FRM_BOX].height) / 2
: LS_COMMENT_WINDOW_Y;
int window = windowCreate(commentWindowX,
commentWindowY,
gLoadSaveFrmSizes[LOAD_SAVE_FRM_BOX].width, gLoadSaveFrmSizes[LOAD_SAVE_FRM_BOX].width,
gLoadSaveFrmSizes[LOAD_SAVE_FRM_BOX].height, gLoadSaveFrmSizes[LOAD_SAVE_FRM_BOX].height,
256, 256,