[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.24,1.25 gui.h,1.12,1.13 insane.cpp,1.13,1.14

Vincent Hamm yazoo at users.sourceforge.net
Wed Apr 3 02:36:45 CEST 2002


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

Modified Files:
	gui.cpp gui.h insane.cpp 
Log Message:
Wrote the string map for V7. Gui colors are still bad

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** gui.cpp	25 Mar 2002 18:17:40 -0000	1.24
--- gui.cpp	2 Apr 2002 17:15:27 -0000	1.25
***************
*** 673,676 ****
--- 673,679 ----
  		return NULL;
  
+ 	if (_s->_features&GF_AFTER_V7)
+ 		string = _s->_vars[string_map_table_v7[stringno-1].num];
+ 	else
  	if (_s->_features&GF_AFTER_V6)
  		string = _s->_vars[string_map_table_v6[stringno-1].num];

Index: gui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gui.h	25 Mar 2002 18:17:40 -0000	1.12
--- gui.h	2 Apr 2002 17:15:27 -0000	1.13
***************
*** 49,52 ****
--- 49,99 ----
  };
  
+ static ResString string_map_table_v7[] = {
+ 	{96, "game name and version"}, //that's how it's supposed to be
+ 	{77, "Select a game to LOAD"},
+ 	{76, "Name your SAVE game"},
+         {70, "save"}, //boot8
+ 	{71, "load"}, //boot9
+ 	{72, "play"}, //boot10
+ 	{73, "cancel"}, //boot11
+ 	{74, "quit"}, //boot12
+ 	{75, "ok"}, //boot13
+ 	{85, "game paused"}, // boot3					
+ 	
+ 	/* this is the almost complete string map for v7
+ 	{63, "how may I serve you?"},
+ 	{64, "the dig v1.0"}, //(game name/version)
+ 	{67, "text display only"},
+ 	{68, "c:\\dig"}, //boot007 (save path ?)
+ 	{69, "the dig"}, //boot21 (game name)
+ 	{70, "save"}, //boot8
+ 	{71, "load"}, //boot9
+ 	{72, "play"}, //boot10
+ 	{73, "cancel"}, //boot11
+ 	{74, "quit"}, //boot12
+ 	{75, "ok"}, //boot13
+ 	{76, "name your save game"}, //boot19
+ 	{77, "select a game to load"}, //boot20
+ 	{78, "you must enter a name"},//boot14
+ 	{79, "saving '%s'"}, //boot17
+ 	{80, "loading '%s'"}, //boot18
+ 	{81, "the game was NOT saved"}, //boot15
+ 	{82, "the game was NOT loaded"}, //boot16
+ 	{83, "how may I serve you?"},
+ 	{84, "how may I serve you?"},
+ 	{85, "game paused"}, // boot3
+ 	{86, "Are you sure you want to restart"},
+ 	{87, "Are you sure you want to quit?"}, //boot05
+ 	{89, "how may I serve you?"},
+ 	{90, "music"}, //boot22
+ 	{91, "voice"}, //boot23
+ 	{92, "sfx"}, //boot24
+ 	{93, "disabled"}, //boot25
+ 	{94, "text speed"}, //boot26
+ 	{95, "text display"}, //boot27
+ 	{96, "the dig v1.0"},*/
+ 	
+ };
+ 
  static ResString string_map_table_v6[] = {
  	{117, "How may I serve you?"}, 

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** insane.cpp	25 Mar 2002 22:46:32 -0000	1.13
--- insane.cpp	2 Apr 2002 17:15:27 -0000	1.14
***************
*** 112,119 ****
  
  void SmushPlayer::parseAHDR() {
! 	memcpy(_fluPalette, _block, 0x300);
  	_paletteChanged = true;
  
! 	printf("parse AHDR\n");
  }
  
--- 112,119 ----
  
  void SmushPlayer::parseAHDR() {
! //	memcpy(_fluPalette, _block, 0x300);
  	_paletteChanged = true;
  
! //	printf("parse AHDR\n");
  }
  
***************
*** 500,509 ****
  	}
  
! 	for(i=0; i<0x300; i++) {
  		_fluPalMul129[i] += _fluPalWords[i];
  		_fluPalette[i] = _fluPalMul129[i]>>7;
  	}
  
! 	_paletteChanged = true;
  }
  
--- 500,511 ----
  	}
  
! 	parseNPAL();
! 
! /*	for(i=0; i<0x300; i++) {
  		_fluPalMul129[i] += _fluPalWords[i];
  		_fluPalette[i] = _fluPalMul129[i]>>7;
  	}
  
! 	_paletteChanged = true;*/
  }
  





More information about the Scummvm-git-logs mailing list