[Gemrb-commits] gemrb: branch master updated. v0.6.2-1005-g8540918

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  8540918988b5635bc0789ff2e49521e6d6da811e (commit)

Summary of changes:
 gemrb/core/DisplayMessage.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
      from  ce6d5cd4b56e10863d8fcd89c84e270245f00466 (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=8540918988b5635bc0789ff2e49521e6d6da811e

commit 8540918988b5635bc0789ff2e49521e6d6da811e
Author: Avenger <ave...@so...>
Date:   Sat Apr 2 22:54:17 2011 +0200

    fixed dialog text random color

diff --git a/gemrb/core/DisplayMessage.cpp b/gemrb/core/DisplayMessage.cpp
index ceecd6b..f7ee5fb 100644
--- a/gemrb/core/DisplayMessage.cpp
+++ b/gemrb/core/DisplayMessage.cpp
@@ -33,11 +33,11 @@ static int strref_table[STRREF_COUNT];
 
 #define PALSIZE 8
 static Color ActorColor[PALSIZE];
-static const char* DisplayFormatName = "[color=%lX]%s - [/color][p][color=%lX]%s[/color][/p]";
-static const char* DisplayFormatAction = "[color=%lX]%s - [/color][p][color=%lX]%s %s[/color][/p]";
-static const char* DisplayFormat = "[/color][p][color=%lX]%s[/color][/p]";
-static const char* DisplayFormatValue = "[/color][p][color=%lX]%s: %d[/color][/p]";
-static const char* DisplayFormatNameString = "[color=%lX]%s - [/color][p][color=%lX]%s: %s[/color][/p]";
+static const char* DisplayFormatName = "[color=%06X]%s - [/color][p][color=%06X]%s[/color][/p]";
+static const char* DisplayFormatAction = "[color=%06X]%s - [/color][p][color=%06X]%s %s[/color][/p]";
+static const char* DisplayFormat = "[/color][p][color=%06X]%s[/color][/p]";
+static const char* DisplayFormatValue = "[/color][p][color=%06X]%s: %d[/color][/p]";
+static const char* DisplayFormatNameString = "[color=%06X]%s - [/color][p][color=%06X]%s: %s[/color][/p]";
 
 DisplayMessage::DisplayMessage(void) {
 	ReadStrrefs();
@@ -161,7 +161,7 @@ void DisplayMessage::DisplayConstantStringNameString(int stridx, unsigned int co
 	actor_color = GetSpeakerColor(name, actor);
 	char* text = core->GetString( strref_table[stridx], IE_STR_SOUND );
 	char* text2 = core->GetString( strref_table[stridx2], IE_STR_SOUND );
-	int newlen = (int)(strlen( DisplayFormat ) + strlen(name) + strlen( text ) + strlen(text2) + 18);
+	int newlen = (int)(strlen( DisplayFormat ) + strlen(name) + strlen( text ) + strlen(text2) + 20);
 	char* newstr = ( char* ) malloc( newlen );
 	if (strlen(text2)) {
 		snprintf( newstr, newlen, DisplayFormatNameString, actor_color, name, color, text, text2 );

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


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