From 0a4719927a8ec9930fabdc1ee044ba26a8db6e76 Mon Sep 17 00:00:00 2001 From: Mark Cannon Date: Wed, 19 Mar 2008 03:05:20 +0000 Subject: [PATCH] Added ToDo.txt - add anything we need to work on here, update as stuff is finished. Also added a tentative fix for the 'Color1 as boolean' Win32 error git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg@154 83fadc84-e282-4d84-a09a-c4228d6ae7e5 --- Makefile.am | 2 -- ToDo.txt | 15 +++++++++++++++ src/Background.cpp | 5 +++-- src/ITG2CryptInterface.cpp | 3 +++ src/arch/ArchHooks/ArchHooks_Win32.cpp | 4 +++- 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 ToDo.txt diff --git a/Makefile.am b/Makefile.am index 91bb8126..321362f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ # Need 1.7 for subdir support. (Well, 1.4 doesn't work, I don't know if anything between does.) AUTOMAKE_OPTIONS = 1.7 foreign -#SUBDIRS = src-pc -#SUBDIRS = src-ac SUBDIRS = src ACLOCAL_AMFLAGS = -I autoconf/m4 diff --git a/ToDo.txt b/ToDo.txt new file mode 100644 index 00000000..ee364355 --- /dev/null +++ b/ToDo.txt @@ -0,0 +1,15 @@ +/* More-or-less in order of priority. */ + +/* Bug fixing */ +-Fix the Win32 custom songs crash on sample music +-Fix the Win32 "Color1 is boolean" LUA parsing error (done?) +-Fix the Win32 "backgrounds in upper-left" problem + +/* Minor feature additions */ +-Implement "CustomSongPreviews" (keep drive mounted during SSM) +-Fix "Banner custom doesn't always show in ScreenRanking" bug +-Implement "hold to enter operator menu" function +-Implement Windows dongle functions (just compile win32lnk?) + +/* Major feature additions */ +-Implement "lifebar graph shows FFC/FEC" diff --git a/src/Background.cpp b/src/Background.cpp index b9da228f..eb823ad7 100755 --- a/src/Background.cpp +++ b/src/Background.cpp @@ -378,8 +378,9 @@ bool BackgroundImpl::Layer::CreateBackground( const Song *pSong, const Backgroun // Set Lua color globals - LUA->SetGlobal( ssprintf("Color%d",1), bd.m_sColor1.empty() ? "1,1,1,1" : bd.m_sColor1 ); - LUA->SetGlobal( ssprintf("Color%d",2), bd.m_sColor2.empty() ? "1,1,1,1" : bd.m_sColor2 ); + // EXPERIMENT: fix "Color1 as boolean" error? + LUA->SetGlobal( ssprintf("Color%d",1), bd.m_sColor1.empty() ? CString("1,1,1,1") : bd.m_sColor1 ); + LUA->SetGlobal( ssprintf("Color%d",2), bd.m_sColor2.empty() ? CString("1,1,1,1") : bd.m_sColor2 ); // Resolve the effect file. diff --git a/src/ITG2CryptInterface.cpp b/src/ITG2CryptInterface.cpp index 8683b998..56eec0e8 100644 --- a/src/ITG2CryptInterface.cpp +++ b/src/ITG2CryptInterface.cpp @@ -7,6 +7,9 @@ #include "ibutton/getkey.h" #include +/* courtesy of random.org. -- Vyhd */ +#define DEFAULT_AES_KEY "65487573252940086457044055343188392138734144585" + /* Windows compatibility layer...really ugly. :( */ #if defined(UNIX) #include diff --git a/src/arch/ArchHooks/ArchHooks_Win32.cpp b/src/arch/ArchHooks/ArchHooks_Win32.cpp index ef7a7a49..8f8c51e6 100755 --- a/src/arch/ArchHooks/ArchHooks_Win32.cpp +++ b/src/arch/ArchHooks/ArchHooks_Win32.cpp @@ -168,7 +168,9 @@ void ArchHooks_Win32::RestartProgram() /* Necessary? Is there anything RestartProgram can't do that this can? */ void ArchHooks_Win32::SystemReboot() { - return; // pretend there's nothing here right now -- we'll enable if needed + EndGame(); + + return; // pretend there's nothing else here right now -- we'll enable if needed if( IsAFile("/Data/no-reboot") ) return; -- 2.11.0