From 94bb8a781ae4d0a6f21834bc0da9b10bc7eaa949 Mon Sep 17 00:00:00 2001 From: ZipFile Date: Sun, 9 Oct 2011 16:45:05 +0200 Subject: [PATCH 1/2] We already have dynamic linked one. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8eb50d2100..161c1f5c99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -603,8 +603,8 @@ libtomcrypt_a_CPPFLAGS = -I$(srcdir)/libtomcrypt/src/headers $(AM_CPPFLAGS) noinst_LIBRARIES += libtomcrypt.a -main_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include \ --I$(top_srcdir)/extern/glew-1.5.8/include +main_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include +#-I$(top_srcdir)/extern/glew-1.5.8/include main_SOURCES = $(PNG) \ $(Screens) \ From d17643e907da7ad54635e12e661ba5cdbd2f266d Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 9 Oct 2011 13:02:24 -0400 Subject: [PATCH 2/2] Display the chartname instead of the description. --- src/ScreenEdit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 9dbd2c59c7..c6f947008b 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -1841,7 +1841,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) SWITCHED_TO.GetValue() + " %s %s '%s' (%d of %d)", GAMEMAN->GetStepsTypeInfo( pSteps->m_StepsType ).szName, DifficultyToString( pSteps->GetDifficulty() ).c_str(), - pSteps->GetDescription().c_str(), + pSteps->GetChartName().c_str(), it - vSteps.begin() + 1, int(vSteps.size()) ); SCREENMAN->SystemMessage( s );