[Scummvm-git-logs] scummvm master -> e3a11ba1d892544f52e29b7ccfb20b975074aca5

dreammaster dreammaster at scummvm.org
Fri Mar 24 02:16:31 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e3a11ba1d8 TITANIC: Finished FMatrix class


Commit: e3a11ba1d892544f52e29b7ccfb20b975074aca5
    https://github.com/scummvm/scummvm/commit/e3a11ba1d892544f52e29b7ccfb20b975074aca5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-23T21:16:22-04:00

Commit Message:
TITANIC: Finished FMatrix class

Changed paths:
    engines/titanic/star_control/fmatrix.cpp


diff --git a/engines/titanic/star_control/fmatrix.cpp b/engines/titanic/star_control/fmatrix.cpp
index 54e674c..a4cfec8 100644
--- a/engines/titanic/star_control/fmatrix.cpp
+++ b/engines/titanic/star_control/fmatrix.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "titanic/star_control/fmatrix.h"
+#include "titanic/star_control/dmatrix.h"
 
 namespace Titanic {
 
@@ -39,7 +40,9 @@ FMatrix::FMatrix(const FMatrix &src) {
 }
 
 void FMatrix::copyFrom(const DMatrix &src) {
-	// TODO
+	_row1 = src._row1;
+	_row2 = src._row2;
+	_row3 = src._row3;
 }
 
 void FMatrix::load(SimpleFile *file, int param) {





More information about the Scummvm-git-logs mailing list