LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-27 03:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin unglobbing std::vector

Browse Source
This commit is contained in:
Tropical
2026-03-08 22:43:43 +01:00
committed by JuiceyDev
parent d2e8a0f9f5
commit 5fad08b9fd
286 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Recipes/ShapelessRecipy.cpp
+4 -4
View File
@@ -12,7 +12,7 @@
#include "Recipes.h"
#include "ShapelessRecipy.h"
ShapelessRecipy::ShapelessRecipy(ItemInstance *result, vector<ItemInstance *> *ingredients, _eGroupType egroup) :
ShapelessRecipy::ShapelessRecipy(ItemInstance *result, std::vector<ItemInstance *> *ingredients, _eGroupType egroup) :
result(result),
ingredients(ingredients),
group(egroup)
@@ -80,7 +80,7 @@ int ShapelessRecipy::size()
// 4J-PB
bool ShapelessRecipy::requires(int iRecipe)
{
vector <ItemInstance *> *tempList = new vector<ItemInstance *>;
vector <ItemInstance *> *tempList = new std::vector<ItemInstance *>;
*tempList=*ingredients;
@@ -88,7 +88,7 @@ bool ShapelessRecipy::requires(int iRecipe)
AUTO_VAR(citEnd, ingredients->end());
int iCount=0;
for (vector<ItemInstance *>::iterator ingredient = ingredients->begin(); ingredient != citEnd; ingredient++)
for (std::vector<ItemInstance *>::iterator ingredient = ingredients->begin(); ingredient != citEnd; 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()))
@@ -121,7 +121,7 @@ void ShapelessRecipy::requires(INGREDIENTS_REQUIRED *pIngReq)
AUTO_VAR(citEnd, ingredients->end());
for (vector<ItemInstance *>::const_iterator ingredient = ingredients->begin(); ingredient != citEnd; ingredient++)
for (std::vector<ItemInstance *>::const_iterator ingredient = ingredients->begin(); ingredient != citEnd; ingredient++)
{
ItemInstance *expected = *ingredient;