(svn r10397) -Fix [FS#969]: subsidy awarded messages broken due to {COMPANY} now taking 1 (not 2) parameters. also remove an unnecessary dereference.
authorpeter1138
Sat, 30 Jun 2007 08:26:34 +0000
changeset 7124 8ef9caaddce5
parent 7123 25daf2b19a33
child 7125 ef3b4aaf994f
(svn r10397) -Fix [FS#969]: subsidy awarded messages broken due to {COMPANY} now taking 1 (not 2) parameters. also remove an unnecessary dereference.
src/economy.cpp
--- a/src/economy.cpp	Sat Jun 30 06:31:49 2007 +0000
+++ b/src/economy.cpp	Sat Jun 30 08:26:34 2007 +0000
@@ -1245,7 +1245,6 @@
 	Subsidy *s;
 	TileIndex xy;
 	Pair pair;
-	Player *p;
 
 	/* check if there is an already existing subsidy that applies to us */
 	for (s = _subsidies; s != endof(_subsidies); s++) {
@@ -1291,10 +1290,9 @@
 
 			/* Add a news item */
 			pair = SetupSubsidyDecodeParam(s, 0);
-			InjectDParam(2);
+			InjectDParam(1);
 
-			p = GetPlayer(_current_player);
-			SetDParam(0, p->index);
+			SetDParam(0, _current_player);
 			AddNewsItem(
 				STR_2031_SERVICE_SUBSIDY_AWARDED + _opt.diff.subsidy_multiplier,
 				NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0),