diff --git a/eid_api.lua b/eid_api.lua index c6c8f8d8..5f00bf8c 100644 --- a/eid_api.lua +++ b/eid_api.lua @@ -51,6 +51,7 @@ EID.ItemTypeAnm2Names = { } --------------------------------------------------------------------------- -------------------------Handle API Functions ----------------------------- +local nullVector = Vector(0,0) -- Adds a description for a collectible. Optional parameters: itemName, language function EID:addCollectible(id, description, itemName, language) @@ -309,6 +310,7 @@ function EID:getObjectName(objID, objType) elseif objType == "custom" then return __eidEntityDescriptions[objID][1] or tableEntry[1] or objID end + return "" end -- check if an entity is part of the describable entities @@ -432,10 +434,10 @@ function EID:renderInlineIcons(spriteTable, posX, posY) end -- helper function to render Icons in specific EID settins -function EID:renderIcon(spriteObj, posX,posY) +function EID:renderIcon(spriteObj, posX, posY) spriteObj.Scale = Vector(EIDConfig["Scale"], EIDConfig["Scale"]) spriteObj.Color = Color(1, 1, 1, EIDConfig["Transparency"], 0, 0, 0) - spriteObj:Render(Vector(posX, posY), Vector(0, 0), Vector(0, 0)) + spriteObj:Render(Vector(posX, posY), nullVector, nullVector) end -- Returns the icon used for the bulletpoint. It will look at the first word in the given string. diff --git a/main.lua b/main.lua index 557aab76..804699a3 100644 --- a/main.lua +++ b/main.lua @@ -45,6 +45,7 @@ require("eid_data") require("eid_api") EID.LastRenderCallColor = EID:getTextColor() +local nullVector = Vector(0,0) --use some very hacky trickery to get the path to this mod local _, err = pcall(require, "") @@ -227,7 +228,7 @@ function EID:renderIndicator(entity) if EIDConfig["Indicator"] == "blink" then local c = 255 - math.floor(255 * ((entity.FrameCount % 40) / 40)) entity:SetColor(Color(1, 1, 1, 1, c, c, c), 1, 1, false, false) - entity:Render(Vector(0, 0)) + entity:Render(nullVector) entity:SetColor(Color(1, 1, 1, 1, 0, 0, 0), 2, 1, false, false) elseif EIDConfig["Indicator"] == "border" then local c = 255 - math.floor(255 * ((entity.FrameCount % 40) / 40)) @@ -237,7 +238,7 @@ function EID:renderIndicator(entity) entity:Render(Vector(1, 0)) entity:Render(Vector(-1, 0)) entity:SetColor(Color(1, 1, 1, 1, 0, 0, 0), 2, 1, false, false) - entity:Render(Vector(0, 0)) + entity:Render(nullVector) elseif EIDConfig["Indicator"] == "highlight" then entity:SetColor(Color(1, 1, 1, 1, 255, 255, 255), 1, 1, false, false) entity:Render(Vector(0, 1)) @@ -245,14 +246,14 @@ function EID:renderIndicator(entity) entity:Render(Vector(1, 0)) entity:Render(Vector(-1, 0)) entity:SetColor(Color(1, 1, 1, 1, 0, 0, 0), 2, 1, false, false) - entity:Render(Vector(0, 0)) + entity:Render(nullVector) elseif EIDConfig["Indicator"] == "arrow" then ArrowSprite:Update() local ArrowOffset = Vector(0, -35) if entity.Variant == 100 and not entity:ToPickup():IsShopItem() then ArrowOffset = Vector(0, -62) end - ArrowSprite:Render(Game():GetRoom():WorldToScreenPosition(entity.Position + ArrowOffset), Vector(0, 0), Vector(0, 0)) + ArrowSprite:Render(Game():GetRoom():WorldToScreenPosition(entity.Position + ArrowOffset), nullVector, nullVector)) end end @@ -381,8 +382,8 @@ local function onRender(t) end CardSprite:Render( Vector(EIDConfig["XPosition"] - 9 * EIDConfig["Scale"], posY() + (12 + offsetX) * EIDConfig["Scale"]), - Vector(0, 0), - Vector(0, 0) + nullVector, + nullVector ) end elseif closest.Variant == PickupVariant.PICKUP_PILL then @@ -414,8 +415,8 @@ local function onRender(t) end pillsprite:Render( Vector(EIDConfig["XPosition"] + 2 * EIDConfig["Scale"], posY() + (11 + offsetX) * EIDConfig["Scale"]), - Vector(0, 0), - Vector(0, 0) + nullVector, + nullVector ) pillsprite.Scale = Vector(1, 1) end