[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.184,1.185 font.cpp,1.34,1.35

[Andrew Kurushin]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26186

Modified Files:
	actor.cpp font.cpp 
Log Message:
fix 1283705 
and actor regression

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- actor.cpp	6 Sep 2005 01:36:27 -0000	1.184
+++ actor.cpp	8 Sep 2005 18:01:39 -0000	1.185
@@ -2543,6 +2543,7 @@
 				bestRating = currentRating;
 				bestPath = nextPoint;
 			}
+			pathDirection = &_pathDirectionList[i];
 		}
 		++i;
 	} while (i < _pathDirectionListCount);

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- font.cpp	2 Sep 2005 08:52:37 -0000	1.34
+++ font.cpp	8 Sep 2005 18:01:39 -0000	1.35
@@ -504,6 +504,10 @@
 			}
 			// Wrap what we've got and restart
 			textPoint.y += h + TEXT_LINESPACING;
+			if (foundPointer == NULL) {
+				// Since word hit NULL but fit, we are done
+				return textPoint.y + h;
+			}
 			w_total = 0;
 			len_total = 0;
 			wc = 0;