diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index e4559571e6..0fc1311e36 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -22,8 +22,8 @@ namespace OpenRA.Mods.Cnc Dictionary Info; Stopwatch lastLoadScreen = new Stopwatch(); Sprite[] ss; - float2 nodPos, gdiPos; - Sprite nodLogo, gdiLogo; + float2 nodPos, gdiPos, evaPos; + Sprite nodLogo, gdiLogo, evaLogo; Rectangle Bounds; Renderer r; NullInputHandler nih = new NullInputHandler(); @@ -51,8 +51,10 @@ namespace OpenRA.Mods.Cnc }; nodLogo = new Sprite(s, new Rectangle(0,256,256,256), TextureChannel.Alpha); gdiLogo = new Sprite(s, new Rectangle(256,256,256,256), TextureChannel.Alpha); - nodPos = new float2(Renderer.Resolution.Width/3 - 256, Renderer.Resolution.Height/2 - 128); - gdiPos = new float2(Renderer.Resolution.Width*2/3, Renderer.Resolution.Height/2 - 128); + evaLogo = new Sprite(s, new Rectangle(256,64,128,64), TextureChannel.Alpha); + nodPos = new float2(Renderer.Resolution.Width/3 - 256, Renderer.Resolution.Height/2 - 128); + gdiPos = new float2(Renderer.Resolution.Width*2/3, Renderer.Resolution.Height/2 - 128); + evaPos = new float2(Renderer.Resolution.Width-43-128, 43); } public void Display() @@ -71,6 +73,7 @@ namespace OpenRA.Mods.Cnc r.BeginFrame(float2.Zero); r.RgbaSpriteRenderer.DrawSprite(gdiLogo, gdiPos); r.RgbaSpriteRenderer.DrawSprite(nodLogo, nodPos); + r.RgbaSpriteRenderer.DrawSprite(evaLogo, evaPos); DrawBorder(); font.DrawText(text, new float2((Renderer.Resolution.Width - textSize.X) / 2, (Renderer.Resolution.Height - textSize.Y) / 2), Color.White); r.EndFrame( nih ); diff --git a/artsrc/cnc/chrome.svg b/artsrc/cnc/chrome.svg index a56c7b86fc..591bc4ea2f 100644 --- a/artsrc/cnc/chrome.svg +++ b/artsrc/cnc/chrome.svg @@ -54,19 +54,36 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="320.50284" - inkscape:cy="454.12823" + inkscape:zoom="2.8284271" + inkscape:cx="280.3593" + inkscape:cy="454.1963" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1386" inkscape:window-height="856" inkscape:window-x="54" - inkscape:window-y="0" + inkscape:window-y="22" inkscape:window-maximized="0" showguides="true" - inkscape:guide-bbox="true" /> + inkscape:guide-bbox="true"> + + + + + @@ -477,12 +494,12 @@ inkscape:connector-curvature="0" /> + + + diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 9c77bf846d..23b499d551 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -3,6 +3,7 @@ shellmap: reticle.png logos: chrome.png install:128,0,128,128 + eva:256,64,128,64 nod-load:0,256,256,256 gdi-load:256,256,256,256 diff --git a/mods/cnc/chrome/ingamemenu.yaml b/mods/cnc/chrome/ingamemenu.yaml index 5e8d5a0cb7..53ca31775a 100644 --- a/mods/cnc/chrome/ingamemenu.yaml +++ b/mods/cnc/chrome/ingamemenu.yaml @@ -11,10 +11,13 @@ Container@INGAME_MENU: Height:512 ImageCollection:shellmap ImageName:reticle - Background@SCANLINES: - Width:WINDOW_RIGHT - Height:WINDOW_BOTTOM - Background:panel-scanline + Image@EVA: + X:WINDOW_RIGHT-128-43 + Y:43 + Width:128 + Height:64 + ImageCollection:logos + ImageName:eva Background@BORDER: Width:WINDOW_RIGHT Height:WINDOW_BOTTOM diff --git a/mods/cnc/chrome/install.yaml b/mods/cnc/chrome/install.yaml index 3ddeb4d036..ee2b28ba5d 100644 --- a/mods/cnc/chrome/install.yaml +++ b/mods/cnc/chrome/install.yaml @@ -13,6 +13,13 @@ Container@INSTALL_BACKGROUND: Y:(WINDOW_BOTTOM-256)/2 ImageCollection:logos ImageName:gdi-load + Image@EVA: + X:WINDOW_RIGHT-128-43 + Y:43 + Width:128 + Height:64 + ImageCollection:logos + ImageName:eva Background: Width:PARENT_RIGHT Height:PARENT_BOTTOM diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 1713887eb8..40c22d7272 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -11,10 +11,13 @@ Container@MENU_BACKGROUND: Height:512 ImageCollection:shellmap ImageName:reticle - Background@SCANLINES: - Width:WINDOW_RIGHT - Height:WINDOW_BOTTOM - Background:panel-scanline + Image@EVA: + X:WINDOW_RIGHT-128-43 + Y:43 + Width:128 + Height:64 + ImageCollection:logos + ImageName:eva Background@BORDER: Width:WINDOW_RIGHT Height:WINDOW_BOTTOM diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index 65480d85fb..ee09ce32a7 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ