[Scummvm-cvs-logs] CVS: scummvm/simon vga.h,NONE,1.1 debug.cpp,1.1.1.1,1.2 intern.h,1.1.1.1,1.2 simon.cpp,1.18,1.19 vga.cpp,1.2,1.3

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv18450

Modified Files:
	debug.cpp intern.h simon.cpp vga.cpp 
Added Files:
	vga.h 
Log Message:
fixed SIMONDEBUG; some cleanup

--- NEW FILE: vga.h ---
/* ScummVM - Scumm Interpreter
 * Copyright (C) 2002 The ScummVM project
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.

 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 * $Header: /cvsroot/scummvm/scummvm/simon/vga.h,v 1.1 2002/10/22 12:05:04 fingolfin Exp $
 *
 */

#ifndef SIMON_VGA_H
#define SIMON_VGA_H

struct VgaFile1Header {
	uint16 x_1, x_2;
	uint16 hdr2_start;
	uint16 x_3, x_4;
};

struct VgaFile1Header2 {
	uint16 x_1;
	uint16 unk1;
	uint16 x_2;
	uint16 id_count;
	uint16 x_3;
	uint16 unk2_offs;
	uint16 x_4;
	uint16 id_table;
	uint16 x_5;
};

struct VgaFile1Struct0x8 {
	uint16 id;
	uint16 x_1;
	uint16 x_2;
	uint16 script_offs;
};

struct VgaFile1Struct0x6 {
	uint16 id;
	uint16 x_2;
	uint16 script_offs;
};

struct VC10_state {
	int image;
	uint16 e;
	int x, y;

	byte base_color;

	uint draw_width, draw_height;
	uint x_skip, y_skip;

	byte *surf2_addr;
	uint surf2_pitch;

	byte *surf_addr;
	uint surf_pitch;

	byte dl, dh;

	byte *depack_src;
	int8 depack_cont;

	byte depack_dest[200];
};

byte *vc_10_depack_column(VC10_state * vs);


#endif

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- debug.cpp	21 Aug 2002 16:07:36 -0000	1.1.1.1
+++ debug.cpp	22 Oct 2002 12:05:04 -0000	1.2
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
+#include "simon/vga.h"
 
 #ifdef SIMONDEBUG
 #define SIMON2
@@ -762,7 +763,7 @@
 
 void SimonState::dump_vga_script(byte *ptr, uint res, uint sprite_id)
 {
-	dump_Vga_script_always(ptr, res, sprite_id);
+	dump_vga_script_always(ptr, res, sprite_id);
 }
 
 

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- intern.h	21 Aug 2002 16:07:36 -0000	1.1.1.1
+++ intern.h	22 Oct 2002 12:05:04 -0000	1.2
@@ -117,38 +117,6 @@
 	TimeEvent *next;
 };
 
-struct VgaFile1Header {
-	uint16 x_1, x_2;
-	uint16 hdr2_start;
-	uint16 x_3, x_4;
-};
-
-struct VgaFile1Header2 {
-	uint16 x_1;
-	uint16 unk1;
-	uint16 x_2;
-	uint16 id_count;
-	uint16 x_3;
-	uint16 unk2_offs;
-	uint16 x_4;
-	uint16 id_table;
-	uint16 x_5;
-};
-
-struct VgaFile1Struct0x8 {
-	uint16 id;
-	uint16 x_1;
-	uint16 x_2;
-	uint16 script_offs;
-};
-
-struct VgaFile1Struct0x6 {
-	uint16 id;
-	uint16 x_2;
-	uint16 script_offs;
-};
-
-
 struct GameSpecificSettings {
 	uint VGA_DELAY_BASE;
 	uint TABLE_INDEX_BASE;

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- simon.cpp	22 Oct 2002 11:48:24 -0000	1.18
+++ simon.cpp	22 Oct 2002 12:05:04 -0000	1.19
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
+#include "simon/vga.h"
 #include "sound/mididrv.h"
 #include "common/gameDetector.h"
 #include <errno.h>

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vga.cpp	24 Aug 2002 15:31:37 -0000	1.2
+++ vga.cpp	22 Oct 2002 12:05:04 -0000	1.3
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
+#include "simon/vga.h"
 
 typedef void (SimonState::*VgaOpcodeProc) ();
 static const uint16 vc_get_out_of_code = 0;
@@ -406,30 +407,6 @@
 	if (!vc_maybe_skip_proc_1(a, b))
 		vc_skip_next_instruction();
 }
-
-struct VC10_state {
-	int image;
-	uint16 e;
-	int x, y;
-
-	byte base_color;
-
-	uint draw_width, draw_height;
-	uint x_skip, y_skip;
-
-	byte *surf2_addr;
-	uint surf2_pitch;
-
-	byte *surf_addr;
-	uint surf_pitch;
-
-	byte dl, dh;
-
-	byte *depack_src;
-	int8 depack_cont;
-
-	byte depack_dest[200];
-};
 
 byte *vc_10_depack_column(VC10_state * vs)
 {