[Scummvm-cvs-logs] scummvm master -> c73904c9788d8f7992c85de33cb505072aba7a2f
sev-
sev at scummvm.org
Sun Sep 29 09:31:16 CEST 2013
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:
c73904c978 SWORD25: Fix compilation
Commit: c73904c9788d8f7992c85de33cb505072aba7a2f
https://github.com/scummvm/scummvm/commit/c73904c9788d8f7992c85de33cb505072aba7a2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-29T00:30:39-07:00
Commit Message:
SWORD25: Fix compilation
Changed paths:
engines/sword25/math/walkregion.cpp
diff --git a/engines/sword25/math/walkregion.cpp b/engines/sword25/math/walkregion.cpp
index 6c53446..0ba7e8e 100644
--- a/engines/sword25/math/walkregion.cpp
+++ b/engines/sword25/math/walkregion.cpp
@@ -341,9 +341,9 @@ bool WalkRegion::persist(OutputPersistenceBlock &writer) {
Common::Array< Common::Array<int> >::const_iterator rowIter = _visibilityMatrix.begin();
while (rowIter != _visibilityMatrix.end()) {
writer.write((uint32)rowIter->size());
- Common::Array<int32>::const_iterator colIter = rowIter->begin();
+ Common::Array<int>::const_iterator colIter = rowIter->begin();
while (colIter != rowIter->end()) {
- writer.write(*colIter);
+ writer.write((int32)*colIter);
++colIter;
}
@@ -381,9 +381,11 @@ bool WalkRegion::unpersist(InputPersistenceBlock &reader) {
uint32 colCount;
reader.read(colCount);
rowIter->resize(colCount);
- Common::Array<int32>::iterator colIter = rowIter->begin();
+ Common::Array<int>::iterator colIter = rowIter->begin();
while (colIter != rowIter->end()) {
- reader.read(*colIter);
+ int32 t;
+ reader.read(t);
+ *colIter = t;
++colIter;
}
More information about the Scummvm-git-logs
mailing list