Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting cleanup, modified a function to pass by const reference.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2011-03-31 11:08:58 +00:00
parent 64d421b8b8
commit 8add655df7
2 changed files with 99 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/include/JFileSystem.h
+1 -1
View File
@@ -129,7 +129,7 @@ private:
string mZipFileName; string mZipFileName;
char *mPassword; char *mPassword;
bool mZipAvailable; bool mZipAvailable;
void preloadZip(string filename); void preloadZip(const string& filename);
#if defined (WIN32) || defined (LINUX) || defined(IOS) #if defined (WIN32) || defined (LINUX) || defined(IOS)
FILE *mFile; FILE *mFile;
#else #else
JGE/src/JFileSystem.cpp
+21 -14
View File
@@ -9,7 +9,7 @@
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable : 4786) #pragma warning(disable : 4786)
#endif #endif
#include "../include/JGE.h" #include "../include/JGE.h"
@@ -25,17 +25,21 @@
#include <string> #include <string>
JZipCache::JZipCache(){} JZipCache::JZipCache()
{}
JZipCache::~JZipCache(){ JZipCache::~JZipCache()
{
map<string,unz_file_pos *>::iterator it; map<string,unz_file_pos *>::iterator it;
for (it = dir.begin(); it != dir.end(); ++it){ for (it = dir.begin(); it != dir.end(); ++it)
{
delete(it->second); delete(it->second);
} }
dir.clear(); dir.clear();
} }
void JFileSystem::preloadZip(string filename){ void JFileSystem::preloadZip(const string& filename)
{
map<string,JZipCache *>::iterator it = mZipCache.find(filename); map<string,JZipCache *>::iterator it = mZipCache.find(filename);
if (it != mZipCache.end()) return; if (it != mZipCache.end()) return;
@@ -48,10 +52,12 @@ void JFileSystem::preloadZip(string filename){
if (!mZipAvailable || !mZipFile) return; if (!mZipAvailable || !mZipFile) return;
} }
int err = unzGoToFirstFile (mZipFile); int err = unzGoToFirstFile (mZipFile);
while (err == UNZ_OK){ while (err == UNZ_OK)
{
unz_file_pos* filePos = new unz_file_pos(); unz_file_pos* filePos = new unz_file_pos();
char filenameInzip[4096]; char filenameInzip[4096];
if (unzGetCurrentFileInfo(mZipFile, NULL, filenameInzip, sizeof(filenameInzip), NULL, 0, NULL, 0) == UNZ_OK){ if (unzGetCurrentFileInfo(mZipFile, NULL, filenameInzip, sizeof(filenameInzip), NULL, 0, NULL, 0) == UNZ_OK)
{
unzGetFilePos(mZipFile, filePos); unzGetFilePos(mZipFile, filePos);
string name = filenameInzip; string name = filenameInzip;
cache->dir[name] = filePos; cache->dir[name] = filePos;
@@ -217,18 +223,19 @@ bool JFileSystem::OpenFile(const string &filename)
void JFileSystem::CloseFile() void JFileSystem::CloseFile()
{ {
if (mZipAvailable && mZipFile != NULL){ if (mZipAvailable && mZipFile != NULL)
{
unzCloseCurrentFile(mZipFile); unzCloseCurrentFile(mZipFile);
return; return;
} }
#if defined (WIN32) || defined (LINUX) || defined (IOS) #if defined (WIN32) || defined (LINUX) || defined (IOS)
if (mFile != NULL) if (mFile != NULL)
fclose(mFile); fclose(mFile);
#else #else
if (mFile > 0) if (mFile > 0)
sceIoClose(mFile); sceIoClose(mFile);
#endif #endif
} }
@@ -240,11 +247,11 @@ int JFileSystem::ReadFile(void *buffer, int size)
} }
else else
{ {
#if defined (WIN32) || defined (LINUX) || defined (IOS) #if defined (WIN32) || defined (LINUX) || defined (IOS)
return fread(buffer, 1, size, mFile); return fread(buffer, 1, size, mFile);
#else #else
return sceIoRead(mFile, buffer, size); return sceIoRead(mFile, buffer, size);
#endif #endif
} }
} }