[Scummvm-cvs-logs] scummvm master -> 6b16fe9423af831cc2d2c4448410c80b18a07541

lordhoto lordhoto at gmail.com
Thu Feb 9 23:11:11 CET 2012


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:
6b16fe9423 TSAGE: Fix compilation by passing non-POD via pointer through "...".


Commit: 6b16fe9423af831cc2d2c4448410c80b18a07541
    https://github.com/scummvm/scummvm/commit/6b16fe9423af831cc2d2c4448410c80b18a07541
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-09T14:10:12-08:00

Commit Message:
TSAGE: Fix compilation by passing non-POD via pointer through "...".

The other uses seem to pass Common::Point via a pointer to the object too,
so this seems fine to do here too.

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bf25c14..e135776 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2759,7 +2759,7 @@ void Scene1337::Action4::signal() {
 			scene->_aSound2.play(61);
 
 			NpcMover *mover = new NpcMover();
-			scene->_item2._object1.addMover(mover, scene->_arrunkObj1337[scene->_field423E]._fieldB94, this);
+			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldB94, this);
 
 			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
 			scene->_field3E28[scene->_field3E24] = 0;






More information about the Scummvm-git-logs mailing list