[Scummvm-cvs-logs] CVS: scummvm scumm.h,1.123,1.124

[Nicolas Bacca]

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

Modified Files:
	scumm.h 
Log Message:
Restored update mess ...

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** scumm.h	17 Apr 2002 20:22:22 -0000	1.123
--- scumm.h	17 Apr 2002 20:34:10 -0000	1.124
***************
*** 83,87 ****
  
  #define RES_DATA(x) (((byte*)x) + sizeof(ResHdr))
! #define RES_SIZE(x) ( READ_BE_UINT32(&((ResHdr*)x)->size) )
  
  
--- 83,87 ----
  
  #define RES_DATA(x) (((byte*)x) + sizeof(ResHdr))
! #define RES_SIZE(x) ( READ_BE_UINT32_UNALIGNED(&((ResHdr*)x)->size) )
  
  
***************
*** 597,601 ****
  
  	/* video buffer */
! 	byte _videoBuffer[328*200]; // main video buffer
  
  	/* system call object */
--- 597,601 ----
  
  	/* video buffer */
! 	byte *_videoBuffer;
  
  	/* system call object */
***************
*** 954,978 ****
  	uint16 _mouthSyncTimes[52];
  	uint _curSoundPos;
! 	int current_cd_sound;
! 
! #ifdef COMPRESSED_SOUND_FILE
! 
! 	#define CACHE_TRACKS 10
! 	#define MP3_BUFFER_SIZE 200000
! 
! 	/* used for mp3 CD music */
! 
! 	int	_current_cache;
! 	int _cached_tracks[CACHE_TRACKS];
! 	struct mad_header _mad_header[CACHE_TRACKS];
! 	long _mp3_size[CACHE_TRACKS];
! 	FILE* _mp3_tracks[CACHE_TRACKS];
! 	void* _mp3_buffer;
! 	PlayingSoundHandle _mp3_handle;
! 
! 	int getCachedTrack(int track);
! 	void playMP3CDTrack(int track, int num_loops, int start, int delay);
! 
! 
  #endif
  
--- 954,978 ----
  	uint16 _mouthSyncTimes[52];
  	uint _curSoundPos;
! 	int current_cd_sound;
! 
! #ifdef COMPRESSED_SOUND_FILE
! 
! 	#define CACHE_TRACKS 10
! 	#define MP3_BUFFER_SIZE 200000
! 
! 	/* used for mp3 CD music */
! 
! 	int	_current_cache;
! 	int _cached_tracks[CACHE_TRACKS];
! 	struct mad_header _mad_header[CACHE_TRACKS];
! 	long _mp3_size[CACHE_TRACKS];
! 	FILE* _mp3_tracks[CACHE_TRACKS];
! 	void* _mp3_buffer;
! 	PlayingSoundHandle _mp3_handle;
! 
! 	int getCachedTrack(int track);
! 	void playMP3CDTrack(int track, int num_loops, int start, int delay);
! 
! 
  #endif
  
***************
*** 1144,1149 ****
  	void restoreBG(int left, int top, int right, int bottom);
  	void redrawBGStrip(int start, int num);	
! 	void redrawBGAreas();
! 	void redrawLines(int from, int to);	
  	
  	void moveCamera();
--- 1144,1148 ----
  	void restoreBG(int left, int top, int right, int bottom);
  	void redrawBGStrip(int start, int num);	
! 	void redrawBGAreas();	
  	
  	void moveCamera();
***************
*** 1847,1849 ****
  void setWindowName(Scumm *s);
  uint16 newTag2Old(uint32 oldTag);
! //void cd_playtrack(int track, int offset, int delay);
--- 1846,1848 ----
  void setWindowName(Scumm *s);
  uint16 newTag2Old(uint32 oldTag);
!