← Back to branch summary

~ubuntu-branches/ubuntu/raring/scummvm/raring

« back to all changes in this revision

Viewing changes to engines/m4/scene.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Moritz Muehlenhoff
  • Date: 2011-05-25 19:02:23 UTC
  • mto: (21.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110525190223-fiqm0oaec714xk31
Tags: upstream-1.3.0
Import upstream version 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/m4/scene.cpp
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
20
 *
21
 
 * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-1-2-1/engines/m4/scene.cpp $
22
 
 * $Id: scene.cpp 52364 2010-08-25 06:42:54Z dreammaster $
 
21
 * $URL$
 
22
 * $Id$
23
23
 *
24
24
 */
25
25
 
149
149
                for (int i = 0; i < _walkSurface->width() * _walkSurface->height(); i++)
150
150
                        destP[i] = (srcP[i] & 0x10) ? 0xFF : 0;
151
151
 
152
 
                byte colors[256 * 4];
 
152
                byte colors[256 * 3];
153
153
                memset(colors, 0, sizeof(colors));
154
 
                colors[255 * 4 + 0] = 255;
155
 
                colors[255 * 4 + 1] = 255;
156
 
                colors[255 * 4 + 2] = 255;
 
154
                colors[255 * 3 + 0] = 255;
 
155
                colors[255 * 3 + 1] = 255;
 
156
                colors[255 * 3 + 2] = 255;
157
157
                _vm->_palette->setPalette(colors, 0, 256);
158
158
        } else {
159
159
                // MADS handling
163
163
 
164
164
                // Show all the scene's walk nodes
165
165
                SceneNodeList &nodeList = _madsVm->scene()->getSceneResources()._nodes;
166
 
                _backgroundSurface->setColour(_madsVm->_palette->WHITE);
 
166
                _backgroundSurface->setColor(_madsVm->_palette->WHITE);
167
167
                for (uint i = 0; i < nodeList.size() - 2; ++i) {
168
168
                        // Draw a little cross at the node's position
169
169
                        _backgroundSurface->hLine(nodeList[i].pt.x - 2, nodeList[i].pt.x + 2, nodeList[i].pt.y);