mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-04 16:26:53 +00:00
fixed SIMONDEBUG; some cleanup
svn-id: r5240
This commit is contained in:
parent
5151e561d5
commit
c8905a5c8a
@ -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_always(byte *ptr, uint res, uint sprite_id)
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
|
@ -117,38 +117,6 @@ struct TimeEvent {
|
||||
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;
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
@ -407,30 +408,6 @@ void SimonState::vc_9_maybe_skip()
|
||||
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)
|
||||
{
|
||||
int8 a = vs->depack_cont;
|
||||
|
83
simon/vga.h
Normal file
83
simon/vga.h
Normal file
@ -0,0 +1,83 @@
|
||||
/* 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$
|
||||
*
|
||||
*/
|
||||
|
||||
#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
|
Loading…
Reference in New Issue
Block a user