.github/workflows/codeql.yml

@@ -42,6 +42,7 @@ jobs:
           liblzma-dev \
           liblzo2-dev \
           libsdl2-dev \
+          nlohmann-json3-dev \
           zlib1g-dev \
           # EOF
         echo "::endgroup::"

src/newgrf_roadstop.cpp

@@ -385,8 +385,15 @@ void TriggerRoadStopRandomisation(Station *st, TileIndex tile, RoadStopRandomTri
 
 	uint32_t whole_reseed = 0;
 
-	/* Bitmask of completely empty cargo types to be matched. */
+	CargoTypes empty_mask = 0;
-	CargoTypes empty_mask = (trigger == RSRT_CARGO_TAKEN) ? GetEmptyMask(st) : 0;
+	if (trigger == RSRT_CARGO_TAKEN) {
+		/* Create a bitmask of completely empty cargo types to be matched */
+		for (CargoID i = 0; i < NUM_CARGO; i++) {
+			if (st->goods[i].cargo.TotalCount() == 0) {
+				SetBit(empty_mask, i);
+			}
+		}
+	}
 
 	uint32_t used_triggers = 0;
 	auto process_tile = [&](TileIndex cur_tile) {

src/newgrf_station.cpp

@@ -391,7 +391,12 @@ uint32_t Station::GetNewGRFVariable(const ResolverObject &object, byte variable,
 {
 	switch (variable) {
 		case 0x48: { // Accepted cargo types
-			uint32_t value = GetAcceptanceMask(this);
+			CargoID cargo_type;
+			uint32_t value = 0;
+
+			for (cargo_type = 0; cargo_type < NUM_CARGO; cargo_type++) {
+				if (HasBit(this->goods[cargo_type].status, GoodsEntry::GES_ACCEPTANCE)) SetBit(value, cargo_type);
+			}
 			return value;
 		}
 
@@ -962,8 +967,15 @@ void TriggerStationRandomisation(Station *st, TileIndex trigger_tile, StationRan
 	uint32_t whole_reseed = 0;
 	ETileArea area = ETileArea(st, trigger_tile, tas[trigger]);
 
-	/* Bitmask of completely empty cargo types to be matched. */
+	CargoTypes empty_mask = 0;
-	CargoTypes empty_mask = (trigger == SRT_CARGO_TAKEN) ? GetEmptyMask(st) : 0;
+	if (trigger == SRT_CARGO_TAKEN) {
+		/* Create a bitmask of completely empty cargo types to be matched */
+		for (CargoID i = 0; i < NUM_CARGO; i++) {
+			if (st->goods[i].cargo.TotalCount() == 0) {
+				SetBit(empty_mask, i);
+			}
+		}
+	}
 
 	/* Store triggers now for var 5F */
 	SetBit(st->waiting_triggers, trigger);

src/station_cmd.cpp

@@ -492,7 +492,7 @@ void ClearAllStationCachedNames()
  * @param st Station to query
  * @return the expected mask
  */
-CargoTypes GetAcceptanceMask(const Station *st)
+static CargoTypes GetAcceptanceMask(const Station *st)
 {
 	CargoTypes mask = 0;
 
@@ -502,21 +502,6 @@ CargoTypes GetAcceptanceMask(const Station *st)
 	return mask;
 }
 
-/**
- * Get a mask of the cargo types that are empty at the station.
- * @param st Station to query
- * @return the empty mask
- */
-CargoTypes GetEmptyMask(const Station *st)
-{
-	CargoTypes mask = 0;
-
-	for (CargoID i = 0; i < NUM_CARGO; i++) {
-		if (st->goods[i].cargo.TotalCount() == 0) SetBit(mask, i);
-	}
-	return mask;
-}
-
 /**
  * Items contains the two cargo names that are to be accepted or rejected.
  * msg is the string id of the message to display.

src/station_func.h

@@ -30,8 +30,6 @@ CargoArray GetProductionAroundTiles(TileIndex tile, int w, int h, int rad);
 CargoArray GetAcceptanceAroundTiles(TileIndex tile, int w, int h, int rad, CargoTypes *always_accepted = nullptr);
 
 void UpdateStationAcceptance(Station *st, bool show_msg);
-CargoTypes GetAcceptanceMask(const Station *st);
-CargoTypes GetEmptyMask(const Station *st);
 
 const DrawTileSprites *GetStationTileLayout(StationType st, byte gfx);
 void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, RoadType roadtype, int image);

src/station_gui.cpp

@@ -1835,7 +1835,11 @@ struct StationViewWindow : public Window {
 		const Station *st = Station::Get(this->window_number);
 		Rect tr = r.Shrink(WidgetDimensions::scaled.framerect);
 
-		SetDParam(0, GetAcceptanceMask(st));
+		CargoTypes cargo_mask = 0;
+		for (CargoID i = 0; i < NUM_CARGO; i++) {
+			if (HasBit(st->goods[i].status, GoodsEntry::GES_ACCEPTANCE)) SetBit(cargo_mask, i);
+		}
+		SetDParam(0, cargo_mask);
 		int bottom = DrawStringMultiLine(tr.left, tr.right, tr.top, INT32_MAX, STR_STATION_VIEW_ACCEPTS_CARGO);
 		return CeilDiv(bottom - r.top - WidgetDimensions::scaled.framerect.top, FONT_HEIGHT_NORMAL);
 	}