- another keyboard bugfix (pressing esc properly cancels chat mode), Thanks ultifd
This commit is contained in:
parent
9d2e08a8c7
commit
f88836203a
|
@ -58,8 +58,7 @@ void ChatManager::keyUp(char key) {
|
||||||
if(editEnabled) {
|
if(editEnabled) {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,key,key);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,key,key);
|
||||||
|
|
||||||
if(key == vkEscape)
|
if(key == vkEscape || key == SDLK_ESCAPE) {
|
||||||
{
|
|
||||||
text.clear();
|
text.clear();
|
||||||
editEnabled= false;
|
editEnabled= false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -208,7 +208,7 @@ void BattleEnd::render(){
|
||||||
|
|
||||||
void BattleEnd::keyDown(char key){
|
void BattleEnd::keyDown(char key){
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
if(key == vkEscape) {
|
if(key == vkEscape || key == SDLK_ESCAPE) {
|
||||||
//program->setState(new MainMenu(program));
|
//program->setState(new MainMenu(program));
|
||||||
|
|
||||||
if(mainMessageBox.getEnabled()) {
|
if(mainMessageBox.getEnabled()) {
|
||||||
|
|
|
@ -187,7 +187,7 @@ void Program::keyDown(char key){
|
||||||
|
|
||||||
if(msgBox.getEnabled()) {
|
if(msgBox.getEnabled()) {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
if(key == vkEscape || key == vkReturn) {
|
if(key == vkEscape || key == SDLK_ESCAPE || key == vkReturn || key == SDLK_RETURN || key == SDLK_KP_ENTER) {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
msgBox.setEnabled(false);
|
msgBox.setEnabled(false);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user