wierd

ReallifeGamemode.Client/Interaction/clothes/ClotheShop.ts

@@ -181,19 +181,6 @@ export default function clotheShopList(globalData: IGlobalData) {
 
                 var txData = getClothingName(key, item.ClotheId, gender);
 
-<<<<<<< HEAD
-
-
-                if (txData != undefined && txData.length > 0) {
-                    categoryMenu.AddItem(new UIMenuItem(mp.game.ui.getLabelText(txData[0].data[0].GXT), ""));
-                    clotheSubMenu = new UIMenu(" ", mp.game.ui.getLabelText(txData[0].data[0].GXT), new Point(0, 0), bannerSprite.library, bannerSprite.texture);
-                    clotheSubMenu.Visible = false;
-                    categorysMenus.push(categoryMenu);
-
-                }
-=======
->>>>>>> f7423b24fc6037048d2eaf65ba94de30faa96e39
-
                 for (const x of txData) {
                     var itemDescription = (key === 11 ? mp.game.ui.getLabelText(x.undershirt[1].GXT) : " ");
                     //var itemDescription = (key === 11 ? x.undershirt[1].GXT + " - " + x.id: "Clothing item.");
@@ -405,11 +392,8 @@ export default function clotheShopList(globalData: IGlobalData) {
                 nextMenu.menu.Visible = true;
                 menuTransition = true;
 
-<<<<<<< HEAD
-               // submenuItemChangeHandler(nextMenu.menu.CurrentSelection);
-=======
                submenuItemChangeHandler(nextMenu.menu.CurrentSelection);
->>>>>>> f7423b24fc6037048d2eaf65ba94de30faa96e39
+
             });
 
             mainMenu.MenuClose.on(() => {
@@ -420,37 +404,6 @@ export default function clotheShopList(globalData: IGlobalData) {
                 lastClothing = null;
             });
 
-<<<<<<< HEAD
-            // Sub menu events
-            categoryMenu.ItemSelect.on((selectedItem, itemIndex) => {
-                const nextMenu = clotheMenus[itemIndex];
-                const slot = Number(nextMenu.slotIdx);
-
-                lastClothing = {
-                    type: nextMenu.type,
-                    slotIdx: slot,
-                    drawable: (nextMenu.type === "props" ? localPlayer.getPropIndex(slot) : localPlayer.getDrawableVariation(slot)),
-                    texture: (nextMenu.type === "props" ? localPlayer.getPropTextureIndex(slot) : localPlayer.getTextureVariation(slot)),
-                    undershirt: [localPlayer.getDrawableVariation(8), localPlayer.getTextureVariation(8)],
-                    torso: localPlayer.getDrawableVariation(3)
-                };
-
-                currentMenuIdx = itemIndex;
-                categoryMenu.Visible = false;
-                nextMenu.menu.Visible = true;
-                menuTransition = true;
-
-                submenuItemChangeHandler(nextMenu.menu.CurrentSelection);
-            });
-
-            categoryMenu.MenuClose.on(() => {
-                currentMenuIdx = -1;
-                mainMenu.Visible = true;
-            });
-=======
->>>>>>> f7423b24fc6037048d2eaf65ba94de30faa96e39
-
-
         }
     });