dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2021-01-31 01:10:01 +00:00
parent 43b0ddc558 725d793be1
commit f9956d88c3
88 changed files with 262 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network.cpp
View File

@@ -258,9 +258,9 @@ void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send,
if (self_send) {
strid = STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY;
} else if ((CompanyID) (data.auxdata & 0xFFFF) == _local_company) {
strid = STR_NETWORK_MESSAGE_GIVE_MONEY;
strid = STR_NETWORK_MESSAGE_GIVE_MONEY_RECEIVE;
} else {
strid = STR_NETWORK_MESSAGE_MONEY_GIVEN;
strid = STR_NETWORK_MESSAGE_GIVE_MONEY;
SetDParam(3, data.auxdata & 0xFFFF);
}
break;