[Gemrb-commits] gemrb: branch master updated. bbe0c442c3f4fa65d80b0d8dedf9c355f8d3972d

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  bbe0c442c3f4fa65d80b0d8dedf9c355f8d3972d (commit)
       via  67b5c3c41c37c55bcba0b11c42764d8f95b206b9 (commit)

Summary of changes:
 gemrb/core/GUI/TextArea.cpp  |   17 +++++++++++++++--
 gemrb/core/GUI/TextArea.h    |    2 ++
 gemrb/core/Interface.cpp     |    4 +++-
 gemrb/override/pst/gemrb.ini |    1 +
 4 files changed, 21 insertions(+), 3 deletions(-)
      from  11a0d82fa5c745f92f99559b423cc4740017f46f (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=bbe0c442c3f4fa65d80b0d8dedf9c355f8d3972d

commit bbe0c442c3f4fa65d80b0d8dedf9c355f8d3972d
Merge: 67b5c3c 11a0d82
Author: Avenger <ave...@so...>
Date:   Tue Jul 27 20:03:12 2010 +0200

    Merge branch 'master' of ssh://ave...@ge.../gitroot/gemrb/gemrb


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

commit 67b5c3c41c37c55bcba0b11c42764d8f95b206b9
Author: Avenger <ave...@so...>
Date:   Tue Jul 27 20:02:12 2010 +0200

    externalized the 'NOTE:' string that is used in highlights in PST TextArea

diff --git a/gemrb/core/GUI/TextArea.cpp b/gemrb/core/GUI/TextArea.cpp
index 0ec74eb..f6819ee 100644
--- a/gemrb/core/GUI/TextArea.cpp
+++ b/gemrb/core/GUI/TextArea.cpp
@@ -350,9 +350,19 @@ void TextArea::DiscardLines()
 	PopLines(drop, true);
 }
 
+static char *note_const = NULL;
 static const char inserted_crap[]="[/color][color=ffffff]";
 #define CRAPLENGTH sizeof(inserted_crap)-1
 
+void TextArea::SetNoteString(const char *s)
+{
+	free(note_const);
+	if (s) {
+		note_const = (char *) malloc(strlen(s)+5);
+		sprintf(note_const, "\r\n\r\n%s", s);
+	}
+}
+
 /** Appends a String to the current Text */
 int TextArea::AppendText(const char* text, int pos)
 {
@@ -363,11 +373,14 @@ int TextArea::AppendText(const char* text, int pos)
 	int newlen = ( int ) strlen( text );
 
 	if (pos == -1) {
-		const char *note = strstr(text,"\r\n\r\nNOTE:");
+		const char *note = NULL;
+		if (note_const) {
+			note = strstr(text,note_const);
+		}
 		char *str;
 		if (NULL == note) {
 			str = (char *) malloc( newlen +1 );
-			memcpy(str,text, newlen+1);
+			memcpy(str, text, newlen+1);
 		}
 		else {
 			unsigned int notepos = (unsigned int) (note - text);
diff --git a/gemrb/core/GUI/TextArea.h b/gemrb/core/GUI/TextArea.h
index ef9fc75..c861c06 100644
--- a/gemrb/core/GUI/TextArea.h
+++ b/gemrb/core/GUI/TextArea.h
@@ -64,6 +64,8 @@ class GEM_EXPORT TextArea : public Control {
 public:
 	TextArea(Color hitextcolor, Color initcolor, Color lowtextcolor);
 	~TextArea(void);
+	/** global configuration */
+	static void SetNoteString(const char *s);
 	/** Draws the Control on the Output Display */
 	void Draw(unsigned short x, unsigned short y);
 	/** Sets the Actual Text */
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index a1abd33..98bf491 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -193,7 +193,6 @@ Interface::Interface(int iargc, char* iargv[])
 	strncpy( ButtonFont, "STONESML", sizeof(ButtonFont) );
 	strncpy( TooltipFont, "STONESML", sizeof(TooltipFont) );
 	strncpy( MovieFont, "STONESML", sizeof(MovieFont) );
-	//strncpy( CursorBam, "CAROT", sizeof(CursorBam) );
 	strncpy( ScrollCursorBam, "CURSARW", sizeof(ScrollCursorBam) );
 	strncpy( GlobalScript, "BALDUR", sizeof(GlobalScript) );
 	strncpy( WorldMapName, "WORLDMAP", sizeof(WorldMapName) );
@@ -2384,6 +2383,9 @@ bool Interface::LoadGemRBINI()
 		}
 	}
 
+	s = ini->GetKeyAsString( "resources", "NoteString", NULL );
+	TextArea::SetNoteString(s);
+
 	s = ini->GetKeyAsString( "resources", "INIConfig", NULL );
 	if (s)
 		strcpy( INIConfig, s );
diff --git a/gemrb/override/pst/gemrb.ini b/gemrb/override/pst/gemrb.ini
index 490cfb0..d476631 100644
--- a/gemrb/override/pst/gemrb.ini
+++ b/gemrb/override/pst/gemrb.ini
@@ -37,6 +37,7 @@ TooltipFont = TRMTFONT
 GroundCircleBAM1 = WMPICKL/3
 GroundCircleBAM2 = WMPICKR
 GroundCircleBAM3 = WMPICKL
+NoteString = NOTE:
 
 ; INI file from the original games
 INIConfig = torment.ini

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


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