diff --git a/Classes/BeansHudItem.uc b/Classes/BeansHudItem.uc
index 686c2e9..cec09aa 100644
--- a/Classes/BeansHudItem.uc
+++ b/Classes/BeansHudItem.uc
@@ -1,12 +1,12 @@
class BeansHudItem expands baseHudItem;
//#EXEC TEXTURE IMPORT NAME=beansIcon FILE=..\HPMENU\TEXTURES\HUD\beansIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=beanCounter FILE=..\HPMENU\TEXTURES\HUD\beanCounter.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=beanCounter FILE=Textures\Icons\beancounter.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=beans1 FILE=..\HPMENU\TEXTURES\HUD\beans1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=beans2 FILE=..\HPMENU\TEXTURES\HUD\beans2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=beans3 FILE=..\HPMENU\TEXTURES\HUD\beans3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=beans4 FILE=..\HPMENU\TEXTURES\HUD\beans4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=beans1 FILE=Textures\Icons\beans1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=beans2 FILE=Textures\Icons\beans2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=beans3 FILE=Textures\Icons\beans3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=beans4 FILE=Textures\Icons\beans4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var Texture BeanTexture[4];
diff --git a/Classes/BroomHud.uc b/Classes/BroomHud.uc
index 0580f05..4345dee 100644
--- a/Classes/BroomHud.uc
+++ b/Classes/BroomHud.uc
@@ -3,13 +3,13 @@
//=============================================================================
class BroomHud extends HPHud;
-#EXEC TEXTURE IMPORT NAME=ProgressBarFull FILE=TEXTURES\HUD\ProgressBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ProgressBarEmpty FILE=TEXTURES\HUD\ProgressBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ProgressBarFull FILE=Textures\Icons\ProgressBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ProgressBarEmpty FILE=Textures\Icons\ProgressBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EmptyHoop FILE=TEXTURES\HUD\EmptyHoop.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HoopTimer FILE=TEXTURES\HUD\HoopTimer.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=KeyBar FILE=TEXTURES\HUD\KeyBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=SnitchBar FILE=TEXTURES\HUD\SnitchBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EmptyHoop FILE=Textures\Icons\EmptyHoop.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HoopTimer FILE=Textures\Icons\HoopTimer.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=KeyBar FILE=Textures\Icons\KeyBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SnitchBar FILE=Textures\Icons\SnitchBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//Add to your harry
//HUDType=class'HPMenu.BroomHud';
diff --git a/Classes/FEBook.uc b/Classes/FEBook.uc
index b7411f7..9829b53 100644
--- a/Classes/FEBook.uc
+++ b/Classes/FEBook.uc
@@ -1,23 +1,23 @@
class FEBook extends baseFEBook;
-#EXEC TEXTURE IMPORT NAME=FEBookTexture1 FILE=TEXTURES\FE\BookPiece1.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEBookTexture2 FILE=TEXTURES\FE\BookPiece2.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEBookTexture3 FILE=TEXTURES\FE\BookPiece3.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEBookTexture4 FILE=TEXTURES\FE\BookPiece4.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEBookTexture5 FILE=TEXTURES\FE\BookPiece5.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEBookTexture6 FILE=TEXTURES\FE\BookPiece6.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=MainTabTexture FILE=TEXTURES\FE\MainTab.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioTabTexture FILE=TEXTURES\FE\FolioTab.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportTabTexture FILE=TEXTURES\FE\ReportTab.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=SaveTabTexture FILE=TEXTURES\FE\SaveTab.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ChapterTabTexture FILE=TEXTURES\FE\ChapterTab.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=MainTabOverTexture FILE=TEXTURES\FE\MainTabOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioTabOverTexture FILE=TEXTURES\FE\FolioTabOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportTabOverTexture FILE=TEXTURES\FE\ReportTabOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=SaveTabOverTexture FILE=TEXTURES\FE\SaveTabOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ChapterTabOverTexture FILE=TEXTURES\FE\ChapterTabOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEBookTexture1 FILE=Textures\Icons\FEBookTexture1.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEBookTexture2 FILE=Textures\Icons\FEBookTexture2.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEBookTexture3 FILE=Textures\Icons\FEBookTexture3.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEBookTexture4 FILE=Textures\Icons\FEBookTexture4.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEBookTexture5 FILE=Textures\Icons\FEBookTexture5.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEBookTexture6 FILE=Textures\Icons\FEBookTexture6.bmp GROUP="Icons" FLAGS=1 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=MainTabTexture FILE=Textures\Icons\MainTabTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioTabTexture FILE=Textures\Icons\FolioTabTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportTabTexture FILE=Textures\Icons\ReportTabTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SaveTabTexture FILE=Textures\Icons\SaveTabTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ChapterTabTexture FILE=Textures\Icons\ChapterTabTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=MainTabOverTexture FILE=Textures\Icons\MainTabOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioTabOverTexture FILE=Textures\Icons\FolioTabOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportTabOverTexture FILE=Textures\Icons\ReportTabOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SaveTabOverTexture FILE=Textures\Icons\SaveTabOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ChapterTabOverTexture FILE=Textures\Icons\ChapterTabOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=FESplashTexture1 FILE=TEXTURES\FE\MoonTitle1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=FESplashTexture2 FILE=TEXTURES\FE\Moontitle2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
@@ -26,65 +26,65 @@ class FEBook extends baseFEBook;
//#EXEC TEXTURE IMPORT NAME=FESplashTexture5 FILE=TEXTURES\FE\Moontitle5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=FESplashTexture6 FILE=TEXTURES\FE\Moontitle6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELegalTexture1 FILE=TEXTURES\FE\Legal1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELegalTexture2 FILE=TEXTURES\FE\Legal2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELegalTexture3 FILE=TEXTURES\FE\Legal3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELegalTexture4 FILE=TEXTURES\FE\Legal4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELegalTexture5 FILE=TEXTURES\FE\Legal5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELegalTexture6 FILE=TEXTURES\FE\Legal6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEEALogoTexture1 FILE=TEXTURES\FE\EALogo001.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEEALogoTexture2 FILE=TEXTURES\FE\EALogo002.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEEALogoTexture3 FILE=TEXTURES\FE\EALogo003.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEEALogoTexture4 FILE=TEXTURES\FE\EALogo004.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEEALogoTexture5 FILE=TEXTURES\FE\EALogo005.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEEALogoTexture6 FILE=TEXTURES\FE\EALogo006.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FELeftReturnUpIcon FILE=TEXTURES\Arrows\leftreturnarrowup.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELeftReturnOverIcon FILE=TEXTURES\Arrows\leftreturnover.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-
-#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture1 FILE=TEXTURES\FE\ScrollBack1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture2 FILE=TEXTURES\FE\ScrollBack2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture3 FILE=TEXTURES\FE\ScrollBack3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture4 FILE=TEXTURES\FE\ScrollBack4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture5 FILE=TEXTURES\FE\ScrollBack5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture6 FILE=TEXTURES\FE\ScrollBack6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEReportBackTexture1 FILE=TEXTURES\FE\ReportBack1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEReportBackTexture2 FILE=TEXTURES\FE\ReportBack2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEReportBackTexture3 FILE=TEXTURES\FE\ReportBack3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEReportBackTexture4 FILE=TEXTURES\FE\ReportBack4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEReportBackTexture5 FILE=TEXTURES\FE\ReportBack5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEReportBackTexture6 FILE=TEXTURES\FE\ReportBack6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FESaveBackTexture1 FILE=TEXTURES\FE\SAVE\SaveBack1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESaveBackTexture2 FILE=TEXTURES\FE\SAVE\SaveBack2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESaveBackTexture3 FILE=TEXTURES\FE\SAVE\SaveBack3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESaveBackTexture4 FILE=TEXTURES\FE\SAVE\SaveBack4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESaveBackTexture5 FILE=TEXTURES\FE\SAVE\SaveBack5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESaveBackTexture6 FILE=TEXTURES\FE\SAVE\SaveBack6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture1 FILE=TEXTURES\Options\001OptionBack.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture2 FILE=TEXTURES\Options\002OptionBack.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture3 FILE=TEXTURES\Options\003OptionBack.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture4 FILE=TEXTURES\Options\004OptionBack.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture5 FILE=TEXTURES\Options\005OptionBack.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture6 FILE=TEXTURES\Options\006OptionBack.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture1 FILE=TEXTURES\Folio\FolioBack001.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture2 FILE=TEXTURES\Folio\FolioBack002.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture3 FILE=TEXTURES\Folio\FolioBack003.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture4 FILE=TEXTURES\Folio\FolioBack004.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture5 FILE=TEXTURES\Folio\FolioBack005.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture6 FILE=TEXTURES\Folio\FolioBack006.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture1 FILE=TEXTURES\Folio\harryback001.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture2 FILE=TEXTURES\Folio\harryback002.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture3 FILE=TEXTURES\Folio\harryback003.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture4 FILE=TEXTURES\Folio\harryback004.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture5 FILE=TEXTURES\Folio\harryback005.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture6 FILE=TEXTURES\Folio\harryback006.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELegalTexture1 FILE=Textures\Icons\FELegalTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELegalTexture2 FILE=Textures\Icons\FELegalTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELegalTexture3 FILE=Textures\Icons\FELegalTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELegalTexture4 FILE=Textures\Icons\FELegalTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELegalTexture5 FILE=Textures\Icons\FELegalTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELegalTexture6 FILE=Textures\Icons\FELegalTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEEALogoTexture1 FILE=Textures\Icons\FEEALogoTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEEALogoTexture2 FILE=Textures\Icons\FEEALogoTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEEALogoTexture3 FILE=Textures\Icons\FEEALogoTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEEALogoTexture4 FILE=Textures\Icons\FEEALogoTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEEALogoTexture5 FILE=Textures\Icons\FEEALogoTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEEALogoTexture6 FILE=Textures\Icons\FEEALogoTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FELeftReturnUpIcon FILE=Textures\Icons\FELeftReturnUpIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELeftReturnOverIcon FILE=Textures\Icons\FELeftReturnOverIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+
+#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture1 FILE=Textures\Icons\FEScrollBackTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture2 FILE=Textures\Icons\FEScrollBackTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture3 FILE=Textures\Icons\FEScrollBackTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture4 FILE=Textures\Icons\FEScrollBackTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture5 FILE=Textures\Icons\FEScrollBackTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEScrollBackTexture6 FILE=Textures\Icons\FEScrollBackTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEReportBackTexture1 FILE=Textures\Icons\FEReportBackTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEReportBackTexture2 FILE=Textures\Icons\FEReportBackTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEReportBackTexture3 FILE=Textures\Icons\FEReportBackTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEReportBackTexture4 FILE=Textures\Icons\FEReportBackTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEReportBackTexture5 FILE=Textures\Icons\FEReportBackTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEReportBackTexture6 FILE=Textures\Icons\FEReportBackTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FESaveBackTexture1 FILE=Textures\Icons\FESaveBackTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESaveBackTexture2 FILE=Textures\Icons\FESaveBackTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESaveBackTexture3 FILE=Textures\Icons\FESaveBackTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESaveBackTexture4 FILE=Textures\Icons\FESaveBackTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESaveBackTexture5 FILE=Textures\Icons\FESaveBackTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESaveBackTexture6 FILE=Textures\Icons\FESaveBackTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture1 FILE=Textures\Icons\FEOptionsBackTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture2 FILE=Textures\Icons\FEOptionsBackTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture3 FILE=Textures\Icons\FEOptionsBackTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture4 FILE=Textures\Icons\FEOptionsBackTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture5 FILE=Textures\Icons\FEOptionsBackTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionsBackTexture6 FILE=Textures\Icons\FEOptionsBackTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture1 FILE=Textures\Icons\FEFolioBackTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture2 FILE=Textures\Icons\FEFolioBackTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture3 FILE=Textures\Icons\FEFolioBackTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture4 FILE=Textures\Icons\FEFolioBackTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture5 FILE=Textures\Icons\FEFolioBackTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioBackTexture6 FILE=Textures\Icons\FEFolioBackTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture1 FILE=Textures\Icons\FEFolioHarryTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture2 FILE=Textures\Icons\FEFolioHarryTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture3 FILE=Textures\Icons\FEFolioHarryTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture4 FILE=Textures\Icons\FEFolioHarryTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture5 FILE=Textures\Icons\FEFolioHarryTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEFolioHarryTexture6 FILE=Textures\Icons\FEFolioHarryTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var UWindowButton MainTab;
var UWindowButton ReportTab;
@@ -506,12 +506,14 @@ event Tick(float delta)
function Created()
{
-local int i;
-local Texture tempTexture;
+ local int i, xoffset, yoffset;
+ local Texture tempTexture;
Super.Created();
bNewGame = false;
+ xoffset = ((WinWidth/2)-320);
+ yoffset = ((WinHeight/2)-240);
/* tempTexture=Texture'MainTabTexture';
MainTab = UWindowButton(CreateControl(class'UWindowButton',
@@ -555,7 +557,7 @@ local Texture tempTexture;
*/
tempTexture=Texture'FELeftReturnUpIcon';
BackPageButton = UWindowButton(CreateControl(class'UWindowButton',
- (WinWidth-75)+0,(WinHeight-39)-10,75, 39));
+ (WinWidth-(75+xoffset)), (WinHeight-(39+yoffset))-10, 75, 39));
BackPageButton.UpTexture=Texture'FELeftReturnUpIcon';
BackPageButton.DownTexture=Texture'FELeftReturnOverIcon';
BackPageButton.OverTexture=Texture'FELeftReturnOverIcon';
@@ -570,66 +572,66 @@ local Texture tempTexture;
//BtnGotoStoryBook.DownTexture=Texture'SaveTabOverTexture';
//BtnGotoStoryBook.OverTexture=Texture'SaveTabOverTexture';
- MainPage = baseFEPage(CreateWindow(class'FEMainPage',0,0,640,480));
+ MainPage = baseFEPage(CreateWindow(class'FEMainPage',xoffset,yoffset,640,480));
MainPage.book=self;
MainPage.hideWindow();
- SlotPage = baseFEPage(CreateWindow(class'FESlotPage',0,0,640,480));
+ SlotPage = baseFEPage(CreateWindow(class'FESlotPage',xoffset,yoffset,640,480));
SlotPage.book=self;
SlotPage.hideWindow();
- ReportPage = baseFEPage(CreateWindow(class'FEReportPage',0,0,640-55,480-40));
+ ReportPage = baseFEPage(CreateWindow(class'FEReportPage',xoffset,yoffset,640-55,480-40));
ReportPage.book=self;
ReportPage.hideWindow();
- FolioPage = baseFEPage(CreateWindow(class'FEFolioPage',0,0,640-60,480-30));
+ FolioPage = baseFEPage(CreateWindow(class'FEFolioPage',xoffset,yoffset,640-60,480-30));
FolioPage.book=self;
FolioPage.hideWindow();
- ChapterPage = baseFEPage(CreateWindow(class'FEChapterPage',45,10,528,416));
+ ChapterPage = baseFEPage(CreateWindow(class'FEChapterPage',xoffset+45,yoffset+10,528,416));
ChapterPage.book=self;
ChapterPage.hideWindow();
- SavePage = baseFEPage(CreateWindow(class'FESavePage',45,10,528,416));
+ SavePage = baseFEPage(CreateWindow(class'FESavePage',xoffset+45,yoffset+10,528,416));
SavePage.book=self;
SavePage.hideWindow();
- LevSelectPage = baseFEPage(CreateWindow(class'FELevSelectPage',45,10,528,416));
+ LevSelectPage = baseFEPage(CreateWindow(class'FELevSelectPage',xoffset+45,yoffset+10,528,416));
LevSelectPage.book=self;
LevSelectPage.hideWindow();
- OptionsPage = baseFEPage(CreateWindow(class'FEOptionsPage',45,10,528,430));
+ OptionsPage = baseFEPage(CreateWindow(class'FEOptionsPage',xoffset+45,yoffset+10,528,430));
OptionsPage.book=self;
OptionsPage.hideWindow();
- LoadPage = baseFEPage(CreateWindow(class'FELoadPage',45,10,528,416));
+ LoadPage = baseFEPage(CreateWindow(class'FELoadPage',xoffset+45,yoffset+10,528,416));
LoadPage.book=self;
LoadPage.hideWindow();
//Full screen
- StoryBookPage = baseFEPage(CreateWindow(class'FEStoryBookPage',0,0,640,480));
+ StoryBookPage = baseFEPage(CreateWindow(class'FEStoryBookPage',xoffset,yoffset,640,480));
StoryBookPage.book=self;
StoryBookPage.hideWindow();
//Full screen
- QuidMatchPage = baseFEPage(CreateWindow(class'FEQuidMatchPage',0,0,640,480));
+ QuidMatchPage = baseFEPage(CreateWindow(class'FEQuidMatchPage',xoffset,yoffset,640,480));
QuidMatchPage.book=self;
QuidMatchPage.hideWindow();
- LangPage = baseFEPage(CreateWindow(class'FESoundBrowser',0,0,640,480));
+ LangPage = baseFEPage(CreateWindow(class'FESoundBrowser',xoffset,yoffset,640,480));
LangPage.book=self;
LangPage.hideWindow();
//debug mode button to allow you to go into a level specified on the command line
- DismissButton = UWindowSmallButton(CreateControl(class'UWindowSmallButton',WinWidth-10,0,10, 10));
+ DismissButton = UWindowSmallButton(CreateControl(class'UWindowSmallButton',WinWidth-(10+xoffset),yoffset,10, 10));
DismissButton.setFont(F_HPMenuLarge);
- StatusBarTextWindow = UWindowWrappedTextArea( CreateControl(class'UWindowWrappedTextArea', 0, WinHeight-26, 500, 26) );
+ StatusBarTextWindow = UWindowWrappedTextArea( CreateControl(class'UWindowWrappedTextArea', xoffset, WinHeight-(26+yoffset), 500, 26) );
StatusBarTextWindow.Clear();
StatusBarTextWindow.AddText("");
StatusBarTextWindow.Font = F_HPMenuLarge;
@@ -656,6 +658,16 @@ local Texture tempTexture;
LogoTexture2.bMasked=true;
bDrawLogo=true;
}
+
+ if(GetLanguage()~="TRA")
+ {
+ LogoTexture1 = Texture( DynamicLoadObject("MenuArt.Logo1", class'Texture') );
+ LogoTexture1.bMasked=true;
+ LogoTexture2 = Texture( DynamicLoadObject("MenuArt.Logo2", class'Texture') );
+ LogoTexture2.bMasked=true;
+ bDrawLogo=true;
+ }
+
CurPage=None;
/*
@@ -675,16 +687,15 @@ local LevelInfo lev;
function ScaleAndDraw(Canvas canvas,float x,float y,Texture tex)
{
-local float fx,fy;
+ local float offsetx, offsety;
if(tex==None)
return;
- fx=(canvas.SizeX/640.0);
- fy=(canvas.SizeY/480.0);
-fx=1;fy=1;
+ offsetx=(WinWidth/2)-(640/2);
+ offsety=(WinHeight/2)-(480/2);
- DrawStretchedTexture( canvas, x*fx, y*fy, tex.USize*fx,tex.VSize*fy,tex);
+ DrawStretchedTexture(canvas, x+offsetx, y+offsety, tex.USize, tex.VSize, tex);
}
@@ -719,10 +730,12 @@ local color saveColor;
if(bResolutionChanged)
{
- root.SetScale(root.realwidth/640);
+ root.SetScale(root.RealHeight/480);
bResolutionChanged=false;
}
+ DrawStretchedTexture(canvas, 0, 0, WinWidth+1, WinHeight+1, Texture'BlackTexture');
+
if(bShowSplash)
{
//check for splash change
@@ -842,8 +855,12 @@ function WindowDone(UWindowWindow W)
function HPMessageBox doHPMessageBox(string msg, string textButton1, optional string textButton2, optional float timeOut)
{
local HPMessageBox w;
-
- w = HPMessageBox(Root.CreateWindow(class'HPMessageBox', (640-246)/2, (480-102)/2, 246, 102, Self));
+ local int xoffset, yoffset;
+
+ xoffset = ((Root.WinWidth/2)-320);
+ yoffset = ((Root.WinHeight/2)-240);
+
+ w = HPMessageBox(Root.CreateWindow(class'HPMessageBox', xoffset+(640-246)/2, yoffset+(480-102)/2, 246, 102, Self));
w.Setup (msg, textButton1, textButton2, timeOut);
root.ShowModal(w);
@@ -1026,16 +1043,19 @@ function RunURL( string levURL, bool bTravelItems )
function EndGame()
{
local baseHarry harry;
+ local int xoffset, yoffset;
// This changes behaviour of space and escape for folio page
bInEndGame = true;
+ xoffset = ((WinWidth/2)-320);
+ yoffset = ((WinHeight/2)-240);
//disable saves. Bug Fix CMP 10-26
FESlotPage(SlotPage).SetSelectedSlot(-1);
if( CreditsPage == None )
{
- CreditsPage = baseFEPage(CreateWindow(class'FECreditsPage',0,0,640,480));
+ CreditsPage = baseFEPage(CreateWindow(class'FECreditsPage',xoffset,yoffset,640,480));
CreditsPage.book=self;
CreditsPage.hideWindow();
}
@@ -1058,13 +1078,16 @@ function EndGame()
function ShowCredits()
{
local baseHarry harry;
+ local int xoffset, yoffset;
// This changes behaviour of space and escape for folio page
bInEndGame = true;
+ xoffset = ((WinWidth/2)-320);
+ yoffset = ((WinHeight/2)-240);
if( CreditsPage == None )
{
- CreditsPage = baseFEPage(CreateWindow(class'FECreditsPage',0,0,640,480));
+ CreditsPage = baseFEPage(CreateWindow(class'FECreditsPage',xoffset,yoffset,640,480));
CreditsPage.book=self;
CreditsPage.hideWindow();
}
diff --git a/Classes/FEFolioPage.uc b/Classes/FEFolioPage.uc
index 3429e36..1902c67 100644
--- a/Classes/FEFolioPage.uc
+++ b/Classes/FEFolioPage.uc
@@ -2,67 +2,67 @@ class FEFolioPage expands baseFEPage;
// Imports for all available images of wizard cards so far
-#EXEC TEXTURE IMPORT NAME=WizCardAdalbertBigTexture FILE=TEXTURES\Folio\Cards\Adalbertbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardBertieBigTexture FILE=TEXTURES\Folio\Cards\bertiebig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardBowmanBigTexture FILE=TEXTURES\Folio\Cards\bowmanbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardBurdockBigTexture FILE=TEXTURES\Folio\Cards\burdockbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardCassandraBigTexture FILE=TEXTURES\Folio\Cards\cassandrabig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardCorneliusBigTexture FILE=TEXTURES\Folio\Cards\corneliusbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardDerwentBigTexture FILE=TEXTURES\Folio\Cards\derwentbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardDumbledoreBigTexture FILE=TEXTURES\Folio\Cards\dumbledorbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardEdgarBigTexture FILE=TEXTURES\Folio\Cards\edgarbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardElladoraBigTexture FILE=TEXTURES\Folio\Cards\elladorabig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardGiffordBigTexture FILE=TEXTURES\Folio\Cards\giffordbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardGodricBigTexture FILE=TEXTURES\Folio\Cards\godricbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHarryBigTexture FILE=TEXTURES\Folio\Cards\harrybig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHelgaBigTexture FILE=TEXTURES\Folio\Cards\helgabig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHengistBigTexture FILE=TEXTURES\Folio\Cards\hengistbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardIgnatiaBigTexture FILE=TEXTURES\Folio\Cards\ignatiabig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardMerlinBigTexture FILE=TEXTURES\Folio\Cards\merlinbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardMorganBigTexture FILE=TEXTURES\Folio\Cards\morganbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardNewtBigTexture FILE=TEXTURES\Folio\Cards\newtbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardRodericBigTexture FILE=TEXTURES\Folio\Cards\rodericbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardRowenaBigTexture FILE=TEXTURES\Folio\Cards\rowenabig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardSalizarBigTexture FILE=TEXTURES\Folio\Cards\salizarbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardTillyBigTexture FILE=TEXTURES\Folio\Cards\Tillybig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardUricBigTexture FILE=TEXTURES\Folio\Cards\uricbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHerpoBigTexture FILE=TEXTURES\Folio\Cards\herpobig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=WizCardAdalbertSmallTexture FILE=TEXTURES\Folio\Cards\adalbertsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardBertieSmallTexture FILE=TEXTURES\Folio\Cards\bertiesmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardBowmanSmallTexture FILE=TEXTURES\Folio\Cards\bowmansmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardBurdockSmallTexture FILE=TEXTURES\Folio\Cards\burdocksmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardCassandraSmallTexture FILE=TEXTURES\Folio\Cards\cassandrasmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardCorneliusSmallTexture FILE=TEXTURES\Folio\Cards\corneliussmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardDerwentSmallTexture FILE=TEXTURES\Folio\Cards\derwentsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardDumbledoreSmallTexture FILE=TEXTURES\Folio\Cards\dumbledorsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardEdgarSmallTexture FILE=TEXTURES\Folio\Cards\edgarsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardElladoraSmallTexture FILE=TEXTURES\Folio\Cards\elladorasmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardGiffordSmallTexture FILE=TEXTURES\Folio\Cards\giffordsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardGodricSmallTexture FILE=TEXTURES\Folio\Cards\godricsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHarrySmallTexture FILE=TEXTURES\Folio\Cards\harrysmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHelgaSmallTexture FILE=TEXTURES\Folio\Cards\helgasmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHengistSmallTexture FILE=TEXTURES\Folio\Cards\hengistsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardIgnatiaSmallTexture FILE=TEXTURES\Folio\Cards\ignatiasmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardMerlinSmallTexture FILE=TEXTURES\Folio\Cards\merlinsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardMorganSmallTexture FILE=TEXTURES\Folio\Cards\morgansmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardNewtSmallTexture FILE=TEXTURES\Folio\Cards\newtsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardRodericSmallTexture FILE=TEXTURES\Folio\Cards\rodericsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardRowenaSmallTexture FILE=TEXTURES\Folio\Cards\rowenasmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardSalizarSmallTexture FILE=TEXTURES\Folio\Cards\salizarsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardTillySmallTexture FILE=TEXTURES\Folio\Cards\Tillysmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardUricSmallTexture FILE=TEXTURES\Folio\Cards\uricsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardHerpoSmallTexture FILE=TEXTURES\Folio\Cards\herposmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FolioArrowLeft FILE=TEXTURES\Folio\leftarrow.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioArrowLeftDown FILE=TEXTURES\Folio\leftarrowdown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioArrowLeftOver FILE=TEXTURES\Folio\leftarrowover.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioArrowRight FILE=TEXTURES\Folio\rightarrow.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioArrowRightDown FILE=TEXTURES\Folio\rightarrowdown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FolioArrowRightOver FILE=TEXTURES\Folio\rightarrowover.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=WizCardMissingBigTexture FILE=TEXTURES\Folio\Cards\missingcardbig.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=WizCardMissingSmallTexture FILE=TEXTURES\Folio\Cards\missingcardsmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardAdalbertBigTexture FILE=Textures\Icons\WizCardAdalbertBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardBertieBigTexture FILE=Textures\Icons\WizCardBertieBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardBowmanBigTexture FILE=Textures\Icons\WizCardBowmanBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardBurdockBigTexture FILE=Textures\Icons\WizCardBurdockBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardCassandraBigTexture FILE=Textures\Icons\WizCardCassandraBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardCorneliusBigTexture FILE=Textures\Icons\WizCardCorneliusBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardDerwentBigTexture FILE=Textures\Icons\WizCardDerwentBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardDumbledoreBigTexture FILE=Textures\Icons\WizCardDumbledoreBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardEdgarBigTexture FILE=Textures\Icons\WizCardEdgarBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardElladoraBigTexture FILE=Textures\Icons\WizCardElladoraBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardGiffordBigTexture FILE=Textures\Icons\WizCardGiffordBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardGodricBigTexture FILE=Textures\Icons\WizCardGodricBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHarryBigTexture FILE=Textures\Icons\WizCardHarryBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHelgaBigTexture FILE=Textures\Icons\WizCardHelgaBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHengistBigTexture FILE=Textures\Icons\WizCardHengistBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardIgnatiaBigTexture FILE=Textures\Icons\WizCardIgnatiaBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardMerlinBigTexture FILE=Textures\Icons\WizCardMerlinBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardMorganBigTexture FILE=Textures\Icons\WizCardMorganBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardNewtBigTexture FILE=Textures\Icons\WizCardNewtBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardRodericBigTexture FILE=Textures\Icons\WizCardRodericBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardRowenaBigTexture FILE=Textures\Icons\WizCardRowenaBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardSalizarBigTexture FILE=Textures\Icons\WizCardSalizarBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardTillyBigTexture FILE=Textures\Icons\WizCardTillyBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardUricBigTexture FILE=Textures\Icons\WizCardUricBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHerpoBigTexture FILE=Textures\Icons\WizCardHerpoBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=WizCardAdalbertSmallTexture FILE=Textures\Icons\WizCardAdalbertSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardBertieSmallTexture FILE=Textures\Icons\WizCardBertieSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardBowmanSmallTexture FILE=Textures\Icons\WizCardBowmanSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardBurdockSmallTexture FILE=Textures\Icons\WizCardBurdockSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardCassandraSmallTexture FILE=Textures\Icons\WizCardCassandraSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardCorneliusSmallTexture FILE=Textures\Icons\WizCardCorneliusSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardDerwentSmallTexture FILE=Textures\Icons\WizCardDerwentSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardDumbledoreSmallTexture FILE=Textures\Icons\WizCardDumbledoreSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardEdgarSmallTexture FILE=Textures\Icons\WizCardEdgarSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardElladoraSmallTexture FILE=Textures\Icons\WizCardElladoraSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardGiffordSmallTexture FILE=Textures\Icons\WizCardGiffordSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardGodricSmallTexture FILE=Textures\Icons\WizCardGodricSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHarrySmallTexture FILE=Textures\Icons\WizCardHarrySmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHelgaSmallTexture FILE=Textures\Icons\WizCardHelgaSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHengistSmallTexture FILE=Textures\Icons\WizCardHengistSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardIgnatiaSmallTexture FILE=Textures\Icons\WizCardIgnatiaSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardMerlinSmallTexture FILE=Textures\Icons\WizCardMerlinSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardMorganSmallTexture FILE=Textures\Icons\WizCardMorganSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardNewtSmallTexture FILE=Textures\Icons\WizCardNewtSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardRodericSmallTexture FILE=Textures\Icons\WizCardRodericSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardRowenaSmallTexture FILE=Textures\Icons\WizCardRowenaSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardSalizarSmallTexture FILE=Textures\Icons\WizCardSalizarSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardTillySmallTexture FILE=Textures\Icons\WizCardTillySmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardUricSmallTexture FILE=Textures\Icons\WizCardUricSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardHerpoSmallTexture FILE=Textures\Icons\WizCardHerpoSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FolioArrowLeft FILE=Textures\Icons\FolioArrowLeft.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioArrowLeftDown FILE=Textures\Icons\FolioArrowLeftDown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioArrowLeftOver FILE=Textures\Icons\FolioArrowLeftOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioArrowRight FILE=Textures\Icons\FolioArrowRight.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioArrowRightDown FILE=Textures\Icons\FolioArrowRightDown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FolioArrowRightOver FILE=Textures\Icons\FolioArrowRightOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=WizCardMissingBigTexture FILE=Textures\Icons\WizCardMissingBigTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=WizCardMissingSmallTexture FILE=Textures\Icons\WizCardMissingSmallTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var Color PurpleColour, purpleBright;
diff --git a/Classes/FEMainPage.uc b/Classes/FEMainPage.uc
index 1144141..61d6c52 100644
--- a/Classes/FEMainPage.uc
+++ b/Classes/FEMainPage.uc
@@ -1,6 +1,6 @@
class FEMainPage expands baseFEPage;
-#EXEC TEXTURE IMPORT NAME=HPLogoTexture FILE=TEXTURES\FE\HPLogo.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLogoTexture FILE=Textures\Icons\HPLogoTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=HPLogoTexture FILE=TEXTURES\FE\BookPiece6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
diff --git a/Classes/FEOptionsPage.uc b/Classes/FEOptionsPage.uc
index 02a5db1..09e481a 100644
--- a/Classes/FEOptionsPage.uc
+++ b/Classes/FEOptionsPage.uc
@@ -1,9 +1,9 @@
class FEOptionsPage expands baseFEPage;
-#EXEC TEXTURE IMPORT NAME=FEOverOptionTexture FILE=TEXTURES\Options\overoption.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOverOption3Texture FILE=TEXTURES\Options\overoption3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOverOption4Texture FILE=TEXTURES\Options\overoption4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOverOption5Texture FILE=TEXTURES\Options\overoption5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOverOptionTexture FILE=Textures\Icons\FEOverOptionTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOverOption3Texture FILE=Textures\Icons\FEOverOption3Texture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOverOption4Texture FILE=Textures\Icons\FEOverOption4Texture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOverOption5Texture FILE=Textures\Icons\FEOverOption5Texture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var bool bInitialized;
@@ -257,6 +257,7 @@ function Created()
{
local int ctlX, ctlY, ctlW, ctlH, labelWidth, labelX, offsetX, offsetY, I;
local int MusicVolume, SoundVolume;
+ local float W, H;
local string sens;
LocalizeStrings();
@@ -286,7 +287,7 @@ function Created()
VideoLabel.SetText(VideoText);
VideoLabel.SetFont(F_Bold);
VideoLabel.TextColor = BlueColour;
- ctlY = 87-offsetY;
+ ctlY = 88-offsetY;
I = 0;
@@ -410,7 +411,7 @@ function Created()
for (I=0; I<ArrayCount(LabelList); I++)
{
- KeyNames[I] = UWindowLabelControl(CreateControl(class'UWindowLabelControl', labelX, ctlY, labelWidth, 1));
+ KeyNames[I] = UWindowLabelControl(CreateControl(class'HPMenuOptionText', labelX, ctlY, labelWidth, 1));
KeyNames[I].SetText(LabelList[I]);
KeyNames[I].SetFont(F_Normal);
KeyNames[I].TextColor = PurpleColour;
diff --git a/Classes/FEQuidMatchPage.uc b/Classes/FEQuidMatchPage.uc
index 4027bde..ba0f09a 100644
--- a/Classes/FEQuidMatchPage.uc
+++ b/Classes/FEQuidMatchPage.uc
@@ -1,40 +1,40 @@
class FEQuidMatchPage expands baseFEPage;
-#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture1 FILE=TEXTURES\FE\QuidBack1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture2 FILE=TEXTURES\FE\QuidBack2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture3 FILE=TEXTURES\FE\QuidBack3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture4 FILE=TEXTURES\FE\QuidBack4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture5 FILE=TEXTURES\FE\QuidBack5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture6 FILE=TEXTURES\FE\QuidBack6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FELeftArrowUpIcon FILE=TEXTURES\Arrows\leftarrowup.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FELeftArrowOverIcon FILE=TEXTURES\Arrows\leftarrowover.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FERightArrowUpIcon FILE=TEXTURES\Arrows\rightarrowup.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FERightArrowOverIcon FILE=TEXTURES\Arrows\rightarrowover.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-
-#EXEC TEXTURE IMPORT NAME=FEGrifLogoMed FILE=TEXTURES\FE\griffendorMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEHuffLogoMed FILE=TEXTURES\FE\hufflepuffMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESlytLogoMed FILE=TEXTURES\FE\slytherinMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FERaveLogoMed FILE=TEXTURES\FE\ravenclawMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEGrifLogoSmall FILE=TEXTURES\FE\griffendorSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEHuffLogoSmall FILE=TEXTURES\FE\hufflepuffSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESlytLogoSmall FILE=TEXTURES\FE\slytherinSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FERaveLogoSmall FILE=TEXTURES\FE\ravenclawSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEGrifLogoTiny FILE=TEXTURES\FE\griffendorTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEHuffLogoTiny FILE=TEXTURES\FE\hufflepuffTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESlytLogoTiny FILE=TEXTURES\FE\slytherinTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FERaveLogoTiny FILE=TEXTURES\FE\ravenclawTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=FEVSTexture FILE=TEXTURES\FE\vs.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESmallVSTexture FILE=TEXTURES\FE\vsSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=BroomstickPracticeTexture FILE=TEXTURES\FE\broompracticebutton.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=QuidLeagueTexture FILE=TEXTURES\FE\quidditchleaugebutton.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BroomstickPracticeLockedTexture FILE=TEXTURES\FE\broompracticebuttonGrey.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=QuidLeagueLockedTexture FILE=TEXTURES\FE\quidditchleaugebuttonGrey.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture1 FILE=Textures\Icons\FEQuidBackTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture2 FILE=Textures\Icons\FEQuidBackTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture3 FILE=Textures\Icons\FEQuidBackTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture4 FILE=Textures\Icons\FEQuidBackTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture5 FILE=Textures\Icons\FEQuidBackTexture5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEQuidBackTexture6 FILE=Textures\Icons\FEQuidBackTexture6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FELeftArrowUpIcon FILE=Textures\Icons\FELeftArrowUpIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FELeftArrowOverIcon FILE=Textures\Icons\FELeftArrowOverIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FERightArrowUpIcon FILE=Textures\Icons\FERightArrowUpIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FERightArrowOverIcon FILE=Textures\Icons\FERightArrowOverIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+
+#EXEC TEXTURE IMPORT NAME=FEGrifLogoMed FILE=Textures\Icons\FEGrifLogoMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEHuffLogoMed FILE=Textures\Icons\FEHuffLogoMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESlytLogoMed FILE=Textures\Icons\FESlytLogoMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FERaveLogoMed FILE=Textures\Icons\FERaveLogoMed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEGrifLogoSmall FILE=Textures\Icons\FEGrifLogoSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEHuffLogoSmall FILE=Textures\Icons\FEHuffLogoSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESlytLogoSmall FILE=Textures\Icons\FESlytLogoSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FERaveLogoSmall FILE=Textures\Icons\FERaveLogoSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEGrifLogoTiny FILE=Textures\Icons\FEGrifLogoTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEHuffLogoTiny FILE=Textures\Icons\FEHuffLogoTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESlytLogoTiny FILE=Textures\Icons\FESlytLogoTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FERaveLogoTiny FILE=Textures\Icons\FERaveLogoTiny.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=FEVSTexture FILE=Textures\Icons\FEVSTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESmallVSTexture FILE=Textures\Icons\FESmallVSTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=BroomstickPracticeTexture FILE=Textures\Icons\BroomstickPracticeTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=QuidLeagueTexture FILE=Textures\Icons\QuidLeagueTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BroomstickPracticeLockedTexture FILE=Textures\Icons\BroomstickPracticeLockedTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=QuidLeagueLockedTexture FILE=Textures\Icons\QuidLeagueLockedTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var UWindowButton ForwardButton;
diff --git a/Classes/FEReportPage.uc b/Classes/FEReportPage.uc
index 3865059..c92bb16 100644
--- a/Classes/FEReportPage.uc
+++ b/Classes/FEReportPage.uc
@@ -3,27 +3,27 @@
//=============================================================================
class FEReportPage extends baseFEPage;
-#EXEC TEXTURE IMPORT NAME=BookReportGreenSand FILE=TEXTURES\FE\Report\greensand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BookReportBlueSand FILE=TEXTURES\FE\Report\bluesand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BookReportPurpleSand FILE=TEXTURES\FE\Report\purplesand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BookReportRedSand FILE=TEXTURES\FE\Report\redsand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BookReportYellowSand FILE=TEXTURES\FE\Report\yellowsand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=BeanBadgeTexture FILE=TEXTURES\FE\Report\beans.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=PointBadgeTexture FILE=TEXTURES\FE\Report\harrypoints.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=CardBadgeTexture FILE=TEXTURES\FE\Report\wizardcards.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=GreenUpTexture FILE=TEXTURES\FE\Report\GreenUp.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BlueUpTexture FILE=TEXTURES\FE\Report\BlueUp.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=PurpleUpTexture FILE=TEXTURES\FE\Report\PurpleUp.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=GreenDownTexture FILE=TEXTURES\FE\Report\GreenDown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BlueDownTexture FILE=TEXTURES\FE\Report\BlueDown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=PurpleDownTexture FILE=TEXTURES\FE\Report\PurpleDown.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=GreenOverTexture FILE=TEXTURES\FE\Report\GreenOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=BlueOverTexture FILE=TEXTURES\FE\Report\BlueOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=PurpleOverTexture FILE=TEXTURES\FE\Report\PurpleOver.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BookReportGreenSand FILE=Textures\Icons\BookReportGreenSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BookReportBlueSand FILE=Textures\Icons\BookReportBlueSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BookReportPurpleSand FILE=Textures\Icons\BookReportPurpleSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BookReportRedSand FILE=Textures\Icons\BookReportRedSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BookReportYellowSand FILE=Textures\Icons\BookReportYellowSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=BeanBadgeTexture FILE=Textures\Icons\BeanBadgeTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=PointBadgeTexture FILE=Textures\Icons\PointBadgeTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=CardBadgeTexture FILE=Textures\Icons\CardBadgeTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=GreenUpTexture FILE=Textures\Icons\GreenUpTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BlueUpTexture FILE=Textures\Icons\BlueUpTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=PurpleUpTexture FILE=Textures\Icons\PurpleUpTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=GreenDownTexture FILE=Textures\Icons\GreenDownTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BlueDownTexture FILE=Textures\Icons\BlueDownTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=PurpleDownTexture FILE=Textures\Icons\PurpleDownTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=GreenOverTexture FILE=Textures\Icons\GreenOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=BlueOverTexture FILE=Textures\Icons\BlueOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=PurpleOverTexture FILE=Textures\Icons\PurpleOverTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var float TimePassed;
diff --git a/Classes/FESlotPage.uc b/Classes/FESlotPage.uc
index 568f9c4..cf1b78d 100644
--- a/Classes/FESlotPage.uc
+++ b/Classes/FESlotPage.uc
@@ -1,6 +1,6 @@
class FESlotPage expands baseFEPage;
-#EXEC TEXTURE IMPORT NAME=SaveSlotEmptyTexture FILE=TEXTURES\FE\SAVE\crest.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SaveSlotEmptyTexture FILE=Textures\Icons\SaveSlotEmptyTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var UWindowSmallButton NewGameButton;
var UWindowButton LogoWindow;
diff --git a/Classes/FEStoryBookPage.uc b/Classes/FEStoryBookPage.uc
index 11ac076..acdebcd 100644
--- a/Classes/FEStoryBookPage.uc
+++ b/Classes/FEStoryBookPage.uc
@@ -32,19 +32,19 @@ class FEStoryBookPage expands baseFEPage;
//#EXEC TEXTURE IMPORT NAME=TextureTest2 FILE=TEXTURES\StoryBook\3_1_001Test.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground1 FILE=TEXTURES\StoryBook\levelload01.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground2 FILE=TEXTURES\StoryBook\levelload02.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground3 FILE=TEXTURES\StoryBook\levelload03.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground4 FILE=TEXTURES\StoryBook\levelload04.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground5 FILE=TEXTURES\StoryBook\levelload05.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground6 FILE=TEXTURES\StoryBook\levelload06.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground1 FILE=TEXTURES\StoryBook\bg001.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground2 FILE=TEXTURES\StoryBook\bg002.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground3 FILE=TEXTURES\StoryBook\bg003.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground4 FILE=TEXTURES\StoryBook\bg004.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground5 FILE=TEXTURES\StoryBook\bg005.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground6 FILE=TEXTURES\StoryBook\bg006.pcx GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground1 FILE=Textures\Icons\HPLevelInfoBackground1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground2 FILE=Textures\Icons\HPLevelInfoBackground2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground3 FILE=Textures\Icons\HPLevelInfoBackground3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground4 FILE=Textures\Icons\HPLevelInfoBackground4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground5 FILE=Textures\Icons\HPLevelInfoBackground5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPLevelInfoBackground6 FILE=Textures\Icons\HPLevelInfoBackground6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground1 FILE=Textures\Icons\HPStoryTextureBackground1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground2 FILE=Textures\Icons\HPStoryTextureBackground2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground3 FILE=Textures\Icons\HPStoryTextureBackground3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground4 FILE=Textures\Icons\HPStoryTextureBackground4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground5 FILE=Textures\Icons\HPStoryTextureBackground5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=HPStoryTextureBackground6 FILE=Textures\Icons\HPStoryTextureBackground6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#exec OBJ LOAD FILE=..\..\Mmmmusic\JS_StoryBook_v2_mx.umx PACKAGE=Engine
diff --git a/Classes/HPConsole.uc b/Classes/HPConsole.uc
index d57dd40..104899a 100644
--- a/Classes/HPConsole.uc
+++ b/Classes/HPConsole.uc
@@ -4,25 +4,25 @@
class HPConsole extends baseConsole;
-#exec TEXTURE IMPORT NAME=MainBack1 FILE=Textures\MainBack1.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBack2 FILE=Textures\MainBack2.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBack3 FILE=Textures\MainBack3.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBack4 FILE=Textures\MainBack4.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBack5 FILE=Textures\MainBack5.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBack6 FILE=Textures\MainBack6.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBack1 FILE=Textures\Icons\MainBack1.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBack2 FILE=Textures\Icons\MainBack2.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBack3 FILE=Textures\Icons\MainBack3.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBack4 FILE=Textures\Icons\MainBack4.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBack5 FILE=Textures\Icons\MainBack5.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBack6 FILE=Textures\Icons\MainBack6.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBackUp FILE=Textures\MainUp.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBackDown FILE=Textures\MainDown.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=MainBackOver FILE=Textures\MainOver.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBackUp FILE=Textures\Icons\MainBackUp.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBackDown FILE=Textures\Icons\MainBackDown.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=MainBackOver FILE=Textures\Icons\MainBackOver.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=DemoUp FILE=Textures\DemoUp.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=DemoDown FILE=Textures\DemoDown.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=DemoOver FILE=Textures\DemoOver.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=DemoUp FILE=Textures\Icons\DemoUp.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=DemoDown FILE=Textures\Icons\DemoDown.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=DemoOver FILE=Textures\Icons\DemoOver.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=LevelUp FILE=Textures\LevelUp.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=LevelDown FILE=Textures\LevelDown.bmp GROUP="Icons" MIPS=OFF
-#exec TEXTURE IMPORT NAME=LevelOver FILE=Textures\LevelOver.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=LevelUp FILE=Textures\Icons\LevelUp.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=LevelDown FILE=Textures\Icons\LevelDown.bmp GROUP="Icons" MIPS=OFF
+#exec TEXTURE IMPORT NAME=LevelOver FILE=Textures\Icons\LevelOver.bmp GROUP="Icons" MIPS=OFF
var UWindowDialogClientWindow levSelect;
@@ -902,12 +902,11 @@ local LevelInfo lev;
if(!bCreatedRoot)
{
CreateRootWindow(Canvas);
- root.SetScale(root.RealWidth/640);
+ root.SetScale(root.RealHeight/480);
// root.GUIScale=root.RealWidth/640;
SetupLanguage();
-
- menuBook=FEBook(Root.CreateWindow(class'FEBook', 0*((Root.WinWidth/2)-320), 0*((Root.WinHeight/2)-240), 640, 480, root));
+ menuBook=FEBook(Root.CreateWindow(class'FEBook', 0*((Root.WinWidth/2)-320), 0*((Root.WinHeight/2)-240), Root.WinWidth, 480, root));
MenuBook.OpenBook("Splash");
// find out if this was a custom level
diff --git a/Classes/HPHud.uc b/Classes/HPHud.uc
index f75eff7..4f1625d 100644
--- a/Classes/HPHud.uc
+++ b/Classes/HPHud.uc
@@ -4,28 +4,28 @@
class HPHud extends baseHUD;
-#EXEC TEXTURE IMPORT NAME=frogIcon FILE=TEXTURES\HUD\frogIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=fullPotionIcon FILE=TEXTURES\HUD\potion2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=halfPotionIcon FILE=TEXTURES\HUD\potion1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=frogIcon FILE=Textures\Icons\frogIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=fullPotionIcon FILE=Textures\Icons\fullPotionIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=halfPotionIcon FILE=Textures\Icons\halfPotionIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyBarFull FILE=TEXTURES\HUD\EnemyBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyBarEmpty FILE=TEXTURES\HUD\EmptyBar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyBarFull FILE=Textures\Icons\EnemyBarFull.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyBarEmpty FILE=Textures\Icons\EnemyBarEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyHead1 FILE=TEXTURES\HUD\EnemyHead1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyHead2 FILE=TEXTURES\HUD\EnemyHead2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyHead3 FILE=TEXTURES\HUD\EnemyHead3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyHead4 FILE=TEXTURES\HUD\EnemyHead4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyHead5 FILE=TEXTURES\HUD\EnemyHead5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=EnemyHead6 FILE=TEXTURES\HUD\EnemyHead6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyHead1 FILE=Textures\Icons\EnemyHead1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyHead2 FILE=Textures\Icons\EnemyHead2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyHead3 FILE=Textures\Icons\EnemyHead3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyHead4 FILE=Textures\Icons\EnemyHead4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyHead5 FILE=Textures\Icons\EnemyHead5.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=EnemyHead6 FILE=Textures\Icons\EnemyHead6.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=MalfoyHead FILE=TEXTURES\HUD\Malfoybar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=VoldemortHead FILE=TEXTURES\HUD\Voldemortbar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=PeevesHead FILE=TEXTURES\HUD\Peevesbar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=MalfoyHead FILE=Textures\Icons\MalfoyHead.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=VoldemortHead FILE=Textures\Icons\VoldemortHead.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=PeevesHead FILE=Textures\Icons\PeevesHead.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=FluffyHead FILE=TEXTURES\HUD\Fluffybar.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=FluffyHeadEmpty FILE=TEXTURES\HUD\FluffyEmpty.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FluffyHeadMAwake FILE=TEXTURES\HUD\FluffybarMAwake.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FluffyHeadMAsleep FILE=TEXTURES\HUD\FluffybarMAsleep.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FluffyHeadMAwake FILE=Textures\Icons\FluffyHeadMAwake.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FluffyHeadMAsleep FILE=Textures\Icons\FluffyHeadMAsleep.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#exec Font Import File=Textures\Lrgred.pcx Name=LargeRedFont
diff --git a/Classes/HPMenuOptionCheckBox.uc b/Classes/HPMenuOptionCheckBox.uc
index 391e7f3..3125059 100644
--- a/Classes/HPMenuOptionCheckBox.uc
+++ b/Classes/HPMenuOptionCheckBox.uc
@@ -1,9 +1,9 @@
class HPMenuOptionCheckBox extends UWindowCheckbox;
-#EXEC TEXTURE IMPORT NAME=FEOptionTickUncheckedTex FILE=TEXTURES\Options\checkboxup.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionTickUncheckedOverTex FILE=TEXTURES\Options\checkboxover.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionTickCheckedTex FILE=TEXTURES\Options\checkboxuptick.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEOptionTickCheckedOverTex FILE=TEXTURES\Options\checkboxovertick.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionTickUncheckedTex FILE=Textures\Icons\FEOptionTickUncheckedTex.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionTickUncheckedOverTex FILE=Textures\Icons\FEOptionTickUncheckedOverTex.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionTickCheckedTex FILE=Textures\Icons\FEOptionTickCheckedTex.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOptionTickCheckedOverTex FILE=Textures\Icons\FEOptionTickCheckedOverTex.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
function Checkbox_SetupSizes(UWindowCheckbox W, Canvas C)
{
diff --git a/Classes/HPMenuOptionComboList.uc b/Classes/HPMenuOptionComboList.uc
index d1c6992..87ec702 100644
--- a/Classes/HPMenuOptionComboList.uc
+++ b/Classes/HPMenuOptionComboList.uc
@@ -1,8 +1,8 @@
class HPMenuOptionComboList extends UWindowComboList;
-#EXEC TEXTURE IMPORT NAME=FEComboListLarge FILE=TEXTURES\Options\largepopup.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEComboListSmall FILE=TEXTURES\Options\smallpopup.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FEComboListBox FILE=TEXTURES\Options\box.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEComboListLarge FILE=Textures\Icons\FEComboListLarge.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEComboListSmall FILE=Textures\Icons\FEComboListSmall.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEComboListBox FILE=Textures\Icons\FEComboListBox.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var Texture bgImage;
diff --git a/Classes/HPMenuOptionHSlider.uc b/Classes/HPMenuOptionHSlider.uc
index 124b7b2..ebb71b6 100644
--- a/Classes/HPMenuOptionHSlider.uc
+++ b/Classes/HPMenuOptionHSlider.uc
@@ -1,7 +1,7 @@
class HPMenuOptionHSlider extends UWindowHSliderControl;
-#EXEC TEXTURE IMPORT NAME=FEOverSliderTexture FILE=TEXTURES\Options\overoption2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FESliderKnobTexture FILE=TEXTURES\Options\slider.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FEOverSliderTexture FILE=Textures\Icons\FEOverSliderTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FESliderKnobTexture FILE=Textures\Icons\FESliderKnobTexture.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var Texture overImage, knobImage;
diff --git a/Classes/HPMenuOptionText.uc b/Classes/HPMenuOptionText.uc
new file mode 100644
index 0000000..7d715d8
--- /dev/null
+++ b/Classes/HPMenuOptionText.uc
@@ -0,0 +1,40 @@
+class HPMenuOptionText extends UWindowLabelControl;
+
+var int textOffsetX;
+
+function Created()
+{
+ Super.Created();
+}
+
+function BeforePaint(Canvas C, float X, float Y)
+{
+ local float W, H;
+
+ Super.BeforePaint(C, X, Y);
+
+ WinHeight = 18;
+ TextSize(C, Text, W, H);
+ TextY = (WinHeight - H) / 2;
+
+ switch(Align)
+ {
+ case TA_Left:;
+ break;
+ case TA_Right:
+ TextX = WinWidth - W;
+ break;
+ case TA_Center:
+ TextX = (WinWidth - W) / 2;
+ break;
+ }
+}
+
+function Paint(Canvas C, float X, float Y)
+{
+ Super.Paint(C, X, Y);
+}
+
+defaultproperties
+{
+}
diff --git a/Classes/PointHudItem.uc b/Classes/PointHudItem.uc
index 8215994..5770ca2 100644
--- a/Classes/PointHudItem.uc
+++ b/Classes/PointHudItem.uc
@@ -1,7 +1,7 @@
class PointHudItem expands baseHudItem;
//#EXEC TEXTURE IMPORT NAME=pointsIcon FILE=..\HPMENU\TEXTURES\HUD\pointsIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=pointsIcon FILE=..\HPMENU\TEXTURES\HUD\HudHousepoints.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=pointsIcon FILE=Textures\Icons\pointsIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
function int GetValue()
{
diff --git a/Classes/PrivHud.uc b/Classes/PrivHud.uc
index 0cbfe4b..a106de1 100644
--- a/Classes/PrivHud.uc
+++ b/Classes/PrivHud.uc
@@ -3,22 +3,22 @@
//=============================================================================
class PrivHud extends baseHUD;
-#exec TEXTURE IMPORT NAME=LetterBackground1 FILE=TEXTURES\LetterBackground1.BMP GROUP="Icons" MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterBackground2 FILE=TEXTURES\LetterBackground2.BMP GROUP="Icons" MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterBackground1 FILE=Textures\Icons\LetterBackground1.bmp GROUP="Icons" MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterBackground2 FILE=Textures\Icons\LetterBackground2.bmp GROUP="Icons" MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece1 FILE=TEXTURES\LetterPiece1.BMP GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece2 FILE=TEXTURES\LetterPiece2.BMP GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece3 FILE=TEXTURES\LetterPiece3.BMP GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece4 FILE=TEXTURES\LetterPiece4.BMP GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece5 FILE=TEXTURES\LetterPiece5.BMP GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece6 FILE=TEXTURES\LetterPiece6.BMP GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterPiece7 FILE=TEXTURES\LetterPiece7.BMP GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece1 FILE=Textures\Icons\LetterPiece1.bmp GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece2 FILE=Textures\Icons\LetterPiece2.bmp GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece3 FILE=Textures\Icons\LetterPiece3.bmp GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece4 FILE=Textures\Icons\LetterPiece4.bmp GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece5 FILE=Textures\Icons\LetterPiece5.bmp GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece6 FILE=Textures\Icons\LetterPiece6.bmp GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterPiece7 FILE=Textures\Icons\LetterPiece7.bmp GROUP="Icons" FLAGS=2 MIPS=ON
-#exec TEXTURE IMPORT NAME=LetterIcon FILE=TEXTURES\LetterIcon.PCX GROUP="Icons" FLAGS=2 MIPS=ON
+#exec TEXTURE IMPORT NAME=LetterIcon FILE=Textures\Icons\LetterIcon.bmp GROUP="Icons" FLAGS=2 MIPS=ON
-#exec Font Import File=Textures\Lrgred.pcx Name=LargeRedFont
+//#exec Font Import File=Textures\Fonts\LargeRedFont.bmp Name=LargeRedFont
var int numLetterTicks;
var int numLetterPieces;
diff --git a/Classes/SeedHudItem.uc b/Classes/SeedHudItem.uc
index 63b682e..11fa27f 100644
--- a/Classes/SeedHudItem.uc
+++ b/Classes/SeedHudItem.uc
@@ -1,7 +1,7 @@
class SeedHudItem expands baseHudItem;
//#EXEC TEXTURE IMPORT NAME=FireSeedIcon FILE=..\HPMENU\TEXTURES\HUD\FireSeedIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=FireSeedIcon FILE=..\HPMENU\TEXTURES\HUD\FireSeed.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=FireSeedIcon FILE=Textures\Icons\FireSeedIcon.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
function int GetValue()
diff --git a/Classes/StarHudItem.uc b/Classes/StarHudItem.uc
index 8330aa1..4e6f440 100644
--- a/Classes/StarHudItem.uc
+++ b/Classes/StarHudItem.uc
@@ -1,7 +1,7 @@
class StarHudItem expands baseHudItem;
//#EXEC TEXTURE IMPORT NAME=StarIcon FILE=..\HPMENU\TEXTURES\HUD\StarIcon.bmp GROUP=Icons FLAGS=2 MIPS=off
-#EXEC TEXTURE IMPORT NAME=StarIcon FILE=..\HPMENU\TEXTURES\HUD\Star.bmp GROUP=Icons FLAGS=2 MIPS=off
+#EXEC TEXTURE IMPORT NAME=StarIcon FILE=Textures\Icons\StarIcon.bmp GROUP=Icons FLAGS=2 MIPS=off
function int GetValue()
{
diff --git a/Classes/Version.uc b/Classes/Version.uc
index f374481..d5c1eb5 100644
--- a/Classes/Version.uc
+++ b/Classes/Version.uc
@@ -5,5 +5,5 @@ var bool bDebugEnabled;
defaultproperties
{
- Version="1.53"
+ Version="1.55"
}
diff --git a/Classes/alohPage.uc b/Classes/alohPage.uc
index 75edcf6..e44f4b1 100644
--- a/Classes/alohPage.uc
+++ b/Classes/alohPage.uc
@@ -6,8 +6,8 @@ class alohPage expands baseSpellPage;
//#EXEC TEXTURE IMPORT NAME=alohPageTexture3 FILE=TEXTURES\HUD\alohPage3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=alohPageTexture4 FILE=TEXTURES\HUD\alohPage4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=alohPageTexture1 FILE=TEXTURES\HUD\letters\alohomora1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=alohPageTexture2 FILE=TEXTURES\HUD\letters\alohomora2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohPageTexture1 FILE=Textures\Icons\alohPageTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=alohPageTexture2 FILE=Textures\Icons\alohPageTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{
diff --git a/Classes/avifPage.uc b/Classes/avifPage.uc
index e265cae..af70928 100644
--- a/Classes/avifPage.uc
+++ b/Classes/avifPage.uc
@@ -6,8 +6,8 @@ class avifPage expands baseSpellPage;
//#EXEC TEXTURE IMPORT NAME=avifPageTexture3 FILE=TEXTURES\HUD\avifPage3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=avifPageTexture4 FILE=TEXTURES\HUD\avifPage4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=avifPageTexture1 FILE=TEXTURES\HUD\letters\avifors1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=avifPageTexture2 FILE=TEXTURES\HUD\letters\avifors2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=avifPageTexture1 FILE=Textures\Icons\avifPageTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=avifPageTexture2 FILE=Textures\Icons\avifPageTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{
diff --git a/Classes/congratsLetter.uc b/Classes/congratsLetter.uc
index a7891e5..12d2918 100644
--- a/Classes/congratsLetter.uc
+++ b/Classes/congratsLetter.uc
@@ -1,7 +1,7 @@
class congratsLetter expands basePopup;
-#exec TEXTURE IMPORT NAME=congratsLetter1 FILE=TEXTURES\congrat1.BMP GROUP="Icons" FLAGS=2 MIPS=off
-#exec TEXTURE IMPORT NAME=congratsLetter2 FILE=TEXTURES\congrat2.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=congratsLetter1 FILE=Textures\Icons\congratsLetter1.bmp GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=congratsLetter2 FILE=Textures\Icons\congratsLetter2.bmp GROUP="Icons" FLAGS=2 MIPS=off
function Draw(Canvas canvas)
diff --git a/Classes/demoLetter.uc b/Classes/demoLetter.uc
index 42ac023..9c20374 100644
--- a/Classes/demoLetter.uc
+++ b/Classes/demoLetter.uc
@@ -1,7 +1,7 @@
class demoLetter expands basePopup;
-#exec TEXTURE IMPORT NAME=welcomeLetter1 FILE=TEXTURES\welcome1.BMP GROUP="Icons" FLAGS=2 MIPS=off
-#exec TEXTURE IMPORT NAME=welcomeLetter2 FILE=TEXTURES\welcome2.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=welcomeLetter1 FILE=Textures\Icons\welcomeLetter1.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=welcomeLetter2 FILE=Textures\Icons\welcomeLetter2.BMP GROUP="Icons" FLAGS=2 MIPS=off
function Draw(Canvas canvas)
diff --git a/Classes/flintPage.uc b/Classes/flintPage.uc
index 815b9d9..11f605b 100644
--- a/Classes/flintPage.uc
+++ b/Classes/flintPage.uc
@@ -1,10 +1,10 @@
class flintPage expands baseSpellPage;
-#EXEC TEXTURE IMPORT NAME=flintPageTexture1 FILE=TEXTURES\HUD\flintPage1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=flintPageTexture2 FILE=TEXTURES\HUD\flintPage2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=flintPageTexture3 FILE=TEXTURES\HUD\flintPage3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=flintPageTexture4 FILE=TEXTURES\HUD\flintPage4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=flintPageTexture1 FILE=Textures\Icons\flintPageTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=flintPageTexture2 FILE=Textures\Icons\flintPageTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=flintPageTexture3 FILE=Textures\Icons\flintPageTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=flintPageTexture4 FILE=Textures\Icons\flintPageTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{
diff --git a/Classes/hedLetter.uc b/Classes/hedLetter.uc
index 8c68118..ddd561f 100644
--- a/Classes/hedLetter.uc
+++ b/Classes/hedLetter.uc
@@ -1,7 +1,7 @@
class hedLetter expands basePopup;
-#exec TEXTURE IMPORT NAME=hedLetter1 FILE=TEXTURES\hedletter1.BMP GROUP="Icons" FLAGS=2 MIPS=off
-#exec TEXTURE IMPORT NAME=hedLetter2 FILE=TEXTURES\hedletter2.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=hedLetter1 FILE=Textures\Icons\hedletter1.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=hedLetter2 FILE=Textures\Icons\hedletter2.BMP GROUP="Icons" FLAGS=2 MIPS=off
var string text;
var string textName;
diff --git a/Classes/hudReportCard.uc b/Classes/hudReportCard.uc
index adbac1f..e1fcce3 100644
--- a/Classes/hudReportCard.uc
+++ b/Classes/hudReportCard.uc
@@ -3,15 +3,15 @@
//=============================================================================
class hudReportCard extends basePopup;
-#EXEC TEXTURE IMPORT NAME=ReportPiece1 FILE=TEXTURES\Report\InGame\Report001.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportPiece2 FILE=TEXTURES\Report\InGame\Report002.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportPiece3 FILE=TEXTURES\Report\InGame\Report003.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportPiece4 FILE=TEXTURES\Report\InGame\Report004.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-
-#EXEC TEXTURE IMPORT NAME=ReportGreenSand FILE=TEXTURES\Report\InGame\greensand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportYellowSand FILE=TEXTURES\Report\InGame\yellowsand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportPurpleSand FILE=TEXTURES\Report\InGame\purplesand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=ReportRedSand FILE=TEXTURES\Report\InGame\redsand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportPiece1 FILE=Textures\Icons\ReportPiece1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportPiece2 FILE=Textures\Icons\ReportPiece2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportPiece3 FILE=Textures\Icons\ReportPiece3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportPiece4 FILE=Textures\Icons\ReportPiece4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+
+#EXEC TEXTURE IMPORT NAME=ReportGreenSand FILE=Textures\Icons\ReportGreenSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportYellowSand FILE=Textures\Icons\ReportYellowSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportPurpleSand FILE=Textures\Icons\ReportPurpleSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=ReportRedSand FILE=Textures\Icons\ReportRedSand.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
var float cardWidth, cardHeight;
var float left_x, top_y;
diff --git a/Classes/hudSpellBook.uc b/Classes/hudSpellBook.uc
index 56d0200..2592b8f 100644
--- a/Classes/hudSpellBook.uc
+++ b/Classes/hudSpellBook.uc
@@ -1,9 +1,9 @@
class hudSpellBook extends UWindowWindow;
-#EXEC TEXTURE IMPORT NAME=SpellBookTexture1 FILE=TEXTURES\HUD\spellbook1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=SpellBookTexture2 FILE=TEXTURES\HUD\spellbook2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=SpellBookTexture3 FILE=TEXTURES\HUD\spellbook3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=SpellBookTexture4 FILE=TEXTURES\HUD\spellbook4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SpellBookTexture1 FILE=Textures\Icons\SpellBookTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SpellBookTexture2 FILE=Textures\Icons\SpellBookTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SpellBookTexture3 FILE=Textures\Icons\SpellBookTexture3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=SpellBookTexture4 FILE=Textures\Icons\SpellBookTexture4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
#exec new TrueTypeFontFactory Name=spellBookFont FontName="Black Chancery" Height=16 AntiAlias=1 CharactersPerPage=32
diff --git a/Classes/masterLetter.uc b/Classes/masterLetter.uc
index 04ded83..5c1732c 100644
--- a/Classes/masterLetter.uc
+++ b/Classes/masterLetter.uc
@@ -1,7 +1,7 @@
class masterLetter expands basePopup;
-#exec TEXTURE IMPORT NAME=masterLetter1 FILE=TEXTURES\master1.BMP GROUP="Icons" FLAGS=2 MIPS=off
-#exec TEXTURE IMPORT NAME=masterLetter2 FILE=TEXTURES\master2.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=masterLetter1 FILE=Textures\Icons\masterLetter1.bmp GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=masterLetter2 FILE=Textures\Icons\masterLetter2.bmp GROUP="Icons" FLAGS=2 MIPS=off
function Draw(Canvas canvas)
diff --git a/Classes/sorryLetter.uc b/Classes/sorryLetter.uc
index 288e39a..ebc96b6 100644
--- a/Classes/sorryLetter.uc
+++ b/Classes/sorryLetter.uc
@@ -1,7 +1,7 @@
class sorryLetter expands basePopup;
-#exec TEXTURE IMPORT NAME=sorryLetter1 FILE=TEXTURES\sorry1.BMP GROUP="Icons" FLAGS=2 MIPS=off
-#exec TEXTURE IMPORT NAME=sorryLetter2 FILE=TEXTURES\sorry2.BMP GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=sorryLetter1 FILE=Textures\Icons\sorryLetter1.bmp GROUP="Icons" FLAGS=2 MIPS=off
+#exec TEXTURE IMPORT NAME=sorryLetter2 FILE=Textures\Icons\sorryLetter2.bmp GROUP="Icons" FLAGS=2 MIPS=off
function Draw(Canvas canvas)
diff --git a/Classes/verdPage.uc b/Classes/verdPage.uc
index 18fddad..eadb177 100644
--- a/Classes/verdPage.uc
+++ b/Classes/verdPage.uc
@@ -6,8 +6,8 @@ class verdPage expands baseSpellPage;
//#EXEC TEXTURE IMPORT NAME=verdPageTexture3 FILE=TEXTURES\HUD\verdPage3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=verdPageTexture4 FILE=TEXTURES\HUD\verdPage4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=verdPageTexture1 FILE=TEXTURES\HUD\letters\verdimillious1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=verdPageTexture2 FILE=TEXTURES\HUD\letters\verdimillious2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=verdPageTexture1 FILE=Textures\Icons\verdPageTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=verdPageTexture2 FILE=Textures\Icons\verdPageTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{
diff --git a/Classes/wingPage.uc b/Classes/wingPage.uc
index 19320de..226879c 100644
--- a/Classes/wingPage.uc
+++ b/Classes/wingPage.uc
@@ -6,8 +6,8 @@ class wingPage expands baseSpellPage;
//#EXEC TEXTURE IMPORT NAME=verdPageTexture3 FILE=TEXTURES\HUD\verdPage3.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
//#EXEC TEXTURE IMPORT NAME=verdPageTexture4 FILE=TEXTURES\HUD\verdPage4.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=wingPageTexture1 FILE=TEXTURES\HUD\letters\wingardium1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
-#EXEC TEXTURE IMPORT NAME=wingPageTexture2 FILE=TEXTURES\HUD\letters\wingardium2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=wingPageTexture1 FILE=Textures\Icons\wingPageTexture1.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
+#EXEC TEXTURE IMPORT NAME=wingPageTexture2 FILE=Textures\Icons\wingPageTexture2.bmp GROUP="Icons" FLAGS=2 MIPS=OFF
defaultproperties
{