From 2b02ad8151b2583a214fced81e4e1cb791349edc Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 14 May 2006 08:09:22 +0000 Subject: [PATCH] Cleanup. --- stepmania/src/CatalogXml.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp index 3f3d66b7f6..e2d34f56e5 100644 --- a/stepmania/src/CatalogXml.cpp +++ b/stepmania/src/CatalogXml.cpp @@ -22,20 +22,16 @@ #include "arch/LoadingWindow/LoadingWindow.h" #include "LocalizedString.h" -#define SHOW_PLAY_MODE(pm) THEME->GetMetricB("CatalogXml",ssprintf("ShowPlayMode%s",PlayModeToString(pm).c_str())) -#define SHOW_STYLE(ps) THEME->GetMetricB("CatalogXml",ssprintf("ShowStyle%s",Capitalize((ps)->m_szName).c_str())) -#define INTERNET_RANKING_HOME_URL THEME->GetMetric ("CatalogXml","InternetRankingHomeUrl") -#define INTERNET_RANKING_UPLOAD_URL THEME->GetMetric ("CatalogXml","InternetRankingUploadUrl") -#define INTERNET_RANKING_VIEW_GUID_URL THEME->GetMetric ("CatalogXml","InternetRankingViewGuidUrl") -#define PRODUCT_TITLE THEME->GetMetric ("CatalogXml","ProductTitle") -#define FOOTER_TEXT THEME->GetMetric ("CatalogXml","FooterText") -#define FOOTER_LINK THEME->GetMetric ("CatalogXml","FooterLink") - -/* - * These RStrings store where the Catalog* files are located, and what they - * called. - */ +#define SHOW_PLAY_MODE(pm) THEME->GetMetricB("CatalogXml",ssprintf("ShowPlayMode%s",PlayModeToString(pm).c_str())) +#define SHOW_STYLE(ps) THEME->GetMetricB("CatalogXml",ssprintf("ShowStyle%s",Capitalize((ps)->m_szName).c_str())) +#define INTERNET_RANKING_HOME_URL THEME->GetMetric ("CatalogXml","InternetRankingHomeUrl") +#define INTERNET_RANKING_UPLOAD_URL THEME->GetMetric ("CatalogXml","InternetRankingUploadUrl") +#define INTERNET_RANKING_VIEW_GUID_URL THEME->GetMetric ("CatalogXml","InternetRankingViewGuidUrl") +#define PRODUCT_TITLE THEME->GetMetric ("CatalogXml","ProductTitle") +#define FOOTER_TEXT THEME->GetMetric ("CatalogXml","FooterText") +#define FOOTER_LINK THEME->GetMetric ("CatalogXml","FooterLink") +// Catalog file paths. const RString CATALOG_XML = "Catalog.xml"; const RString CATALOG_XSL = "Catalog.xsl"; const RString CATALOG_XML_FILE = "Save/" + CATALOG_XML;