mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 20:45:35 +00:00
Code Issues Releases Wiki Activity

define crosshair owned colour in openmw_hud_box.skin.xml

Browse source
This commit is contained in:
Jiří Kuneš 2015-07-18 21:29:38 +02:00
parent 75f5972898
commit cbc44b33ba
6 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS.md
View file

@ -52,6 +52,7 @@ Programmers
jeaye jeaye
Jeffrey Haines (Jyby) Jeffrey Haines (Jyby)
Jengerer Jengerer
Jiří Kuneš (kunesj)
Joel Graff (graffy) Joel Graff (graffy)
John Blomberg (fstp) John Blomberg (fstp)
Jordan Ayers Jordan Ayers
@ -59,7 +60,6 @@ Programmers
Julien Voisin (jvoisin/ap0) Julien Voisin (jvoisin/ap0)
Karl-Felix Glatzer (k1ll) Karl-Felix Glatzer (k1ll)
Kevin Poitra (PuppyKevin) Kevin Poitra (PuppyKevin)
kunesj
Lars Söderberg (Lazaroth) Lars Söderberg (Lazaroth)
lazydev lazydev
Leon Saunders (emoose) Leon Saunders (emoose)

6
apps/openmw/mwgui/hud.cpp
View file

@ -521,15 +521,13 @@ namespace MWGui
void HUD::setCrosshairOwned(bool owned) void HUD::setCrosshairOwned(bool owned)
{ {
MyGUI::Colour red = MyGUI::Colour(1.0, 0, 0);
MyGUI::Colour white = MyGUI::Colour(1.0, 1.0, 1.0);
if(owned) if(owned)
{ {
mCrosshair->setColour(red); mCrosshair->changeWidgetSkin("HUD_Crosshair_Owned");
} }
else else
{ {
mCrosshair->setColour(white); mCrosshair->changeWidgetSkin("HUD_Crosshair");
} }
} }

2
apps/openmw/mwgui/tooltips.cpp
View file

@ -377,7 +377,7 @@ namespace MWGui
{ {
if(checkOwned()) if(checkOwned())
{ {
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R"); mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_Owned");
} }
else else
{ {

3
files/mygui/openmw_hud.layout
View file

@ -122,8 +122,7 @@
</Widget> </Widget>
<!-- Crosshair --> <!-- Crosshair -->
<Widget type="ImageBox" skin="ImageBox" position="0 0 32 32" align="Center Center" name="Crosshair"> <Widget type="ImageBox" skin="HUD_Crosshair" position="0 0 32 32" align="Center Center" name="Crosshair">
<Property key="ImageTexture" value="textures\target.dds"/>
</Widget> </Widget>
<!-- Basic FPSCounter box --> <!-- Basic FPSCounter box -->

19
files/mygui/openmw_hud_box.skin.xml
View file

@ -32,11 +32,11 @@
</Resource> </Resource>
<Resource type="ResourceSkin" name="HUD_Box_NoTransp_R" size="40 40"> <Resource type="ResourceSkin" name="HUD_Box_NoTransp_Owned" size="40 40">
<!-- The interior of the box --> <!-- The interior of the box -->
<Child type="Widget" skin="DialogBG_R" offset="0 0 40 40" align="Stretch" name="Client"/> <Child type="Widget" skin="DialogBG_Owned" offset="0 0 40 40" align="Stretch" name="Client"/>
<!-- Borders --> <!-- Borders -->
@ -44,4 +44,19 @@
</Resource> </Resource>
<!-- Defines crosshair color -->
<Resource type="ResourceSkin" name="HUD_Crosshair" size="32 32" texture="textures\target.dds">
<BasisSkin type="MainSkin" offset="0 0 32 32">
<State name="normal" offset="0 0 32 32"/>
</BasisSkin>
</Resource>
<!-- Defines owned crosshair color -->
<Resource type="ResourceSkin" name="HUD_Crosshair_Owned" size="32 32" texture="textures\target.dds">
<Property key="Colour" value="0.9 0 0 1"/>
<BasisSkin type="MainSkin" offset="0 0 32 32">
<State name="normal" offset="0 0 32 32"/>
</BasisSkin>
</Resource>
</MyGUI> </MyGUI>

5
files/mygui/openmw_windows.skin.xml
View file

@ -129,9 +129,10 @@
</BasisSkin> </BasisSkin>
</Resource> </Resource>
<!-- Defines a red background --> <!-- Defines a owned background -->
<Resource type="ResourceSkin" name="DialogBG_R" size="8 8" texture="white"> <Resource type="ResourceSkin" name="DialogBG_Owned" size="8 8" texture="white">
<Property key="Colour" value="0.2 0 0 1"/> <Property key="Colour" value="0.2 0 0 1"/>
<!-- <Property key="Colour" value="#{setting=GUI,color background owned}"/> -->
<BasisSkin type="MainSkin" offset="0 0 8 8"> <BasisSkin type="MainSkin" offset="0 0 8 8">
<State name="normal" offset="0 0 8 8"/> <State name="normal" offset="0 0 8 8"/>
</BasisSkin> </BasisSkin>