Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. v0.6.6-138-g7d2311e
|
From: Tom <rtp...@us...> - 2011-11-24 00:21:38
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 7d2311e91daf267779169176975ad8db8be158f1 (commit)
via 9787e3a96cf22965f0bea16c5a224f9fd20d0944 (commit)
Summary of changes:
gemrb.6.in | 5 ----
gemrb/GemRB.cfg.noinstall.sample | 2 -
gemrb/GemRB.cfg.sample.in | 2 -
gemrb/core/FileCache.cpp | 33 -----------------------------
gemrb/core/FileCache.h | 1 -
gemrb/core/Interface.cpp | 2 -
gemrb/core/Interface.h | 2 +-
gemrb/plugins/BIFImporter/BIFImporter.cpp | 3 +-
8 files changed, 3 insertions(+), 47 deletions(-)
from d89f53db40610f6aa2e60c83df7739badc3b6175 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=7d2311e91daf267779169176975ad8db8be158f1
commit 7d2311e91daf267779169176975ad8db8be158f1
Merge: 9787e3a d89f53d
Author: Tom Prince <tom...@ua...>
Date: Wed Nov 23 19:20:35 2011 -0500
Merge remote-tracking branch 'sf'
diff --cc gemrb/core/Interface.h
index 0e0cb09,0bd1024..57b00fe
--- a/gemrb/core/Interface.h
+++ b/gemrb/core/Interface.h
@@@ -755,10 -756,10 +756,10 @@@ public
unsigned int TooltipDelay;
int IgnoreOriginalINI;
unsigned int FogOfWar;
- bool CaseSensitive, SlowBIFs, SkipIntroVideos, DrawFPS;
+ bool CaseSensitive, SkipIntroVideos, DrawFPS;
bool TouchScrollAreas, UseSoftKeyboard;
unsigned short NumFingScroll, NumFingKboard, NumFingInfo;
- bool GUIEnhancements;
+ int GUIEnhancements;
bool KeepCache;
bool MultipleQuickSaves;
Variables *plugin_flags;
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=9787e3a96cf22965f0bea16c5a224f9fd20d0944
commit 9787e3a96cf22965f0bea16c5a224f9fd20d0944
Author: Tom Prince <tom...@ua...>
Date: Wed Nov 23 15:02:13 2011 -0500
Remove untested SlowBIFs code.
diff --git a/gemrb.6.in b/gemrb.6.in
index 3046a84..092b93a 100644
--- a/gemrb.6.in
+++ b/gemrb.6.in
@@ -220,11 +220,6 @@ program found at
Path to the data files for the game's particular CDs or any other data sources.
.TP
-.BR SlowBIFs =(0|1)
-defaults to
-.IR 0 .
-
-.TP
.BR CachePath =PATH
User-writable directory where the engine caches uncompressed and temporary
files. Defaults to a subdirectory of the current directory.
diff --git a/gemrb/GemRB.cfg.noinstall.sample b/gemrb/GemRB.cfg.noinstall.sample
index b17e284..0437470 100644
--- a/gemrb/GemRB.cfg.noinstall.sample
+++ b/gemrb/GemRB.cfg.noinstall.sample
@@ -104,8 +104,6 @@ TooltipDelay=500
#CaseSensitive=1
-#SlowBIFs=0
-
#####################################################
# GUI Parameters #
#####################################################
diff --git a/gemrb/GemRB.cfg.sample.in b/gemrb/GemRB.cfg.sample.in
index a81ea54..5f29727 100644
--- a/gemrb/GemRB.cfg.sample.in
+++ b/gemrb/GemRB.cfg.sample.in
@@ -111,8 +111,6 @@ TooltipDelay=500
#CaseSensitive=1
-#SlowBIFs=0
-
#####################################################
# GUI Parameters #
#####################################################
diff --git a/gemrb/core/FileCache.cpp b/gemrb/core/FileCache.cpp
index 00af645..f3cd9c6 100644
--- a/gemrb/core/FileCache.cpp
+++ b/gemrb/core/FileCache.cpp
@@ -51,36 +51,3 @@ DataStream* CacheCompressedStream(DataStream *stream, const char* filename, int
}
return FileStream::OpenFile(path);
}
-
-DataStream* CacheStream(DataStream* src)
-{
- src->Seek(0, GEM_STREAM_START);
- if (!core->SlowBIFs)
- return src;
-
- char cachedfile[_MAX_PATH];
- PathJoin(cachedfile, core->CachePath, src->filename, NULL);
-
- if (!file_exists(cachedfile)) { // File was not found in cache
- FileStream dest;
- if (!dest.Create(cachedfile)) {
- error("Cache", "CachedFile failed to write to cached file '%s' (from '%s')\n", cachedfile, src->originalfile);
- }
-
- size_t blockSize = 1024 * 1000;
- char buff[1024 * 1000];
- do {
- if (blockSize > src->Remains())
- blockSize = src->Remains();
- size_t len = src->Read(buff, blockSize);
- size_t c = dest.Write(buff, len);
- if (c != len) {
- error("Cache", "CacheFile failed to write to cached file '%s' (from '%s')\n", cachedfile, src->originalfile);
- }
- } while (src->Remains());
- }
-
- delete src;
-
- return FileStream::OpenFile(cachedfile);
-}
diff --git a/gemrb/core/FileCache.h b/gemrb/core/FileCache.h
index 374a5b6..865421a 100644
--- a/gemrb/core/FileCache.h
+++ b/gemrb/core/FileCache.h
@@ -22,6 +22,5 @@
#include "System/DataStream.h"
GEM_EXPORT DataStream* CacheCompressedStream(DataStream *stream, const char* filename, int length = 0, bool overwrite = false);
-GEM_EXPORT DataStream* CacheStream(DataStream* src);
#endif
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 8230b0f..e5676e2 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -187,7 +187,6 @@ Interface::Interface(int iargc, char* iargv[])
#else
CaseSensitive = false;
#endif
- SlowBIFs = false;
SkipIntroVideos = false;
DrawFPS = false;
TouchScrollAreas = false;
@@ -2283,7 +2282,6 @@ bool Interface::LoadConfig(const char* filename)
CONFIG_INT("FullScreen", FullScreen = );
CONFIG_INT("GUIEnhancements", GUIEnhancements = );
CONFIG_INT("TouchScrollAreas", TouchScrollAreas = );
- CONFIG_INT("SlowBIFs", SlowBIFs = );
CONFIG_INT("Height", Height = );
CONFIG_INT("KeepCache", KeepCache = );
CONFIG_INT("MultipleQuickSaves", MultipleQuickSaves = );
diff --git a/gemrb/core/Interface.h b/gemrb/core/Interface.h
index 568abd7..0e0cb09 100644
--- a/gemrb/core/Interface.h
+++ b/gemrb/core/Interface.h
@@ -755,7 +755,7 @@ public:
unsigned int TooltipDelay;
int IgnoreOriginalINI;
unsigned int FogOfWar;
- bool CaseSensitive, SlowBIFs, SkipIntroVideos, DrawFPS;
+ bool CaseSensitive, SkipIntroVideos, DrawFPS;
bool TouchScrollAreas, UseSoftKeyboard;
unsigned short NumFingScroll, NumFingKboard, NumFingInfo;
bool GUIEnhancements;
diff --git a/gemrb/plugins/BIFImporter/BIFImporter.cpp b/gemrb/plugins/BIFImporter/BIFImporter.cpp
index 9878a8d..55da327 100644
--- a/gemrb/plugins/BIFImporter/BIFImporter.cpp
+++ b/gemrb/plugins/BIFImporter/BIFImporter.cpp
@@ -134,7 +134,8 @@ int BIFImporter::OpenArchive(const char* path)
stream = DecompressBIFC(file, cachePath);
delete file;
} else if (strncmp( Signature, "BIFFV1 ", 8 ) == 0) {
- stream = CacheStream(file);
+ file->Seek(0, GEM_STREAM_START);
+ stream = file;
} else {
delete file;
return GEM_ERROR;
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|