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

Reorganize variables scope for goto

This commit is contained in:
k3tamina 2022-05-29 11:47:18 +02:00
parent 954a45bc75
commit 3c666b480c
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/character_selector.cc
View File

@ -246,6 +246,10 @@ bool characterSelectorWindowInit()
int characterSelectorWindowX = (screenGetWidth() - CS_WINDOW_WIDTH) / 2; int characterSelectorWindowX = (screenGetWidth() - CS_WINDOW_WIDTH) / 2;
int characterSelectorWindowY = (screenGetHeight() - CS_WINDOW_HEIGHT) / 2; int characterSelectorWindowY = (screenGetHeight() - CS_WINDOW_HEIGHT) / 2;
CacheEntry* backgroundFrmHandle;
int backgroundFid;
unsigned char* backgroundFrmData;
gCharacterSelectorWindow = windowCreate(characterSelectorWindowX, characterSelectorWindowY, CS_WINDOW_WIDTH, CS_WINDOW_HEIGHT, _colorTable[0], 0); gCharacterSelectorWindow = windowCreate(characterSelectorWindowX, characterSelectorWindowY, CS_WINDOW_WIDTH, CS_WINDOW_HEIGHT, _colorTable[0], 0);
if (gCharacterSelectorWindow == -1) { if (gCharacterSelectorWindow == -1) {
goto err; goto err;
@ -256,9 +260,8 @@ bool characterSelectorWindowInit()
goto err; goto err;
} }
CacheEntry* backgroundFrmHandle; backgroundFid = buildFid(6, 174, 0, 0, 0);
int backgroundFid = buildFid(6, 174, 0, 0, 0); backgroundFrmData = artLockFrameData(backgroundFid, 0, 0, &backgroundFrmHandle);
unsigned char* backgroundFrmData = artLockFrameData(backgroundFid, 0, 0, &backgroundFrmHandle);
if (backgroundFrmData == NULL) { if (backgroundFrmData == NULL) {
goto err; goto err;
} }

13
src/game_dialog.cc
View File

@ -1539,6 +1539,11 @@ int gameDialogSetReviewOptionText(const char* string)
// 0x446288 // 0x446288
int _gdProcessInit() int _gdProcessInit()
{ {
int upBtn;
int downBtn;
int optionsWindowX;
int optionsWindowY;
int fid; int fid;
int replyWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_REPLY_WINDOW_X; int replyWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_REPLY_WINDOW_X;
@ -1549,7 +1554,7 @@ int _gdProcessInit()
} }
// Top part of the reply window - scroll up. // Top part of the reply window - scroll up.
int upBtn = buttonCreate(gGameDialogReplyWindow, 1, 1, 377, 28, -1, -1, KEY_ARROW_UP, -1, NULL, NULL, NULL, 32); upBtn = buttonCreate(gGameDialogReplyWindow, 1, 1, 377, 28, -1, -1, KEY_ARROW_UP, -1, NULL, NULL, NULL, 32);
if (upBtn == -1) { if (upBtn == -1) {
goto err_1; goto err_1;
} }
@ -1558,7 +1563,7 @@ int _gdProcessInit()
buttonSetMouseCallbacks(upBtn, _reply_arrow_up, _reply_arrow_restore, 0, 0); buttonSetMouseCallbacks(upBtn, _reply_arrow_up, _reply_arrow_restore, 0, 0);
// Bottom part of the reply window - scroll down. // Bottom part of the reply window - scroll down.
int downBtn = buttonCreate(gGameDialogReplyWindow, 1, 29, 377, 28, -1, -1, KEY_ARROW_DOWN, -1, NULL, NULL, NULL, 32); downBtn = buttonCreate(gGameDialogReplyWindow, 1, 29, 377, 28, -1, -1, KEY_ARROW_DOWN, -1, NULL, NULL, NULL, 32);
if (downBtn == -1) { if (downBtn == -1) {
goto err_1; goto err_1;
} }
@ -1566,8 +1571,8 @@ int _gdProcessInit()
buttonSetCallbacks(downBtn, _gsound_red_butt_press, _gsound_red_butt_release); buttonSetCallbacks(downBtn, _gsound_red_butt_press, _gsound_red_butt_release);
buttonSetMouseCallbacks(downBtn, _reply_arrow_down, _reply_arrow_restore, 0, 0); buttonSetMouseCallbacks(downBtn, _reply_arrow_down, _reply_arrow_restore, 0, 0);
int optionsWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_OPTIONS_WINDOW_X; optionsWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_OPTIONS_WINDOW_X;
int optionsWindowY = (screenGetHeight() - GAME_DIALOG_WINDOW_HEIGHT) / 2 + GAME_DIALOG_OPTIONS_WINDOW_Y; optionsWindowY = (screenGetHeight() - GAME_DIALOG_WINDOW_HEIGHT) / 2 + GAME_DIALOG_OPTIONS_WINDOW_Y;
gGameDialogOptionsWindow = windowCreate(optionsWindowX, optionsWindowY, GAME_DIALOG_OPTIONS_WINDOW_WIDTH, GAME_DIALOG_OPTIONS_WINDOW_HEIGHT, 256, WINDOW_FLAG_0x04); gGameDialogOptionsWindow = windowCreate(optionsWindowX, optionsWindowY, GAME_DIALOG_OPTIONS_WINDOW_WIDTH, GAME_DIALOG_OPTIONS_WINDOW_HEIGHT, 256, WINDOW_FLAG_0x04);
if (gGameDialogOptionsWindow == -1) { if (gGameDialogOptionsWindow == -1) {
goto err_2; goto err_2;

7
src/object.cc
View File

@ -260,6 +260,9 @@ char _obj_seen[5001];
// 0x488780 // 0x488780
int objectsInit(unsigned char* buf, int width, int height, int pitch) int objectsInit(unsigned char* buf, int width, int height, int pitch)
{ {
int dudeFid;
int eggFid;
memset(_obj_seen, 0, 5001); memset(_obj_seen, 0, 5001);
dword_639D98 = width + 320; dword_639D98 = width + 320;
_updateAreaPixelBounds = -320; _updateAreaPixelBounds = -320;
@ -308,7 +311,7 @@ int objectsInit(unsigned char* buf, int width, int height, int pitch)
gObjectsWindowBufferSize = height * width; gObjectsWindowBufferSize = height * width;
gObjectsWindowPitch = pitch; gObjectsWindowPitch = pitch;
int dudeFid = buildFid(1, _art_vault_guy_num, 0, 0, 0); dudeFid = buildFid(1, _art_vault_guy_num, 0, 0, 0);
objectCreateWithFidPid(&gDude, dudeFid, 0x1000000); objectCreateWithFidPid(&gDude, dudeFid, 0x1000000);
gDude->flags |= OBJECT_FLAG_0x400; gDude->flags |= OBJECT_FLAG_0x400;
@ -322,7 +325,7 @@ int objectsInit(unsigned char* buf, int width, int height, int pitch)
exit(1); exit(1);
} }
int eggFid = buildFid(6, 2, 0, 0, 0); eggFid = buildFid(6, 2, 0, 0, 0);
objectCreateWithFidPid(&gEgg, eggFid, -1); objectCreateWithFidPid(&gEgg, eggFid, -1);
gEgg->flags |= OBJECT_FLAG_0x400; gEgg->flags |= OBJECT_FLAG_0x400;
gEgg->flags |= OBJECT_TEMPORARY; gEgg->flags |= OBJECT_TEMPORARY;