[Gemrb-commits] gemrb: branch master updated. v0.7.0-180-ge563cf2

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  e563cf2d00929d88182de5f65e07661e4e0f0613 (commit)
       via  ab443d09db9e3e8ba1435fa309ca926791503f6f (commit)

Summary of changes:
 INSTALL                                   |    2 ++
 README                                    |    2 ++
 gemrb/plugins/2DAImporter/2DAImporter.cpp |    7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)
      from  23d7e8f0823b86a10023b80ed446e4f1913b28a0 (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=e563cf2d00929d88182de5f65e07661e4e0f0613

commit e563cf2d00929d88182de5f65e07661e4e0f0613
Author: Tom Prince <tom...@ua...>
Date:   Sat Jan 28 22:21:33 2012 -0500

    Print file with bad 2da signature.

diff --git a/gemrb/plugins/2DAImporter/2DAImporter.cpp b/gemrb/plugins/2DAImporter/2DAImporter.cpp
index 74e372f..ab844a9 100644
--- a/gemrb/plugins/2DAImporter/2DAImporter.cpp
+++ b/gemrb/plugins/2DAImporter/2DAImporter.cpp
@@ -52,9 +52,10 @@ bool p2DAImporter::Open(DataStream* str)
 	while (*strp == ' ')
 		strp++;
 	if (strncmp( strp, "2DA V1.0", 8 ) != 0) {
-		printMessage("2DAImporter", "Bad signature!\n",YELLOW );
-// we don't care about this, so exptable.2da of iwd2 won't cause a bigger problem
-//		return false;
+		printMessage("2DAImporter", "Bad signature (%s)! Ignoring...\n",YELLOW, str->filename );
+		// we don't care about this, so exptable.2da of iwd2 won't cause a bigger problem
+		// also, certain creatures are described by 2da's without signature.
+		// return false;
 	}
 	Signature[0] = 0;
 	str->ReadLine( Signature, sizeof(Signature) );

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=ab443d09db9e3e8ba1435fa309ca926791503f6f

commit ab443d09db9e3e8ba1435fa309ca926791503f6f
Author: Tom Prince <tom...@ua...>
Date:   Sat Jan 28 22:20:08 2012 -0500

    Document that gcc4.3 miscompiles gemrb.

diff --git a/INSTALL b/INSTALL
index 668379c..f9916f6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,8 @@ Tools you will need to build GemRB:
   - make
   - g++
 
+NOTE: g++ 4.3 is known to miscompile gemrb.
+
 Libraries:
   - ZLib
   - Python 2.3 or better, compiled with shared libraries
diff --git a/README b/README
index 7eb3750..dde0195 100644
--- a/README
+++ b/README
@@ -28,6 +28,8 @@ some smart phones (Symbian, Android, other Linux-based, Ios)
 some consoles (OpenPandora, Dingoo)
 some exotic OSes (ReactOS, SyllableOS, Haiku, AmigaOS)
 
+g++ 4.3 is known to miscompile gemrb.
+
 Requirements
 ------------
 See the INSTALL file.

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator