teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Added crosshair, commented LAND records

Browse source 
git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@136 ea6a568a-9f4f-0410-981a-c910a81bb256
This commit is contained in:
nkorslund 2009-10-31 08:43:56 +00:00
parent 9ff29461f9
commit 5715235a17
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
esm/loadcell.d
View file

@ -100,7 +100,8 @@ struct ExteriorCell
// Landscape and path grid data // Landscape and path grid data
Land land; // There can be TWO landscapes! Or maybe I have Land land; // There can be TWO landscapes! Or maybe I have
// misunderstood something. Need to check what it means. // misunderstood something. Need to check what it
// means. UPDATE: See comment further down.
PathGrid paths; PathGrid paths;
@ -127,7 +128,11 @@ struct ExteriorCell
if(isNextHRec("PGRD")) paths.load(); if(isNextHRec("PGRD")) paths.load();
// Land can also be here instead. In fact, it can be both // Land can also be here instead. In fact, it can be both
// places. I have to figure out what it means. // places. I have to figure out what it means. UPDATE: Since
// both the LAND and PGRD records have X/Y coordinates of their
// own, a much more robust solution is to not depend on
// order. Nevertheless, I still think there are a couple of
// instances of duplicate LAND structures in esm files.
if(isNextHRec("LAND")) land.load(); if(isNextHRec("LAND")) land.load();
if(land.state == LoadState.Loaded) if(land.state == LoadState.Loaded)

5
gui/cpp_mygui.cpp
View file

@ -255,7 +255,10 @@ public:
getWidget(minimap, "MiniMap"); getWidget(minimap, "MiniMap");
getWidget(compass, "Compass"); getWidget(compass, "Compass");
getWidget(crosshair, "Crosshair");
compass->setImageTexture("compass.dds"); compass->setImageTexture("compass.dds");
crosshair->setImageTexture("target.dds");
} }
void setStats(int h, int hmax, int m, int mmax, int s, int smax) void setStats(int h, int hmax, int m, int mmax, int s, int smax)
@ -297,6 +300,8 @@ public:
MyGUI::StaticImagePtr minimap; MyGUI::StaticImagePtr minimap;
MyGUI::StaticImagePtr compass; MyGUI::StaticImagePtr compass;
MyGUI::StaticImagePtr crosshair;
}; };
class MapWindow : public Layout class MapWindow : public Layout

5
media_mygui/openmw_hud_layout.xml
View file

@ -43,5 +43,10 @@
<Widget type="StaticImage" skin="StaticImage" position="17 18 32 32" align="Left Bottom" <Widget type="StaticImage" skin="StaticImage" position="17 18 32 32" align="Left Bottom"
name="Compass"/> name="Compass"/>
</Widget> </Widget>
<!-- Crosshair -->
<Widget type="StaticImage" skin="StaticImage" position="0 0 32
32" align="Center Center" name="Crosshair"/>
</Widget> </Widget>
</MyGUI> </MyGUI>