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

Uninline gameDialogHighlightsExit

This commit is contained in:
Alexander Batalov 2022-08-07 15:38:47 +03:00
parent 019dbbb56e
commit ba2ae3c303
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/game_dialog.cc
View File

@ -664,7 +664,8 @@ static int gameDialogWindowRenderBackground();
static int _talkToRefreshDialogWindowRect(Rect* rect); static int _talkToRefreshDialogWindowRect(Rect* rect);
static void gameDialogRenderHighlight(unsigned char* src, int srcWidth, int srcHeight, int srcPitch, unsigned char* dest, int x, int y, int destPitch, unsigned char* a9, unsigned char* a10); static void gameDialogRenderHighlight(unsigned char* src, int srcWidth, int srcHeight, int srcPitch, unsigned char* dest, int x, int y, int destPitch, unsigned char* a9, unsigned char* a10);
static void gameDialogRenderTalkingHead(Art* art, int frame); static void gameDialogRenderTalkingHead(Art* art, int frame);
static void gameDialogPrepareHighlights(); static void gameDialogHighlightsInit();
static void gameDialogHighlightsExit();
// gdialog_init // gdialog_init
// 0x444D1C // 0x444D1C
@ -921,7 +922,7 @@ int _gdialogInitFromScript(int headFid, int reaction)
dialogSetOptionColor(0.2f, 0.2f, 0.2f); dialogSetOptionColor(0.2f, 0.2f, 0.2f);
dialogSetReplyTitle(NULL); dialogSetReplyTitle(NULL);
_dialogRegisterWinDrawCallbacks(_demo_copy_title, _demo_copy_options); _dialogRegisterWinDrawCallbacks(_demo_copy_title, _demo_copy_options);
gameDialogPrepareHighlights(); gameDialogHighlightsInit();
colorCycleDisable(); colorCycleDisable();
if (_gdDialogTurnMouseOff) { if (_gdDialogTurnMouseOff) {
_gmouse_disable(0); _gmouse_disable(0);
@ -995,11 +996,8 @@ int _gdialogExitFromScript()
_lipsFID = 0; _lipsFID = 0;
} }
_freeColorBlendTable(_colorTable[17969]); // NOTE: Uninline.
_freeColorBlendTable(_colorTable[22187]); gameDialogHighlightsExit();
artUnlock(gGameDialogUpperHighlightFrmHandle);
artUnlock(gGameDialogLowerHighlightFrmHandle);
_gdialog_state = 0; _gdialog_state = 0;
_dialogue_state = 0; _dialogue_state = 0;
@ -4597,7 +4595,7 @@ void gameDialogRenderTalkingHead(Art* headFrm, int frame)
} }
// 0x44B080 // 0x44B080
void gameDialogPrepareHighlights() void gameDialogHighlightsInit()
{ {
for (int color = 0; color < 256; color++) { for (int color = 0; color < 256; color++) {
int r = (_Color2RGB_(color) & 0x7C00) >> 10; int r = (_Color2RGB_(color) & 0x7C00) >> 10;
@ -4625,3 +4623,15 @@ void gameDialogPrepareHighlights()
gGameDialogLowerHighlightFrmWidth = artGetWidth(gGameDialogLowerHighlightFrm, 0, 0); gGameDialogLowerHighlightFrmWidth = artGetWidth(gGameDialogLowerHighlightFrm, 0, 0);
gGameDialogLowerHighlightFrmHeight = artGetHeight(gGameDialogLowerHighlightFrm, 0, 0); gGameDialogLowerHighlightFrmHeight = artGetHeight(gGameDialogLowerHighlightFrm, 0, 0);
} }
// NOTE: Inlined.
//
// 0x44B1D4
static void gameDialogHighlightsExit()
{
_freeColorBlendTable(_colorTable[17969]);
_freeColorBlendTable(_colorTable[22187]);
artUnlock(gGameDialogUpperHighlightFrmHandle);
artUnlock(gGameDialogLowerHighlightFrmHandle);
}