diff options
Diffstat (limited to 'engines/dm/dialog.cpp')
| -rw-r--r-- | engines/dm/dialog.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/dm/dialog.cpp b/engines/dm/dialog.cpp index 53513b7e7a..c069bb462b 100644 --- a/engines/dm/dialog.cpp +++ b/engines/dm/dialog.cpp @@ -33,11 +33,11 @@ namespace DM { -DialogMan::DialogMan(DMEngine* vm) : _vm(vm) { +DialogMan::DialogMan(DMEngine *vm) : _vm(vm) { _g335_selectedDialogChoice = 0; } -void DialogMan::f427_dialogDraw(char* msg1, char* msg2, char* choice1, char* choice2, char* choice3, char* choice4, bool screenDialog, bool clearScreen, bool fading) { +void DialogMan::f427_dialogDraw(char *msg1, char *msg2, char *choice1, char *choice2, char *choice3, char *choice4, bool screenDialog, bool clearScreen, bool fading) { static Box constBox1 = Box(0, 223, 101, 125); static Box constBox2 = Box(0, 223, 76, 100); static Box constBox3 = Box(0, 223, 51, 75); @@ -140,14 +140,14 @@ void DialogMan::f427_dialogDraw(char* msg1, char* msg2, char* choice1, char* cho _vm->_displayMan->updateScreen(); } -void DialogMan::f425_printCenteredChoice(byte* bitmap, char* str, int16 posX, int16 posY) { +void DialogMan::f425_printCenteredChoice(byte *bitmap, char *str, int16 posX, int16 posY) { if (str) { posX -= (strlen(str) * 6) >> 1; _vm->_textMan->f40_printTextToBitmap(bitmap, k112_byteWidthViewport, posX, posY, k9_ColorGold, k5_ColorLightBrown, str, k136_heightViewport); } } -bool DialogMan::f426_isMessageOnTwoLines(char* str, char* part1, char* part2) { +bool DialogMan::f426_isMessageOnTwoLines(char *str, char *part1, char *part2) { uint16 strLength = strlen(str); if (strLength <= 30) return false; @@ -163,10 +163,10 @@ bool DialogMan::f426_isMessageOnTwoLines(char* str, char* part1, char* part2) { } int16 DialogMan::f424_dialogGetChoice(uint16 choiceCount, uint16 dialogSetIndex, int16 driveType, int16 automaticChoiceIfFlopyInDrive) { - MouseInput* L1298_ps_PrimaryMouseInputBackup; - MouseInput* L1299_ps_SecondaryMouseInputBackup; - KeyboardInput* L1300_ps_PrimaryKeyboardInputBackup; - KeyboardInput* L1301_ps_SecondaryKeyboardInputBackup; + MouseInput *L1298_ps_PrimaryMouseInputBackup; + MouseInput *L1299_ps_SecondaryMouseInputBackup; + KeyboardInput *L1300_ps_PrimaryKeyboardInputBackup; + KeyboardInput *L1301_ps_SecondaryKeyboardInputBackup; Box L1303_s_BoxB; Box L1304_s_BoxA; @@ -178,7 +178,7 @@ int16 DialogMan::f424_dialogGetChoice(uint16 choiceCount, uint16 dialogSetIndex, _vm->_eventMan->_g442_secondaryMouseInput = nullptr; _vm->_eventMan->_g443_primaryKeyboardInput = nullptr; _vm->_eventMan->_g444_secondaryKeyboardInput = nullptr; - _vm->_eventMan->_g441_primaryMouseInput = g480_PrimaryMouseInput_DialogSets[dialogSetIndex][choiceCount - 1]; + _vm->_eventMan->_g441_primaryMouseInput = _vm->_eventMan->_primaryMouseInputDialogSets[dialogSetIndex][choiceCount - 1]; _vm->_eventMan->f357_discardAllInput(); _g335_selectedDialogChoice = 99; do { |