From 5715235a172dad6104e6ab4be18f36921ea770c9 Mon Sep 17 00:00:00 2001 From: nkorslund Date: Sat, 31 Oct 2009 08:43:56 +0000 Subject: [PATCH] Added crosshair, commented LAND records git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@136 ea6a568a-9f4f-0410-981a-c910a81bb256 --- esm/loadcell.d | 9 +++++++-- gui/cpp_mygui.cpp | 5 +++++ media_mygui/openmw_hud_layout.xml | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/esm/loadcell.d b/esm/loadcell.d index b774f1e6d..992f49b1d 100644 --- a/esm/loadcell.d +++ b/esm/loadcell.d @@ -100,7 +100,8 @@ struct ExteriorCell // Landscape and path grid data 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; @@ -127,7 +128,11 @@ struct ExteriorCell if(isNextHRec("PGRD")) paths.load(); // 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(land.state == LoadState.Loaded) diff --git a/gui/cpp_mygui.cpp b/gui/cpp_mygui.cpp index 88c2130d1..2c4388a03 100644 --- a/gui/cpp_mygui.cpp +++ b/gui/cpp_mygui.cpp @@ -255,7 +255,10 @@ public: getWidget(minimap, "MiniMap"); getWidget(compass, "Compass"); + getWidget(crosshair, "Crosshair"); + compass->setImageTexture("compass.dds"); + crosshair->setImageTexture("target.dds"); } void setStats(int h, int hmax, int m, int mmax, int s, int smax) @@ -297,6 +300,8 @@ public: MyGUI::StaticImagePtr minimap; MyGUI::StaticImagePtr compass; + + MyGUI::StaticImagePtr crosshair; }; class MapWindow : public Layout diff --git a/media_mygui/openmw_hud_layout.xml b/media_mygui/openmw_hud_layout.xml index 38ff25440..22417b401 100644 --- a/media_mygui/openmw_hud_layout.xml +++ b/media_mygui/openmw_hud_layout.xml @@ -43,5 +43,10 @@ + + + +