revert henke's loadingwindow "improvements"; if you're reading this, henke, you do *NOT* sacrifice readability for misguided optimization, and you do *NOT* use a globally externed variable for something with a useful lifetime of part of one function

This commit is contained in:
Mark Cannon
2011-08-06 21:33:49 +00:00
parent 76a167d91b
commit e1a447cc36
13 changed files with 105 additions and 79 deletions
+6 -5
View File
@@ -1,6 +1,7 @@
#ifndef SONGMANAGER_H
#define SONGMANAGER_H
class LoadingWindow;
class Song;
class Style;
class Steps;
@@ -34,7 +35,7 @@ public:
SongManager();
~SongManager();
void InitSongsFromDisk();
void InitSongsFromDisk( LoadingWindow *ld );
void FreeSongs();
void Cleanup();
@@ -52,7 +53,7 @@ public:
void LoadGroupSymLinks( RString sDir, RString sGroupFolder );
void InitCoursesFromDisk();
void InitCoursesFromDisk( LoadingWindow *ld );
void InitAutogenCourses();
void InitRandomAttacks();
void FreeCourses();
@@ -62,8 +63,8 @@ public:
void DeleteAutogenCourses();
void InvalidateCachedTrails();
void InitAll(); // songs, courses, groups - everything.
void Reload( bool bAllowFastLoad); // songs, courses, groups - everything.
void InitAll( LoadingWindow *ld ); // songs, courses, groups - everything.
void Reload( bool bAllowFastLoad, LoadingWindow *ld=NULL ); // songs, courses, groups - everything.
void PreloadSongImages();
RString GetSongGroupBannerPath( RString sSongGroup ) const;
@@ -169,7 +170,7 @@ public:
void PushSelf( lua_State *L );
protected:
void LoadStepManiaSongDir( RString sDir );
void LoadStepManiaSongDir( RString sDir, LoadingWindow *ld );
void LoadDWISongDir( RString sDir );
bool GetExtraStageInfoFromCourse( bool bExtra2, RString sPreferredGroup, Song*& pSongOut, Steps*& pStepsOut );
void SanityCheckGroupDir( RString sDir ) const;