Skip to content

Use adequate variables for dispatchCharClientHook #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LimeSlime888 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use adequate variables for dispatchCharClientHook #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions frontend/static/yw/javascript/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,21 +766,12 @@ function drawBlockChar(charCode, textRender, x, y, cellW, cellH, altGrid) {
}
}

function dispatchCharClientHook(cCode, textRender, tileX, tileY, x, y, clampW, clampH) {
function dispatchCharClientHook(cCode, textRender, tileX, tileY, charX, charY, offsetX, offsetY, cellW, cellH) {
var funcs = specialClientHooks.renderchar;
if(!funcs.length) return false;
for(var i = 0; i < funcs.length; i++) {
var func = funcs[i];
// duplicate from drawBlockChar - needs refactoring
var tmpCellW = clampW / tileC;
var tmpCellH = clampH / tileR;
var sx = Math.floor(x * tmpCellW);
var sy = Math.floor(y * tmpCellH);
var ex = Math.floor((x + 1) * tmpCellW);
var ey = Math.floor((y + 1) * tmpCellH);
tmpCellW = ex - sx;
tmpCellH = ey - sy;
var status = func(cCode, textRender, tileX, tileY, x, y, sx, sy, tmpCellW, tmpCellH);
var status = func(cCode, textRender, tileX, tileY, charX, charY, offsetX, offsetY, cellW, cellH);
if(status) {
return true;
}
Expand Down Expand Up @@ -898,7 +889,7 @@ function renderChar(textRender, offsetX, offsetY, char, color, cellW, cellH, pro
}

if(((specialClientHookMap >> 0) & 1) && !isOverflow) {
var status = dispatchCharClientHook(cCode, textRender, tileX, tileY, charX, charY, cellW, cellH);
var status = dispatchCharClientHook(cCode, textRender, tileX, tileY, charX, charY, fontX, fontY, cellW, cellH);
if(status) {
return true;
}
Expand Down