(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.

src/station_cmd.cpp

@@ -37,6 +37,7 @@
 #include "helpers.hpp"
 #include "misc/autoptr.hpp"
 #include "road.h"
+#include "cargotype.h"
 
 /**
  * Called if a new block is added to the station-pool
@@ -361,7 +362,7 @@ static uint GetAcceptanceMask(const Station *st)
 static void ShowRejectOrAcceptNews(const Station *st, uint num_items, CargoID *cargo, StringID msg)
 {
 	for (uint i = 0; i < num_items; i++) {
-		SetDParam(i + 1, _cargoc.names_s[cargo[i]]);
+		SetDParam(i + 1, GetCargo(cargo[i])->name);
 	}
 
 	SetDParam(0, st->index);