LAB: Fix the coding style of a some if/else statements

This commit is contained in:
Strangerke 2015-12-14 15:27:14 +01:00 committed by Willem Jan Palenstijn
parent acaece288f
commit 52d0243eff
5 changed files with 16 additions and 28 deletions

View file

@ -57,14 +57,12 @@ void Intro::introEatMessages() {
return;
}
if (msg == NULL)
if (!msg)
return;
else {
if (((msg->_msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & msg->_qualifier)) ||
((msg->_msgClass == RAWKEY) && (msg->_code == 27))
)
_quitIntro = true;
}
if (((msg->_msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & msg->_qualifier))
|| ((msg->_msgClass == RAWKEY) && (msg->_code == 27)))
_quitIntro = true;
}
}
@ -164,9 +162,7 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
delete[] textBuffer;
return;
}
else if (cls == MOUSEBUTTONS) {
} else if (cls == MOUSEBUTTONS) {
if (IEQUALIFIER_LEFTBUTTON & qualifier) {
if (end) {
if (isScreen)