Browse Source

Move DiabloHotkeyMsg to control.cpp and use IsChatAvailable

pull/2636/head
obligaron 5 years ago committed by Anders Jenbo
parent
commit
6be94ceb3f
  1. 11
      Source/control.cpp
  2. 1
      Source/control.h
  3. 11
      Source/diablo.cpp

11
Source/control.cpp

@ -2065,4 +2065,15 @@ bool control_presskeys(int vkey)
return true;
}
void DiabloHotkeyMsg(uint32_t dwMsg)
{
if (!IsChatAvailable()) {
return;
}
assert(dwMsg < QUICK_MESSAGE_OPTIONS);
NetSendCmdString(0xFFFFFF, sgOptions.Chat.szHotKeyMsgs[dwMsg]);
}
} // namespace devilution

1
Source/control.h

@ -152,6 +152,7 @@ void control_type_message();
void control_reset_talk();
bool control_talk_last_key(char vkey);
bool control_presskeys(int vkey);
void DiabloHotkeyMsg(uint32_t dwMsg);
extern Rectangle ChrBtnsRect[4];

11
Source/diablo.cpp

@ -405,17 +405,6 @@ void RightMouseDown()
}
}
void DiabloHotkeyMsg(uint32_t dwMsg)
{
if (!gbIsMultiplayer) {
return;
}
assert(dwMsg < QUICK_MESSAGE_OPTIONS);
NetSendCmdString(0xFFFFFF, sgOptions.Chat.szHotKeyMsgs[dwMsg]);
}
bool PressSysKey(int wParam)
{
if (gmenu_is_active() || wParam != DVL_VK_F10)

Loading…
Cancel
Save