timewarp-commit Mailing List for Star Control: TimeWarp (Page 47)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/timewarp/source/gamex/edit
In directory sc8-pr-cvs1:/tmp/cvs-serv3999/gamex/edit

Modified Files:
	edit_dialogue.cpp edit_dialogue.h 
Log Message:
fg interface update/ starmap editor update

Index: edit_dialogue.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_dialogue.cpp	12 Dec 2003 15:53:18 -0000	1.3
--- edit_dialogue.cpp	14 Dec 2003 22:19:56 -0000	1.4
***************
*** 141,144 ****
--- 141,152 ----
  Dialo dialo;

+ 
+ void GameDialogue::init_menu()
+ {
+ 	T = new TWindow("gamex/interface/dialogeditor", 0, 0, game_screen);
+ 	maparea = 0;
+ }
+ 
+ 
  void GameDialogue::init()
  {
***************
*** 214,218 ****

- 	R = new TWindow("gamex/interface/dialogeditor", 10, 10, view->frame->surface);

--- 222,225 ----
***************
*** 223,246 ****

  	//strcpy(Qtext, "a\n b\n c\n d\n e\n f\n g\n h\n i");
! 	T = new TextEditBox(R, "text/", usefont, dialo->T, 256);
! 	T->set_textcolor(tcol);

! 	B = new TextList(R, "branches/", usefont);

! 	refresh = new Button(R, "refresh_", 0);

! 	Bplus = new Button(R, "addbranch_", 0);
  //	Bmin = new Button(R, "Bmin", 0);

! 	bprev = new Button(R, "prevbranch_", 0);
  //	bnext = new Button(R, "next", 0);

! 	dialostatus = new SwitchButton(R, "state_", 0);

  	// add a text-button for the race pic, and a popup for the race list selection ?!

! 	raceselect = new TextButton(R, "race_", usefont);
  	raceselect->set_text(dialo->racepic, makecol(255,255,0));
  	raceselect->passive = false;
--- 230,253 ----

  	//strcpy(Qtext, "a\n b\n c\n d\n e\n f\n g\n h\n i");
! 	Tedit = new TextEditBox(T, "text/", usefont, dialo->T, 256);
! 	Tedit->set_textcolor(tcol);

! 	Tlist = new TextList(T, "branches/", usefont);

! 	refresh = new Button(T, "refresh_", 0);

! 	Bplus = new Button(T, "addbranch_", 0);
  //	Bmin = new Button(R, "Bmin", 0);

! 	bprev = new Button(T, "prevbranch_", 0);
  //	bnext = new Button(R, "next", 0);

! 	dialostatus = new SwitchButton(T, "state_", 0);

  	// add a text-button for the race pic, and a popup for the race list selection ?!

! 	raceselect = new TextButton(T, "race_", usefont);
  	raceselect->set_text(dialo->racepic, makecol(255,255,0));
  	raceselect->passive = false;
***************
*** 250,263 ****
  	popupraceselect->tbl->set_optionlist(racepiclist, Nracepiclist, makecol(255,255,128));
  	popupraceselect->hide();

  //	winman = new WindowManager;
  //	winman->add(R);
! 	R->add(popupraceselect);

! 	R->tree_doneinit();

  	initeditor(dialo);

  }

--- 257,273 ----
  	popupraceselect->tbl->set_optionlist(racepiclist, Nracepiclist, makecol(255,255,128));
  	popupraceselect->hide();
+ 	//popupraceselect->setscreen(T->drawarea);

  //	winman = new WindowManager;
  //	winman->add(R);
! 	T->add(popupraceselect);

! 	T->tree_doneinit();

  	initeditor(dialo);

+ 	// no need for tic-info.
+ 	ti = false;
  }

***************
*** 310,319 ****
  		Blist[0][0] = 0;

! 	B->set_optionlist(Blist, dialo->Nbranches, makecol(255,255,255));

  	dialostatus->state = dialo->state;

! 	T->text_reset(dialo->T);

  	raceselect->set_text(dialo->racepic, makecol(255,255,0));
--- 320,329 ----
  		Blist[0][0] = 0;

! 	Tlist->set_optionlist(Blist, dialo->Nbranches, makecol(255,255,255));

  	dialostatus->state = dialo->state;

! 	Tedit->text_reset(dialo->T);

  	raceselect->set_text(dialo->racepic, makecol(255,255,0));
***************
*** 329,334 ****

! 	FULL_REDRAW = true;
! 	R->tree_calculate();

--- 339,344 ----

! 	//FULL_REDRAW = true;
! 	//R->tree_calculate();

***************
*** 396,400 ****

  	//if (bnext->flag.left_mouse_press)
! 	if (B->flag.left_mouse_press)
  	{
  		// load the data from the child branch.
--- 406,410 ----

  	//if (bnext->flag.left_mouse_press)
! 	if (Tlist->flag.left_mouse_press)
  	{
  		// load the data from the child branch.
***************
*** 402,406 ****
  		{
  			int i;
! 			i = B->gety();//scroll.yselect;
  			if (i >= 0 && i < dialo->Nbranches)	// shouldn't be necessary ?!
  			{
--- 412,416 ----
  		{
  			int i;
! 			i = Tlist->gety();//scroll.yselect;
  			if (i >= 0 && i < dialo->Nbranches)	// shouldn't be necessary ?!
  			{
***************
*** 449,456 ****

  	//show_mouse(frame->surface);
! 	R->tree_setscreen(view->frame->surface);
! 	R->tree_animate();
! 	show_mouse(view->frame->surface);
! 	scare_mouse();
  }

--- 459,466 ----

  	//show_mouse(frame->surface);
! 	//T->tree_setscreen(view->frame->surface);
! 	//T->tree_animate();
! 	//show_mouse(view->frame->surface);
! 	//scare_mouse();
  }

Index: edit_dialogue.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** edit_dialogue.h	12 Dec 2003 15:53:18 -0000	1.2
--- edit_dialogue.h	14 Dec 2003 22:19:56 -0000	1.3
***************
*** 70,73 ****
--- 70,74 ----
  	virtual void quit();
  	//virtual bool handle_key(int k);
+ 	virtual void init_menu();

  	virtual void calculate();
***************
*** 81,89 ****

! //	WindowManager *winman;
! 	TWindow *R;
! 
! 	TextEditBox *T;
! 	TextList	*B;

  	Button *refresh, *Bplus, *bprev;
--- 82,87 ----

! 	TextEditBox *Tedit;
! 	TextList	*Tlist;

  	Button *refresh, *Bplus, *bprev;

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (136)	Dec (218)
2004	Jan (214)	Feb (208)	Mar (186)	Apr (15)	May (3)	Jun (35)	Jul (6)	Aug	Sep	Oct	Nov	Dec
2005	Jan (1)	Feb	Mar (1)	Apr	May	Jun	Jul (58)	Aug (123)	Sep (31)	Oct (9)	Nov	Dec (1)
2006	Jan (25)	Feb (10)	Mar (25)	Apr (61)	May	Jun (78)	Jul	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb	Mar	Apr (12)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul (10)	Aug	Sep	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2014	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

timewarp-commit Mailing List for Star Control: TimeWarp (Page 47)

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