[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.520.2.8,1.520.2.9 simon.h,1.149.2.4,1.149.2.5 verb.cpp,1.29.2.3,1.29.2.4

kirben kirben at users.sourceforge.net
Wed Jan 25 20:03:04 CET 2006


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15860/simon

Modified Files:
      Tag: branch-0-8-0
	simon.cpp simon.h verb.cpp 
Log Message:

Remove leftovers.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.520.2.8
retrieving revision 1.520.2.9
diff -u -d -r1.520.2.8 -r1.520.2.9
--- simon.cpp	26 Jan 2006 03:44:35 -0000	1.520.2.8
+++ simon.cpp	26 Jan 2006 04:01:55 -0000	1.520.2.9
@@ -533,7 +533,7 @@
 	else if (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32))
 		driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 
-	midi.mapMT32toGM (!(getGameType() == GType_SIMON2) && !(ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)));
+	midi.mapMT32toGM (getGameType() == GType_SIMON1 && !(ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)));
 
 	midi.set_driver(driver);
 	int ret = midi.open();
@@ -1711,7 +1711,7 @@
 
 	fcs_ptr = _fcsPtrArray3[fcs_index & 7];
 
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		width_div_3 = fcs_ptr->width / 3;
 		height_div_3 = fcs_ptr->height / 3;
 	} else {
@@ -1740,7 +1740,7 @@
 		num_sibs_with_flag = 0;
 		while (item_ptr && width_div_3 > num_sibs_with_flag) {
 			if ((unk2 == 0 || item_ptr->classFlags & unk2) && has_item_childflag_0x10(item_ptr))
-				if (!(getGameType() == GType_SIMON2)) {
+				if (getGameType() == GType_SIMON1) {
 					num_sibs_with_flag++;
 				} else {
 					num_sibs_with_flag += 20;
@@ -1764,7 +1764,7 @@
 		if ((unk2 == 0 || item_ptr->classFlags & unk2) && has_item_childflag_0x10(item_ptr)) {
 			if (item_again == false) {
 				fcs_ptr->fcs_data->e[k].item = item_ptr;
-				if (!(getGameType() == GType_SIMON2)) {
+				if (getGameType() == GType_SIMON1) {
 					draw_icon_c(fcs_ptr, item_get_icon_number(item_ptr), x_pos * 3, y_pos);
 					fcs_ptr->fcs_data->e[k].hit_area =
 						setup_icon_hit_area(fcs_ptr, x_pos * 3, y_pos,
@@ -1811,7 +1811,7 @@
 
 	ha = findEmptyHitArea();
 	_scrollUpHitArea = ha - _hitAreas;
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		ha->x = 308;
 		ha->y = 149;
 		ha->width = 12;
@@ -1836,7 +1836,7 @@
 	ha = findEmptyHitArea();
 	_scrollDownHitArea = ha - _hitAreas;
 
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		ha->x = 308;
 		ha->y = 176;
 		ha->width = 12;
@@ -2056,7 +2056,7 @@
 void SimonEngine::hitarea_stuff_helper() {
 	time_t cur_time;
 
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		uint subr_id = _variableArray[254];
 		if (subr_id != 0) {
 			Subroutine *sub = getSubroutineByID(subr_id);
@@ -2378,7 +2378,7 @@
 
 	if (vga_res_id == 0) {
 
-		if (!(getGameType() == GType_SIMON2)) {
+		if (getGameType() == GType_SIMON1) {
 			_unkPalFlag = true;
 		} else {
 			_dxUse3Or4ForLock = true;
@@ -2456,7 +2456,7 @@
 
 	_lockWord &= ~0x20;
 
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		if (_unkPalFlag) {
 			_unkPalFlag = false;
 			while (_paletteColorCount != 0) {
@@ -2577,7 +2577,7 @@
 	// caused several glitches in this scene.
 	// We work around the problem by correcting the code_ptr for sprite
 	// 200 in this scene, if it is wrong.
-	if (!(getGameType() == GType_SIMON2) && (_language == 2) &&
+	if (getGameType() == GType_SIMON1 && (_language == 2) &&
 		(code_ptr - _vgaBufferPointers[cur_file].vgaFile1 == 4) && (cur_sprite == 200) && (cur_file == 2))
 		code_ptr += 0x66;
 
@@ -3023,7 +3023,7 @@
 
 	if (fcs->fcs_data->unk4 != -1) {
 		delete_hitarea_by_index(fcs->fcs_data->unk4);
-		if (!(getGameType() == GType_SIMON2))
+		if (getGameType() == GType_SIMON1)
 			fcs_unk_5(fcs, fcs_index);
 	}
 
@@ -3067,7 +3067,7 @@
 void SimonEngine::copy_img_from_3_to_2(FillOrCopyStruct *fcs) {
 	_lockWord |= 0x8000;
 
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		dx_copy_rgn_from_3_to_2(fcs->y + fcs->height * 8 + ((fcs == _fcsPtrArray3[2]) ? 1 : 0), (fcs->x + fcs->width) * 8, fcs->y, fcs->x * 8);
 	} else {
 		if (_vgaVar6 && _fcsPtrArray3[2] == fcs) {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.149.2.4
retrieving revision 1.149.2.5
diff -u -d -r1.149.2.4 -r1.149.2.5
--- simon.h	26 Jan 2006 03:44:36 -0000	1.149.2.4
+++ simon.h	26 Jan 2006 04:01:56 -0000	1.149.2.5
@@ -175,7 +175,6 @@
 	uint SOUND_INDEX_BASE;
 	const GameSpecificSettings *gss;
 
-	byte _game;
 	byte _keyPressed;
 
 	typedef enum {
@@ -519,7 +518,6 @@
 	void fcs_unk_2(uint a);
 	void o_unk_103();
 	void fcs_delete(uint a);
-	void o_unk_108(uint a);
 	void clear_hitarea_bit_0x40(uint hitarea);
 	void set_hitarea_bit_0x40(uint hitarea);
 	void set_hitarea_x_y(uint hitarea, int x, int y);
@@ -532,11 +530,9 @@
 	void hitarea_leave(HitArea * ha);
 	void leaveHitAreaById(uint hitarea_id);
 
-	void o_unk_114();
 	void o_wait_for_vga(uint a);
 	void skip_speech();
 	void o_unk_120(uint a);
-	void o_unk_126();
 	void o_play_music_resource();
 	void o_save_game();
 	void o_load_game();

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -d -r1.29.2.3 -r1.29.2.4
--- verb.cpp	26 Jan 2006 03:35:21 -0000	1.29.2.3
+++ verb.cpp	26 Jan 2006 04:01:56 -0000	1.29.2.4
@@ -419,7 +419,7 @@
 	if (ha == tmp)
 		return;
 
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		if (tmp != NULL) {
 			tmp->flags |= 8;
 			video_toggle_colors(tmp, 0xd5, 0xd0, 0xd5, 0xA);
@@ -442,7 +442,7 @@
 }
 
 void SimonEngine::hitarea_leave(HitArea *ha) {
-	if (!(getGameType() == GType_SIMON2)) {
+	if (getGameType() == GType_SIMON1) {
 		video_toggle_colors(ha, 0xdf, 0xd5, 0xda, 5);
 	} else {
 		video_toggle_colors(ha, 0xe7, 0xe5, 0xe6, 1);





More information about the Scummvm-git-logs mailing list