[Scummvm-cvs-logs] CVS: scummvm akos.h,1.5,1.6 gameDetector.cpp,1.23,1.24 scumm.h,1.128,1.129

[James Brown]

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

Modified Files:
	akos.h gameDetector.cpp scumm.h 
Log Message:
Fix PocketSCUMM. Palette is wrong tho. BBrox is a genius.



Index: akos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** akos.h	12 Apr 2002 10:34:45 -0000	1.5
--- akos.h	19 Apr 2002 15:02:14 -0000	1.6
***************
*** 24,30 ****
  
  #if !defined(__GNUC__)
- 
  	#pragma START_PACK_STRUCTS
- 
  #endif	
  
--- 24,28 ----
***************
*** 49,52 ****
--- 47,54 ----
  	int16 move_x, move_y;
  } GCC_PACK;
+ 
+ #if !defined(__GNUC__)
+ 	#pragma END_PACK_STRUCTS
+ #endif	
  
  struct AkosRenderer {

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** gameDetector.cpp	19 Apr 2002 11:12:27 -0000	1.23
--- gameDetector.cpp	19 Apr 2002 15:02:14 -0000	1.24
***************
*** 428,433 ****
--- 428,435 ----
  		break;
  
+ #ifdef USE_NULL_DRIVER
  	case GD_NULL:
  		return OSystem_NULL_create();
+ #endif
  #endif
  	}

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** scumm.h	19 Apr 2002 13:57:18 -0000	1.128
--- scumm.h	19 Apr 2002 15:02:14 -0000	1.129
***************
*** 939,943 ****
  
  	/* Should be in Sound class */
! 	SoundMixer _mixer[1];
  
  //	MixerChannel _mixer_channel[NUM_MIXER];
--- 939,947 ----
  
  	/* Should be in Sound class */
! 	union {
! 		SoundMixer _mixer[1];
! 		uint32 xxxx_1;
! 	};
! 	//SoundMixer _mixer[1];
  
  //	MixerChannel _mixer_channel[NUM_MIXER];
***************
*** 1134,1138 ****
  	void initVirtScreen(int slot, int top, int height, bool twobufs, bool fourextra);
  	void initBGBuffers();
! 	void initCycl(byte *ptr);	// Color cycle
  	void createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax);
  
--- 1138,1143 ----
  	void initVirtScreen(int slot, int top, int height, bool twobufs, bool fourextra);
  	void initBGBuffers();
! 	void initCycl(byte *ptr);	// Color cycle
! 
  	void createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax);
  
***************
*** 1224,1228 ****
  	byte *_shadowPalette;
  	int _shadowPaletteSize;
! 	byte _currentPalette[0x300];
  	byte _proc_special_palette[256];
  	int _palDirtyMin, _palDirtyMax;
--- 1229,1234 ----
  	byte *_shadowPalette;
  	int _shadowPaletteSize;
! 	byte _currentPalette[0x300];
! 
  	byte _proc_special_palette[256];
  	int _palDirtyMin, _palDirtyMax;