hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix skin select issue on VC

Browse Source
This commit is contained in:
Vortrex
2021-10-15 22:35:49 -05:00
parent 5ceccd090b
commit dd7bf81e95
1 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/client/skin-select.js
View File

@@ -15,28 +15,11 @@ let skinSelectMessageColourTop = COLOUR_YELLOW;
let skinSelectMessageColourBottom = COLOUR_WHITE; let skinSelectMessageColourBottom = COLOUR_WHITE;
let usingSkinSelector = false; let usingSkinSelector = false;
let usingNewCharacterSkinSelector = false;
let skinSelectorIndex = 0; let skinSelectorIndex = 0;
let skinSelectPosition = null; let skinSelectPosition = null;
let skinSelectHeading = null; let skinSelectHeading = null;
let newCharacterSkinSelectPedPosition = [
[],
[139.54, -903.00, 26.16],
[-379.16, -535.27, 17.28],
[2495.03, -1685.66, 13.51],
[904.27, -498.00, 14.522],
];
let newCharacterSkinSelectPedHeading = [
[],
[15.0],
[0.0],
[0.01],
[3.127],
];
// =========================================================================== // ===========================================================================
function initSkinSelectScript() { function initSkinSelectScript() {
@@ -62,22 +45,22 @@ function loadSkinSelectMessageFontBottom() {
function processSkinSelectKeyPress(keyCode) { function processSkinSelectKeyPress(keyCode) {
if(usingSkinSelector) { if(usingSkinSelector) {
if(keyCode == SDLK_RIGHT) { if(keyCode == SDLK_RIGHT || keyCode == SDLK_s) {
if(allowedSkins[game.game].length-1 == skinSelectorIndex) { if(skinSelectorIndex >= allowedSkins[getGame()].length-1) {
skinSelectorIndex = 0; skinSelectorIndex = 0;
} else { } else {
skinSelectorIndex++; skinSelectorIndex++;
} }
localPlayer.skin = allowedSkins[game.game][skinSelectorIndex][0]; skinSelectMessageTextTop = allowedSkins[getGame()][skinSelectorIndex][1];
skinSelectMessageTextTop = allowedSkins[game.game][skinSelectorIndex][1]; localPlayer.skin = allowedSkins[getGame()][skinSelectorIndex][0];
} else if(keyCode == SDLK_LEFT) { } else if(keyCode == SDLK_LEFT || keyCode == SDLK_a) {
if(skinSelectorIndex <= 0) { if(skinSelectorIndex <= 0) {
skinSelectorIndex = allowedSkins[game.game].length-1; skinSelectorIndex = allowedSkins[getGame()].length-1;
} else { } else {
skinSelectorIndex--; skinSelectorIndex--;
} }
localPlayer.skin = allowedSkins[game.game][skinSelectorIndex][0]; skinSelectMessageTextTop = allowedSkins[getGame()][skinSelectorIndex][1];
skinSelectMessageTextTop = allowedSkins[game.game][skinSelectorIndex][1]; localPlayer.skin = allowedSkins[getGame()][skinSelectorIndex][0];
} else if(keyCode == SDLK_RETURN) { } else if(keyCode == SDLK_RETURN) {
triggerNetworkEvent("vrr.skinSelected", skinSelectorIndex); triggerNetworkEvent("vrr.skinSelected", skinSelectorIndex);
} else if(keyCode == SDLK_BACKSPACE) { } else if(keyCode == SDLK_BACKSPACE) {
@@ -112,10 +95,8 @@ function processSkinSelectRendering() {
function toggleSkinSelect(state) { function toggleSkinSelect(state) {
if(state) { if(state) {
skinSelectorIndex = 0; skinSelectorIndex = 0;
if(localPlayer.skin != allowedSkins[game.game][skinSelectorIndex][0]) {
localPlayer.skin = allowedSkins[game.game][skinSelectorIndex][0];
}
usingSkinSelector = true; usingSkinSelector = true;
let tempPosition = localPlayer.position; let tempPosition = localPlayer.position;
tempPosition.z += 0.5; tempPosition.z += 0.5;
let frontCameraPosition = getPosInFrontOfPos(tempPosition, localPlayer.heading, 3); let frontCameraPosition = getPosInFrontOfPos(tempPosition, localPlayer.heading, 3);
@@ -124,6 +105,7 @@ function toggleSkinSelect(state) {
game.setCameraLookAt(frontCameraPosition, localPlayer.position, true); game.setCameraLookAt(frontCameraPosition, localPlayer.position, true);
} }
localPlayer.skin = allowedSkins[getGame()][skinSelectorIndex][0];
gui.showCursor(true, false); gui.showCursor(true, false);
localPlayer.invincible = true; localPlayer.invincible = true;
localPlayer.setProofs(true, true, true, true, true); localPlayer.setProofs(true, true, true, true, true);