[Gemrb-commits] gemrb: branch master updated. v0.6.2-32-g18c2ddc

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  18c2ddcdab95f919d802b1dca92b8593d8083285 (commit)
       via  57a218a29e160557b95254f21728bc66fd56c199 (commit)

Summary of changes:
 gemrb/CMakeLists.txt                |    1 +
 gemrb/GemRB.cpp                     |    3 ++-
 gemrb/core/DisplayMessage.cpp       |    8 ++++----
 gemrb/core/LRUCache.cpp             |    2 +-
 gemrb/plugins/SDLAudio/SDLAudio.cpp |    4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
      from  ecc77ed8228d005274b8c68f565e9d36b8819fb0 (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=18c2ddcdab95f919d802b1dca92b8593d8083285

commit 18c2ddcdab95f919d802b1dca92b8593d8083285
Author: Jaka Kranjc <lyn...@us...>
Date:   Thu Aug 26 23:34:19 2010 +0200

    search the sdl include dir when compiling gemrb, fixing a bad apple problem

diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
index ea45646..b7fcfef 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
@@ -7,6 +7,7 @@ ADD_SUBDIRECTORY( tests )
 
 ADD_EXECUTABLE(gemrb GemRB.cpp )
 SET_TARGET_PROPERTIES(gemrb PROPERTIES INSTALL_RPATH ${LIB_DIR})
+INCLUDE_DIRECTORIES( ${SDL_INCLUDE_DIR} )
 IF(WIN32)
  TARGET_LINK_LIBRARIES(gemrb gemrb_core)
 ELSE(WIN32)
diff --git a/gemrb/GemRB.cpp b/gemrb/GemRB.cpp
index 3246783..72f66c0 100644
--- a/gemrb/GemRB.cpp
+++ b/gemrb/GemRB.cpp
@@ -28,8 +28,9 @@
 
 
 //this supposed to convince SDL to work on OS/X
+//WARNING: commenting this out will cause SDL 1.2.x to crash
 #ifdef __APPLE_CC__ // we need startup SDL here
-#include "SDL/SDL.h"
+#include <SDL.h>
 #endif
 
 int main(int argc, char* argv[])
diff --git a/gemrb/plugins/SDLAudio/SDLAudio.cpp b/gemrb/plugins/SDLAudio/SDLAudio.cpp
index 1aa3223..632347b 100644
--- a/gemrb/plugins/SDLAudio/SDLAudio.cpp
+++ b/gemrb/plugins/SDLAudio/SDLAudio.cpp
@@ -28,8 +28,8 @@
 #include "MusicMgr.h"
 #include "SoundMgr.h"
 
-#include "SDL.h"
-#include "SDL_mixer.h"
+#include <SDL.h>
+#include <SDL_mixer.h>
 
 SDLAudio::SDLAudio(void)
 {

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

commit 57a218a29e160557b95254f21728bc66fd56c199
Author: Jaka Kranjc <lyn...@us...>
Date:   Thu Aug 26 23:30:54 2010 +0200

    fixed a few possible uninitialised var uses, patch from spike411

diff --git a/gemrb/core/DisplayMessage.cpp b/gemrb/core/DisplayMessage.cpp
index ff1cf1a..1954acc 100644
--- a/gemrb/core/DisplayMessage.cpp
+++ b/gemrb/core/DisplayMessage.cpp
@@ -153,7 +153,7 @@ void DisplayMessage::DisplayConstantStringValue(int stridx, unsigned int color,
 void DisplayMessage::DisplayConstantStringNameString(int stridx, unsigned int color, int stridx2, const Scriptable *actor) const
 {
 	unsigned int actor_color;
-	const char *name;
+	const char *name = 0;
 
 	if (stridx<0) return;
 	actor_color = GetSpeakerColor(name, actor);
@@ -186,8 +186,8 @@ void DisplayMessage::DisplayConstantStringName(int stridx, unsigned int color, c
 void DisplayMessage::DisplayConstantStringAction(int stridx, unsigned int color, const Scriptable *attacker, const Scriptable *target) const
 {
 	unsigned int attacker_color;
-	const char *name1;
-	const char *name2;
+	const char *name1 = 0;
+	const char *name2 = 0;
 
 	if (stridx<0) return;
 
@@ -216,7 +216,7 @@ void DisplayMessage::DisplayStringName(int stridx, unsigned int color, const Scr
 void DisplayMessage::DisplayStringName(const char *text, unsigned int color, const Scriptable *speaker) const
 {
 	unsigned int speaker_color;
-	const char *name;
+	const char *name = 0;
 
 	if (!text) return;
 	speaker_color = GetSpeakerColor(name, speaker);
diff --git a/gemrb/core/LRUCache.cpp b/gemrb/core/LRUCache.cpp
index e228834..afb72ac 100644
--- a/gemrb/core/LRUCache.cpp
+++ b/gemrb/core/LRUCache.cpp
@@ -164,7 +164,7 @@ void testLRUCache()
 
 	bool r;
 	void* p;
-	const char* k2;
+	const char* k2 = 0;
 
 	r = c.Lookup("k050", p);
 	assert(!r);

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


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