From 32a2a02b52f91ea6621291490464dfae24ac0ad4 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 10 Aug 2022 14:14:57 -0500
Subject: [PATCH] Use skin util for skin select

---
 scripts/client/skin-select.js | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/scripts/client/skin-select.js b/scripts/client/skin-select.js
index 394c6e2a..c918625e 100644
--- a/scripts/client/skin-select.js
+++ b/scripts/client/skin-select.js
@@ -54,18 +54,7 @@ function processSkinSelectKeyPress(keyCode) {
 			}
 			logToConsole(LOG_DEBUG, `Switching to skin ${allowedSkins[skinSelectorIndex][1]} (Index: ${skinSelectorIndex}, Skin: ${allowedSkins[skinSelectorIndex][0]})`);
 			skinSelectMessageTextTop = allowedSkins[skinSelectorIndex][1];
-			if (getGame() == AGRP_GAME_GTA_IV) {
-				let skinId = allowedSkins[skinSelectorIndex][0];
-				if (natives.isModelInCdimage(skinId)) {
-					natives.requestModel(skinId);
-					natives.loadAllObjectsNow();
-					if (natives.hasModelLoaded(skinId)) {
-						natives.changePlayerModel(natives.getPlayerId(), skinId);
-					}
-				}
-			} else {
-				localPlayer.skin = allowedSkins[skinSelectorIndex][0];
-			}
+			setLocalPlayerSkin(allowedSkins[skinSelectorIndex][0]);
 		} else if (keyCode == SDLK_RIGHT || keyCode == SDLK_D) {
 			if (skinSelectorIndex <= 0) {
 				skinSelectorIndex = allowedSkins.length - 1;
@@ -74,18 +63,7 @@ function processSkinSelectKeyPress(keyCode) {
 			}
 			logToConsole(LOG_DEBUG, `Switching to skin ${allowedSkins[skinSelectorIndex][1]} (Index: ${skinSelectorIndex}, Skin: ${allowedSkins[skinSelectorIndex][0]})`);
 			skinSelectMessageTextTop = allowedSkins[skinSelectorIndex][1];
-			if (getGame() == AGRP_GAME_GTA_IV) {
-				let skinId = allowedSkins[skinSelectorIndex][0];
-				if (natives.isModelInCdimage(skinId)) {
-					natives.requestModel(skinId);
-					natives.loadAllObjectsNow();
-					if (natives.hasModelLoaded(skinId)) {
-						natives.changePlayerModel(natives.getPlayerId(), skinId);
-					}
-				}
-			} else {
-				localPlayer.skin = allowedSkins[skinSelectorIndex][0];
-			}
+			setLocalPlayerSkin(allowedSkins[skinSelectorIndex][0]);
 		} else if (keyCode == SDLK_RETURN) {
 			sendNetworkEventToServer("agrp.skinSelected", skinSelectorIndex);
 			toggleSkinSelect(false);