timewarp-commit — Shows each and every CVS commit - high volume

[Timewarp-commit] source/melee mgame.cpp,1.18,1.19

[<geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv26649/melee

Modified Files:
	mgame.cpp 
Log Message:
alhordian tweak

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mgame.cpp	2 Nov 2003 22:39:52 -0000	1.18
--- mgame.cpp	9 Nov 2003 11:26:52 -0000	1.19
***************
*** 468,489 ****
  		td->tm_hour, td->tm_min);
  
! 	fprintf(f, "name, pos(x,y), vel(x,y), state, obj-pointer(this), ship-pointer(ship), target pointer(target)\n\n");
! 	int i;
! 	for (i = 0; i < physics->num_items; i += 1)
  	{
! 		SpaceLocation *s;
! 		s = physics->item[i];
! 
! 		if (!(s && s->exists() && s->detectable()))
! 			continue;
! 
! 		int is = s->state;
! 		Vector2 p = s->normal_pos();
! 		Vector2 v = s->vel;
! 
! 		// set "enable run-type information" for this feature
! 		// (rebuild all after changing that option)
! 		fprintf(f, "%030s %09.1e %09.1e %09.1e %09.1e %03i 0x%08X 0x%08X 0x%08X\n",
! 			typeid(*s).name(), p.x, p.y, v.x, v.y, is, (unsigned int)s, (unsigned int)s->ship, (unsigned int)s->target );
  	}
  
--- 468,495 ----
  		td->tm_hour, td->tm_min);
  
! 	if (physics)
  	{
! 		fprintf(f, "name, pos(x,y), vel(x,y), state, obj-pointer(this), ship-pointer(ship), target pointer(target)\n\n");
! 		
! 		int i;
! 		for (i = 0; i < physics->num_items; i += 1)
! 		{
! 			SpaceLocation *s;
! 			s = physics->item[i];
! 			
! 			if (!(s && s->exists() && s->detectable()))
! 				continue;
! 			
! 			int is = s->state;
! 			Vector2 p = s->normal_pos();
! 			Vector2 v = s->vel;
! 			
! 			// set "enable run-type information" for this feature
! 			// (rebuild all after changing that option)
! 			fprintf(f, "%030s %09.1e %09.1e %09.1e %09.1e %03i 0x%08X 0x%08X 0x%08X\n",
! 				typeid(*s).name(), p.x, p.y, v.x, v.y, is, (unsigned int)s, (unsigned int)s->ship, (unsigned int)s->target );
! 		}
! 	} else {
! 		fprintf(f, "No physics defined\n");
  	}
  
***************
*** 498,501 ****
--- 504,508 ----
  	int *linenum = 0, *level = 0;
  
+ 	int i;
  	i = 0;	// start with the most recent one.
  	while (	get_stacklist_info(i, &fname, &linenum, &level) )

[Timewarp-commit] source/newships shpbatde.cpp,1.13,1.14 shphotsp.cpp,1.7,1.8 shpoliha.cpp,1.6,1.7

[<geo...@us...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1:/tmp/cvs-serv14592/newships

Modified Files:
	shpbatde.cpp shphotsp.cpp shpoliha.cpp 
Log Message:
fixed hotspot suppression problem/ batha deviant clouds changed/ hotspot crash analyzed and maybe fixed/ smooth transition of olidandee even if speed rapidly changes


Index: shpbatde.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbatde.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shpbatde.cpp	26 Oct 2003 10:43:17 -0000	1.13
--- shpbatde.cpp	8 Nov 2003 11:19:30 -0000	1.14
***************
*** 63,67 ****
  	int    weaponDamage, weaponArmour;
  
! 	double cloudLifeTime;
  
  	double	gravforce, gravforce_default, gravRange;
--- 63,67 ----
  	int    weaponDamage, weaponArmour;
  
! 	double	cloudLifeTime, cloudDamage;
  
  	double	gravforce, gravforce_default, gravRange;
***************
*** 118,124 ****
  
  	BathaCloud(SpaceLocation *creator, Vector2 opos, double oangle,
! 					SpaceSprite *osprite, double olifetime);
  
  	virtual void calculate();
  };
  
--- 118,125 ----
  
  	BathaCloud(SpaceLocation *creator, Vector2 opos, double oangle,
! 					SpaceSprite *osprite, double olifetime, double odamage);
  
  	virtual void calculate();
+ 	virtual int handle_damage(SpaceLocation *source, double normal, double direct = 0);
  };
  
***************
*** 139,142 ****
--- 140,144 ----
  	
  	cloudLifeTime = get_config_float("Special", "LifeTime", 0);
+ 	cloudDamage = get_config_float("Special", "Damage", 0);
  	
  	// properties of this ship are :
***************
*** 196,200 ****
  	D = R * unit_vector(tw_random(PI2));
  
! 	bc = new BathaCloud(this, pos+D, angle, data->spriteSpecial, cloudLifeTime);
  	game->add(bc);
  
--- 198,202 ----
  	D = R * unit_vector(tw_random(PI2));
  
! 	bc = new BathaCloud(this, pos+D, angle, data->spriteSpecial, cloudLifeTime, cloudDamage);
  	game->add(bc);
  
***************
*** 280,284 ****
  			
  			if (!o->isPlanet())
! 				o->vel += Vacc;
			else
				vel -= Vacc;
	
			vel -= Vacc;
  			if (vel.length() > speed_max)
  				vel *= speed_max / vel.length();
--- 282,290 ----
  			
  			if (!o->isPlanet())
! 				o->vel += Vacc;
! 			else
! 				vel -= Vacc;
! 	
! 			vel -= Vacc;
  			if (vel.length() > speed_max)
  				vel *= speed_max / vel.length();
***************
*** 532,536 ****
  
  BathaCloud::BathaCloud(SpaceLocation *creator, Vector2 opos, double oangle,
! 				SpaceSprite *osprite, double olifetime)
  :
  SpaceObject(creator, opos, oangle, osprite)
--- 538,542 ----
  
  BathaCloud::BathaCloud(SpaceLocation *creator, Vector2 opos, double oangle,
! 				SpaceSprite *osprite, double olifetime, double odamage)
  :
  SpaceObject(creator, opos, oangle, osprite)
***************
*** 538,542 ****
  	layer = LAYER_SHOTS;
  	vel = 0;
! 	isblockingweapons = true;
  
  	lifetime = olifetime;
--- 544,550 ----
  	layer = LAYER_SHOTS;
  	vel = 0;
! 	isblockingweapons = false;//true;  don't block; just deal damage.
! 
! 	damage_factor = odamage;
  
  	lifetime = olifetime;
***************
*** 565,568 ****
--- 573,577 ----
  }
  
+ 
  void BathaCloud::calculate()
  {
***************
*** 588,591 ****
--- 597,605 ----
  
  
+ int BathaCloud::handle_damage(SpaceLocation *source, double normal, double direct)
+ {
+ 	state = 0;	// just disappear.
+ 	return true;
+ }
  
  REGISTER_SHIP ( BathaDeviant )

Index: shphotsp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shphotsp.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shphotsp.cpp	20 Oct 2003 11:00:38 -0000	1.7
--- shphotsp.cpp	8 Nov 2003 11:19:30 -0000	1.8
***************
*** 90,96 ****
  
  ShpHotSpot::ShpHotSpot(Vector2 opos, double angle, ShipData *data, unsigned int code) 
! 	:
! 	Ship(opos, angle, data, code) 
! 	{
  	weaponRange         = scale_range(get_config_float("Weapon", "Range", 0));
  	weaponVelocity      = scale_velocity(get_config_float("Weapon", "Velocity", 0));
--- 90,96 ----
  
  ShpHotSpot::ShpHotSpot(Vector2 opos, double angle, ShipData *data, unsigned int code) 
! :
! Ship(opos, angle, data, code) 
! {
  	weaponRange         = scale_range(get_config_float("Weapon", "Range", 0));
  	weaponVelocity      = scale_velocity(get_config_float("Weapon", "Velocity", 0));
***************
*** 134,145 ****
  
  	coremaketime = 0.0;
! 	}
  
  
  void ShpHotSpot::calculate()
  {
! 	STACKTRACE
  	double a, L;
  
  
  	Vector2 U = vel;
--- 134,149 ----
  
  	coremaketime = 0.0;
! }
  
  
  void ShpHotSpot::calculate()
  {
! 	STACKTRACE;
! 
  	double a, L;
  
+ 	if ( !(weaponhs && weaponhs->exists()) )
+ 		weaponhs = 0;
+ 
  
  	Vector2 U = vel;
***************
*** 182,186 ****
  //		angle = a;	// avoid that the ship turns (if you use left/right keys)
  
! 	if ( weaponhs && weaponhs->exists() )
  	{
  		batt = prev_batt;	// override the recharging.
--- 186,190 ----
  //		angle = a;	// avoid that the ship turns (if you use left/right keys)
  
! 	if ( weaponhs )
  	{
  		batt = prev_batt;	// override the recharging.
***************
*** 291,295 ****
  
  
! 	if ( weaponhs && weaponhs->exists() )
  	{
  		//if ( weaponhs->autofocus )
--- 295,299 ----
  
  
! 	if ( weaponhs )
  	{
  		//if ( weaponhs->autofocus )
***************
*** 397,401 ****
  void TheHotSpot::calculate()
  {
! 	STACKTRACE
  	if ( !(mother && mother->exists()) )
  	{
--- 401,406 ----
  void TheHotSpot::calculate()
  {
! 	STACKTRACE;
! 
  	if ( !(mother && mother->exists()) )
  	{
***************
*** 484,488 ****
  void TheHotSpot::inflict_damage(SpaceObject *other)
  {
! 	STACKTRACE
  	damage_repeat_time += frame_time;
  
--- 489,493 ----
  void TheHotSpot::inflict_damage(SpaceObject *other)
  {
! 	STACKTRACE;
  	damage_repeat_time += frame_time;
  
***************
*** 498,505 ****
  int TheHotSpot::handle_damage(SpaceLocation *source, double normal, double direct)
  {
! 	STACKTRACE
  	// what happens when it hits the planet? it dies !!
  	// why ... I dunno !?
  	// answer: planet sets state=0 for 0-mass objects on impact.
  
  	// don't do anything - it exists, until the source flame dies.
--- 503,517 ----
  int TheHotSpot::handle_damage(SpaceLocation *source, double normal, double direct)
  {
! 	STACKTRACE;
  	// what happens when it hits the planet? it dies !!
  	// why ... I dunno !?
  	// answer: planet sets state=0 for 0-mass objects on impact.
+ 
+ 	if (!state)
+ 	{
+ 		state = 1;
+ 		hidefromview = true;
+ 	}
+ 
  
  	// don't do anything - it exists, until the source flame dies.

Index: shpoliha.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpoliha.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpoliha.cpp	26 Oct 2003 10:43:17 -0000	1.6
--- shpoliha.cpp	8 Nov 2003 11:19:30 -0000	1.7
***************
*** 183,186 ****
--- 183,188 ----
  
  	collide_flag_sameship = bit(LAYER_SPECIAL);
+ 
+ 	relangle = 0;
  }
  
***************
*** 188,192 ****
  void OlidandeeArm::calculate()
  {
! 	STACKTRACE
  	if (!(owner && owner->exists()))
  	{
--- 190,194 ----
  void OlidandeeArm::calculate()
  {
! 	STACKTRACE;
  	if (!(owner && owner->exists()))
  	{
***************
*** 205,209 ****
  	da *= direction;
  
! 	relangle = da;
  
  	BigShipPart::calculate();
--- 207,228 ----
  	da *= direction;
  
! 
! 
! 	da = da - relangle;		// what should be added to relangle to achieve new position
! 	while (da > PI)		da -= PI2;
! 	while (da < -PI)	da += PI2;
! 
! 	double damax;
! 	damax = 0.5 * PI * frame_time * 1E-3;
! 
! 	if (da > damax)
! 		da = damax;
! 
! 	if (da < -damax)
! 		da = -damax;
! 
! 
! 
! 	relangle += da;
  
  	BigShipPart::calculate();

[Timewarp-commit] source/melee mmain.cpp,1.13,1.14 mship.cpp,1.12,1.13

[<geo...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv14592/melee

Modified Files:
	mmain.cpp mship.cpp 
Log Message:
fixed hotspot suppression problem/ batha deviant clouds changed/ hotspot crash analyzed and maybe fixed/ smooth transition of olidandee even if speed rapidly changes


Index: mmain.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mmain.cpp	26 Oct 2003 10:43:17 -0000	1.13
--- mmain.cpp	8 Nov 2003 11:19:29 -0000	1.14
***************
*** 544,547 ****
--- 544,548 ----
  
  
+ 		
  		// CHECK FILE SIZES !! to intercept desynch before they happen.
  
***************
*** 559,562 ****
--- 560,565 ----
  			tw_error("DAT files have different size! This may cause a desynch. Press Retry to continue");
  		}
+ 		
+ 
  		}
  	delete slot;

Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mship.cpp	26 Oct 2003 10:43:17 -0000	1.12
--- mship.cpp	8 Nov 2003 11:19:29 -0000	1.13
***************
*** 319,322 ****
--- 319,324 ----
  	angle = floor(oangle / (PI2/64)) * (PI2/64);
  	sprite_index = get_index(angle);
+ 
+ 	hashotspots = true;
  }
  
***************
*** 413,416 ****
--- 415,420 ----
  	angle = floor(shipAngle / (PI2/64)) * (PI2/64);
  	sprite_index = get_index(angle);
+ 
+ 	hashotspots = true;
  }
  

[Timewarp-commit] Util timewarp.nsi,1.1,1.2

[<you...@us...>]

Update of /cvsroot/timewarp/Util
In directory sc8-pr-cvs1:/tmp/cvs-serv29160/Util

Modified Files:
	timewarp.nsi 
Log Message:
Fixed /util/timwarp.nsi : twwin.exe is now available from the start menu after installation; the install .exe is no longer placed inside the install .exe ; some cosmetic changes Time Warp becomes TimeWarp, etc

Index: timewarp.nsi
===================================================================
RCS file: /cvsroot/timewarp/Util/timewarp.nsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** timewarp.nsi	25 Oct 2003 16:42:57 -0000	1.1
--- timewarp.nsi	7 Nov 2003 06:19:59 -0000	1.2
***************
*** 20,37 ****
  InstallDir $PROGRAMFILES\TimeWarp
  
! ; Registry key to check for directory (so if you install again, it will 
  ; overwrite the old one automatically)
  InstallDirRegKey HKLM SOFTWARE\TimeWarp "Install_Dir"
  
  ; The text to prompt the user to enter a directory
! ComponentText "This will install Star Control: Time Warp ${VER_MAJOR}u${VER_MINOR} on your computer. Select which optional things you want installed."
  
  ; The text to prompt the user to enter a directory
! DirText "Choose a directory to install in to:"
  
  ;--------------------------------
  
  ; The stuff to install
! Section "Time Warp Core (required)"
  
    SectionIn RO
--- 20,37 ----
  InstallDir $PROGRAMFILES\TimeWarp
  
! ; Registry key to check for directory (so if you install again, it will
  ; overwrite the old one automatically)
  InstallDirRegKey HKLM SOFTWARE\TimeWarp "Install_Dir"
  
  ; The text to prompt the user to enter a directory
! ComponentText "This will install Star Control: TimeWarp ${VER_MAJOR}u${VER_MINOR} on your computer. Select which optional components you want installed."
  
  ; The text to prompt the user to enter a directory
! DirText "Choose a directory to install to:"
  
  ;--------------------------------
  
  ; The stuff to install
! Section "TimeWarp Core (required)"
  
    SectionIn RO
***************
*** 46,50 ****
    File "..\*.dll"
    File "..\*.dmo"
!   File "..\timewarp.exe"
    File "..\*.html"
    File "..\*.ini"
--- 46,50 ----
    File "..\*.dll"
    File "..\*.dmo"
!   File "..\twwin.exe"
    File "..\*.html"
    File "..\*.ini"
***************
*** 72,79 ****
    File "..\ships\sc3\*.*"
  
-   SetOutPath $INSTDIR\Util
-   File "..\Util\*.*"
-     
- 
    ; Write the installation path into the registry
    WriteRegStr HKLM SOFTWARE\TimeWarp "Install_Dir" "$INSTDIR"
--- 72,75 ----
***************
*** 84,90 ****
    WriteUninstaller "uninstall.exe"
    CreateDirectory "$SMPROGRAMS\TimeWarp"
!   CreateShortCut "$SMPROGRAMS\TimeWarp\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
!   CreateShortCut "$SMPROGRAMS\TimeWarp\readme.lnk" "$INSTDIR\readme.html" "" "$INSTDIR\readme.html" 0
!   CreateShortCut "$SMPROGRAMS\TimeWarp\timewarp.lnk" "$INSTDIR\timewarp.exe" "" "$INSTDIR\timewarp.exe" 0
  SectionEnd
  
--- 80,86 ----
    WriteUninstaller "uninstall.exe"
    CreateDirectory "$SMPROGRAMS\TimeWarp"
!   CreateShortCut "$SMPROGRAMS\TimeWarp\Uninstall.lnk" "$INSTDIR\uninstall.exe"  "Uninstall"
!   CreateShortCut "$SMPROGRAMS\TimeWarp\readme.lnk" "$INSTDIR\readme.html" "Readme.html"
!   CreateShortCut "$SMPROGRAMS\TimeWarp\timewarp.lnk" "$INSTDIR\twwin.exe" "Star Control: TimeWarp"
  SectionEnd
  
***************
*** 117,122 ****
    SetOutPath $INSTDIR\source\twgui
    File "..\source\twgui\*.*"
!   SetOutPath $INSTDIR\source\util
!   File "..\source\util\*.*"
  
  SectionEnd
--- 113,121 ----
    SetOutPath $INSTDIR\source\twgui
    File "..\source\twgui\*.*"
!   SetOutPath $INSTDIR\Util
!   File "..\Util\*.html"
!   File "..\Util\*.nsi"
!   File "..\Util\*.pl"
!     
  
  SectionEnd

[Timewarp-commit] source/melee moptions.cpp,1.5,1.6

[<yu...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv6489/source/melee

Modified Files:
	moptions.cpp 
Log Message:
Fixed GCC compilation problem caused by conversion from int (*)(void *, int*) to void*

Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** moptions.cpp	4 Nov 2003 23:30:32 -0000	1.5
--- moptions.cpp	5 Nov 2003 09:43:37 -0000	1.6
***************
*** 184,188 ****
  
    { d_text_proc,       170,  310,  160,  20,   255,  0,   0,     0,       0,    0,    (void *)"Gamma Correction", NULL, NULL },//DIALOG_VIDEO_GAMMA_TEXT
!   { d_slider_proc,     170,  330,  160,  15,   255,  0,   0,     0,       255,  0,    NULL, handleGammaSliderChange, NULL  },//DIALOG_VIDEO_GAMMA_SLIDER
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       3,    0,    NULL, NULL, NULL }
--- 184,188 ----
  
    { d_text_proc,       170,  310,  160,  20,   255,  0,   0,     0,       0,    0,    (void *)"Gamma Correction", NULL, NULL },//DIALOG_VIDEO_GAMMA_TEXT
!   { d_slider_proc,     170,  330,  160,  15,   255,  0,   0,     0,       255,  0,    NULL, (void *)handleGammaSliderChange, NULL  },//DIALOG_VIDEO_GAMMA_SLIDER
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       3,    0,    NULL, NULL, NULL }
***************
*** 337,343 ****
    { d_button_proc,     200,  60,  80,   40,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Cancel", NULL, NULL },
    { d_check_proc,      40,  110,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Sound Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 110,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, handleSoundSliderChange, NULL },
    { d_check_proc,      40,  140,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Music Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 140,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, handleMusicSliderChange, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
--- 337,343 ----
    { d_button_proc,     200,  60,  80,   40,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Cancel", NULL, NULL },
    { d_check_proc,      40,  110,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Sound Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 110,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, (void *)handleSoundSliderChange, NULL },
    { d_check_proc,      40,  140,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Music Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 140,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, (void *)handleMusicSliderChange, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }

[Timewarp-commit] docs Interface.txt,1.4,1.5

[<you...@us...>]

Update of /cvsroot/timewarp/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv23083/docs

Modified Files:
	Interface.txt 
Log Message:
ongoing work... just being paranoid in case my HDD explodes or something :)

Index: Interface.txt
===================================================================
RCS file: /cvsroot/timewarp/docs/Interface.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Interface.txt	3 Nov 2003 23:19:12 -0000	1.4
--- Interface.txt	5 Nov 2003 07:53:57 -0000	1.5
***************
*** 87,90 ****
--- 87,101 ----
  set in-game rendering options
  
+ *************************************************************************
+ Style Goals - Stuff that I want to say about this interface  ************
+ *************************************************************************
+ 
+ This interface should be have an arcade feel to it.  Each options should be accesible by both mouse and keyboard via the cursor keys.  In fact, it should be possible to use the entire interface via joystick.
+ 
+ The interface should be very fast and responsive at all times.  Anything which requires any substantial amount of load time should be done concurrently (ie in another thread) and not slow down the interface.
+ 
+ The idea is to make it like an arcade-style interface, or like a console-type game.  Local players can simply hit their "Start" button on their controller to join in a game.  In some gametypes, that means the rules of the game should reflect this possibility, ie if we know that a player may join the game late, make the victory limit a fraglimit or timelimit, rather than to eliminate every player's fleet; a late joiner will have a larger fleet when joining, and hence a competetive advantage.  Or simply make the late player wait until the next round to join with his complete fleet.
+ 
+ Also, as much as possible, the screens should make use of OO-inheritance to re-use code.  Some screens may be reused in unexpected ways.  For example, when joining the game, a user may have to select a fleet, or even edit their fleet just before joining the game.  So the fleet editor should be able to be shown as the only "panel" on the screen, or as one of a few panels on the screen at once.  Say there's a player playing solo, and a local player presses "Start" to join the game.  The screen changes to 2-person split view, and the new player has his fleet editor show up in his view, which the first player keeps playing in her view.  When the new player is all set up, the view may change to both on the screen at once, depending on how they want things set up.
  
  
***************
*** 95,106 ****
  Legend:
  
! ........          empty space
  
! ...........       some kind of non-interactive image or text
  .. image ..
! ........... 
  
! [button]         Can either be moved to by the cursor keys, or clicked on with mouse.  Activating this button makes the "activate" sound from sc2, selecting it with the cursor keys makes the "select" sound from sc2.  (quieter but similar sound for mouseover event?)  Keyboard shortcuts are drawn in different a colour, example if the button text was "Button", "B" would be coloured differently to indicate that it is a keyboard shortcut.  When a button has the focus, it it drawn differently, with a coloured or "throbbing" border.
  
  
  [submenu button>   A control similar in functionality to button that, when it has the focus, triggers a popup menu.  Its selected value is shown to the right of the button when it does not have the focus.  This menu appears when the button has the focus or has the mouse over it.  Pressing the button changes the focus to an previous selected entry in the menu.  Similar to the windows start menu, except that the selected value appears next to the control when the menu is not expanded.  The current expanded menu is drawn overtop of the other displayed values, and everything else for that matter.  The button which has the focus on starting a page normally does not expand (so a user can see the selected values).  These menus should appear very very quickly.
--- 106,123 ----
  Legend:
  
! ........           Empty space
  
! ...........        Some kind of non-interactive image or text
  .. image ..
! ...........
  
! ...............    A list of objects.  Normally, this allows for single
! .. Object1   ..   or multiple selection, and double-clicking or pressing 
! .. Object2   ..   enter with the focus does something interesting with 
! .. Object3   ..   the current selection.  
! ..     (list)..
! ...............
  
+ [button]         Can either be moved to by the cursor keys, or clicked on with mouse.  Activating this button makes the "activate" sound from sc2, selecting it with the cursor keys makes the "select" sound from sc2.  (quieter but similar sound for mouseover event?)  Keyboard shortcuts are drawn in different a colour, example if the button text was "Button", "B" would be coloured differently to indicate that it is a keyboard shortcut.  When a button has the focus, it it drawn differently, with a coloured or "throbbing" border.
  
  [submenu button>   A control similar in functionality to button that, when it has the focus, triggers a popup menu.  Its selected value is shown to the right of the button when it does not have the focus.  This menu appears when the button has the focus or has the mouse over it.  Pressing the button changes the focus to an previous selected entry in the menu.  Similar to the windows start menu, except that the selected value appears next to the control when the menu is not expanded.  The current expanded menu is drawn overtop of the other displayed values, and everything else for that matter.  The button which has the focus on starting a page normally does not expand (so a user can see the selected values).  These menus should appear very very quickly.
***************
*** 144,147 ****
--- 161,166 ----
  
  
+ 
+ 
  Section: Title Page **********************************************************
  Goals: Show title of game, exit game, link to all functions within the game, show version number
***************
*** 171,175 ****
  ..............................................................................
  ..............................................................................
! ................................................................Version number
  
  Background has a cool looking spacey scene, perhaps a planet, a nebula or something else that looks colourful and pretty which is animated, and maybe a spaceship occasionally zooms by.  Maybe a distant battle has some flashes of light with quiet booms and distant ships flying around.  
--- 190,194 ----
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)          .. Version# ..
  
  Background has a cool looking spacey scene, perhaps a planet, a nebula or something else that looks colourful and pretty which is animated, and maybe a spaceship occasionally zooms by.  Maybe a distant battle has some flashes of light with quiet booms and distant ships flying around.  
***************
*** 194,205 ****
  ............................. Start Melee ....................................
  ..............................................................................
! .....[Start Playing          ]................................................
! .....[Host multiplayer       >.. No            ...............................
! .....[Pick Gametype          >.. Classic Melee ...............................
! .....[Configure Gametype...  ]................................................
! .....[Set number of bots     >.. 1             ...............................
! .....[Set fleet limit        >.. 100 Small     ...............................
! .....[Pick maps...           ]................................................
! .....[Pick local players...  ]................................................
  ..............................................................................
  ..............................................................................
--- 213,223 ----
  ............................. Start Melee ....................................
  ..............................................................................
! .....[Start Playing!           ]..............................................
! .....[Pick Gametype            >.. Classic Melee                    ..........
! .....[Configure Gametype...    ]..............................................
! .....[Pick maps...             ]..............................................
! .....[Confgure local players...]..............................................
! .....[Host multiplayer         >.. No (local players only)          ..........
! .....[Configure Multiplayer... ]..............................................
  ..............................................................................
  ..............................................................................
***************
*** 207,217 ****
  ..............................................................................
  ..............................................................................
  
- "Start Playing" is selected when starting this screen.
- Host multiplayer menu:
-  * No (no multiplayer)
-  * 
  ESC goes back to previous menu screen
  
  
  Section:  Configure Gametype  **********************************************
--- 225,261 ----
  ..............................................................................
  ..............................................................................
+ . Help Text (changes to reflect the current selection)                      ..
+ 
+ "Start Playing!" is selected when starting this screen.
+ 
+ "Start Playing!" starts the game with the current settings.
+ 
+ "Pick Gametype" Menu:
+    * one entry for each registered gametype.  
+ Selecting one of these gametypes does the following:
+    *  Set the selection of maps to the most recent list of maps for that gametype (there exists a reasonable default selection for each gametype).   
+ 
+ "Configure Gametype..." opens up the configure gametype screen which is relevant to the gametype selected.  There should be such screen for each gametype, quite probably making use of inheritance to make coding easier.
+ 
+ "Pick Maps..." opens up a screen which has a listing of the available maps for a given gametype.
+ 
+ "Confgure local players..." opens up a screen that shows the local (human) players and their involvement in the game.  The screen may be different depending on the gametype.  For example, a game without teams may just have the players show up, or a game with teams may ask the players to pick their teams here.  
+ 
+ "Host multiplayer" menu:
+    * No (local players only)
+    * Yes (LAN and Internet players)
+ 
+ "Configure Multiplayer.." opens up Configure Multiplayer section
  
  ESC goes back to previous menu screen
  
+ Notes:
+ 
+ /*
+ .....[Set number of bots       >.. 1                       ...................
+ .....[Set fleet limit          >.. 100 Small               ...................
+ */
+ 
+ 
  
  Section:  Configure Gametype  **********************************************
***************
*** 224,230 ****
  ............................ Configure Gametype ..............................
  ..............................................................................
! .....[Back           ]........................................................
! ..............................................................................
! ..............................................................................
  ..............................................................................
  ..............................................................................
--- 268,273 ----
  ............................ Configure Gametype ..............................
  ..............................................................................
! .....[Accept         ]........................................................
! .....[Cancel         ]........................................................
  ..............................................................................
  ..............................................................................
***************
*** 239,276 ****
  ..............................................................................
  ..............................................................................
  
  ESC goes back to previous
  
  
! Section:   **********************************************************
! Goals: 
  Links to:
  
  Layout:
  ..............................................................................
  ..............................................................................
  ..............................................................................
  ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
  
  ESC goes back to previous
  
  
  Section: Join Mulitplayer (current) *****************************************
  Goals: Joins a multiplayer game at a specific IP address
! Links to:
  
  Layout:
--- 282,339 ----
  ..............................................................................
  ..............................................................................
+ . Help Text (changes to reflect the current selection)                      ..
  
  ESC goes back to previous
  
  
! Section: Pick Maps **********************************************************
! Goals: Manipulate a list of maps which should be relevant for the selected gametype.  Note the following:
!    * each map for the current gametype should make sense
!    * the order of maps is to be preserved and presented as meaningful
  Links to:
  
  Layout:
  ..............................................................................
+ .............................. Pick Maps .....................................
  ..............................................................................
+ .....[Add map               >................. Single planet                ..
+ .....[Add All Available Maps]................. Asteroid field               ..
+ .....[Remove Map            ]................. Star System                  ..
+ .....[Remove All Maps       ].................                              ..
+ .....[Reorder Maps          ].................                              ..
+ ..............................................                              ..
+ .....[Accept                ].................                              ..
+ .....[Cancel                ].................                              ..
+ ..............................................                              ..
+ ..............................................                              ..
+ ..............................................                              ..
+ ..............................................                  (map list)  ..
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)                      ..
! 
! When starting this screen, the map list is populated with the most recent selection of maps for the given gametype.  A reasonable default selection is available for each gametype.  
! 
! "Add map" menu:
!    * one entry for each map which is relevant to the gametype.  Picking one of these will add it to the end of the map list
! "Add All Available Maps"
!    * adds one of each available map to the map list
! "Remove Map" changes focus to the map list, in "remove maps mode."
! "Remove All Maps" removes all the maps from the map list.
! "Reorder Maps" changes focus to the map list in "reorder maps mode."
! (map list) is a list of the chosen maps.  Multiple selections are allowed.  The behaviour of this thing is like so:
!    * by default, the list is in "remove maps mode"
!    * in "remove maps mode", double clicking or pressing enter with the focus will remove the selected maps.
!    * in "reorder maps mode," pressing enter while selecting item(s) will place an asterisk or other mark next to the item(s).  Any other movements within the list will show an arrow next to the current cursor position to indicate an insertion point.  Pressing enter again will move the marked maps to the current cursor position.  
!    * mouse dragging moves maps from one position to another.
  
  ESC goes back to previous
  
+ Notes:
+    * Can't set things like the number of asteroids anywhere...?
  
  Section: Join Mulitplayer (current) *****************************************
  Goals: Joins a multiplayer game at a specific IP address
! Links to: 
  
  Layout:
***************
*** 279,288 ****
  ..............................................................................
  ......[Join                ]..................................................
! ......[Specify Address     ].. 127.0.0.1 (text field).........................
! ......[Recent Addresses    >.. 127.0.0.1             .........................
! ......[Back                ]..................................................
! ..............................................................................
! ..............................................................................
! ..............................................................................
  ..............................................................................
  ..............................................................................
--- 342,350 ----
  ..............................................................................
  ......[Join                ]..................................................
! ......[Specify Address     ].. 127.0.0.1 (text field)     ....................
! ......[Recent Addresses    >.. 127.0.0.1                  ....................
! ......[Port                ].. 15515 (text field)         ....................
! ......[Accept              ]..................................................
! ......[Cancel              ]..................................................
  ..............................................................................
  ..............................................................................
***************
*** 293,303 ****
  ..............................................................................
  ..............................................................................
  
- ESC goes back to previous
  Activating "Join" attempts to join the game at the specified address.
- Activating "Specify IP Address" changes focus to a text field to the right.  As the user types, a list of previously entered addresses is shown in a list below the text field.  Only those that match what the user has typed should appear.  The user can use the up/down keys to move down and within this list to select an address.  Any new address the user types in here will be added to the list of recent addresses.  (for use in this popup list and the one for "recent addresses")
- Activating "Recent addresses" pops up a menu with the recent addresses in it.  Picking one sets the "Specify address" field.
  
  
  
  
--- 355,372 ----
  ..............................................................................
  ..............................................................................
+ . Help Text (changes to reflect the current selection)                      ..
  
  Activating "Join" attempts to join the game at the specified address.
  
+ Activating "Specify IP Address" changes focus to a text field to the right.  As the user types, a list of previously entered addresses is shown in a list below the text field.  Only those that match what the user has typed should appear.  The user can use the up/down keys to move down and within this list to select an address.  Any new address the user types in here will be added to the list of recent addresses.  (for use in this popup list and the one for "recent addresses").  Specifying a text address will perform a DNS lookup when it's time to connect.  As much as possible, show the server address in a human-readable format.
  
+ Pressing enter while the address text field has focus changes the focus to the "Specify Address" button.
+ 
+ Activating "Recent addresses" pops up a menu with the recent addresses in it.  Picking one sets the "Specify address" and "Port" text field.
+   * one entry for each of the last 20 (or whatever) entries.  Displays as a human-readable format, but with the port at the end seperated by a colon (ie myserver.com:15515 rather than 12.34.56.78:15515)
+ 
+ Activating "Port" changes focus to the port text field.  pressing enter on that field changes focus to the port button.
+ 
+ ESC goes back to previous
  
  
***************
*** 311,320 ****
  
  
! Section:   **********************************************************
! Goals: 
  Links to:
  
  Layout:
  ..............................................................................
  ..............................................................................
  ..............................................................................
--- 380,394 ----
  
  
! Section: Confgure Local Players ********************************************
! Goals: Declares which players are available for a given instance of a game; player availability and options may vary by the selected gametype. Some common options:
!    * declare the player as playing
!    * for each player, set the starting team
!    * for each player, set his controls
!    * for each player, set his starting fleet
  Links to:
  
  Layout:
  ..............................................................................
+ .......................... Configure Local Players ...........................
  ..............................................................................
  ..............................................................................
***************
*** 332,337 ****
  ..............................................................................
  ..............................................................................
! ..............................................................................
! ..............................................................................
  
  ESC goes back to previous
--- 406,410 ----
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)                      ..
  
  ESC goes back to previous
***************
*** 360,364 ****
  ..............................................................................
  ..............................................................................
! ..............................................................................
  
  ESC goes back to previous
--- 433,437 ----
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)                      ..
  
  ESC goes back to previous
***************
*** 387,391 ****
  ..............................................................................
  ..............................................................................
! ..............................................................................
  
  ESC goes back to previous
--- 460,464 ----
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)                      ..
  
  ESC goes back to previous
***************
*** 414,418 ****
  ..............................................................................
  ..............................................................................
! ..............................................................................
  
  ESC goes back to previous
--- 487,491 ----
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)                      ..
  
  ESC goes back to previous
***************
*** 441,445 ****
  ..............................................................................
  ..............................................................................
! ..............................................................................
  
  ESC goes back to previous
--- 514,518 ----
  ..............................................................................
  ..............................................................................
! . Help Text (changes to reflect the current selection)                      ..
  
  ESC goes back to previous

[Timewarp-commit] source/melee moptions.cpp,1.4,1.5

[<you...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv17400/source/melee

Modified Files:
	moptions.cpp 
Log Message:
made the sound and music option get updated when the user adjusts the sliders.  If you can read this, you're registered in the commit mailing list, and you win a cookie!

Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** moptions.cpp	4 Nov 2003 20:59:19 -0000	1.4
--- moptions.cpp	4 Nov 2003 23:30:32 -0000	1.5
***************
*** 317,321 ****
  	}
  	return;
! }
  
  enum {
--- 317,324 ----
  	}
  	return;
! }
! 
! int handleSoundSliderChange(void *dp3, int d2);
! int handleMusicSliderChange(void *dp3, int d2);
  
  enum {
***************
*** 334,343 ****
    { d_button_proc,     200,  60,  80,   40,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Cancel", NULL, NULL },
    { d_check_proc,      40,  110,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Sound Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 110,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, NULL, NULL },
    { d_check_proc,      40,  140,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Music Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 140,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, NULL, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
! 	};
  
  void audio_menu (Game *game) {STACKTRACE
--- 337,346 ----
    { d_button_proc,     200,  60,  80,   40,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Cancel", NULL, NULL },
    { d_check_proc,      40,  110,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Sound Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 110,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, handleSoundSliderChange, NULL },
    { d_check_proc,      40,  140,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Music Volume ", NULL, NULL },  
!   { d_slider_proc,     205, 140,  180,  15,   255,  0,    0,    0,       255,  0,    NULL, handleMusicSliderChange, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL }
! 	};
  
  void audio_menu (Game *game) {STACKTRACE
***************
*** 365,368 ****
--- 368,390 ----
  	};
  
+ int handleSoundSliderChange(void *dp3, int d2) {
+ 	sound.set_volumes(
+ 		audio_dialog[DIALOG_AUDIO_SOUND_VOL].d2,
+ 		audio_dialog[DIALOG_AUDIO_MUSIC_VOL].d2,
+ 		audio_dialog[DIALOG_AUDIO_SOUND_ON].flags & D_SELECTED,
+ 		audio_dialog[DIALOG_AUDIO_MUSIC_ON].flags & D_SELECTED
+ 		);
+     return 0;
+ }
+ 
+ int handleMusicSliderChange(void *dp3, int d2) {
+ 	sound.set_volumes(
+ 		audio_dialog[DIALOG_AUDIO_SOUND_VOL].d2,
+ 		audio_dialog[DIALOG_AUDIO_MUSIC_VOL].d2,
+ 		audio_dialog[DIALOG_AUDIO_SOUND_ON].flags & D_SELECTED,
+ 		audio_dialog[DIALOG_AUDIO_MUSIC_ON].flags & D_SELECTED
+ 		);
+     return 0;
+ }
  
  

[Timewarp-commit] source/melee moptions.cpp,1.3,1.4

[<you...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv18419/source/melee

Modified Files:
	moptions.cpp 
Log Message:
changed video options menu: Accepting a change is confirmed, then saved to the .ini files (replacing the Apply / Set default buttons)

Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** moptions.cpp	8 Jun 2003 17:55:52 -0000	1.3
--- moptions.cpp	4 Nov 2003 20:59:19 -0000	1.4
***************
*** 109,114 ****
  	return;
  	}
! 
! 
  
  char *resolution[] = { 
--- 109,144 ----
  	return;
  	}
! 
! 
! bool confirmVideoChanges() {
!     enum { 
!         DIALOG_CONFIRM_VIDEO_BOX = 0,
!         DIALOG_CONFIRM_VIDEO_TEXT,
!         DIALOG_CONFIRM_VIDEO_YES,
!         DIALOG_CONFIRM_VIDEO_NO
!     };
!     
!     DIALOG confirmVideoDialog[] = {
!         // (dialog proc)     (x)   (y)   (w)   (h)   (fg) (bg) (key) (flags)  (d1)  (d2)  (dp)
!         { d_box_proc,       120,  140,  368,  90,   255,  0,    0,     0,       0,    0,    NULL, NULL, NULL },
!         { d_text_proc,      130,  150,  348,  30,   255,  0,    0,     0,       0,    0,    (void *)"Do you want to keep these settings?", NULL, NULL },
!         { d_button_proc,    130,  190,  174,  30,   255,  0,    0,D_EXIT,       0,    0,    (void *)"Yes", NULL, NULL },
!         { d_button_proc,    294,  190,  174,  30,   255,  0,    0,D_EXIT,       0,    0,    (void *)"No", NULL, NULL },
!         { NULL,               0,    0,    0,   0,    255,  0,    0,     0,       3,    0,    NULL, NULL, NULL }
!     };
!     
!     int choice = -1;
!     while (-1 != (choice = tw_popup_dialog(NULL, confirmVideoDialog, 0))) {        
!         switch (choice) {
!         case DIALOG_CONFIRM_VIDEO_YES:
!             return true;
!         case DIALOG_CONFIRM_VIDEO_NO:
!             return false;
!         }
!     }
!     return false;
! }
! 
! int handleGammaSliderChange(void *dp3, int d2);
  
  char *resolution[] = { 
***************
*** 129,133 ****
  	DIALOG_VIDEO_BPPLIST,
  	DIALOG_VIDEO_EXIT,
- 	DIALOG_VIDEO_APPLY,
  	DIALOG_VIDEO_GET_DEFAULT,
  	DIALOG_VIDEO_SET_DEFAULT,
--- 159,162 ----
***************
*** 137,194 ****
  DIALOG video_dialog[] = {
    // (dialog proc)     (x)   (y)   (w)   (h)   (fg) (bg) (key) (flags)  (d1)  (d2)  (dp)
!   { d_box_proc,        20,   20,  400, 400,   255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
  
!   { d_check_proc,      190,  120,  160,  30,   255,  0,    0,    0,       0,    0,    (void *)"Full-screen ", NULL, NULL },
  
!   { d_text_proc,       190,  180, 160,  30,   255,  0,    0,    0,       0,    0,    (void *)"Custom", NULL, NULL },
!   { d_box_proc,        188,  208, 164,  34,   255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
!   { d_edit_proc,       190,  210, 150,  30,   255,  0,    0,    0,       75,   0,    (void *) dialog_string[3], NULL, NULL },
  
!   { d_text_proc,       30,  120,  140,  30,   255,  0,    0,    0,       0,    0,    (void *)"Resolution", NULL, NULL },
!   { d_list_proc2,      30,  145,  140, 115,   255,  0,    0,    0,       0,    0,    (void *) genericListboxGetter, NULL, resolution },
!   { d_text_proc,       30,  290,  100,  30,   255,  0,    0,    0,       0,    0,    (void *)"Color Depth", NULL, NULL },
!   { d_list_proc2,      30,  310,  100, 100,   255,  0,    0,    0,       0,    0,    (void *) genericListboxGetter, NULL, color_depth },
  
!   { d_button_proc,      32,  30,  100,   35,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },
!   { d_button_proc,      32,  70,  100,   35,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Apply", NULL, NULL },
!   { d_button_proc,     143,  30,  260,  35,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Restore Default", NULL, NULL },
!   { d_button_proc,     143,  70,  260,  35,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Set Default", NULL, NULL },
  
!   { d_text_proc,       170,  310,  160,  20,   255,  0,    0,    0,       0,    0,    (void *)"Gamma Correction", NULL, NULL },
!   { d_slider_proc,     170,  330,  160,  15,   255,  0,    0,    0,       255,  0,    NULL, NULL, NULL },
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       3,    0,    NULL, NULL, NULL }
  	};
  
  
  void video_menu (Game *game) {STACKTRACE
! 	int choice = -1;
! 	while (choice != DIALOG_VIDEO_EXIT) {
! 		sprintf(dialog_string[3], "%dx%d", videosystem.width, videosystem.height);
! 
! 		//set index for resolution
! 		int x, y, x2, y2, i, bpp, bpp2, fs;
! 		x2 = videosystem.width;
! 		y2 = videosystem.height;
! 		for (i = 0; resolution[i+1]; i += 1) {
! 			x = strtol(resolution[i], NULL, 10);
! 			y = strtol(strchr(resolution[i], 'x') + 1, NULL, 10);
! 			if ((x == x2) && (y == y2)) break;
! 			}
! 		video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
! 
! 		//set index for bpp
! 		bpp = videosystem.bpp;
! 		for (i = 0; true; i += 1) {
! 			if (!color_depth[i]) tw_error("video_menu - current bpp invalid?");
! 			if (strtol(color_depth[i], NULL, 10) == bpp) break;
! 			}
! 		video_dialog[DIALOG_VIDEO_BPPLIST].d1 = i;
  
- 		//set button for fullscreen
- 		video_dialog[DIALOG_VIDEO_FULLSCREEN].flags = videosystem.fullscreen ? D_SELECTED : 0;
  
! 		//set gamma correction
! 		video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2 = get_gamma();
  
  		//do the dialog
--- 166,233 ----
  DIALOG video_dialog[] = {
    // (dialog proc)     (x)   (y)   (w)   (h)   (fg) (bg) (key) (flags)  (d1)  (d2)  (dp)
!   { d_box_proc,        20,   20,  400, 400,   255,  0,    0,     0,       0,    0,    NULL, NULL, NULL },//DIALOG_VIDEO_BOX
  
!   { d_check_proc,      190,  120, 160,  30,   255,  0,    0,     0,       0,    0,    (void *)"Full-screen ", NULL, NULL },//DIALOG_VIDEO_FULLSCREEN
  
!   { d_text_proc,       190,  180, 160,  30,   255,  0,    0,     0,       0,    0,    (void *)"Custom", NULL, NULL },//DIALOG_VIDEO_CUSTOM_TEXT
!   { d_box_proc,        188,  208, 164,  34,   255,  0,    0,     0,       0,    0,    NULL, NULL, NULL },//DIALOG_VIDEO_CUSTOM_BOX
!   { d_edit_proc,       190,  210, 150,  30,   255,  0,    0,     0,       75,   0,    (void *) dialog_string[3], NULL, NULL },//DIALOG_VIDEO_CUSTOM_EDIT
  
!   { d_text_proc,       30,  120,  140,  30,   255,  0,    0,     0,       0,    0,    (void *)"Resolution", NULL, NULL },//DIALOG_VIDEO_RESTEXT
!   { d_list_proc2,      30,  145,  140, 115,   255,  0,    0,D_EXIT,       0,    0,    (void *) genericListboxGetter, NULL, resolution },//DIALOG_VIDEO_RESLIST
!   { d_text_proc,       30,  290,  100,  30,   255,  0,    0,     0,       0,    0,    (void *)"Color Depth", NULL, NULL },//DIALOG_VIDEO_BPPTEXT
!   { d_list_proc2,      30,  310,  100, 100,   255,  0,    0,D_EXIT,       0,    0,    (void *) genericListboxGetter, NULL, color_depth },//DIALOG_VIDEO_BPPLIST
  
!   { d_button_proc,      32,  30,  100,   35,   255,  0,   0,D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },//DIALOG_VIDEO_EXIT
!   { d_button_proc,     143,  30,  260,  35,   255,  0,    0,D_EXIT,  0,    0,    (void *)"Restore Default", NULL, NULL },//DIALOG_VIDEO_GET_DEFAULT
!   { d_button_proc,      32,  70,  100,   35,   255,  0,   0,D_EXIT,  0,    0,    (void *)"Ok", NULL, NULL },//DIALOG_VIDEO_SET_DEFAULT
  
!   { d_text_proc,       170,  310,  160,  20,   255,  0,   0,     0,       0,    0,    (void *)"Gamma Correction", NULL, NULL },//DIALOG_VIDEO_GAMMA_TEXT
!   { d_slider_proc,     170,  330,  160,  15,   255,  0,   0,     0,       255,  0,    NULL, handleGammaSliderChange, NULL  },//DIALOG_VIDEO_GAMMA_SLIDER
    { d_tw_yield_proc,        0,    0,    0,    0,  255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,   0,    0,    0,    255,  0,    0,    0,       3,    0,    NULL, NULL, NULL }
  	};
+ 
+ int handleGammaSliderChange(void *dp3, int d2) {
+     set_gamma(d2);
+     return d2;
+ }
  
  
  void video_menu (Game *game) {STACKTRACE
! 	int choice = -1;
!     bool done = false;
!     
! 	while ( (choice != DIALOG_VIDEO_EXIT) && (!done) ) {
! 		sprintf(dialog_string[3], "%dx%d", videosystem.width, videosystem.height);
  
  
!         //set index for resolution
!         int x, y, x2, y2, i, bpp, bpp2, fs;
!         x2 = videosystem.width;
!         y2 = videosystem.height;
!         for (i = 0; resolution[i+1]; i += 1) {
!             x = strtol(resolution[i], NULL, 10);
!             y = strtol(strchr(resolution[i], 'x') + 1, NULL, 10);
!             if ((x == x2) && (y == y2)) break;
!         }
!         video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
!         
!         //set index for bpp
!         bpp = videosystem.bpp;
!         for (i = 0; true; i += 1) {
!             if (!color_depth[i]) tw_error("video_menu - current bpp invalid?");
!             if (strtol(color_depth[i], NULL, 10) == bpp) break;
!         }
!         video_dialog[DIALOG_VIDEO_BPPLIST].d1 = i;
!         
!         //set button for fullscreen
!         video_dialog[DIALOG_VIDEO_FULLSCREEN].flags = videosystem.fullscreen ? D_SELECTED : 0;
! 
!         int startfs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags;
! 
!         
!         //set gamma correction
!         video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2 = get_gamma();
  
  		//do the dialog
***************
*** 205,239 ****
  		//set bpp from menu
  		i = video_dialog[DIALOG_VIDEO_BPPLIST].d1;
! 		bpp2 = strtol(color_depth[i], NULL, 10);
! 
! 		//set fullscreen from menu
! 		fs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags & D_SELECTED;
! 
! 		if (choice == DIALOG_VIDEO_GET_DEFAULT) {
! 			set_config_file("client.ini");
! 			bpp2   = get_config_int("Video", "BitsPerPixel", 16);
! 			x2     = get_config_int("Video", "ScreenWidth", 640);
! 			y2     = get_config_int("Video", "ScreenHeight", 480);
! 			fs     = get_config_int("Video", "FullScreen", false);
! 			set_gamma(get_config_int("Video", "Gamma", 128));
! 			choice = DIALOG_VIDEO_APPLY;
! 		}
! 		if ((choice == DIALOG_VIDEO_APPLY) | (choice == DIALOG_VIDEO_SET_DEFAULT)) {
! 			if ((bpp2 != bpp) && game) {
! 				tw_alert ("Color depths cannot be changed in\nthe middle of a game\nin this version", "Okay");
! 				}
! 			else {
! 				set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
! 				i = videosystem.set_resolution(x2, y2, bpp2, fs);
! 				if (i && (choice == DIALOG_VIDEO_SET_DEFAULT)) {
! 					set_config_file("client.ini");
! 					set_config_int("Video", "BitsPerPixel", bpp2);
! 					set_config_int("Video", "ScreenWidth", x2);
! 					set_config_int("Video", "ScreenHeight", y2);
! 					set_config_int("Video", "FullScreen", fs);
! 					set_config_int("Video", "Gamma", get_gamma());
! 				}
! 			}
! 		}
  	}
  	return;
--- 244,318 ----
  		//set bpp from menu
  		i = video_dialog[DIALOG_VIDEO_BPPLIST].d1;
!         bpp2 = strtol(color_depth[i], NULL, 10);
!         
!         //set fullscreen from menu
!         fs = video_dialog[DIALOG_VIDEO_FULLSCREEN].flags & D_SELECTED;
!         
!         switch (choice) {
!             case DIALOG_VIDEO_GET_DEFAULT:
!                 set_config_file("client.ini");
!                 bpp2   = get_config_int("Video", "BitsPerPixel", 16);
!                 x2     = get_config_int("Video", "ScreenWidth", 640);
!                 y2     = get_config_int("Video", "ScreenHeight", 480);
!                 fs     = get_config_int("Video", "FullScreen", false);
!                 set_gamma(get_config_int("Video", "Gamma", 128));
! 
!                 videosystem.set_resolution(x2, y2, bpp2, fs);
!                 break;
!             
!            
!              case DIALOG_VIDEO_SET_DEFAULT:
!                  if ((bpp2 != bpp) && game) {
!                      tw_alert ("Color depths cannot be changed in\nthe middle of a game\nin this version", "Okay");
!                  }
!                  else {
!                      done = true;
!                  }
!                  break;
! 
!              case DIALOG_VIDEO_BPPLIST:
!              case DIALOG_VIDEO_RESLIST:
!                  break;
! 
!              case DIALOG_VIDEO_GAMMA_SLIDER:
!                  set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
!                  break;
! 
!              case DIALOG_VIDEO_EXIT:
!              case -1:
!                  return;
!                  break;
!         }
!         
!         if ( (x2 != x) ||
!              (y2 != y) ||
!              (bpp != bpp2) ||
!              (startfs != fs) )
!         {
!             set_gamma(video_dialog[DIALOG_VIDEO_GAMMA_SLIDER].d2);
!             videosystem.set_resolution(x2, y2, bpp2, fs);
!             
!             if (confirmVideoChanges()) {
!                 set_config_file("client.ini");
!                 set_config_int("Video", "BitsPerPixel", bpp2);
!                 set_config_int("Video", "ScreenWidth", x2);
!                 set_config_int("Video", "ScreenHeight", y2);
!                 set_config_int("Video", "FullScreen", fs);
!                 set_config_int("Video", "Gamma", get_gamma());
!                 return;
!             }
!             else {
!                 set_config_file("client.ini");
!                 bpp2   = get_config_int("Video", "BitsPerPixel", 16);
!                 x2     = get_config_int("Video", "ScreenWidth", 640);
!                 y2     = get_config_int("Video", "ScreenHeight", 480);
!                 fs     = get_config_int("Video", "FullScreen", false);
!                 set_gamma(get_config_int("Video", "Gamma", 128));
! 
!                 i = videosystem.set_resolution(x2, y2, bpp2, fs);
!                 done = false;
!             }
!         }
!         
  	}
  	return;

[Timewarp-commit] docs Interface.txt,1.3,1.4

[<you...@us...>]

Update of /cvsroot/timewarp/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv31732

Modified Files:
	Interface.txt 
Log Message:
last verification of mailing list before it goes live

Index: Interface.txt
===================================================================
RCS file: /cvsroot/timewarp/docs/Interface.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Interface.txt	3 Nov 2003 23:16:24 -0000	1.3
--- Interface.txt	3 Nov 2003 23:19:12 -0000	1.4
***************
*** 3,7 ****
  2003.10.14 youbastrd started
  2003.10.29 youbastrd continuing after a hiatus
! 2003.11.03 youbastrd testing wacky new commit mailing list...testing again, linefeeds were a problem...?
  
  *************************************************************************
--- 3,7 ----
  2003.10.14 youbastrd started
  2003.10.29 youbastrd continuing after a hiatus
! 2003.11.03 youbastrd testing wacky new commit mailing list... should work now
  
  *************************************************************************

[Timewarp-commit] docs Interface.txt,1.2,1.3

[<you...@us...>]

Update of /cvsroot/timewarp/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv31221

Modified Files:
	Interface.txt 
Log Message:
testingcommit mailing list again, apparently an error in linefeeds causes the entire file to be shown by diff, and hence get posted to the mailing list.... which can be too big to send

Index: Interface.txt
===================================================================
RCS file: /cvsroot/timewarp/docs/Interface.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Interface.txt	3 Nov 2003 23:05:15 -0000	1.2
--- Interface.txt	3 Nov 2003 23:16:24 -0000	1.3
***************
*** 3,7 ****
  2003.10.14 youbastrd started
  2003.10.29 youbastrd continuing after a hiatus
! 2003.11.03 youbastrd testing wacky new commit mailing list
  
  *************************************************************************
--- 3,7 ----
  2003.10.14 youbastrd started
  2003.10.29 youbastrd continuing after a hiatus
! 2003.11.03 youbastrd testing wacky new commit mailing list...testing again, linefeeds were a problem...?
  
  *************************************************************************

[Timewarp-commit] ok last test to make sure spamgourmet is set up right

[<po...@ro...>]

test3

[Timewarp-commit] test2, first one didn't show up

[<po...@ro...>]

test2

[Timewarp-commit] test from youbastrd

[<po...@ro...>]

this is a test message.  Wee!