gemrb: Infinity Engine emulator
The branch 0.6.5 has been updated
via eb06bf3e0b6654666219ef5440025c6343de2cc4 (commit)
via f689c7ea1015bd055934a9b2eee53993d6f7fdc8 (commit)
Summary of changes:
CMakeLists.txt | 1 +
gemrb/core/Font.cpp | 1 +
gemrb/core/GUI/TextArea.cpp | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
from bc74dbc8351a95649e476625ab80a67b81d52ecc (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=eb06bf3e0b6654666219ef5440025c6343de2cc4
commit eb06bf3e0b6654666219ef5440025c6343de2cc4
Author: Jaka Kranjc <lynxlupodian@...>
Date: Sun Jul 24 12:30:04 2011 +0200
CMakeLists.txt: also show the value of DISABLE_WERROR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78e2c64..7877eea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -355,6 +355,7 @@ PRINT_OPTION("${NOCOLOR}" "NOCOLOR")
PRINT_OPTION("${TOUCHSCREEN}" "TOUCHSCREEN")
PRINT_OPTION("${STATIC_LINK}" "STATIC_LINK")
PRINT_OPTION("${INSOURCEBUILD}" "INSOURCEBUILD")
+PRINT_OPTION("${DISABLE_WERROR}" "DISABLE_WERROR")
message(STATUS "")
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
message(STATUS "")
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=f689c7ea1015bd055934a9b2eee53993d6f7fdc8
commit f689c7ea1015bd055934a9b2eee53993d6f7fdc8
Author: Jaka Kranjc <lynxlupodian@...>
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 );
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|