I am slightly confused. Why does it say this is merged? Trunk does definitely not contain the new code. Could it be that you branched and merged your different branches from each other instead from trunk?
however, the code looks fine. Just a nit
upcast(Warehouse, wh, building); if (wh)
can be written as
if (upcast(Warehouse, wh, building))
« Back to merge proposal
I am slightly confused. Why does it say this is merged? Trunk does definitely not contain the new code. Could it be that you branched and merged your different branches from each other instead from trunk?
however, the code looks fine. Just a nit
upcast(Warehouse, wh, building);
if (wh)
can be written as
if (upcast(Warehouse, wh, building))