diff options
| author | Bendegúz Nagy | 2016-08-12 12:48:44 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | e7d460bdc83a271181124ed03563d2c63204fcb0 (patch) | |
| tree | 320450c7eb696c6b97ab264d1487aea8678ec412 /engines | |
| parent | a11ae306e417d4a538270b8a386ceddb539a5aae (diff) | |
| download | scummvm-rg350-e7d460bdc83a271181124ed03563d2c63204fcb0.tar.gz scummvm-rg350-e7d460bdc83a271181124ed03563d2c63204fcb0.tar.bz2 scummvm-rg350-e7d460bdc83a271181124ed03563d2c63204fcb0.zip | |
DM: Attempt to fix menus.cpp crlf problem
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dm/menus.cpp | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 3d8f313c92..7077225cc9 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -297,68 +297,68 @@ const char* MenuMan::f384_getActionName(ChampionAction actionIndex) { Box g504_BoxSpellAreaControls = Box(233, 319, 42, 49); // @ G0504_s_Graphic560_Box_SpellAreaControls void MenuMan::f393_drawSpellAreaControls(ChampionIndex champIndex) { -
-
- Champion *champ = &_vm->_championMan->_gK71_champions[champIndex];
- _vm->_displayMan->_g578_useByteBoxCoordinates = false;
- int16 champHP0 = _vm->_championMan->_gK71_champions[0]._currHealth;
- int16 champHP1 = _vm->_championMan->_gK71_champions[1]._currHealth;
- int16 champHP2 = _vm->_championMan->_gK71_champions[2]._currHealth;
- int16 champHP3 = _vm->_championMan->_gK71_champions[3]._currHealth;
- _vm->_eventMan->f78_showMouse();
- _vm->_displayMan->D24_fillScreenBox(g504_BoxSpellAreaControls, k0_ColorBlack);
- switch (champIndex) {
- case 0:
- _vm->_eventMan->f6_highlightScreenBox(233, 277, 42, 49);
- _vm->_textMan->f53_printToLogicalScreen(235, 48, k0_ColorBlack, k4_ColorCyan, champ->_name);
- if (_vm->_championMan->_g305_partyChampionCount > 1) {
- if (champHP1) {
- _vm->_eventMan->f6_highlightScreenBox(280, 291, 42, 48);
- }
-T0393002:
- if (_vm->_championMan->_g305_partyChampionCount > 2) {
- if (champHP2) {
- _vm->_eventMan->f6_highlightScreenBox(294, 305, 42, 48);
- }
-T0393003:
- if (_vm->_championMan->_g305_partyChampionCount > 3) {
- if (champHP3) {
- _vm->_eventMan->f6_highlightScreenBox(308, 319, 42, 48);
- }
- }
- }
- }
- break;
- case 1:
- if (champHP0) {
- _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48);
- }
- _vm->_eventMan->f6_highlightScreenBox(247, 291, 42, 49);
- _vm->_textMan->f53_printToLogicalScreen(249, 48, k0_ColorBlack, k4_ColorCyan, champ->_name);
- goto T0393002;
- case 2:
- if (champHP0) {
- _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48);
- }
- if (champHP1) {
- _vm->_eventMan->f6_highlightScreenBox(247, 258, 42, 48);
- }
- _vm->_eventMan->f6_highlightScreenBox(261, 305, 42, 49);
- _vm->_textMan->f53_printToLogicalScreen(263, 48, k0_ColorBlack, k4_ColorCyan, champ->_name);
- goto T0393003;
- case 3:
- if (champHP0) {
- _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48);
- }
- if (champHP1) {
- _vm->_eventMan->f6_highlightScreenBox(247, 258, 42, 48);
- }
- if (champHP2) {
- _vm->_eventMan->f6_highlightScreenBox(261, 272, 42, 48);
- }
- _vm->_eventMan->f6_highlightScreenBox(275, 319, 42, 49);
- _vm->_textMan->f53_printToLogicalScreen(277, 48, k0_ColorBlack, k4_ColorCyan, champ->_name);
- }
+ + + Champion *champ = &_vm->_championMan->_gK71_champions[champIndex]; + _vm->_displayMan->_g578_useByteBoxCoordinates = false; + int16 champHP0 = _vm->_championMan->_gK71_champions[0]._currHealth; + int16 champHP1 = _vm->_championMan->_gK71_champions[1]._currHealth; + int16 champHP2 = _vm->_championMan->_gK71_champions[2]._currHealth; + int16 champHP3 = _vm->_championMan->_gK71_champions[3]._currHealth; + _vm->_eventMan->f78_showMouse(); + _vm->_displayMan->D24_fillScreenBox(g504_BoxSpellAreaControls, k0_ColorBlack); + switch (champIndex) { + case 0: + _vm->_eventMan->f6_highlightScreenBox(233, 277, 42, 49); + _vm->_textMan->f53_printToLogicalScreen(235, 48, k0_ColorBlack, k4_ColorCyan, champ->_name); + if (_vm->_championMan->_g305_partyChampionCount > 1) { + if (champHP1) { + _vm->_eventMan->f6_highlightScreenBox(280, 291, 42, 48); + } +T0393002: + if (_vm->_championMan->_g305_partyChampionCount > 2) { + if (champHP2) { + _vm->_eventMan->f6_highlightScreenBox(294, 305, 42, 48); + } +T0393003: + if (_vm->_championMan->_g305_partyChampionCount > 3) { + if (champHP3) { + _vm->_eventMan->f6_highlightScreenBox(308, 319, 42, 48); + } + } + } + } + break; + case 1: + if (champHP0) { + _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48); + } + _vm->_eventMan->f6_highlightScreenBox(247, 291, 42, 49); + _vm->_textMan->f53_printToLogicalScreen(249, 48, k0_ColorBlack, k4_ColorCyan, champ->_name); + goto T0393002; + case 2: + if (champHP0) { + _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48); + } + if (champHP1) { + _vm->_eventMan->f6_highlightScreenBox(247, 258, 42, 48); + } + _vm->_eventMan->f6_highlightScreenBox(261, 305, 42, 49); + _vm->_textMan->f53_printToLogicalScreen(263, 48, k0_ColorBlack, k4_ColorCyan, champ->_name); + goto T0393003; + case 3: + if (champHP0) { + _vm->_eventMan->f6_highlightScreenBox(233, 244, 42, 48); + } + if (champHP1) { + _vm->_eventMan->f6_highlightScreenBox(247, 258, 42, 48); + } + if (champHP2) { + _vm->_eventMan->f6_highlightScreenBox(261, 272, 42, 48); + } + _vm->_eventMan->f6_highlightScreenBox(275, 319, 42, 49); + _vm->_textMan->f53_printToLogicalScreen(277, 48, k0_ColorBlack, k4_ColorCyan, champ->_name); + } _vm->_eventMan->f77_hideMouse(); } @@ -408,7 +408,7 @@ void MenuMan::f394_setMagicCasterAndDrawSpellArea(int16 champIndex) { _vm->_eventMan->f77_hideMouse(); return; } - L1213_ps_Champion = &_vm->_championMan->_gK71_champions[_vm->_championMan->_g514_magicCasterChampionIndex = (ChampionIndex)champIndex];
+ L1213_ps_Champion = &_vm->_championMan->_gK71_champions[_vm->_championMan->_g514_magicCasterChampionIndex = (ChampionIndex)champIndex]; f392_buildSpellAreaLine(k2_SpellAreaAvailableSymbols); _vm->_eventMan->f78_showMouse(); f393_drawSpellAreaControls((ChampionIndex)champIndex); |