diff --git a/SQF/dayz_code/Configs/RscDisplay/RscDisplaySpawnSelecter.hpp b/SQF/dayz_code/Configs/RscDisplay/RscDisplaySpawnSelecter.hpp index 4b32b1974..cc2135e65 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscDisplaySpawnSelecter.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscDisplaySpawnSelecter.hpp @@ -2,8 +2,8 @@ class RscDisplaySpawnSelecter { idd = 6903; enableDisplay = 1; - onLoad = "dayz_DisplaySpawnSelecter = true;"; - //onUnload = "dayz_DisplaySpawnSelecter = false;"; + onLoad = "DZE_DisplaySpawnSelector = true;"; + //onUnload = "DZE_DisplaySpawnSelector = false;"; class controlsBackground { class Mainback : RscPicture { @@ -28,7 +28,7 @@ class RscDisplaySpawnSelecter { h = 0.3044 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 1;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 1;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; class RscSelectedRegion2: RscActiveText @@ -42,7 +42,7 @@ class RscDisplaySpawnSelecter { h = 0.270356 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 0;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 0;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; class RscSelectedRegion3: RscActiveText @@ -56,7 +56,7 @@ class RscDisplaySpawnSelecter { h = 0.275 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 2;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 2;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; class RscSelectedRegion4: RscActiveText @@ -70,7 +70,7 @@ class RscDisplaySpawnSelecter { h = 0.274546 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 3;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 3;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; class RscSelectedRegion5: RscActiveText @@ -84,7 +84,7 @@ class RscDisplaySpawnSelecter { h = 0.275001 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 4;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 4;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; class RscSelectedRegion6: RscActiveText @@ -98,7 +98,7 @@ class RscDisplaySpawnSelecter { h = 0.275 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 5;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 5;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; class RscSelectedRegionRandom: RscActiveText @@ -112,7 +112,7 @@ class RscDisplaySpawnSelecter { h = 0.331135035 * safezoneH; color[] = { 0.5, 0.5, 0.5, 1 }; colorActive[] = { 1, 1, 1, 1 }; - action = "closeDialog 0;dayz_DisplaySpawnSelecter = false;dayz_selectRegion = 9;"; + action = "closeDialog 0;DZE_DisplaySpawnSelector = false;dayz_selectRegion = 9;"; onMouseEnter = "ctrlSetFocus (_this select 0)"; }; diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index ecdb6de60..24130a959 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -212,321 +212,7 @@ class RscDisplayMain : RscStandardDisplay }; }; }; -/* -class RscDisplayMainMap { - saveParams = 1; - - class controlsBackground { - class Map {}; - - class CA_Black : CA_Black_Back {}; - - class CA_Map : RscMapControl { - x = "SafeZoneXAbs"; - y = "SafeZoneY"; - w = "SafeZoneWAbs"; - h = "SafeZoneH"; - }; - }; - - class controls { - class DiaryIndex {}; - class DiaryAdd {}; - class DiarySort {}; - class DiaryFilter {}; - class Diary {}; - - class CA_MainBackground : IGUIBack { - idc = 1020; - x = "SafeZoneX + 0.010 * SafeZoneW"; - y = "SafeZoneY + 0.031"; - w = "0.98*SafeZoneW"; - h = 0.082; - colorbackground[] = {0.1961, 0.1451, 0.0941, 0.85}; - }; - - class CA_TopicsBackground : IGUIBack { - idc = 1021; - x = "0.010*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.117"; - w = "0.146*SafeZoneW"; - h = 0.53; - colorbackground[] = {0.1961, 0.1451, 0.0941, 0.85}; - }; - - class CA_SubTopicsBackground : IGUIBack { - idc = 1022; - x = "0.16*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.117"; - w = "0.283*SafeZoneW"; - h = 0.53; - colorbackground[] = {0.1961, 0.1451, 0.0941, 0.85}; - }; - - class CA_ContentBackground : IGUIBack { - idc = 1023; - x = "0.446*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.117"; - w = "SafeZoneW * 0.544"; - h = 0.832; - colorbackground[] = {0.1961, 0.1451, 0.0941, 0.85}; - }; - - delete CA_PlayerName; - delete CA_PlayerRank; - - class CA_MissionName : RscText { - idc = 112; - style = 1; - x = "0.02*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.033"; - w = "0.96 * SafeZoneW"; - h = 0.041; - sizeEx = 0.034; - colorText[] = {0.95, 0.95, 0.95, 1}; - text = $STR_DIARY_MISSION_NAME; - }; - - delete CA_CurrentTaskLabel; - delete CA_CurrentTask; - - class DiaryList : RscIGUIListBox { - idc = 1001; - onLBSelChanged = "[_this select 0, _this select 1, 'List'] call compile preprocessFileLineNumbers 'ca\Warfare2\Scripts\Client\GUI\GUI_logEH.sqf'; private ['_dummy']; _dummy = [_this,'onLBSelChanged'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf';"; - default = 1; - x = "0.010*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.137"; - w = "0.146*SafeZoneW"; - h = 0.6; - }; - - class CA_DiaryIndex : RscIGUIListBox { - idc = 1002; - onLBSelChanged = "[_this select 0, _this select 1, 'Index'] call compile preprocessFileLineNumbers 'ca\Warfare2\Scripts\Client\GUI\GUI_logEH.sqf';"; - default = 0; - x = "0.16*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.137"; - w = "0.283*SafeZoneW"; - h = 0.6; - sizeEx = 0.034; - }; - - class CA_DiaryGroup : RscControlsGroup { - idc = 1013; - x = "0.446*SafeZoneW + SafeZoneX"; - y = "SafeZoneY + 0.137"; - w = "0.534*SafeZoneW"; - h = 0.718; - - class VScrollbar { - autoScrollSpeed = -1; - autoScrollDelay = 5; - autoScrollRewind = 0; - color[] = {1, 1, 1, 1}; - width = 0.01; - }; - - class HScrollbar { - color[] = {1, 1, 1, 0}; - height = 0.001; - }; - - class Controls { - class CA_Diary : RscHTML { - idc = 1003; - cycleLinks = 0; - cycleAllLinks = 0; - default = 0; - x = "0.01*SafeZoneW"; - y = 0.0; - w = "0.514*SafeZoneW"; - h = 1.807; - colorText[] = {0.95, 0.95, 0.95, 1}; - - class H1 { - font = "Zeppelin32"; - fontBold = "Zeppelin32"; - sizeEx = 0.034; - }; - - class P { - font = "Zeppelin32"; - fontBold = "Zeppelin32"; - sizeEx = 0.034; - }; - }; - }; - }; - - class HC_tooltip_back : IGUIBack { - idc = 1124; - x = 0.0; - y = 0.0; - w = 0.0; - h = 0.0; - colorBackground[] = {0.2, 0.15, 0.1, 0.8}; - }; - - class HC_tooltip_text : RscStructuredText { - idc = 1125; - x = 0.0; - y = 0.0; - w = 0.0; - h = 0.0; - size = 0.035; - - class Attributes { - font = "Zeppelin32"; - color = "#B6F862"; - align = "left"; - shadow = true; - }; - }; - }; - - class objects { - class Watch : RscObject { - model = "\ca\ui\Watch.p3d"; - x = 0.08; - xBack = 0.4; - y = 0.925; - yBack = 0.5; - z = 0.21; - zBack = 0.11; - enableZoom = 1; - direction[] = {0, 1, 7.2}; - up[] = {0, 0, -1}; - scale = 0.4; - }; - - class Compass : RscObject { - model = "\ca\ui\Compass.p3d"; - selectionArrow = ""; - x = 0.16; - xBack = 0.6; - y = 0.925; - yBack = 0.5; - z = 0.2; - zBack = 0.1; - enableZoom = 1; - direction[] = {1, 0, 0}; - up[] = {0, 1, 0}; - scale = 0.35; - }; - - class GPS : RscObject { - model = "\ca\ui\gps.p3d"; - x = 0.36; - xBack = 0.7; - y = 0.925; - yBack = 0.5; - z = 0.22; - zBack = 0.12; - scale = 0.3; - - class Areas { - class Display { - class controls { - class GPSSquare : RscText { - idc = 75; - x = 0; - y = 0.56; - w = 1; - h = 0.5; - colorText[] = {0.2314, 0.2588, 0.1373, 1.0}; - sizeEx = 0.4; - }; - - class GPS_ALT : RscText { - idc = 77; - x = 0.25; - y = 0.31; - w = 1; - h = 0.3; - colorText[] = {0.2314, 0.2588, 0.1373, 1.0}; - sizeEx = 0.23; - }; - - class GPS_Heading : RscText { - idc = 78; - x = 0.25; - y = 0.073; - w = 1; - h = 0.3; - colorText[] = {0.2314, 0.2588, 0.1373, 1.0}; - sizeEx = 0.23; - }; - }; - }; - }; - }; - - class WalkieTalkie : RscObject { - model = "\ca\ui\radio.p3d"; - x = 0.56; - xBack = 0.8; - y = 0.925; - yBack = 0.5; - z = 0.22; - zBack = 0.12; - scale = 0.15; - - class Areas { - class Papir { - class controls { - class RscRadioText : RscActiveText { - sizeEx = 0.17; - x = 0.005; - y = 0.02; - h = 0.1; - }; - - class RadioAlpha : RscRadioText { - y = 0.05; - }; - - class RadioBravo : RscRadioText { - y = 0.17; - }; - - class RadioCharlie : RscRadioText { - y = 0.29; - }; - - class RadioDelta : RscRadioText { - y = 0.41; - }; - - class RadioEcho : RscRadioText { - y = 0.53; - }; - - class RadioFoxtrot : RscRadioText { - y = 0.65; - }; - - class RadioGolf : RscRadioText { - y = 0.77; - }; - - class RadioHotel : RscRadioText { - y = 0.89; - }; - - class RadioIndia : RscRadioText { - y = 1.01; - }; - - class RadioJuliet : RscRadioText { - y = 1.13; - }; - }; - }; - }; - }; - }; -}; -*/ + class RscDisplayClientGetReady : RscDisplayGetReady { onload = "private ['_dummy']; _dummy = [_this,'onload'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf'; _this spawn { while { !isNull (findDisplay 53) } do { ctrlActivate ((_this select 0) displayCtrl 1); sleep 0.1; }; };"; color0[] = {0.4, 0.4, 0.4, 1}; @@ -1648,14 +1334,11 @@ class DZ_ItemInteraction { }; }; -#ifdef NewPlayerUI -#include "RscDisplay\RscNewPlayerUI.hpp" -#else -#include "RscDisplay\RscOldPlayerUI.hpp" -#endif - -#ifdef SpawnSelecter #include "RscDisplay\RscDisplaySpawnSelecter.hpp" -#endif - #include "RscDisplay\RscMap.hpp" + +#ifdef NewPlayerUI + #include "RscDisplay\RscNewPlayerUI.hpp" +#else + #include "RscDisplay\RscOldPlayerUI.hpp" +#endif