Merge branch 'improved_breakdowns' into jgrpp

# Conflicts:
#	src/vehiclelist.cpp
This commit is contained in:
Jonathan G Rennison
2017-08-15 19:26:26 +01:00
60 changed files with 261 additions and 143 deletions

View File

@@ -494,10 +494,13 @@ struct NetworkChatWindow : public Window {
virtual void OnClick(Point pt, int widget, int click_count)
{
switch (widget) {
/* Send */
case WID_NC_SENDBUTTON: SendChat(this->message_editbox.text.buf, this->dtype, this->dest);
/* FALL THROUGH */
case WID_NC_CLOSE: /* Cancel */ delete this; break;
case WID_NC_SENDBUTTON: /* Send */
SendChat(this->message_editbox.text.buf, this->dtype, this->dest);
FALLTHROUGH;
case WID_NC_CLOSE: /* Cancel */
delete this;
break;
}
}