Fix PocketSCUMM. Palette is wrong tho. BBrox is a genius.

svn-id: r4009

akos.h

@@ -23,9 +23,7 @@
 
 
 #if !defined(__GNUC__)
-
 	#pragma START_PACK_STRUCTS
-
 #endif	
 
 
@@ -49,6 +47,10 @@ struct AkosCI {
 	int16 move_x, move_y;
 } GCC_PACK;
 
+#if !defined(__GNUC__)
+	#pragma END_PACK_STRUCTS
+#endif	
+
 struct AkosRenderer {
 	CostumeData *cd;
 	int x,y; /* where to draw costume */

gameDetector.cpp

@@ -427,8 +427,10 @@ OSystem *GameDetector::createSystem() {
 #endif
 		break;
 
+#ifdef USE_NULL_DRIVER
 	case GD_NULL:
 		return OSystem_NULL_create();
+#endif
 #endif
 	}
 

scumm.h

@@ -938,7 +938,11 @@ public:
 	void setVerbObject(uint room, uint object, uint verb);
 
 	/* Should be in Sound class */
+	union {
 		SoundMixer _mixer[1];
+		uint32 xxxx_1;
+	};
+	//SoundMixer _mixer[1];
 
 //	MixerChannel _mixer_channel[NUM_MIXER];
 	byte _sfxMode;
@@ -1134,6 +1138,7 @@ public:
 	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);
 
 	void drawObject(int obj, int arg);	
@@ -1224,6 +1229,7 @@ public:
 	byte *_shadowPalette;
 	int _shadowPaletteSize;
 	byte _currentPalette[0x300];
+
 	byte _proc_special_palette[256];
 	int _palDirtyMin, _palDirtyMax;
 	byte _bkColor;

sound/mixer.cpp

@@ -66,6 +66,7 @@ void SoundMixer::on_generate_samples(void *s, byte *samples, int len) {
 }
 
 bool SoundMixer::bind_to_system(OSystem *syst) {
+	//_volume_table = (int16*)malloc(256 * sizeof(int16));
 	_volume_table = (int16*)calloc(256*sizeof(int16),1);
 		
 	uint rate = (uint)syst->property(OSystem::PROP_GET_SAMPLE_RATE, 0);

sound/mixer.h

@@ -6,7 +6,6 @@
 #endif
 
 typedef uint32 PlayingSoundHandle;
-
 class SoundMixer {
 private:	
 	class Channel {
@@ -190,5 +189,4 @@ struct MixerChannel {	/* Mixer Channel */
 };
 #endif
 
-
 #endif /* _mixer_h_included */