Mercurial > otakunoraifu

comparison window/picture.cc @ 53:ddbcbd000206

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
comparison
equal deleted inserted replaced
52:15a18fbe6f21 53:ddbcbd000206
335 335
336 void PicBase::SetSurfaceAlphaFile(const char* file) { 336 void PicBase::SetSurfaceAlphaFile(const char* file) {
337 337
338 /* ファイルを元に alpha 画像を作成する */ 338 /* ファイルを元に alpha 画像を作成する */
339 /* ファイル： パルフェの 'fil' ファイル */ 339 /* ファイル： パルフェの 'fil' ファイル */
340 ARCINFO* info = file_searcher.Find(FILESEARCH::PDT, file,"fil"); 340 ARCINFO* info = FileSearcher::GetInstance()->Find(FileSearcher::PDT, file,"fil");
341 if (info == NULL) return; 341 if (info == NULL) return;
342 char* new_alpha = info->CopyRead(); 342 char* new_alpha = info->CopyRead();
343 int alpha_size = info->Size(); 343 int alpha_size = info->Size();
344 delete info; 344 delete info;
345 Rect sr(0,0); int w,h; 345 Rect sr(0,0); int w,h;
760 count--; 760 count--;
761 return true; 761 return true;
762 } 762 }
763 763
764 inline Surface* FileToSurface::LoadSurface(string name, char*& mem) { 764 inline Surface* FileToSurface::LoadSurface(string name, char*& mem) {
765 ARCINFO* info = file_searcher.Find(FILESEARCH::PDT, name.c_str(),"pdt"); 765 ARCINFO* info = FileSearcher::GetInstance()->Find(FileSearcher::PDT, name.c_str(), "pdt");
766 if (info == NULL) return NULL; 766 if (info == NULL) return NULL;
767 GRPCONV* conv = GRPCONV::AssignConverter(info); 767 GRPCONV* conv = GRPCONV::AssignConverter(info);
768 if (conv == NULL) { 768 if (conv == NULL) {
769 delete info; 769 delete info;
770 return NULL; 770 return NULL;