Mercurial > otakunoraifu
diff window/picture.cc @ 53:ddbcbd000206
* MuSys, AyuSysConfig, FileSearcher (former FILESEARCHER) and KeyHolder (former KEYHOLDER) are now singletons
* ParseMoji moved to TextStream
* Some cleaning (0 -> NULL when needed, removal of useless returns, ...)
| author | thib |
|---|---|
| date | Sun, 19 Apr 2009 11:44:05 +0000 |
| parents | 15a18fbe6f21 |
| children | e16e13d8cd68 |
line wrap: on
line diff
--- a/window/picture.cc +++ b/window/picture.cc @@ -337,7 +337,7 @@ void PicBase::SetSurfaceAlphaFile(const /* ファイルを元に alpha 画像を作成する */ /* ファイル： パルフェの 'fil' ファイル */ - ARCINFO* info = file_searcher.Find(FILESEARCH::PDT, file,"fil"); + ARCINFO* info = FileSearcher::GetInstance()->Find(FileSearcher::PDT, file,"fil"); if (info == NULL) return; char* new_alpha = info->CopyRead(); int alpha_size = info->Size(); @@ -762,7 +762,7 @@ inline bool FileToSurface::DeleteData(Su } inline Surface* FileToSurface::LoadSurface(string name, char*& mem) { - ARCINFO* info = file_searcher.Find(FILESEARCH::PDT, name.c_str(),"pdt"); + ARCINFO* info = FileSearcher::GetInstance()->Find(FileSearcher::PDT, name.c_str(), "pdt"); if (info == NULL) return NULL; GRPCONV* conv = GRPCONV::AssignConverter(info); if (conv == NULL) {