aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another inv fix

Browse Source
This commit is contained in:
VegaZ
2018-12-27 00:06:07 +01:00
parent b35ee0ad60
commit 3df210c023
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Client/Gui/Inventory/inventory.js
View File

@@ -106,7 +106,9 @@ mp.events.add("openTradeMenu", (tradePartnerName) => {
tradePartner = tradePartnerName; tradePartner = tradePartnerName;
isTrading = true; isTrading = true;
}); });
mp.events.add("showTradeRequest", () => {
show = false;
});
mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => { mp.events.add("showInventoryToAdmin", (pName, invWeight, itemArr) => {
if (showAdmin === false) { if (showAdmin === false) {
targetPlayerName = pName; targetPlayerName = pName;

11
Client/Interaction/interaction.js
View File

@@ -128,6 +128,11 @@ mp.events.add("render", () => {
} }
} }
mp.game.graphics.set2dLayer(4); mp.game.graphics.set2dLayer(4);
isMouseOverButton(pos[0], pos[1]);
mp.game.graphics.drawRect(0.5 - 0.07, 0.5 + 0.1, 0.06, 0.04, 100, acceptColor, 100, 250);
mp.game.graphics.drawRect(0.5 + 0.07, 0.5 + 0.1, 0.06, 0.04, declineColor, 100, 100, 250);
mp.game.graphics.set2dLayer(5);
if (isMouseOverTradeItem(pos[0], pos[1])) { if (isMouseOverTradeItem(pos[0], pos[1])) {
mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220); mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220);
@@ -157,10 +162,6 @@ mp.events.add("render", () => {
outline: true, outline: true,
}); });
} }
isMouseOverButton(pos[0], pos[1]);
mp.game.graphics.set2dLayer(5);
mp.game.graphics.drawRect(0.5 - 0.07, 0.5 + 0.1, 0.06, 0.04, 100, acceptColor, 100, 250);
mp.game.graphics.drawRect(0.5 + 0.07, 0.5 + 0.1, 0.06, 0.04, declineColor, 100, 100, 250);
mp.game.graphics.set2dLayer(6); mp.game.graphics.set2dLayer(6);
@@ -188,8 +189,8 @@ mp.events.add("render", () => {
}); });
mp.game.graphics.drawRect(0.5, 0.5 + 0.1412, timerBarSize, 0.018, 255, 0, 0, 250); mp.game.graphics.drawRect(0.5, 0.5 + 0.1412, timerBarSize, 0.018, 255, 0, 0, 250);
} else { } else {
mp.events.callRemote('tradeDecision', tradeSelection, JSON.stringify(receivedTradeItems), tradeRequester);
tradeSelection = "timeup"; tradeSelection = "timeup";
mp.events.callRemote('tradeDecision', tradeSelection, JSON.stringify(receivedTradeItems), tradeRequester);
tradeRequest = false; tradeRequest = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
} }