Merge branch 'send_money_company' into jgrpp

2017-03-03 22:42:07 +00:00
parent 7b88f7a290 9c74da46b1
commit 54494a0a7c
75 changed files with 237 additions and 204 deletions
--- a/src/widgets/company_widget.h
+++ b/src/widgets/company_widget.h
@@ -48,6 +48,9 @@ enum CompanyWidgets {

 	WID_C_VIEW_INFRASTRUCTURE,        ///< Panel about infrastructure.

+	WID_C_SELECT_GIVE_MONEY,          ///< Selection widget for the give money button.
+	WID_C_GIVE_MONEY,                 ///< Button to give money.
+
 	WID_C_HAS_PASSWORD,               ///< Has company password lock.
 	WID_C_SELECT_MULTIPLAYER,         ///< Multiplayer selection panel.
 	WID_C_COMPANY_PASSWORD,           ///< Button to set company password.