Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.World/ShapelessRecipy.cpp
View File

@@ -39,18 +39,17 @@ bool ShapelessRecipy::matches(shared_ptr<CraftingContainer> craftSlots, Level *l
{
shared_ptr<ItemInstance> item = craftSlots->getItem(x, y);
if (item != NULL)
if (item)
{
bool found = false;
AUTO_VAR(citEnd, ingredients->end());
for (AUTO_VAR(cit, ingredients->begin()); cit != citEnd; ++cit)
auto citEnd = ingredients->end();
for ( ItemInstance *ingredient : *ingredients )
{
ItemInstance *ingredient = *cit;
if (item->id == ingredient->id && (ingredient->getAuxValue() == Recipes::ANY_AUX_VALUE || item->getAuxValue() == ingredient->getAuxValue()))
{
found = true;
AUTO_VAR( it, find(tempList.begin(), tempList.end(), ingredient ) );
auto it = find(tempList.begin(), tempList.end(), ingredient);
if(it != tempList.end() ) tempList.erase(it);
break;
}
@@ -86,9 +85,8 @@ bool ShapelessRecipy::requires(int iRecipe)
//printf("ShapelessRecipy %d\n",iRecipe);
AUTO_VAR(citEnd, ingredients->end());
int iCount=0;
for (vector<ItemInstance *>::iterator ingredient = ingredients->begin(); ingredient != citEnd; ingredient++)
for ( auto ingredient = ingredients->begin(); ingredient != ingredients->end(); ingredient++)
{
//printf("\tIngredient %d is %d\n",iCount++,(*ingredient)->id);
//if (item->id == (*ingredient)->id && ((*ingredient)->getAuxValue() == Recipes::ANY_AUX_VALUE || item->getAuxValue() == (*ingredient)->getAuxValue()))
@@ -119,15 +117,11 @@ void ShapelessRecipy::requires(INGREDIENTS_REQUIRED *pIngReq)
memset(TempIngReq.iIngAuxValA,Recipes::ANY_AUX_VALUE,sizeof(int)*9);
ZeroMemory(TempIngReq.uiGridA,sizeof(unsigned int)*9);
AUTO_VAR(citEnd, ingredients->end());
for (vector<ItemInstance *>::const_iterator ingredient = ingredients->begin(); ingredient != citEnd; ingredient++)
for ( ItemInstance *expected : *ingredients )
{
ItemInstance *expected = *ingredient;
if (expected!=NULL)
if ( expected )
{
int iAuxVal = (*ingredient)->getAuxValue();
int iAuxVal = expected->getAuxValue();
TempIngReq.uiGridA[iCount++]=expected->id | iAuxVal<<24;
// 4J-PB - put the ingredients in boxes 1,2,4,5 so we can see them in a 2x2 crafting screen
if(iCount==2) iCount=3;