From ee51201eae7fb00c455eaf7b15fa7536a005fc3e Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 1 Feb 2016 17:01:11 +1100 Subject: [PATCH] [Glide64] Get ext_ghq_init to have texture dir is char * --- Source/Glide64/Ext_TxFilter.cpp | 5 ++--- Source/Glide64/Ext_TxFilter.h | 2 +- Source/Glide64/Main.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Glide64/Ext_TxFilter.cpp b/Source/Glide64/Ext_TxFilter.cpp index b7ebc8601..a9c167211 100644 --- a/Source/Glide64/Ext_TxFilter.cpp +++ b/Source/Glide64/Ext_TxFilter.cpp @@ -25,7 +25,7 @@ #include #include "Ext_TxFilter.h" -extern "C" boolean txfilter_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize, const wchar_t *path, const char *ident, dispInfoFuncExt callback); +extern "C" boolean txfilter_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize, const char *path, const char *ident, dispInfoFuncExt callback); extern "C" void txfilter_shutdown(void); extern "C" boolean txfilter(unsigned char *src, int srcwidth, int srcheight, unsigned short srcformat, uint64 g64crc, GHQTexInfo *info); extern "C" boolean txfilter_hirestex(uint64 g64crc, uint64 r_crc64, unsigned short *palette, GHQTexInfo *info); @@ -39,8 +39,7 @@ void ext_ghq_shutdown(void) } boolean ext_ghq_init(int maxwidth, int maxheight, int maxbpp, int options, int cachesize, - const wchar_t *path, const char *ident, - dispInfoFuncExt callback) + const char *path, const char *ident, dispInfoFuncExt callback) { return txfilter_init(maxwidth, maxheight, maxbpp, options, cachesize, path, ident, callback); } diff --git a/Source/Glide64/Ext_TxFilter.h b/Source/Glide64/Ext_TxFilter.h index b5e00a6cd..34a411485 100644 --- a/Source/Glide64/Ext_TxFilter.h +++ b/Source/Glide64/Ext_TxFilter.h @@ -168,7 +168,7 @@ boolean ext_ghq_init(int maxwidth, /* maximum texture width supported by hardwar int maxbpp, /* maximum texture bpp supported by hardware */ int options, /* options */ int cachesize,/* cache textures to system memory */ - const wchar_t *path, /* plugin directory. must be smaller than MAX_PATH */ + const char *path, /* plugin directory. must be smaller than MAX_PATH */ const char *ident, /* name of ROM. must be no longer than 64 in character. */ dispInfoFuncExt callback /* callback function to display info */ ); diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp index a9fcfd5c2..28091f8e6 100644 --- a/Source/Glide64/Main.cpp +++ b/Source/Glide64/Main.cpp @@ -1083,7 +1083,7 @@ int InitGfx() voodoo.sup_32bit_tex ? 32 : 16, // max texture bpp supported by hardware options, settings.ghq_cache_size * 1024 * 1024, // cache texture to system memory - stdstr(settings.texture_dir).ToUTF16().c_str(), + settings.texture_dir.c_str(), rdp.RomName, // name of ROM. must be no longer than 256 characters DisplayLoadProgress); }