[Scummvm-cvs-logs] CVS: scummvm boxes.h,NONE,1.1 gui.cpp,1.21,1.22 saveload.cpp,1.34,1.35 scumm.h,1.94,1.95 scummvm.cpp,1.91,1.92 sdl.cpp,1.48,1.49 sound.cpp,1.33,1.34 sound.h,1.8,1.9

James Brown ender at users.sourceforge.net
Thu Mar 21 08:27:29 CET 2002


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

Modified Files:
	gui.cpp saveload.cpp scumm.h scummvm.cpp sdl.cpp sound.cpp 
	sound.h 
Added Files:
	boxes.h 
Log Message:
Move some box stuff from scumm.h to new boxes.h
Also move some sound-related items from scumm.h to sound.h



--- NEW FILE: boxes.h ---
/* ScummVM - Scumm Interpreter
 * Copyright (C) 2001  Ludvig Strigeus
 * Copyright (C) 2001/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/boxes.h,v 1.1 2002/03/21 16:12:00 ender Exp $
 *
 */

#define SIZEOF_BOX 20
struct Box {				/* Internal walkbox file format */
	int16 ulx,uly;
	int16 urx,ury;
	int16 llx,lly;
	int16 lrx,lry;
	byte mask;
	byte flags;
	uint16 scale;
} GCC_PACK;

struct gate_location {
	int     x;
	int     y;
};

struct AdjustBoxResult {	/* Result type of AdjustBox functions */
	int16 x,y;
	uint16 dist;
};

struct BoxCoords {			/* Box coordinates */
	ScummPoint ul;
	ScummPoint ur;
	ScummPoint ll;
	ScummPoint lr;
};

struct PathNode {		/* Linked list of walkpath nodes */
	uint index;
	struct PathNode *left, *right;
};

struct PathVertex {		/* Linked list of walkpath nodes */
	PathNode *left;
	PathNode *right;
};
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gui.cpp	20 Mar 2002 22:58:41 -0000	1.21
--- gui.cpp	21 Mar 2002 16:12:01 -0000	1.22
***************
*** 23,27 ****
  #include "scumm.h"
  #include "gui.h"
- #include "sound.h"
  
  #ifdef _WIN32_WCE
--- 23,26 ----

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** saveload.cpp	20 Mar 2002 17:51:06 -0000	1.34
--- saveload.cpp	21 Mar 2002 16:12:01 -0000	1.35
***************
*** 23,27 ****
  #include "stdafx.h"
  #include "scumm.h"
- #include "sound.h"
  
  #ifdef _WIN32_WCE
--- 23,26 ----

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** scumm.h	21 Mar 2002 00:40:18 -0000	1.94
--- scumm.h	21 Mar 2002 16:12:01 -0000	1.95
***************
*** 40,49 ****
  struct Actor;
  
- struct gate_location
- {
- 	int     x;
- 	int     y;
- };
- 
  #include "smush.h"
  
--- 40,43 ----
***************
*** 62,74 ****
  };
  
! /* Sound output type - MIDI */
! enum {
! 	MIDI_NULL = 0,
! 	MIDI_WINDOWS = 1,
! 	MIDI_TIMIDITY = 2,
! 	MIDI_SEQ = 3,
! 	MIDI_QTMUSIC = 4,
! 	MIDI_AMIDI = 5
! };
  
  /* Script status type (slot.status) */
--- 56,60 ----
  };
  
! 
  
  /* Script status type (slot.status) */
***************
*** 79,119 ****
  };
  
! const uint16 many_direction_tab[18] = {
! 	4,
! 	8,
! 	71,
! 	109,
! 	251,
! 	530,
! 	0,
! 	0,
! 	0,
! 	0,
! 	22,
! 	72,
! 	107,
! 	157,
! 	202,
! 	252,
! 	287,
! 	337 };
! 
! const int16 many_direction_tab_2 [16] = {
! 	0,
! 	90,
! 	180,
! 	270,
! 	-1,
! 	-1,
! 	-1,
! 	-1,
! 	0,
! 	45,
! 	90,
! 	135,
! 	180,
! 	225,
! 	270,
! 	315 };
  
  struct ScummPoint {
--- 65,70 ----
  };
  
! const uint16 many_direction_tab[18] = {4, 8, 71, 109, 251, 530, 0, 0, 0, 0, 22, 72, 107, 157, 202, 252, 287, 337};
! const int16 many_direction_tab_2[16] = {0, 90, 180, 270, -1, -1, -1, -1, 0, 45, 90, 135, 180, 225, 270, 315};
  
  struct ScummPoint {
***************
*** 125,144 ****
  };
  
- 
  #if !defined(__GNUC__)
  	#pragma START_PACK_STRUCTS
  #endif	
  
- #define SIZEOF_BOX 20
- struct Box { /* file format */
- 	int16 ulx,uly;
- 	int16 urx,ury;
- 	int16 llx,lly;
- 	int16 lrx,lry;
- 	byte mask;
- 	byte flags;
- 	uint16 scale;
- } GCC_PACK;
- 
  struct ResHdr {
  	uint32 tag, size;
--- 76,83 ----
***************
*** 253,261 ****
  #endif
  
- struct AdjustBoxResult {
- 	int16 x,y;
- 	uint16 dist;
- };
- 
  struct VerbSlot {
  	int16 x,y;
--- 192,195 ----
***************
*** 307,320 ****
  };
  
- struct PathNode {
- 	uint index;
- 	struct PathNode *left, *right;
- };
- 
- struct PathVertex {
- 	PathNode *left;
- 	PathNode *right;
- };
- 
  struct VirtScreen {
  	int number;
--- 241,244 ----
***************
*** 785,818 ****
  };
  
- typedef enum {
-   MIXER_STANDARD,
-   MIXER_MP3
- } MixerType;
- 
- struct MixerChannel {
- 	void *_sfx_sound;
- 	MixerType type;
- 	union {
- 	  struct {
- 	    uint32 _sfx_pos;
- 	    uint32 _sfx_size;
- 	    uint32 _sfx_fp_speed;
- 	    uint32 _sfx_fp_pos;
- 	  } standard;
- #ifdef COMPRESSED_SOUND_FILE
- 	  struct {
- 	    struct mad_stream stream;
- 	    struct mad_frame frame;
- 	    struct mad_synth synth;
- 	    uint32 silence_cut;
- 	    uint32 pos_in_frame;
- 	    uint32 position;
- 	    uint32 size;
- 	  } mp3;
- #endif
- 	} sound_data;
- 	void mix(int16 *data, uint32 len);
- 	void clear();
- };
  
  enum GameId {
--- 709,712 ----
***************
*** 877,894 ****
  };
  
! struct BoxCoords {
! 	ScummPoint ul;
! 	ScummPoint ur;
! 	ScummPoint ll;
! 	ScummPoint lr;
! };
! 
! struct OffsetTable {	/* Compressed Sound (.SO3) */
! 	int org_offset;
! 	int new_offset;
! 	int num_tags;
! 	int compressed_size;
! };
! 
  class Scumm {
  public:
--- 771,776 ----
  };
  
! #include "boxes.h"
! #include "sound.h"
  class Scumm {
  public:

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** scummvm.cpp	21 Mar 2002 00:40:18 -0000	1.91
--- scummvm.cpp	21 Mar 2002 16:12:01 -0000	1.92
***************
*** 25,29 ****
  #include "gui.h"
  #include "string.h"
- #include "sound.h"
  
  extern void launcherLoop();
--- 25,28 ----

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** sdl.cpp	21 Mar 2002 00:40:18 -0000	1.48
--- sdl.cpp	21 Mar 2002 16:12:01 -0000	1.49
***************
*** 26,30 ****
  #include "scumm.h"
  #include "gui.h"
- #include "sound.h"
  #include "SDL_thread.h"
  
--- 26,29 ----
***************
*** 884,890 ****
  
  int main(int argc, char* argv[]) {
- 	int delta;
- 	int last_time, new_time;
- 	
  #if defined(MACOS) 
  	/* support for config file on macos */
--- 883,886 ----

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** sound.cpp	20 Mar 2002 17:51:07 -0000	1.33
--- sound.cpp	21 Mar 2002 16:12:01 -0000	1.34
***************
*** 23,27 ****
  #include "stdafx.h"
  #include "scumm.h"
- #include "sound.h"
  #include "cdmusic.h"
  
--- 23,26 ----
***************
*** 371,375 ****
  		_sound_volume_music  = se->get_music_volume();
  		_sound_volume_master = (se->get_master_volume() / 127);
! 		driver->midiSetDriver(se->midiGetDriver());
  	}
  	_sfxFile = openSfxFile();
--- 370,374 ----
  		_sound_volume_music  = se->get_music_volume();
  		_sound_volume_master = (se->get_master_volume() / 127);
! 		driver->midiSetDriver(_midi_driver);
  	}
  	_sfxFile = openSfxFile();

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sound.h	16 Mar 2002 18:58:51 -0000	1.8
--- sound.h	21 Mar 2002 16:12:02 -0000	1.9
***************
*** 18,21 ****
--- 18,25 ----
   * Change Log:
   * $Log$
+  * Revision 1.9  2002/03/21 16:12:02  ender
+  * Move some box stuff from scumm.h to new boxes.h
+  * Also move some sound-related items from scumm.h to sound.h
+  *
   * Revision 1.8  2002/03/16 18:58:51  ender
   * MorphOS port (sdl version) + endian fixes for big endian machines.
***************
*** 49,54 ****
--- 53,100 ----
   */
  
+ #include "gmidi.h"		/* General Midi */
+ 
+ struct OffsetTable {	/* Compressed Sound (.SO3) */
+ 	int org_offset;
+ 	int new_offset;
+ 	int num_tags;
+ 	int compressed_size;
+ };
+ 
+ typedef enum {			/* Mixer types */
+   MIXER_STANDARD,
+   MIXER_MP3
+ } MixerType;
+ 
+ struct MixerChannel {	/* Mixer Channel */
+ 	void *_sfx_sound;
+ 	MixerType type;
+ 	union {
+ 	  struct {
+ 	    uint32 _sfx_pos;
+ 	    uint32 _sfx_size;
+ 	    uint32 _sfx_fp_speed;
+ 	    uint32 _sfx_fp_pos;
+ 	  } standard;
+ #ifdef COMPRESSED_SOUND_FILE
+ 	  struct {
+ 	    struct mad_stream stream;
+ 	    struct mad_frame frame;
+ 	    struct mad_synth synth;
+ 	    uint32 silence_cut;
+ 	    uint32 pos_in_frame;
+ 	    uint32 position;
+ 	    uint32 size;
+ 	  } mp3;
+ #endif
+ 	} sound_data;
+ 	void mix(int16 *data, uint32 len);
+ 	void clear();
+ };
+ 
  int clamp(int val, int min, int max);
  
+ 
+ 
  struct FM_OPL;
  struct Part;
***************
*** 586,591 ****
  
  	SOUND_DRIVER_TYPE *driver() { return _driver; }
- 	int  midiGetDriver() {return _s->_midi_driver;}
- 	void midiSetDriver(int devicetype);
  	bool _mt32emulate;	
  };
--- 632,635 ----





More information about the Scummvm-git-logs mailing list