[Scummvm-cvs-logs] SF.net SVN: scummvm: [25033] scummvm/trunk/engines/agi

dsx at users.sourceforge.net dsx at users.sourceforge.net
Sat Jan 6 18:07:14 CET 2007


Revision: 25033
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25033&view=rev
Author:   dsx
Date:     2007-01-06 09:07:13 -0800 (Sat, 06 Jan 2007)

Log Message:
-----------
Start removing hires code from AGI engine.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/cycle.cpp
    scummvm/trunk/engines/agi/picture.cpp
    scummvm/trunk/engines/agi/picture.h

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2007-01-06 16:46:38 UTC (rev 25032)
+++ scummvm/trunk/engines/agi/agi.cpp	2007-01-06 17:07:13 UTC (rev 25033)
@@ -574,7 +574,7 @@
 void AgiEngine::initialize() {
 	memset(&opt, 0, sizeof(struct agi_options));
 	opt.gamerun = GAMERUN_RUNGAME;
-	opt.hires = true;
+	opt.hires = 0;
 
 	// TODO: Some sound emulation modes do not fit our current music
 	//       drivers, and I'm not sure what they are. For now, they might

Modified: scummvm/trunk/engines/agi/cycle.cpp
===================================================================
--- scummvm/trunk/engines/agi/cycle.cpp	2007-01-06 16:46:38 UTC (rev 25032)
+++ scummvm/trunk/engines/agi/cycle.cpp	2007-01-06 17:07:13 UTC (rev 25033)
@@ -350,9 +350,6 @@
 int AgiEngine::run_game() {
 	int i, ec = err_OK;
 
-	if (opt.renderMode == Common::kRenderCGA)
-		opt.hires = 0;
-
 	for (i = 0; i < MAX_DIRS; i++)
 		memset(&game.ev_keyp[i], 0, sizeof(struct agi_event));
 

Modified: scummvm/trunk/engines/agi/picture.cpp
===================================================================
--- scummvm/trunk/engines/agi/picture.cpp	2007-01-06 16:46:38 UTC (rev 25032)
+++ scummvm/trunk/engines/agi/picture.cpp	2007-01-06 17:07:13 UTC (rev 25033)
@@ -715,24 +715,6 @@
 	foffs--;
 }
 
-/**
- * Show AGI picture.
- * This function copies a ``hidden'' AGI picture to the output device.
- */
-void PictureMgr::show_hires_pic() {
-	int y, offset;
-	int32 i;
-
-	i = 0;
-	offset = _vm->game.line_min_print * CHAR_LINES;
-	for (y = 0; y < _HEIGHT; y++) {
-		_gfx->putPixelsHires(0, y + offset, _WIDTH * 2, &_vm->game.hires[i]);
-		i += _WIDTH * 2;
-	}
-
-	_gfx->flushScreen();
-}
-
 void PictureMgr::fix_hires_picture() {
 	uint8 *p, *b;
 	int i;
@@ -974,10 +956,6 @@
 	int offset;
 
 	debugC(8, kDebugLevelMain, "Show picture!");
-	if (_vm->opt.hires) {
-		show_hires_pic();
-		return;
-	}
 
 	i = 0;
 	offset = _vm->game.line_min_print * CHAR_LINES;

Modified: scummvm/trunk/engines/agi/picture.h
===================================================================
--- scummvm/trunk/engines/agi/picture.h	2007-01-06 16:46:38 UTC (rev 25032)
+++ scummvm/trunk/engines/agi/picture.h	2007-01-06 17:07:13 UTC (rev 25033)
@@ -67,7 +67,6 @@
 	void _hires_fill(unsigned int x, unsigned int y);
 	void hires_fill();
 	INLINE int hires_fill_here(int x, int y);
-	void show_hires_pic();
 	void fix_hires_picture();
 	void draw_picture();
 


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