[Gemrb-commits] gemrb: branch master updated. v0.6.2-1414-gfd0ebc7

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  fd0ebc75ea684c6f81de2d09057e7334f7da6013 (commit)
       via  82b08c224ecadc844b9095482543531cd47a4b81 (commit)
       via  d9db35d429d4a53dd5c313bae8c442b954ab525e (commit)
       via  5a917670e1144df1d9f55ce4c0ad302713159f20 (commit)

Summary of changes:
 NEWS                        |   10 ++++++++++
 configure.in                |    2 +-
 gemrb/core/Font.cpp         |    1 +
 gemrb/core/GUI/TextArea.cpp |    4 ++--
 gemrb/core/Game.cpp         |   16 ++++++----------
 gemrb/includes/globals.h    |    2 +-
 6 files changed, 21 insertions(+), 14 deletions(-)
      from  b9a8b4e9030c91e32f01b0d787a20d730d798811 (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=fd0ebc75ea684c6f81de2d09057e7334f7da6013

commit fd0ebc75ea684c6f81de2d09057e7334f7da6013
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Jul 24 12:24:14 2011 +0200

    pst: simplify 76c7c8db017e2ec

diff --git a/gemrb/core/Game.cpp b/gemrb/core/Game.cpp
index c4686c2..77ad3da 100644
--- a/gemrb/core/Game.cpp
+++ b/gemrb/core/Game.cpp
@@ -882,12 +882,10 @@ bool Game::AddJournalEntry(ieStrRef strref, int Section, int Group)
 			je->Section = (ieByte) Section;
 			je->Group = (ieByte) Group;
 			ieDword chapter = 0;
-			locals->Lookup("CHAPTER", chapter);
-			if (core->HasFeature(GF_NO_NEW_VARIABLES)) {
-				je->Chapter = 0;
-			} else {
-				je->Chapter = (ieByte) chapter;
+			if (!core->HasFeature(GF_NO_NEW_VARIABLES)) {
+				locals->Lookup("CHAPTER", chapter);
 			}
+			je->Chapter = (ieByte) chapter;
 			je->GameTime = GameTime;
 			return true;
 		}
@@ -895,12 +893,10 @@ bool Game::AddJournalEntry(ieStrRef strref, int Section, int Group)
 	je = new GAMJournalEntry;
 	je->GameTime = GameTime;
 	ieDword chapter = 0;
-	locals->Lookup("CHAPTER", chapter);
-	if (core->HasFeature(GF_NO_NEW_VARIABLES)) {
-		je->Chapter = 0;
-	} else {
-		je->Chapter = (ieByte) chapter;
+	if (!core->HasFeature(GF_NO_NEW_VARIABLES)) {
+		locals->Lookup("CHAPTER", chapter);
 	}
+	je->Chapter = (ieByte) chapter;
 	je->unknown09 = 0;
 	je->Section = (ieByte) Section;
 	je->Group = (ieByte) Group;

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

commit 82b08c224ecadc844b9095482543531cd47a4b81
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Jul 24 12:20:09 2011 +0200

    gcc 4.6 warning fixes
    it compiles fine now and no problems with Resource1-4 :s

diff --git a/gemrb/core/Font.cpp b/gemrb/core/Font.cpp
index 7cb1bec..75142ca 100644
--- a/gemrb/core/Font.cpp
+++ b/gemrb/core/Font.cpp
@@ -301,6 +301,7 @@ void Font::Print(Region cliprgn, Region rgn, const unsigned char* string,
 		capital=1;
 		enablecap=true;
 	}
+	(void)enablecap; //HACK: shut up unused-but-set warnings, until the var is reused
 
 	unsigned int psx = PARAGRAPH_START_X;
 	Palette* pal = hicolor;
diff --git a/gemrb/core/GUI/TextArea.cpp b/gemrb/core/GUI/TextArea.cpp
index c1cf968..dee7e10 100644
--- a/gemrb/core/GUI/TextArea.cpp
+++ b/gemrb/core/GUI/TextArea.cpp
@@ -179,9 +179,9 @@ void TextArea::Draw(unsigned short x, unsigned short y)
 		for (size_t i = 0; i < linesize; i++) {
 			if (strnicmp( "[s=", lines[i], 3 ) == 0) {
 				int tlen;
-				unsigned long idx, acolor, bcolor;
+				unsigned long acolor, bcolor;
 				char* rest;
-				idx = strtoul( lines[i] + 3, &rest, 0 );
+				strtoul( lines[i] + 3, &rest, 0 );
 				if (*rest != ',')
 					goto notmatched;
 				acolor = strtoul( rest + 1, &rest, 16 );

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

commit d9db35d429d4a53dd5c313bae8c442b954ab525e
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Jul 24 12:07:32 2011 +0200

    0.6.5-git

diff --git a/configure.in b/configure.in
index 1c225cb..6c7586e 100644
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,7 @@
 dnl Initialize autoconf and automake
 
 AC_PREREQ([2.57])
-AC_INIT(gemrb, 0.6.4-git)
+AC_INIT(gemrb, 0.6.5-git)
 
 AC_MSG_WARN([
 
diff --git a/gemrb/includes/globals.h b/gemrb/includes/globals.h
index 62197de..550521a 100644
--- a/gemrb/includes/globals.h
+++ b/gemrb/includes/globals.h
@@ -34,7 +34,7 @@
 
 #include "ie_types.h"
 
-#define VERSION_GEMRB "0.6.4-git"
+#define VERSION_GEMRB "0.6.5-git"
 
 #define GEMRB_STRING "GemRB v" VERSION_GEMRB
 

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

commit 5a917670e1144df1d9f55ce4c0ad302713159f20
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Jul 24 12:06:33 2011 +0200

    restart the NEWS cycle

diff --git a/NEWS b/NEWS
index a6ce496..5e5dc62 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+GemRB git (b9a8b4e):
+  New features:
+    - 
+
+  Improved features:
+    - 
+    - bugfixes
+
+  Applied patches:
+
 GemRB V0.6.5 (2011-07-24):
   New features:
     - quickspell support

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


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