[Gemrb-commits] gemrb: branch master updated. v0.7.2-252-g98b3063

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  98b3063e7669bb8e19db825133676bda6e86bbcd (commit)

Summary of changes:
 gemrb/core/Font.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
      from  c97940184920d7e92cbe49424d5432a210ecbc61 (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=98b3063e7669bb8e19db825133676bda6e86bbcd

commit 98b3063e7669bb8e19db825133676bda6e86bbcd
Author: Brad Allred <bra...@me...>
Date:   Wed Jan 2 11:21:25 2013 -0700

    mistakenly neglected that one row was already accounted for
    
    This reverts all but cleanup from commit 153d00da48b3c73735e0176959d0b282e9ba5e3b.

diff --git a/gemrb/core/Font.cpp b/gemrb/core/Font.cpp
index aca3294..5905a47 100644
--- a/gemrb/core/Font.cpp
+++ b/gemrb/core/Font.cpp
@@ -315,7 +315,7 @@ void Font::PrintFromLine(int startrow, Region rgn, const unsigned char* string,
 			initials_x = x;
 
 			//how many more lines to be indented (one was already indented)
-			initials_rows = 1 + ((initials->maxHeight - 1) / maxHeight); // ceiling
+			initials_rows = (initials->maxHeight - 1) / maxHeight;
 			initials_rows += num_empty_rows;
 			initials_row = row;
 			last_initial_row = initials_row;
@@ -615,7 +615,7 @@ void Font::SetupString(char* string, unsigned int width, bool NoColor, Font *ini
 			enablecap=false;
 			initials_x = wx + psx;
 			//how many more lines to be indented (one was already indented)
-			initials_rows = 1 + ((initials->maxHeight - 1) / maxHeight); // ceiling
+			initials_rows = (initials->maxHeight - 1) / maxHeight;
 			continue;
 		} else {
 			wx += GetCharSprite((unsigned char)string[pos])->Width;

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


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