From 55231bb8d3e1a4e2752ac3d444c4287eb0ca4e8b Mon Sep 17 00:00:00 2001 From: void_17 <61356189+void2012@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:11:18 +0700 Subject: Remove AUTO_VAR macro and _toString function (#592) --- Minecraft.World/ShapelessRecipy.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'Minecraft.World/ShapelessRecipy.cpp') diff --git a/Minecraft.World/ShapelessRecipy.cpp b/Minecraft.World/ShapelessRecipy.cpp index 67ed0381..44bf6a54 100644 --- a/Minecraft.World/ShapelessRecipy.cpp +++ b/Minecraft.World/ShapelessRecipy.cpp @@ -39,18 +39,17 @@ bool ShapelessRecipy::matches(shared_ptr craftSlots, Level *l { shared_ptr 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::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::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; -- cgit v1.2.3