[Scummvm-cvs-logs] SF.net SVN: scummvm: [21960] scummvm/trunk/engines/simon

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sun Apr 16 22:02:01 CEST 2006


Revision: 21960
Author:   kirben
Date:     2006-04-16 22:01:29 -0700 (Sun, 16 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21960&view=rev

Log Message:
-----------
Minor cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/simon/animation.cpp
    scummvm/trunk/engines/simon/animation.h
    scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/animation.cpp
===================================================================
--- scummvm/trunk/engines/simon/animation.cpp	2006-04-17 04:02:48 UTC (rev 21959)
+++ scummvm/trunk/engines/simon/animation.cpp	2006-04-17 05:01:29 UTC (rev 21960)
@@ -31,7 +31,7 @@
 #include <zlib.h>
 #endif
 
-bool DXA_Player::open(const char *filename) {
+bool MoviePlayer::open(const char *filename) {
 	bool opened = false;
 	char filename2[100];
 
@@ -80,13 +80,13 @@
 	return opened;
 }
 
-void DXA_Player::close() {
+void MoviePlayer::close() {
 	_fd.close();
 	free(_frameBuffer1);
 	free(_frameBuffer2);
 }
 
-void DXA_Player::play() {
+void MoviePlayer::play() {
 	g_system->clearScreen();
 
 	while (_currentFrame < _framesCount) {
@@ -97,7 +97,7 @@
 	g_system->clearScreen();
 }
 
-void DXA_Player::handleNextFrame() {
+void MoviePlayer::handleNextFrame() {
 	uint32 tag = _fd.readUint32BE();
 	if (tag == MKID_BE('CMAP')) {
 		uint8 rgb[768];
@@ -154,7 +154,7 @@
 	delay(_frameTicks);
 }
 
-void DXA_Player::decodeZlib(uint8 *data, int size, int totalSize) {
+void MoviePlayer::decodeZlib(uint8 *data, int size, int totalSize) {
 #ifdef USE_ZLIB
 	uint8 *temp = (uint8 *)malloc(size);
 	if (temp) {
@@ -176,15 +176,15 @@
 #endif
 }
 
-void DXA_Player::decode0(uint8 *data, int size) {
+void MoviePlayer::decode0(uint8 *data, int size) {
 	error("decode0");
 }
 
-void DXA_Player::decode2(uint8 *data, int size, int totalSize) {
+void MoviePlayer::decode2(uint8 *data, int size, int totalSize) {
 	error("decode2");
 }
 
-void DXA_Player::delay(uint amount) {
+void MoviePlayer::delay(uint amount) {
 	OSystem::Event event;
 
 	uint32 start = g_system->getMillis();

Modified: scummvm/trunk/engines/simon/animation.h
===================================================================
--- scummvm/trunk/engines/simon/animation.h	2006-04-17 04:02:48 UTC (rev 21959)
+++ scummvm/trunk/engines/simon/animation.h	2006-04-17 05:01:29 UTC (rev 21960)
@@ -20,17 +20,12 @@
  *
  */
 
-#ifndef __DXA_PLAYER_H__
-#define __DXA_PLAYER_H__
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "common/file.h"
 
-struct DXA_Player {
-	static const uint32 _tagDEXA;
-	static const uint32 _tagFRAM;
-	static const uint32 _tagWAVE;
-	static const uint32 _tagCMAP;
-	
+struct MoviePlayer {
 	bool _playing;
 	bool _leftButtonDown;
 	bool _rightButtonDown;
@@ -55,4 +50,4 @@
 	void decode2(uint8 *data, int size, int totalSize);
 };
 
-#endif // __DXA_PLAYER_H__
+#endif

Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-17 04:02:48 UTC (rev 21959)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-17 05:01:29 UTC (rev 21960)
@@ -1933,7 +1933,7 @@
 	// 183: play video
 	debug(0, "Play video %s", _videoName);
 
-	DXA_Player p;
+	MoviePlayer p;
 	if (p.open((const char *)_videoName)) {
 		p.play();
 		p.close();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list