From 907274f9bd856ab64482a124d52ed920fe0e9b0c Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 23 Aug 2015 21:23:55 +0200 Subject: [PATCH] Fixed cross-compiling with theos --- JGE/include/JLBFont.h | 2 - JGE/include/JRenderer.h | 10 +- JGE/include/JSoundSystem.h | 2 + JGE/include/JSpline.h | 19 +- JGE/src/JFileSystem.cpp | 8 +- JGE/src/JSpline.cpp | 14 +- JGE/src/iOS/EAGLViewController.h | 1 + JGE/src/iOS/EAGLViewController.m | 10 +- JGE/src/iOS/wagicAppDelegate.m | 2 +- JGE/src/unzip/crypt.h | 14 +- JGE/src/unzip/ioapi.c | 60 ++--- JGE/src/unzip/unzip.c | 198 ++++++---------- JGE/src/unzip/zip.c | 216 +++++++++--------- JGE/src/zipFS/zfsystem.cpp | 1 - .../Reachability/Reachability.m | 2 +- .../mtg/iOS/SoundManager/MyOpenALSupport.c | 115 +++++----- projects/mtg/iOS/SoundManager/SoundManager.m | 4 +- .../UI/WagicDownloadProgressViewController.m | 6 +- .../mtg/iOS/asi-http-request/ASIHTTPRequest.m | 4 +- projects/mtg/src/AIPlayer.cpp | 2 - projects/mtg/src/DeckMenu.cpp | 3 - projects/mtg/src/GameStateDuel.cpp | 3 - projects/mtg/src/SimplePad.cpp | 7 +- projects/mtg/src/WGui.cpp | 2 + projects/mtg/src/WResourceManager.cpp | 2 + 25 files changed, 320 insertions(+), 387 deletions(-) diff --git a/JGE/include/JLBFont.h b/JGE/include/JLBFont.h index 3c911a9ce..79031f3e5 100644 --- a/JGE/include/JLBFont.h +++ b/JGE/include/JLBFont.h @@ -178,8 +178,6 @@ private: float mSpacing; PIXEL_TYPE mColor; - int mBlend; - int mBase; }; diff --git a/JGE/include/JRenderer.h b/JGE/include/JRenderer.h index 0a7b264e3..452ac4955 100644 --- a/JGE/include/JRenderer.h +++ b/JGE/include/JRenderer.h @@ -598,8 +598,6 @@ private: GLint prog2_positionLoc; GLint prog2_texCoordLoc; GLint prog2_colorLoc; - // MVP matrix - ESMatrix prog2_mvpMatrix; // Uniform locations GLint prog2_mvpLoc; @@ -612,13 +610,11 @@ private: int mCurrentTextureFormat; #endif +#ifdef PSP bool mVsync; - + int mTexCounter; +#endif int mSwizzle; - int mTexCounter; - - - int mCurrentTextureFilter; int mCurrTexBlendSrc; diff --git a/JGE/include/JSoundSystem.h b/JGE/include/JSoundSystem.h index 130935813..50771a646 100644 --- a/JGE/include/JSoundSystem.h +++ b/JGE/include/JSoundSystem.h @@ -258,7 +258,9 @@ private: #endif int mVolume; +#ifndef IOS int mMusicVolume; +#endif int mSampleVolume; diff --git a/JGE/include/JSpline.h b/JGE/include/JSpline.h index e5b6f28e2..ca0c57eee 100644 --- a/JGE/include/JSpline.h +++ b/JGE/include/JSpline.h @@ -18,12 +18,11 @@ using namespace std; #define MID_POINT_THRESHOLD 1.0f - ////////////////////////////////////////////////////////////////////////// /// Position of a single dot on screen. /// ////////////////////////////////////////////////////////////////////////// -class Point +class JPoint { public: @@ -34,13 +33,13 @@ public: /// @param _y - Y position. /// ////////////////////////////////////////////////////////////////////////// - Point(float _x, float _y) { x = _x; y = _y; } + JPoint(float _x, float _y) { x = _x; y = _y; } ////////////////////////////////////////////////////////////////////////// /// Constructor, set position to default (0.0f, 0.0f) /// ////////////////////////////////////////////////////////////////////////// - Point() { x = 0.0f; y = 0.0f; } + JPoint() { x = 0.0f; y = 0.0f; } float x; ///< X position. float y; ///< Y position. @@ -95,7 +94,7 @@ public: /// @param pt - Control point. /// ////////////////////////////////////////////////////////////////////////// - void AddControlPoint(const Point &pt); + void AddControlPoint(const JPoint &pt); ////////////////////////////////////////////////////////////////////////// /// Get a control point of the spline. @@ -105,7 +104,7 @@ public: /// @return Control point. /// ////////////////////////////////////////////////////////////////////////// - void GetControlPoint(Point &point, int index); + void GetControlPoint(JPoint &point, int index); ////////////////////////////////////////////////////////////////////////// /// Work out all pixels of the spline. @@ -128,7 +127,7 @@ public: /// @return Position of the desire point. /// ////////////////////////////////////////////////////////////////////////// - void PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3); + void PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3); ////////////////////////////////////////////////////////////////////////// /// Get a number of pixels for this spline. @@ -146,7 +145,7 @@ public: /// @return Position of the desire point. /// ////////////////////////////////////////////////////////////////////////// - void GetPixel(Point &point, int index); + void GetPixel(JPoint &point, int index); ////////////////////////////////////////////////////////////////////////// /// Render the spline to screen. @@ -156,8 +155,8 @@ public: private: - vector mMidPoints; - vector mPixels; + vector mMidPoints; + vector mPixels; int mCount; }; diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp index 7d190c562..4eeff8f4f 100644 --- a/JGE/src/JFileSystem.cpp +++ b/JGE/src/JFileSystem.cpp @@ -38,6 +38,12 @@ The content that users should not be touching. #include #endif +/* +#ifdef IOS +#include +#endif +*/ + JFileSystem* JFileSystem::mInstance = NULL; JZipCache::JZipCache() @@ -248,7 +254,7 @@ void JFileSystem::clearZipCache() bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL */) { - if (mZipAvailable && mZipFile != NULL) + if (mZipAvailable && mZipFile.is_open()) { if (mZipFileName != zipfile) DetachZipFile(); // close the previous zip file diff --git a/JGE/src/JSpline.cpp b/JGE/src/JSpline.cpp index 05d17958e..2131fb02c 100644 --- a/JGE/src/JSpline.cpp +++ b/JGE/src/JSpline.cpp @@ -71,7 +71,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale) element->QueryFloatAttribute("x", &xx); element->QueryFloatAttribute("y", &yy); - Point pt(xx*xscale, yy*yscale); + JPoint pt(xx*xscale, yy*yscale); AddControlPoint(pt); } @@ -84,7 +84,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale) -void JSpline::PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3) +void JSpline::PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3) { float t2 = t * t; float t3 = t2 * t; @@ -113,8 +113,8 @@ void JSpline::GeneratePixels() x = mMidPoints[1].x; y = mMidPoints[1].y; - Point newPt(x, y); - Point extraPt; + JPoint newPt(x, y); + JPoint extraPt; mPixels.push_back(newPt); @@ -151,13 +151,13 @@ void JSpline::GeneratePixels() } -void JSpline::AddControlPoint(const Point &pt) +void JSpline::AddControlPoint(const JPoint &pt) { mMidPoints.push_back(pt); } -void JSpline::GetControlPoint(Point &point, int index) +void JSpline::GetControlPoint(JPoint &point, int index) { if (index < (int)mMidPoints.size()) { @@ -167,7 +167,7 @@ void JSpline::GetControlPoint(Point &point, int index) } -void JSpline::GetPixel(Point &point, int index) +void JSpline::GetPixel(JPoint &point, int index) { if (index < (int)mPixels.size()) { diff --git a/JGE/src/iOS/EAGLViewController.h b/JGE/src/iOS/EAGLViewController.h index 3cc59827e..743644c10 100755 --- a/JGE/src/iOS/EAGLViewController.h +++ b/JGE/src/iOS/EAGLViewController.h @@ -10,5 +10,6 @@ void resumeGame(); @property (nonatomic, retain) id eaglView; @property (nonatomic, retain) UITextField *inputField; @property (nonatomic, assign) BOOL bannerIsVisible; +- (void)toggleKeyboardWithState: (NSString *) initialText; @end diff --git a/JGE/src/iOS/EAGLViewController.m b/JGE/src/iOS/EAGLViewController.m index 4ad3950b1..d0f93b9c3 100755 --- a/JGE/src/iOS/EAGLViewController.m +++ b/JGE/src/iOS/EAGLViewController.m @@ -53,28 +53,28 @@ - (void)viewWillAppear:(BOOL)animated { NSLog(@"EAGL ViewController - view Will Appear"); - [self.view resumeGame]; + [(id)self.view resumeGame]; } - (void)viewWillDisappear:(BOOL)animated { - [self.view pauseGame]; + [(id)self.view pauseGame]; } - (void)pauseGame { - [self.view pauseGame]; + [(id)self.view pauseGame]; } - (void)resumeGame { - [self.view resumeGame]; + [(id)self.view resumeGame]; } - (void)endGame { - [self.view endGame]; + [(id)self.view endGame]; } - (void)viewDidAppear:(BOOL)animated { diff --git a/JGE/src/iOS/wagicAppDelegate.m b/JGE/src/iOS/wagicAppDelegate.m index 909c639dc..607b05afa 100755 --- a/JGE/src/iOS/wagicAppDelegate.m +++ b/JGE/src/iOS/wagicAppDelegate.m @@ -337,7 +337,7 @@ - (void)applicationWillTerminate:(UIApplication *)application { - [self.glViewController.view destroyGame]; + [(id)self.glViewController.view destroyGame]; } - (void)initializeKeyboard: (id) initialState diff --git a/JGE/src/unzip/crypt.h b/JGE/src/unzip/crypt.h index 622f4bc2e..91e13f2ed 100644 --- a/JGE/src/unzip/crypt.h +++ b/JGE/src/unzip/crypt.h @@ -87,13 +87,13 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon # define ZCR_SEED2 3141592654UL /* use PI as default pattern */ # endif -static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) - const char *passwd; /* password string */ - unsigned char *buf; /* where to write header */ - int bufSize; - unsigned long* pkeys; - const unsigned long* pcrc_32_tab; - unsigned long crcForCrypting; +static int crypthead( + const char *passwd, /* password string */ + unsigned char *buf, /* where to write header */ + int bufSize, + unsigned long* pkeys, + const unsigned long* pcrc_32_tab, + unsigned long crcForCrypting) { int n; /* index in random header */ int t; /* temporary */ diff --git a/JGE/src/unzip/ioapi.c b/JGE/src/unzip/ioapi.c index f1bee23e6..160119939 100644 --- a/JGE/src/unzip/ioapi.c +++ b/JGE/src/unzip/ioapi.c @@ -65,10 +65,10 @@ int ZCALLBACK ferror_file_func OF(( voidpf stream)); -voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) - voidpf opaque; - const char* filename; - int mode; +voidpf ZCALLBACK fopen_file_func ( + voidpf opaque, + const char* filename, + int mode) { FILE* file = NULL; const char* mode_fopen = NULL; @@ -87,11 +87,11 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) } -uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) - voidpf opaque; - voidpf stream; - void* buf; - uLong size; +uLong ZCALLBACK fread_file_func ( + voidpf opaque, + voidpf stream, + void* buf, + uLong size) { uLong ret; ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); @@ -99,31 +99,31 @@ uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) } -uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size) - voidpf opaque; - voidpf stream; - const void* buf; - uLong size; +uLong ZCALLBACK fwrite_file_func ( + voidpf opaque, + voidpf stream, + const void* buf, + uLong size) { uLong ret; ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); return ret; } -long ZCALLBACK ftell_file_func (opaque, stream) - voidpf opaque; - voidpf stream; +long ZCALLBACK ftell_file_func ( + voidpf opaque, + voidpf stream) { long ret; ret = ftell((FILE *)stream); return ret; } -long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) - voidpf opaque; - voidpf stream; - uLong offset; - int origin; +long ZCALLBACK fseek_file_func ( + voidpf opaque, + voidpf stream, + uLong offset, + int origin) { int fseek_origin=0; long ret; @@ -145,26 +145,26 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) return ret; } -int ZCALLBACK fclose_file_func (opaque, stream) - voidpf opaque; - voidpf stream; +int ZCALLBACK fclose_file_func ( + voidpf opaque, + voidpf stream) { int ret; ret = fclose((FILE *)stream); return ret; } -int ZCALLBACK ferror_file_func (opaque, stream) - voidpf opaque; - voidpf stream; +int ZCALLBACK ferror_file_func ( + voidpf opaque, + voidpf stream) { int ret; ret = ferror((FILE *)stream); return ret; } -void fill_fopen_filefunc (pzlib_filefunc_def) - zlib_filefunc_def* pzlib_filefunc_def; +void fill_fopen_filefunc ( + zlib_filefunc_def* pzlib_filefunc_def) { pzlib_filefunc_def->zopen_file = fopen_file_func; pzlib_filefunc_def->zread_file = fread_file_func; diff --git a/JGE/src/unzip/unzip.c b/JGE/src/unzip/unzip.c index 0b122e4fe..79e77181d 100644 --- a/JGE/src/unzip/unzip.c +++ b/JGE/src/unzip/unzip.c @@ -168,10 +168,7 @@ local int unzlocal_getByte OF(( voidpf filestream, int *pi)); -local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - int *pi; +local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi) { unsigned char c; int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); @@ -198,10 +195,7 @@ local int unzlocal_getShort OF(( voidpf filestream, uLong *pX)); -local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - uLong *pX; +local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX) { uLong x ; int i; @@ -226,10 +220,7 @@ local int unzlocal_getLong OF(( voidpf filestream, uLong *pX)); -local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - uLong *pX; +local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX) { uLong x ; int i; @@ -259,9 +250,7 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) /* My own strcmpi / strcasecmp */ -local int strcmpcasenosensitive_internal (fileName1,fileName2) - const char* fileName1; - const char* fileName2; +local int strcmpcasenosensitive_internal (const char* fileName1,const char* fileName2) { for (;;) { @@ -302,10 +291,7 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2) (like 1 on Unix, 2 on Windows) */ -extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) - const char* fileName1; - const char* fileName2; - int iCaseSensitivity; +extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity) { if (iCaseSensitivity==0) iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; @@ -328,9 +314,7 @@ local uLong unzlocal_SearchCentralDir OF(( const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream)); -local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; +local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream) { unsigned char* buf; uLong uSizeFile; @@ -394,9 +378,7 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) Else, the return value is a unzFile Handle, usable with other function of this unzip package. */ -extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) - const char *path; - zlib_filefunc_def* pzlib_filefunc_def; +extern unzFile ZEXPORT unzOpen2 (const char *path, zlib_filefunc_def* pzlib_filefunc_def) { unz_s us; unz_s *s; @@ -497,8 +479,7 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) } -extern unzFile ZEXPORT unzOpen (path) - const char *path; +extern unzFile ZEXPORT unzOpen (const char *path) { return unzOpen2(path, NULL); } @@ -508,8 +489,7 @@ extern unzFile ZEXPORT unzOpen (path) If there is files inside the .Zip opened with unzipOpenCurrentFile (see later), these files MUST be closed with unzipCloseCurrentFile before call unzipClose. return UNZ_OK if there is no problem. */ -extern int ZEXPORT unzClose (file) - unzFile file; +extern int ZEXPORT unzClose (unzFile file) { unz_s* s; if (file==NULL) @@ -529,9 +509,7 @@ extern int ZEXPORT unzClose (file) Write info about the ZipFile in the *pglobal_info structure. No preparation of the structure is needed return UNZ_OK if there is no problem. */ -extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) - unzFile file; - unz_global_info *pglobal_info; +extern int ZEXPORT unzGetGlobalInfo (unzFile file,unz_global_info *pglobal_info) { unz_s* s; if (file==NULL) @@ -545,9 +523,7 @@ extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) /* Translate date/time from Dos format to tm_unz (readable more easilty) */ -local void unzlocal_DosDateToTmuDate (ulDosDate, ptm) - uLong ulDosDate; - tm_unz* ptm; +local void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm) { uLong uDate; uDate = (uLong)(ulDosDate>>16); @@ -574,21 +550,16 @@ local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, char *szComment, uLong commentBufferSize)); -local int unzlocal_GetCurrentFileInfoInternal (file, - pfile_info, - pfile_info_internal, - szFileName, fileNameBufferSize, - extraField, extraFieldBufferSize, - szComment, commentBufferSize) - unzFile file; - unz_file_info *pfile_info; - unz_file_info_internal *pfile_info_internal; - char *szFileName; - uLong fileNameBufferSize; - void *extraField; - uLong extraFieldBufferSize; - char *szComment; - uLong commentBufferSize; +local int unzlocal_GetCurrentFileInfoInternal ( + unzFile file, + unz_file_info *pfile_info, + unz_file_info_internal *pfile_info_internal, + char *szFileName, + uLong fileNameBufferSize, + void *extraField, + uLong extraFieldBufferSize, + char *szComment, + uLong commentBufferSize) { unz_s* s; unz_file_info file_info; @@ -746,19 +717,15 @@ local int unzlocal_GetCurrentFileInfoInternal (file, No preparation of the structure is needed return UNZ_OK if there is no problem. */ -extern int ZEXPORT unzGetCurrentFileInfo (file, - pfile_info, - szFileName, fileNameBufferSize, - extraField, extraFieldBufferSize, - szComment, commentBufferSize) - unzFile file; - unz_file_info *pfile_info; - char *szFileName; - uLong fileNameBufferSize; - void *extraField; - uLong extraFieldBufferSize; - char *szComment; - uLong commentBufferSize; +extern int ZEXPORT unzGetCurrentFileInfo ( + unzFile file, + unz_file_info *pfile_info, + char *szFileName, + uLong fileNameBufferSize, + void *extraField, + uLong extraFieldBufferSize, + char *szComment, + uLong commentBufferSize) { return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL, szFileName,fileNameBufferSize, @@ -770,8 +737,7 @@ extern int ZEXPORT unzGetCurrentFileInfo (file, Set the current file of the zipfile to the first file. return UNZ_OK if there is no problem */ -extern int ZEXPORT unzGoToFirstFile (file) - unzFile file; +extern int ZEXPORT unzGoToFirstFile (unzFile file) { int err=UNZ_OK; unz_s* s; @@ -792,8 +758,7 @@ extern int ZEXPORT unzGoToFirstFile (file) return UNZ_OK if there is no problem return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ -extern int ZEXPORT unzGoToNextFile (file) - unzFile file; +extern int ZEXPORT unzGoToNextFile (unzFile file) { unz_s* s; int err; @@ -826,10 +791,7 @@ extern int ZEXPORT unzGoToNextFile (file) UNZ_OK if the file is found. It becomes the current file. UNZ_END_OF_LIST_OF_FILE if the file is not found */ -extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) - unzFile file; - const char *szFileName; - int iCaseSensitivity; +extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity) { unz_s* s; int err; @@ -905,9 +867,7 @@ typedef struct unz_file_pos_s } unz_file_pos; */ -extern int ZEXPORT unzGetFilePos(file, file_pos) - unzFile file; - unz_file_pos* file_pos; +extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos) { unz_s* s; @@ -923,9 +883,7 @@ extern int ZEXPORT unzGetFilePos(file, file_pos) return UNZ_OK; } -extern int ZEXPORT unzGoToFilePos(file, file_pos) - unzFile file; - unz_file_pos* file_pos; +extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos*file_pos) { unz_s* s; int err; @@ -959,13 +917,11 @@ extern int ZEXPORT unzGoToFilePos(file, file_pos) store in *piSizeVar the size of extra info in local header (filename and size of extra field data) */ -local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, - poffset_local_extrafield, - psize_local_extrafield) - unz_s* s; - uInt* piSizeVar; - uLong *poffset_local_extrafield; - uInt *psize_local_extrafield; +local int unzlocal_CheckCurrentFileCoherencyHeader ( + unz_s* s, + uInt* piSizeVar, + uLong *poffset_local_extrafield, + uInt *psize_local_extrafield) { uLong uMagic,uData,uFlags; uLong size_filename; @@ -1050,12 +1006,12 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, Open for reading data the current file in the zipfile. If there is no error and the file is opened, the return value is UNZ_OK. */ -extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) - unzFile file; - int* method; - int* level; - int raw; - const char* password; +extern int ZEXPORT unzOpenCurrentFile3 ( + unzFile file, + int* method, + int* level, + int raw, + const char* password) { int err=UNZ_OK; uInt iSizeVar; @@ -1136,7 +1092,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; pfile_in_zip_read_info->stream.zfree = (free_func)0; pfile_in_zip_read_info->stream.opaque = (voidpf)0; - pfile_in_zip_read_info->stream.next_in = (voidpf)0; + pfile_in_zip_read_info->stream.next_in = (Bytef*)0; pfile_in_zip_read_info->stream.avail_in = 0; err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); @@ -1195,24 +1151,21 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) return UNZ_OK; } -extern int ZEXPORT unzOpenCurrentFile (file) - unzFile file; +extern int ZEXPORT unzOpenCurrentFile (unzFile file) { return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL); } -extern int ZEXPORT unzOpenCurrentFilePassword (file, password) - unzFile file; - const char* password; +extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password) { return unzOpenCurrentFile3(file, NULL, NULL, 0, password); } -extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) - unzFile file; - int* method; - int* level; - int raw; +extern int ZEXPORT unzOpenCurrentFile2 ( + unzFile file, + int* method, + int* level, + int raw) { return unzOpenCurrentFile3(file, method, level, raw, NULL); } @@ -1227,10 +1180,10 @@ extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) return <0 with error code if there is an error (UNZ_ERRNO for IO error, or zLib error for uncompress error) */ -extern int ZEXPORT unzReadCurrentFile (file, buf, len) - unzFile file; - voidp buf; - unsigned len; +extern int ZEXPORT unzReadCurrentFile( + unzFile file, + voidp buf, + unsigned len) { int err=UNZ_OK; uInt iRead = 0; @@ -1388,8 +1341,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len) /* Give the current position in uncompressed data */ -extern z_off_t ZEXPORT unztell (file) - unzFile file; +extern z_off_t ZEXPORT unztell (unzFile file) { unz_s* s; file_in_zip_read_info_s* pfile_in_zip_read_info; @@ -1408,8 +1360,7 @@ extern z_off_t ZEXPORT unztell (file) /* return 1 if the end of file was reached, 0 elsewhere */ -extern int ZEXPORT unzeof (file) - unzFile file; +extern int ZEXPORT unzeof (unzFile file) { unz_s* s; file_in_zip_read_info_s* pfile_in_zip_read_info; @@ -1441,10 +1392,10 @@ extern int ZEXPORT unzeof (file) the return value is the number of bytes copied in buf, or (if <0) the error code */ -extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) - unzFile file; - voidp buf; - unsigned len; +extern int ZEXPORT unzGetLocalExtrafield ( + unzFile file, + voidp buf, + unsigned len) { unz_s* s; file_in_zip_read_info_s* pfile_in_zip_read_info; @@ -1492,8 +1443,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) Close the file in zip opened with unzipOpenCurrentFile Return UNZ_CRCERROR if all the file was read but the CRC is not good */ -extern int ZEXPORT unzCloseCurrentFile (file) - unzFile file; +extern int ZEXPORT unzCloseCurrentFile (unzFile file) { int err=UNZ_OK; @@ -1535,12 +1485,11 @@ extern int ZEXPORT unzCloseCurrentFile (file) uSizeBuf is the size of the szComment buffer. return the number of byte copied or an error code <0 */ -extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) - unzFile file; - char *szComment; - uLong uSizeBuf; +extern int ZEXPORT unzGetGlobalComment ( + unzFile file, + char *szComment, + uLong uSizeBuf) { - int err=UNZ_OK; unz_s* s; uLong uReadThis ; if (file==NULL) @@ -1567,8 +1516,7 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) } /* Additions by RX '2004 */ -extern uLong ZEXPORT unzGetOffset (file) - unzFile file; +extern uLong ZEXPORT unzGetOffset (unzFile file) { unz_s* s; @@ -1583,9 +1531,9 @@ extern uLong ZEXPORT unzGetOffset (file) return s->pos_in_central_dir; } -extern int ZEXPORT unzSetOffset (file, pos) - unzFile file; - uLong pos; +extern int ZEXPORT unzSetOffset ( + unzFile file, + uLong pos) { unz_s* s; int err; diff --git a/JGE/src/unzip/zip.c b/JGE/src/unzip/zip.c index 7fbe00274..ec5abeba4 100644 --- a/JGE/src/unzip/zip.c +++ b/JGE/src/unzip/zip.c @@ -172,8 +172,7 @@ local linkedlist_datablock_internal* allocate_new_datablock() return ldi; } -local void free_datablock(ldi) - linkedlist_datablock_internal* ldi; +local void free_datablock(linkedlist_datablock_internal* ldi) { while (ldi!=NULL) { @@ -183,24 +182,24 @@ local void free_datablock(ldi) } } -local void init_linkedlist(ll) - linkedlist_data* ll; +local void init_linkedlist( + linkedlist_data* ll) { ll->first_block = ll->last_block = NULL; } -local void free_linkedlist(ll) - linkedlist_data* ll; +local void free_linkedlist( + linkedlist_data* ll) { free_datablock(ll->first_block); ll->first_block = ll->last_block = NULL; } -local int add_data_in_datablock(ll,buf,len) - linkedlist_data* ll; - const void* buf; - uLong len; +local int add_data_in_datablock( + linkedlist_data* ll, + const void* buf, + uLong len) { linkedlist_datablock_internal* ldi; const unsigned char* from_copy; @@ -263,11 +262,11 @@ local int add_data_in_datablock(ll,buf,len) local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong x, int nbByte)); -local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - uLong x; - int nbByte; +local int ziplocal_putValue ( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong x, + int nbByte) { unsigned char buf[4]; int n; @@ -291,10 +290,10 @@ local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte) } local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte)); -local void ziplocal_putValue_inmemory (dest, x, nbByte) - void* dest; - uLong x; - int nbByte; +local void ziplocal_putValue_inmemory ( + void* dest, + uLong x, + int nbByte) { unsigned char* buf=(unsigned char*)dest; int n; @@ -315,9 +314,9 @@ local void ziplocal_putValue_inmemory (dest, x, nbByte) /****************************************************************************/ -local uLong ziplocal_TmzDateToDosDate(ptm,dosDate) - const tm_zip* ptm; - uLong dosDate; +local uLong ziplocal_TmzDateToDosDate( + const tm_zip* ptm, + uLong dosDate) { uLong year = (uLong)ptm->tm_year; if (year>1980) @@ -337,10 +336,10 @@ local int ziplocal_getByte OF(( voidpf filestream, int *pi)); -local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - int *pi; +local int ziplocal_getByte( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + int *pi) { unsigned char c; int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); @@ -367,10 +366,10 @@ local int ziplocal_getShort OF(( voidpf filestream, uLong *pX)); -local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - uLong *pX; +local int ziplocal_getShort ( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX) { uLong x ; int i; @@ -395,10 +394,10 @@ local int ziplocal_getLong OF(( voidpf filestream, uLong *pX)); -local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; - uLong *pX; +local int ziplocal_getLong ( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX) { uLong x ; int i; @@ -437,9 +436,9 @@ local uLong ziplocal_SearchCentralDir OF(( const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream)); -local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream) - const zlib_filefunc_def* pzlib_filefunc_def; - voidpf filestream; +local uLong ziplocal_SearchCentralDir( + const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream) { unsigned char* buf; uLong uSizeFile; @@ -496,11 +495,11 @@ local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream) #endif /* !NO_ADDFILEINEXISTINGZIP*/ /************************************************************/ -extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def) - const char *pathname; - int append; - zipcharpc* globalcomment; - zlib_filefunc_def* pzlib_filefunc_def; +extern zipFile ZEXPORT zipOpen2 ( + const char *pathname, + int append, + zipcharpc* globalcomment, + zlib_filefunc_def* pzlib_filefunc_def) { zip_internal ziinit; zip_internal* zi; @@ -615,7 +614,7 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc if (size_comment>0) { - ziinit.globalcomment = ALLOC(size_comment+1); + ziinit.globalcomment = (char*)ALLOC(size_comment+1); if (ziinit.globalcomment) { size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment); @@ -680,35 +679,30 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc } } -extern zipFile ZEXPORT zipOpen (pathname, append) - const char *pathname; - int append; +extern zipFile ZEXPORT zipOpen ( + const char *pathname, + int append) { return zipOpen2(pathname,append,NULL,NULL); } -extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, - extrafield_local, size_extrafield_local, - extrafield_global, size_extrafield_global, - comment, method, level, raw, - windowBits, memLevel, strategy, - password, crcForCrypting) - zipFile file; - const char* filename; - const zip_fileinfo* zipfi; - const void* extrafield_local; - uInt size_extrafield_local; - const void* extrafield_global; - uInt size_extrafield_global; - const char* comment; - int method; - int level; - int raw; - int windowBits; - int memLevel; - int strategy; - const char* password; - uLong crcForCrypting; +extern int ZEXPORT zipOpenNewFileInZip3 ( + zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level, + int raw, + int windowBits, + int memLevel, + int strategy, + const char* password, + uLong crcForCrypting) { zip_internal* zi; uInt size_filename; @@ -896,21 +890,18 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi, return err; } -extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, - extrafield_local, size_extrafield_local, - extrafield_global, size_extrafield_global, - comment, method, level, raw) - zipFile file; - const char* filename; - const zip_fileinfo* zipfi; - const void* extrafield_local; - uInt size_extrafield_local; - const void* extrafield_global; - uInt size_extrafield_global; - const char* comment; - int method; - int level; - int raw; +extern int ZEXPORT zipOpenNewFileInZip2( + zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level, + int raw) { return zipOpenNewFileInZip3 (file, filename, zipfi, extrafield_local, size_extrafield_local, @@ -920,20 +911,17 @@ extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi, NULL, 0); } -extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, - extrafield_local, size_extrafield_local, - extrafield_global, size_extrafield_global, - comment, method, level) - zipFile file; - const char* filename; - const zip_fileinfo* zipfi; - const void* extrafield_local; - uInt size_extrafield_local; - const void* extrafield_global; - uInt size_extrafield_global; - const char* comment; - int method; - int level; +extern int ZEXPORT zipOpenNewFileInZip ( + zipFile file, + const char* filename, + const zip_fileinfo* zipfi, + const void* extrafield_local, + uInt size_extrafield_local, + const void* extrafield_global, + uInt size_extrafield_global, + const char* comment, + int method, + int level) { return zipOpenNewFileInZip2 (file, filename, zipfi, extrafield_local, size_extrafield_local, @@ -941,8 +929,8 @@ extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi, comment, method, level, 0); } -local int zipFlushWriteBuffer(zi) - zip_internal* zi; +local int zipFlushWriteBuffer( + zip_internal* zi) { int err=ZIP_OK; @@ -963,10 +951,10 @@ local int zipFlushWriteBuffer(zi) return err; } -extern int ZEXPORT zipWriteInFileInZip (file, buf, len) - zipFile file; - const void* buf; - unsigned len; +extern int ZEXPORT zipWriteInFileInZip ( + zipFile file, + const void* buf, + unsigned len) { zip_internal* zi; int err=ZIP_OK; @@ -978,9 +966,9 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len) if (zi->in_opened_file_inzip == 0) return ZIP_PARAMERROR; - zi->ci.stream.next_in = (void*)buf; + zi->ci.stream.next_in = (Bytef*)buf; zi->ci.stream.avail_in = len; - zi->ci.crc32 = crc32(zi->ci.crc32,buf,len); + zi->ci.crc32 = crc32(zi->ci.crc32,(const Bytef*)buf,len); while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0)) { @@ -1028,10 +1016,10 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len) return err; } -extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) - zipFile file; - uLong uncompressed_size; - uLong crc32; +extern int ZEXPORT zipCloseFileInZipRaw ( + zipFile file, + uLong uncompressed_size, + uLong crc32) { zip_internal* zi; uLong compressed_size; @@ -1124,15 +1112,15 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) return err; } -extern int ZEXPORT zipCloseFileInZip (file) - zipFile file; +extern int ZEXPORT zipCloseFileInZip ( + zipFile file) { return zipCloseFileInZipRaw (file,0,0); } -extern int ZEXPORT zipClose (file, global_comment) - zipFile file; - const char* global_comment; +extern int ZEXPORT zipClose ( + zipFile file, + const char* global_comment) { zip_internal* zi; int err = 0; diff --git a/JGE/src/zipFS/zfsystem.cpp b/JGE/src/zipFS/zfsystem.cpp index 34699d080..7611b60cf 100644 --- a/JGE/src/zipFS/zfsystem.cpp +++ b/JGE/src/zipFS/zfsystem.cpp @@ -42,7 +42,6 @@ filesystem * filesystem::pCurrentFS = NULL; std::vector filesystem::m_Buffers; static const int STORED = 0; -static const int DEFLATED = 8; ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/projects/mtg/iOS/Reachability/Reachability 2.0.4ddg/Reachability/Reachability.m b/projects/mtg/iOS/Reachability/Reachability 2.0.4ddg/Reachability/Reachability.m index 05ed2692f..257d5d9a1 100644 --- a/projects/mtg/iOS/Reachability/Reachability 2.0.4ddg/Reachability/Reachability.m +++ b/projects/mtg/iOS/Reachability/Reachability 2.0.4ddg/Reachability/Reachability.m @@ -180,7 +180,7 @@ static void logNetworkStatus_(const char *name, int line, NetworkStatus status) #define logNetworkStatus(status) #endif -@interface Reachability (private) +@interface Reachability () - (NetworkStatus) networkStatusForFlags: (SCNetworkReachabilityFlags) flags; diff --git a/projects/mtg/iOS/SoundManager/MyOpenALSupport.c b/projects/mtg/iOS/SoundManager/MyOpenALSupport.c index 51265e1af..4a51223d9 100755 --- a/projects/mtg/iOS/SoundManager/MyOpenALSupport.c +++ b/projects/mtg/iOS/SoundManager/MyOpenALSupport.c @@ -73,66 +73,67 @@ void* MyGetOpenALAudioData(CFURLRef inFileURL, ALsizei *outDataSize, ALenum *out void* theData = NULL; AudioStreamBasicDescription theOutputFormat; - // Open a file with ExtAudioFileOpen() - err = ExtAudioFileOpenURL(inFileURL, &extRef); - if(err) { printf("MyGetOpenALAudioData: ExtAudioFileOpenURL FAILED, Error = %ld\n", err); goto Exit; } - - // Get the audio data format - err = ExtAudioFileGetProperty(extRef, kExtAudioFileProperty_FileDataFormat, &thePropertySize, &theFileFormat); - if(err) { printf("MyGetOpenALAudioData: ExtAudioFileGetProperty(kExtAudioFileProperty_FileDataFormat) FAILED, Error = %ld\n", err); goto Exit; } - if (theFileFormat.mChannelsPerFrame > 2) { printf("MyGetOpenALAudioData - Unsupported Format, channel count is greater than stereo\n"); goto Exit;} + do { + // Open a file with ExtAudioFileOpen() + err = ExtAudioFileOpenURL(inFileURL, &extRef); + if(err) { printf("MyGetOpenALAudioData: ExtAudioFileOpenURL FAILED, Error = %ld\n", err); break; } - // Set the client format to 16 bit signed integer (native-endian) data - // Maintain the channel count and sample rate of the original source format - theOutputFormat.mSampleRate = theFileFormat.mSampleRate; - theOutputFormat.mChannelsPerFrame = theFileFormat.mChannelsPerFrame; + // Get the audio data format + err = ExtAudioFileGetProperty(extRef, kExtAudioFileProperty_FileDataFormat, &thePropertySize, &theFileFormat); + if(err) { printf("MyGetOpenALAudioData: ExtAudioFileGetProperty(kExtAudioFileProperty_FileDataFormat) FAILED, Error = %ld\n", err); break; } + if (theFileFormat.mChannelsPerFrame > 2) { printf("MyGetOpenALAudioData - Unsupported Format, channel count is greater than stereo\n"); break;} - theOutputFormat.mFormatID = kAudioFormatLinearPCM; - theOutputFormat.mBytesPerPacket = 2 * theOutputFormat.mChannelsPerFrame; - theOutputFormat.mFramesPerPacket = 1; - theOutputFormat.mBytesPerFrame = 2 * theOutputFormat.mChannelsPerFrame; - theOutputFormat.mBitsPerChannel = 16; - theOutputFormat.mFormatFlags = kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked | kAudioFormatFlagIsSignedInteger; + // Set the client format to 16 bit signed integer (native-endian) data + // Maintain the channel count and sample rate of the original source format + theOutputFormat.mSampleRate = theFileFormat.mSampleRate; + theOutputFormat.mChannelsPerFrame = theFileFormat.mChannelsPerFrame; + + theOutputFormat.mFormatID = kAudioFormatLinearPCM; + theOutputFormat.mBytesPerPacket = 2 * theOutputFormat.mChannelsPerFrame; + theOutputFormat.mFramesPerPacket = 1; + theOutputFormat.mBytesPerFrame = 2 * theOutputFormat.mChannelsPerFrame; + theOutputFormat.mBitsPerChannel = 16; + theOutputFormat.mFormatFlags = kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked | kAudioFormatFlagIsSignedInteger; + + // Set the desired client (output) data format + err = ExtAudioFileSetProperty(extRef, kExtAudioFileProperty_ClientDataFormat, sizeof(theOutputFormat), &theOutputFormat); + if(err) { printf("MyGetOpenALAudioData: ExtAudioFileSetProperty(kExtAudioFileProperty_ClientDataFormat) FAILED, Error = %ld\n", err); break; } + + // Get the total frame count + thePropertySize = sizeof(theFileLengthInFrames); + err = ExtAudioFileGetProperty(extRef, kExtAudioFileProperty_FileLengthFrames, &thePropertySize, &theFileLengthInFrames); + if(err) { printf("MyGetOpenALAudioData: ExtAudioFileGetProperty(kExtAudioFileProperty_FileLengthFrames) FAILED, Error = %ld\n", err); break; } + + // Read all the data into memory + UInt32 dataSize = theFileLengthInFrames * theOutputFormat.mBytesPerFrame;; + theData = malloc(dataSize); + if (theData) + { + AudioBufferList theDataBuffer; + theDataBuffer.mNumberBuffers = 1; + theDataBuffer.mBuffers[0].mDataByteSize = dataSize; + theDataBuffer.mBuffers[0].mNumberChannels = theOutputFormat.mChannelsPerFrame; + theDataBuffer.mBuffers[0].mData = theData; + + // Read the data into an AudioBufferList + err = ExtAudioFileRead(extRef, (UInt32*)&theFileLengthInFrames, &theDataBuffer); + if(err == noErr) + { + // success + *outDataSize = (ALsizei)dataSize; + *outDataFormat = (theOutputFormat.mChannelsPerFrame > 1) ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16; + *outSampleRate = (ALsizei)theOutputFormat.mSampleRate; + } + else + { + // failure + free (theData); + theData = NULL; // make sure to return NULL + printf("MyGetOpenALAudioData: ExtAudioFileRead FAILED, Error = %ld\n", err); break; + } + } + } while(0); - // Set the desired client (output) data format - err = ExtAudioFileSetProperty(extRef, kExtAudioFileProperty_ClientDataFormat, sizeof(theOutputFormat), &theOutputFormat); - if(err) { printf("MyGetOpenALAudioData: ExtAudioFileSetProperty(kExtAudioFileProperty_ClientDataFormat) FAILED, Error = %ld\n", err); goto Exit; } - - // Get the total frame count - thePropertySize = sizeof(theFileLengthInFrames); - err = ExtAudioFileGetProperty(extRef, kExtAudioFileProperty_FileLengthFrames, &thePropertySize, &theFileLengthInFrames); - if(err) { printf("MyGetOpenALAudioData: ExtAudioFileGetProperty(kExtAudioFileProperty_FileLengthFrames) FAILED, Error = %ld\n", err); goto Exit; } - - // Read all the data into memory - UInt32 dataSize = theFileLengthInFrames * theOutputFormat.mBytesPerFrame;; - theData = malloc(dataSize); - if (theData) - { - AudioBufferList theDataBuffer; - theDataBuffer.mNumberBuffers = 1; - theDataBuffer.mBuffers[0].mDataByteSize = dataSize; - theDataBuffer.mBuffers[0].mNumberChannels = theOutputFormat.mChannelsPerFrame; - theDataBuffer.mBuffers[0].mData = theData; - - // Read the data into an AudioBufferList - err = ExtAudioFileRead(extRef, (UInt32*)&theFileLengthInFrames, &theDataBuffer); - if(err == noErr) - { - // success - *outDataSize = (ALsizei)dataSize; - *outDataFormat = (theOutputFormat.mChannelsPerFrame > 1) ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16; - *outSampleRate = (ALsizei)theOutputFormat.mSampleRate; - } - else - { - // failure - free (theData); - theData = NULL; // make sure to return NULL - printf("MyGetOpenALAudioData: ExtAudioFileRead FAILED, Error = %ld\n", err); goto Exit; - } - } - -Exit: // Dispose the ExtAudioFileRef, it is no longer needed if (extRef) ExtAudioFileDispose(extRef); return theData; diff --git a/projects/mtg/iOS/SoundManager/SoundManager.m b/projects/mtg/iOS/SoundManager/SoundManager.m index d6c79cc32..22ad35d6b 100644 --- a/projects/mtg/iOS/SoundManager/SoundManager.m +++ b/projects/mtg/iOS/SoundManager/SoundManager.m @@ -206,7 +206,7 @@ SYNTHESIZE_SINGLETON_FOR_CLASS(SoundManager); ALenum format; ALsizei size; ALsizei freq; - ALvoid *data; + ALvoid *data = 0; alError = AL_NO_ERROR; NSBundle *bundle = [NSBundle mainBundle]; @@ -780,8 +780,6 @@ SYNTHESIZE_SINGLETON_FOR_CLASS(SoundManager); - (void)setActivated:(BOOL)aState { - OSStatus result; - if(aState) { NSLog(@"INFO - SoundManager: OpenAL Active"); diff --git a/projects/mtg/iOS/UI/WagicDownloadProgressViewController.m b/projects/mtg/iOS/UI/WagicDownloadProgressViewController.m index 480145397..fb0274c77 100644 --- a/projects/mtg/iOS/UI/WagicDownloadProgressViewController.m +++ b/projects/mtg/iOS/UI/WagicDownloadProgressViewController.m @@ -21,8 +21,6 @@ #define WAGIC_IOS_RESOURCE_NAME WAGIC_CORE_VERSION_STRING "_iOS.zip" -static NSString *kDownloadUrlPath = @"http://wagic.googlecode.com/files/"; - - (void) handleFailedDownload: (NSNotification *) sender { NSString *downloadType = [sender object]; @@ -103,6 +101,7 @@ static NSString *kDownloadUrlPath = @"http://wagic.googlecode.com/files/"; NSURL *url = nil; NSString *downloadFilename = nil; // determine which file to download + kDownloadFileName = [NSString stringWithCString: WAGIC_RESOURCE_NAME encoding:NSUTF8StringEncoding]; kDownloadIosUpdateFileName = [NSString stringWithCString: WAGIC_IOS_RESOURCE_NAME encoding:NSUTF8StringEncoding]; @@ -118,8 +117,9 @@ static NSString *kDownloadUrlPath = @"http://wagic.googlecode.com/files/"; { NSLog( @"Not Implemented for type: %@", downloadType); } + + url = [NSURL URLWithString: [NSString stringWithCString: WAGIC_RESOURCE_URL encoding:NSUTF8StringEncoding]]; - url = [NSURL URLWithString: [NSString stringWithFormat: @"%@/%@", kDownloadUrlPath, downloadFilename]]; NSString *downloadFilePath = [systemResourceDirectory stringByAppendingString: [NSString stringWithFormat: @"/%@", downloadFilename]]; NSLog(@"Downloading %@", [url absoluteURL]); diff --git a/projects/mtg/iOS/asi-http-request/ASIHTTPRequest.m b/projects/mtg/iOS/asi-http-request/ASIHTTPRequest.m index 77eac076c..cc8ba445a 100644 --- a/projects/mtg/iOS/asi-http-request/ASIHTTPRequest.m +++ b/projects/mtg/iOS/asi-http-request/ASIHTTPRequest.m @@ -573,7 +573,7 @@ static NSOperationQueue *sharedQueue = nil; return; } if ([self shouldStreamPostDataFromDisk]) { - [[self postBodyWriteStream] write:[data bytes] maxLength:[data length]]; + [[self postBodyWriteStream] write:(const uint8_t *)[data bytes] maxLength:[data length]]; } else { [[self postBody] appendData:data]; } @@ -3367,7 +3367,7 @@ static NSOperationQueue *sharedQueue = nil; [[self inflatedFileDownloadOutputStream] open]; } - [[self inflatedFileDownloadOutputStream] write:[inflatedData bytes] maxLength:[inflatedData length]]; + [[self inflatedFileDownloadOutputStream] write:(const uint8_t *)[inflatedData bytes] maxLength:[inflatedData length]]; } diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index fdb1e23bf..51b458c0d 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -16,8 +16,6 @@ int AIPlayer::totalAIDecks = -1; -const char * const MTG_LAND_TEXTS[] = { "artifact", "forest", "island", "mountain", "swamp", "plains", "other lands" }; - AIAction::AIAction(AIPlayer * owner, MTGCardInstance * c, MTGCardInstance * t) : owner(owner), ability(NULL), player(NULL), click(c), target(t) { diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index 8524fc90e..7c2e060f5 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -21,13 +21,10 @@ namespace DeckMenuConst const float kDescriptionVerticalBoxPadding = -5; const float kDescriptionHorizontalBoxPadding = 5; - const float kDefaultFontScale = 1.0f; const float kVerticalScrollSpeed = 7.0f; const int DETAILED_INFO_THRESHOLD = 20; const int kDetailedInfoButtonId = 10000; - - const PIXEL_TYPE kRedColor = ARGB(0xFF, 0xFF, 0x00, 0x00); } hgeParticleSystem* DeckMenu::stars = NULL; diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index b93b31b53..2af6be905 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -28,9 +28,6 @@ #include #endif -const float MENU_FONT_SCALE = 1.0f; - - enum ENUM_DUEL_STATE { DUEL_STATE_UNSET = 0, diff --git a/projects/mtg/src/SimplePad.cpp b/projects/mtg/src/SimplePad.cpp index f9d492c61..3f472657f 100644 --- a/projects/mtg/src/SimplePad.cpp +++ b/projects/mtg/src/SimplePad.cpp @@ -355,10 +355,9 @@ void SimplePad::Render() //This could use some cleaning up to make margins more explicit WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT); - float offX = 0, offY = 0; + float offY = 0; float kH = mFont->GetHeight(); float hSpacing = mFont->GetStringWidth("W"); - float rowLen = mFont->GetStringWidth("JKLMNOPQR") + 14 * 7; float vSpacing = 0; float kW = hSpacing; @@ -401,7 +400,9 @@ void SimplePad::Render() if (!bShowNumpad) vSpacing -= kH + 12; #ifndef IOS - + float offX = 0; + float rowLen = mFont->GetStringWidth("JKLMNOPQR") + 14 * 7; + for (int x = 0; x < nbitems; x++) if (keys[x]) { diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index 4a1308f1b..f84fe3a1c 100644 --- a/projects/mtg/src/WGui.cpp +++ b/projects/mtg/src/WGui.cpp @@ -2308,8 +2308,10 @@ void WGuiKeyBinder::setData() j->ResetInput(); } +#if (!defined IOS) static const JButton btnToCheck[] = { JGE_BTN_MENU, JGE_BTN_CTRL, JGE_BTN_RIGHT, JGE_BTN_LEFT, JGE_BTN_UP, JGE_BTN_DOWN, JGE_BTN_OK, JGE_BTN_CANCEL, JGE_BTN_PRI, JGE_BTN_SEC, JGE_BTN_PREV, JGE_BTN_NEXT }; +#endif #define C(o) (static_cast(o)) WGuiBase::CONFIRM_TYPE WGuiKeyBinder::needsConfirm() diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp index 2df9ffb7e..80e3c72ae 100644 --- a/projects/mtg/src/WResourceManager.cpp +++ b/projects/mtg/src/WResourceManager.cpp @@ -11,8 +11,10 @@ #endif #include "WFont.h" +#ifdef FORCE_LOW_CACHE_MEMORY //#define FORCE_LOW_CACHE_MEMORY const unsigned int kConstrainedCacheLimit = 8 * 1024 * 1024; +#endif extern bool neofont; int idCounter = OTHERS_OFFSET;