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

[Timewarp-commit] interfaces/gametest/popuphelp/text backgr.bmp,NONE,1.1 text_backgr.bmp,1.1,NONE

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

Update of /cvsroot/timewarp/interfaces/gametest/popuphelp/text
In directory sc8-pr-cvs1:/tmp/cvs-serv1695

Added Files:
	backgr.bmp 
Removed Files:
	text_backgr.bmp 
Log Message:
filename was wrong

--- NEW FILE: backgr.bmp ---
(This appears to be a binary file; contents omitted.)

--- text_backgr.bmp DELETED ---

[Timewarp-commit] source/games gflmelee.cpp,1.11,1.12 gmissions.cpp,1.13,1.14

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

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv1507/source/games

Modified Files:
	gflmelee.cpp gmissions.cpp 
Log Message:
adapted cause filename format of twgui is slightly changed

Index: gflmelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gflmelee.cpp	15 Nov 2003 20:48:06 -0000	1.11
--- gflmelee.cpp	23 Nov 2003 10:01:54 -0000	1.12
***************
*** 2013,2028 ****
  	col[1] = makecol(200,200,200);
  
! 	up[0] = new Button(A, "up1", -1, -1, 0);
! 	down[0] = new Button(A, "down1", -1, -1, 0);
  
! 	up[1] = new Button(A, "up2", -1, -1, 0);
! 	down[1] = new Button(A, "down2", -1, -1, 0);
  
! 	ok = new Button(A, "ok", -1, -1, 0);
  
! 	fl[0] = new TextButton(A, "text1", -1, -1, usefont);		
  	fl[0]->set_text("", col[0]);
  
! 	fl[1] = new TextButton(A, "text2", -1, -1, usefont);		
  	fl[1]->set_text("", col[1]);
  
--- 2013,2028 ----
  	col[1] = makecol(200,200,200);
  
! 	up[0] = new Button(A, "up1/", -1, -1, 0);
! 	down[0] = new Button(A, "down1/", -1, -1, 0);
  
! 	up[1] = new Button(A, "up2/", -1, -1, 0);
! 	down[1] = new Button(A, "down2/", -1, -1, 0);
  
! 	ok = new Button(A, "ok/", -1, -1, 0);
  
! 	fl[0] = new TextButton(A, "text1/", -1, -1, usefont);		
  	fl[0]->set_text("", col[0]);
  
! 	fl[1] = new TextButton(A, "text2/", -1, -1, usefont);		
  	fl[1]->set_text("", col[1]);
  

Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gmissions.cpp	21 Nov 2003 08:29:01 -0000	1.13
--- gmissions.cpp	23 Nov 2003 10:01:54 -0000	1.14
***************
*** 780,792 ****
  	missionselectmenu = new AreaReserve("interfaces/selectmission/briefing", 50, 400, this->view->frame->surface);
  
! 	b_info = new TextButton(missionselectmenu, "info", -1, -1, usefont);
  
! 	b_accept = new Button(missionselectmenu, "accept", -1, -1, KEY_ENTER);
! 	b_quit = new Button(missionselectmenu, "quit", -1, -1, KEY_ESC);
  
! 	b_title = new TextButton(missionselectmenu, "title", -1, -1, usefont);
  
! 	b_left = new Button(missionselectmenu, "left", -1, -1, KEY_LEFT);
! 	b_right = new Button(missionselectmenu, "right", -1, -1, KEY_RIGHT);
  
  	b_ghost = new GhostButton(missionselectmenu);
--- 780,792 ----
  	missionselectmenu = new AreaReserve("interfaces/selectmission/briefing", 50, 400, this->view->frame->surface);
  
! 	b_info = new TextButton(missionselectmenu, "info/", -1, -1, usefont);
  
! 	b_accept = new Button(missionselectmenu, "accept/", -1, -1, KEY_ENTER);
! 	b_quit = new Button(missionselectmenu, "quit/", -1, -1, KEY_ESC);
  
! 	b_title = new TextButton(missionselectmenu, "title/", -1, -1, usefont);
  
! 	b_left = new Button(missionselectmenu, "left/", -1, -1, KEY_LEFT);
! 	b_right = new Button(missionselectmenu, "right/", -1, -1, KEY_RIGHT);
  
  	b_ghost = new GhostButton(missionselectmenu);

[Timewarp-commit] source/twgui gametest.cpp,1.11,1.12 gametest.h,1.5,1.6

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

Update of /cvsroot/timewarp/source/twgui
In directory sc8-pr-cvs1:/tmp/cvs-serv1507/source/twgui

Modified Files:
	gametest.cpp gametest.h 
Log Message:
adapted cause filename format of twgui is slightly changed

Index: gametest.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/gametest.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gametest.cpp	28 Oct 2003 00:00:38 -0000	1.11
--- gametest.cpp	23 Nov 2003 10:01:54 -0000	1.12
***************
*** 301,304 ****
--- 301,309 ----
  
  
+ void TWgui::handle_zoom_in()
+ {
+ 	view->camera.z /= 1 + 0.002 * frame_time;
+ }
+ 
  void TWgui::init(Log *_log)
  {
***************
*** 340,367 ****
  
  
! 	screenswitch = new SwitchButton(meleemenu, "VIEWSCREEN", -1, -1, mapkey(KEY_R, KEY_LCONTROL));
  
! 	healthbarswitch = new SwitchButton(meleemenu, "HEALTHBARS", -1, -1, mapkey(KEY_H, KEY_ALT));
! 	wedgeindicatorswitch = new SwitchButton(meleemenu, "WEDGEINDIC", -1, -1, mapkey(KEY_W, KEY_ALT));
! 	captainpanelswitch = new SwitchButton(meleemenu, "CPTPANEL", -1, -1, mapkey(KEY_C, KEY_ALT));
! 	chatlogswitch = new SwitchButton(meleemenu, "CHATLOG", -1, -1, mapkey(KEY_C, KEY_ALT));
  
  
! 	zoomin = new Button(meleemenu, "ZOOMIN", -1, -1, KEY_EQUALS, 1);
  
! 	zoomout = new Button(meleemenu, "ZOOMOUT", -1, -1, KEY_MINUS, 1);
  
! 	abort = new Button(meleemenu, "ABORT", -1, -1, mapkey(KEY_A, KEY_LCONTROL));
  
! 	extraplanet = new Button(meleemenu, "EXTRAPLANET", -1, -1, mapkey(KEY_P, KEY_LCONTROL));
  
! 	snapshot = new Button(meleemenu, "SNAPSHOT", -1, -1, mapkey(KEY_S, KEY_LCONTROL));
  
! 	callhelp = new Button(meleemenu, "CALLHELP", -1, -1, mapkey(KEY_H, KEY_LCONTROL));
  
! 	viewmode = new Button(meleemenu, "VIEWMODE", -1, -1, mapkey(KEY_V, KEY_LCONTROL));
  
  	strcpy(texted, "hello");
! 	text_edit = new TextEditBox(meleemenu, "TEXT", -1, -1, usefont, texted, 512);	// text I/O ... experimental !!
  
  
--- 345,373 ----
  
  
! 	screenswitch = new SwitchButton(meleemenu, "VIEWSCREEN/", -1, -1, mapkey(KEY_R, KEY_LCONTROL));
  
! 	healthbarswitch = new SwitchButton(meleemenu, "HEALTHBARS/", -1, -1, mapkey(KEY_H, KEY_ALT));
! 	wedgeindicatorswitch = new SwitchButton(meleemenu, "WEDGEINDIC/", -1, -1, mapkey(KEY_W, KEY_ALT));
! 	captainpanelswitch = new SwitchButton(meleemenu, "CPTPANEL/", -1, -1, mapkey(KEY_C, KEY_ALT));
! 	chatlogswitch = new SwitchButton(meleemenu, "CHATLOG/", -1, -1, mapkey(KEY_C, KEY_ALT));
  
  
! 	zoomin = new Button(meleemenu, "ZOOMIN/", -1, -1, KEY_EQUALS, 1);
! 	zoomin->bind(new ZoomEvent(this));
  
! 	zoomout = new Button(meleemenu, "ZOOMOUT/", -1, -1, KEY_MINUS, 1);
  
! 	abort = new Button(meleemenu, "ABORT/", -1, -1, mapkey(KEY_A, KEY_LCONTROL));
  
! 	extraplanet = new Button(meleemenu, "EXTRAPLANET/", -1, -1, mapkey(KEY_P, KEY_LCONTROL));
  
! 	snapshot = new Button(meleemenu, "SNAPSHOT/", -1, -1, mapkey(KEY_S, KEY_LCONTROL));
  
! 	callhelp = new Button(meleemenu, "CALLHELP/", -1, -1, mapkey(KEY_H, KEY_LCONTROL));
  
! 	viewmode = new Button(meleemenu, "VIEWMODE/", -1, -1, mapkey(KEY_V, KEY_LCONTROL));
  
  	strcpy(texted, "hello");
! 	text_edit = new TextEditBox(meleemenu, "TEXT/", -1, -1, usefont, texted, 512);	// text I/O ... experimental !!
  
  
***************
*** 370,378 ****
  	alertmenu->center(400, 300);		// center around this position, in relative coordinates
  
! 	alert_yes = new Button(alertmenu, "YES", -1, -1, KEY_Y);
  
! 	alert_no = new Button(alertmenu, "NO", -1, -1, KEY_N);
  
! 	alert_text = new TextButton(alertmenu, "TEXT", -1, -1, usefont);
  
  	alertmenu->hide();
--- 376,384 ----
  	alertmenu->center(400, 300);		// center around this position, in relative coordinates
  
! 	alert_yes = new Button(alertmenu, "YES/", -1, -1, KEY_Y);
  
! 	alert_no = new Button(alertmenu, "NO/", -1, -1, KEY_N);
  
! 	alert_text = new TextButton(alertmenu, "TEXT/", -1, -1, usefont);
  
  	alertmenu->hide();
***************
*** 487,490 ****
--- 493,497 ----
  	winman->calculate();
  
+ 	/*
  	if (zoomin->flag.left_mouse_hold)
  	{
***************
*** 494,497 ****
--- 501,506 ----
  		view->camera.z /= 1 + 0.002 * frame_time;
  	}
+ 	*/
+ 
  	if (zoomout->flag.left_mouse_hold)
  	{

Index: gametest.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/gametest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gametest.h	26 Oct 2003 10:43:18 -0000	1.5
--- gametest.h	23 Nov 2003 10:01:54 -0000	1.6
***************
*** 9,13 ****
  #include "../games/gflmelee.h"
  
! 
  
  
--- 9,13 ----
  #include "../games/gflmelee.h"
  
! #include "../twgui/area.h"
  
  
***************
*** 67,70 ****
--- 67,78 ----
  
  	void animate_stuff(Frame *frame);
+ 
+ 	void handle_zoom_in();
+ 	class ZoomEvent : public ButtonEvent {
+ 	public:
+ 		TWgui *g;
+ 		ZoomEvent(TWgui *ag) {g = ag;};
+ 		virtual void handle_lhold(){g->handle_zoom_in();};
+ 	} *zoom_event;
  
  };

[Timewarp-commit] source/twgui area.cpp,1.9,1.10 area.h,1.8,1.9 twgui.cpp,1.10,1.11

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

Update of /cvsroot/timewarp/source/twgui
In directory sc8-pr-cvs1:/tmp/cvs-serv1373/source/twgui

Modified Files:
	area.cpp area.h twgui.cpp 
Log Message:
made the filename of the bitmaps more controllable (not always obligatory subdirs)

Index: area.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/area.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** area.cpp	18 Nov 2003 16:59:00 -0000	1.9
--- area.cpp	23 Nov 2003 10:00:52 -0000	1.10
***************
*** 597,600 ****
--- 597,602 ----
  	areareserve = menu;
  	selected = false;
+ 
+ 	button_event = 0;
  }
  
***************
*** 623,626 ****
--- 625,630 ----
  	mouse.bmp.init(areareserve->mouse.bmp.newmousebmp);
  	// (you can override this with a similar call but using another bitmap later on, if required).
+ 
+ 	button_event = 0;
  }
  
***************
*** 647,652 ****
  		flag.focus = true;
  
! 		if (flag.focus != flag.lastfocus)
! 			handle_focus();
  
  	} else {
--- 651,656 ----
  		flag.focus = true;
  
! 		if (flag.focus != flag.lastfocus && button_event)
! 			button_event->handle_focus();
  
  	} else {
***************
*** 656,661 ****
  		flag.focus = false;
  
! 		if (flag.focus != flag.lastfocus)
! 			handle_defocus();
  	}
  }
--- 660,665 ----
  		flag.focus = false;
  
! 		if (flag.focus != flag.lastfocus && button_event)
! 			button_event->handle_defocus();
  	}
  }
***************
*** 700,704 ****
  		{
  			flag.left_mouse_press = true;
! 			handle_lpress();
  		}
  
--- 704,709 ----
  		{
  			flag.left_mouse_press = true;
! 			if (button_event)
! 				button_event->handle_lpress();
  		}
  
***************
*** 706,710 ****
  		{
  			flag.left_mouse_hold = true;
! 			handle_lhold();
  		}
  
--- 711,716 ----
  		{
  			flag.left_mouse_hold = true;
! 			if (button_event)
! 				button_event->handle_lhold();
  		}
  
***************
*** 712,716 ****
  		{
  			flag.left_mouse_release = true;
! 			handle_lrelease();
  
  		}
--- 718,723 ----
  		{
  			flag.left_mouse_release = true;
! 			if (button_event)
! 				button_event->handle_lrelease();
  
  		}
***************
*** 719,723 ****
  		{
  			flag.right_mouse_press = true;
! 			handle_rpress();
  		}
  
--- 726,731 ----
  		{
  			flag.right_mouse_press = true;
! 			if (button_event)
! 				button_event->handle_rpress();
  		}
  
***************
*** 808,812 ****
  
  // check a square area to see if it has the mouse on it.
- 
  bool AreaBox::hasmouse()
  {
--- 816,819 ----

Index: area.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/area.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** area.h	28 Oct 2003 00:00:37 -0000	1.8
--- area.h	23 Nov 2003 10:00:52 -0000	1.9
***************
*** 7,10 ****
--- 7,35 ----
  
  
+ class ButtonEvent
+ {
+ public:
+ 	
+ 	virtual void handle_char(int c) {};
+ 	virtual void handle_uchar(int c) {};
+ 	virtual void handle_focus() {};
+ 	virtual void handle_defocus() {};
+ 	virtual void handle_click() {};
+ 	virtual void handle_doubleclick() {};
+ 	virtual void handle_gotmouse() {};
+ 	virtual void handle_lostmouse() {};
+ 	virtual void handle_wheel(int c) {};
+ 	virtual void handle_lpress() {};
+ 	virtual void handle_mpress() {};
+ 	virtual void handle_rpress() {};
+ 	virtual void handle_lrelease() {};
+ 	virtual void handle_mrelease() {};
+ 	virtual void handle_rrelease() {};
+ 	virtual void handle_lhold() {};
+ 	virtual void handle_mhold() {};
+ 	virtual void handle_rhold() {};
+ };
+ 
+ 
  class AreaReserve;
  
***************
*** 15,18 ****
--- 40,48 ----
  public:
  
+ 	ButtonEvent	*button_event;
+ 	void bind(ButtonEvent *be) {button_event = be;};
+ 
+ 	void bind_lhold(void *f()) { xxx = f; };
+ 
  	bool selected;		// a general-purpose flag; is set if left mouse is held; this can
  						// be useful in simple applications.
***************
*** 131,153 ****
  
  	virtual void handle_menu_focus_loss();
- 
- 	virtual void handle_char(int c) {};
- 	virtual void handle_uchar(int c) {};
- 	virtual void handle_focus() {};
- 	virtual void handle_defocus() {};
- 	virtual void handle_click() {};
- 	virtual void handle_doubleclick() {};
- 	virtual void handle_gotmouse() {};
- 	virtual void handle_lostmouse() {};
- 	virtual void handle_wheel(int c) {};
- 	virtual void handle_lpress() {};
- 	virtual void handle_mpress() {};
- 	virtual void handle_rpress() {};
- 	virtual void handle_lrelease() {};
- 	virtual void handle_mrelease() {};
- 	virtual void handle_rrelease() {};
- 	virtual void handle_lhold() {};
- 	virtual void handle_mhold() {};
- 	virtual void handle_rhold() {};
  
  };
--- 161,164 ----

Index: twgui.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** twgui.cpp	22 Nov 2003 23:10:34 -0000	1.10
--- twgui.cpp	23 Nov 2003 10:00:52 -0000	1.11
***************
*** 272,281 ****
  
  	strcpy(id2, id);
! 	strcat(id2, "/left");
  	left	= new Button(A, id2, -1, -1, 0);
  	if (!left->W) {	delete left;	left = 0;	}
  
  	strcpy(id2, id);
! 	strcat(id2, "/right");
  	right	= new Button(A, id2, -1, -1, 0);
  	if (!right->W)	{	delete right;	right = 0;	}
--- 272,281 ----
  
  	strcpy(id2, id);
! 	strcat(id2, "left/");
  	left	= new Button(A, id2, -1, -1, 0);
  	if (!left->W) {	delete left;	left = 0;	}
  
  	strcpy(id2, id);
! 	strcat(id2, "right/");
  	right	= new Button(A, id2, -1, -1, 0);
  	if (!right->W)	{	delete right;	right = 0;	}
***************
*** 283,287 ****
  	// add a scroll bar
  	strcpy(id2, id);
! 	strcat(id2, "/scrollbar_hor");
  	scrollhor = new ScrollBar(A, id2, -1, -1);
  	if (!scrollhor->W)	{	delete scrollhor;	scrollhor = 0;	}
--- 283,287 ----
  	// add a scroll bar
  	strcpy(id2, id);
! 	strcat(id2, "scrollbar_hor/");
  	scrollhor = new ScrollBar(A, id2, -1, -1);
  	if (!scrollhor->W)	{	delete scrollhor;	scrollhor = 0;	}
***************
*** 297,311 ****
  
  	strcpy(id2, id);
! 	strcat(id2, "/up");
  	up		= new Button(A, id2, -1, -1, 0);
  	if (!up->W)	{	delete up;	up = 0;	}
  
  	strcpy(id2, id);
! 	strcat(id2, "/down");
  	down	= new Button(A, id2, -1, -1, 0);
  	if (!down->W)	{	delete down;	down = 0;	}
  
  	strcpy(id2, id);
! 	strcat(id2, "/scrollbar_vert");
  	scrollvert = new ScrollBar(A, id2, -1, -1);
  	if (!scrollvert->W)	{	delete scrollvert;	scrollvert = 0;	}
--- 297,311 ----
  
  	strcpy(id2, id);
! 	strcat(id2, "up/");
  	up		= new Button(A, id2, -1, -1, 0);
  	if (!up->W)	{	delete up;	up = 0;	}
  
  	strcpy(id2, id);
! 	strcat(id2, "down/");
  	down	= new Button(A, id2, -1, -1, 0);
  	if (!down->W)	{	delete down;	down = 0;	}
  
  	strcpy(id2, id);
! 	strcat(id2, "scrollbar_vert/");
  	scrollvert = new ScrollBar(A, id2, -1, -1);
  	if (!scrollvert->W)	{	delete scrollvert;	scrollvert = 0;	}
***************
*** 356,362 ****
  	strcpy(strselected, ident);
  
! 	strcat(strdefault,  "/default");
! 	strcat(strfocus,    "/focus");
! 	strcat(strselected, "/selected");
  
  	
--- 356,362 ----
  	strcpy(strselected, ident);
  
! 	strcat(strdefault,  "default");
! 	strcat(strfocus,    "focus");
! 	strcat(strselected, "selected");
  
  	
***************
*** 1088,1093 ****
  	strcpy(stroff, ident);
  
! 	strcat(stron, "/on");
! 	strcat(stroff,"/off");
  
  
--- 1088,1093 ----
  	strcpy(stroff, ident);
  
! 	strcat(stron, "on");
! 	strcat(stroff,"off");
  
  
***************
*** 1381,1385 ****
  	relpos = 0.0;	// between 0 and 1
  
! 	button = getbmp("/button");
  
  	if (button)
--- 1381,1385 ----
  	relpos = 0.0;	// between 0 and 1
  
! 	button = getbmp("button");
  
  	if (button)
***************
*** 1670,1675 ****
  
  	//scroll_control = new scrollpos_str();
! 	scrollcontrol.hor(this, "scroll", &scroll);
! 	scrollcontrol.ver(this, "scroll", &scroll);
  
  	/*
--- 1670,1675 ----
  
  	//scroll_control = new scrollpos_str();
! 	scrollcontrol.hor(this, "scroll/", &scroll);
! 	scrollcontrol.ver(this, "scroll/", &scroll);
  
  	/*
***************
*** 1897,1901 ****
  {
  	// add a text list box
! 	tia = new TextInfoArea(this, "text", -1, -1, afont);//, &scroll);
  	tia->set_textinfo(atext, aNchar);
  
--- 1897,1901 ----
  {
  	// add a text list box
! 	tia = new TextInfoArea(this, "text/", -1, -1, afont);//, &scroll);
  	tia->set_textinfo(atext, aNchar);
  
***************
*** 1951,1955 ****
  
  	// add a text list box
! 	tbl = new TextButtonList(this, "TEXT", -1, -1, afont, &scroll);
  	tbl->set_optionlist(aoptionslist, makecol(0,0,0));
  
--- 1951,1955 ----
  
  	// add a text list box
! 	tbl = new TextButtonList(this, "TEXT/", -1, -1, afont, &scroll);
  	tbl->set_optionlist(aoptionslist, makecol(0,0,0));
  
***************
*** 1992,2003 ****
  {
  
! 	icons = new MatrixIcons(this, "ICON", -1, -1, &scroll, KEY_ENTER);
  
  	// this auto-configures the data as well ...
  	icons->set_iconinfo(alistIcon, ascale);
  
! 	info = new TextButton(this, "INFO", -1, -1, afont);
! 	oncerandom = new Button(this, "RANDOM", -1, -1, KEY_R);
! 	alwaysrandom = new Button(this, "ALWAYSRANDOM", -1, -1, KEY_A);
  
  	doneinit();	// closes the datafile
--- 1992,2003 ----
  {
  
! 	icons = new MatrixIcons(this, "ICON/", -1, -1, &scroll, KEY_ENTER);
  
  	// this auto-configures the data as well ...
  	icons->set_iconinfo(alistIcon, ascale);
  
! 	info = new TextButton(this, "INFO/", -1, -1, afont);
! 	oncerandom = new Button(this, "RANDOM/", -1, -1, KEY_R);
! 	alwaysrandom = new Button(this, "ALWAYSRANDOM/", -1, -1, KEY_A);
  
  	doneinit();	// closes the datafile
***************
*** 2056,2060 ****
  	// obtain the overlay ... this defines the width/height of each matrix area
  
! 	overlay = getbmp("/overlay");
  	if (!overlay)
  	{
--- 2056,2060 ----
  	// obtain the overlay ... this defines the width/height of each matrix area
  
! 	overlay = getbmp("overlay");
  	if (!overlay)
  	{
***************
*** 2337,2343 ****
  			true)	// it has got a child
  {
! 	yes = new Button(this, "YES", -1, -1, KEY_Y);
  
! 	no = new Button(this, "NO", -1, -1, KEY_N);
  
  	if (!inherited)
--- 2337,2343 ----
  			true)	// it has got a child
  {
! 	yes = new Button(this, "YES/", -1, -1, KEY_Y);
  
! 	no = new Button(this, "NO/", -1, -1, KEY_N);
  
  	if (!inherited)
***************
*** 2376,2380 ****
  			true)	// it has got a child
  {
! 	ok = new Button(this, "OK", -1, -1, KEY_ENTER);
  
  	if (!inherited)
--- 2376,2380 ----
  			true)	// it has got a child
  {
! 	ok = new Button(this, "OK/", -1, -1, KEY_ENTER);
  
  	if (!inherited)
***************
*** 2444,2448 ****
  void AreaTablet::initbackgr(bool autoplace)
  {
! 	backgr = getbmp("/backgr");
  	
  	if (backgr)
--- 2444,2448 ----
  void AreaTablet::initbackgr(bool autoplace)
  {
! 	backgr = getbmp("backgr");
  	
  	if (backgr)
***************
*** 2460,2464 ****
  		char streditbox[128];
  		strcpy(streditbox,  ident);
! 		strcat(streditbox,  "/backgr");
  
  		locate_by_backgr(streditbox);
--- 2460,2464 ----
  		char streditbox[128];
  		strcpy(streditbox,  ident);
! 		strcat(streditbox,  "backgr");
  
  		locate_by_backgr(streditbox);

[Timewarp-commit] ships shpchoex.ini,1.4,1.5 shpclofl.ini,1.1,1.2 shpdragr.ini,1.3,1.4 shpfiear.ini,1.6,1.7 shpgarty.ini,1.3,1.4 shphydcr.ini,1.5,1.6 shpjnkla.ini,1.3,1.4 shpjygst.ini,1.3,1.4 shpkoaja.ini,1.1,1.2 shpmekpi.ini,1.3,1.4 shpoliha.ini,1.2,1.3 shpostdi.ini,1.4,1.5 shprekas.ini,1.4,1.5 shpstrsc.ini,1.3,1.4 shpuxjba.ini,1.2,1.3 shpvezba.ini,1.3,1.4 shpwassu.ini,1.3,1.4 shpwistr.ini,1.3,1.4 shpxilcr.ini,1.6,1.7 shpyevme.ini,1.4,1.5

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

Update of /cvsroot/timewarp/ships
In directory sc8-pr-cvs1:/tmp/cvs-serv909/ships

Modified Files:
	shpchoex.ini shpclofl.ini shpdragr.ini shpfiear.ini 
	shpgarty.ini shphydcr.ini shpjnkla.ini shpjygst.ini 
	shpkoaja.ini shpmekpi.ini shpoliha.ini shpostdi.ini 
	shprekas.ini shpstrsc.ini shpuxjba.ini shpvezba.ini 
	shpwassu.ini shpwistr.ini shpxilcr.ini shpyevme.ini 
Log Message:
added captain-names to several .ini files

Index: shpchoex.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpchoex.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpchoex.ini	29 Aug 2003 23:23:34 -0000	1.4
--- shpchoex.ini	23 Nov 2003 09:58:22 -0000	1.5
***************
*** 58,59 ****
--- 58,64 ----
  Special_Range = 1
  
+ [Names]
+ NumNames = 3
+ CaptName1 = Chadisastu
+ CaptName2 = Kiluyn
+ CaptName3 = Minjerox

Index: shpclofl.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpclofl.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpclofl.ini	8 Jun 2003 17:54:57 -0000	1.1
--- shpclofl.ini	23 Nov 2003 09:58:22 -0000	1.2
***************
*** 65,66 ****
--- 65,72 ----
  
  
+ 
+ [Names]
+ NumNames = 2
+ CaptName1 = Eelof-Veeras
+ CaptName2 = Ure-Murni
+ 

Index: shpdragr.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpdragr.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpdragr.ini	8 Jun 2003 17:54:57 -0000	1.3
--- shpdragr.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 48,49 ****
--- 48,54 ----
  Special = Always_When_Full
  Special2 = No_Proximity
+ 
+ [Names]
+ NumNames = 2
+ CaptName1 = Resquel
+ CaptName2 = Quiszin

Index: shpfiear.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpfiear.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpfiear.ini	26 Oct 2003 10:43:16 -0000	1.6
--- shpfiear.ini	23 Nov 2003 09:58:22 -0000	1.7
***************
*** 49,50 ****
--- 49,56 ----
  WeaponRel = 0
  Special = Defense
+ 
+ [Names]
+ NumNames = 3
+ CaptName1 = Medremol
+ CaptName2 = Szzeri
+ CaptName3 = Sidersk

Index: shpgarty.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpgarty.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpgarty.ini	8 Jun 2003 17:55:00 -0000	1.3
--- shpgarty.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 54,55 ****
--- 54,64 ----
  Special = Proximity
  Special_Range = 5
+ 
+ [Names]
+ NumNames = 6
+ CaptName1 = Bhilgor
+ CaptName2 = Garcoch
+ CaptName3 = Nor-Kachar
+ CaptName4 = Hordrosk
+ CaptName5 = Ghelgor
+ CaptName6 = R'dalkrorth

Index: shphydcr.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shphydcr.ini,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shphydcr.ini	26 Oct 2003 10:43:16 -0000	1.5
--- shphydcr.ini	23 Nov 2003 09:58:22 -0000	1.6
***************
*** 85,87 ****
  Special = Homing
  Special_Range = 200
! Special2 = Always_When_Full
\ No newline at end of file
--- 85,93 ----
  Special = Homing
  Special_Range = 200
! Special2 = Always_When_Full
! 
! 
! [Names]
! NumNames = 2
! CaptName1 = Hydrasis
! CaptName2 = Hidrekae

Index: shpjnkla.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpjnkla.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpjnkla.ini	8 Jun 2003 17:55:06 -0000	1.3
--- shpjnkla.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 43,44 ****
--- 43,54 ----
  RangeFactor = 1.0
  ShipsOnly = 0
+ 
+ [Names]
+ NumNames = 7
+ CaptName1 = Jikidra
+ CaptName2 = Mrgrol
+ CaptName3 = Yxchra
+ CaptName4 = Hordofgol
+ CaptName5 = Kjyrn
+ CaptName6 = Jio-Endre
+ CaptName7 = N'krelx

Index: shpjygst.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpjygst.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpjygst.ini	8 Jun 2003 17:55:07 -0000	1.3
--- shpjygst.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 46,47 ****
--- 46,51 ----
  Special = No_Proximity
  Special_Range = 25
+ 
+ [Names]
+ NumNames = 1
+ CaptName1 = Jiglirn 

Index: shpkoaja.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpkoaja.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpkoaja.ini	8 Jun 2003 17:55:09 -0000	1.1
--- shpkoaja.ini	23 Nov 2003 09:58:22 -0000	1.2
***************
*** 65,67 ****
--- 65,71 ----
  SpecialFreq = 2
  
+ [Names]
+ NumNames = 2
+ CaptName1 = Nisrau
+ CaptName2 = Esrua
  

Index: shpmekpi.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpmekpi.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpmekpi.ini	26 Oct 2003 10:43:16 -0000	1.3
--- shpmekpi.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 54,55 ****
--- 54,60 ----
  Special = Defense
  SpecialFreq = 1
+ 
+ [Names]
+ NumNames = 2
+ CaptName1 = Minochorn
+ CaptName2 = Noxorus

Index: shpoliha.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpoliha.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpoliha.ini	26 Oct 2003 10:43:16 -0000	1.2
--- shpoliha.ini	23 Nov 2003 09:58:22 -0000	1.3
***************
*** 47,48 ****
--- 47,54 ----
  Period = 0.2
  ; seconds between laser shots
+ 
+ [Names]
+ NumNames = 3
+ CaptName1 = Odrikoi
+ CaptName2 = Enacterel
+ CaptName3 = Oiveren

Index: shpostdi.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpostdi.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpostdi.ini	2 Nov 2003 22:39:52 -0000	1.4
--- shpostdi.ini	23 Nov 2003 09:58:22 -0000	1.5
***************
*** 39,40 ****
--- 39,53 ----
  Special = Reserve_Battery
  Batt_Recharge = 16
+ 
+ [Names]
+ NumNames = 10
+ CaptName1 = Orkli
+ CaptName2 = Storvli
+ CaptName3 = Zorblai
+ CaptName4 = Flofti
+ CaptName5 = Nifrue
+ CaptName6 = Kiplik
+ CaptName7 = Nritflik
+ CaptName8 = Frizlork
+ CaptName9 = Tifriltik
+ CaptName10 = Quilftri

Index: shprekas.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shprekas.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shprekas.ini	15 Nov 2003 11:04:18 -0000	1.4
--- shprekas.ini	23 Nov 2003 09:58:22 -0000	1.5
***************
*** 50,51 ****
--- 50,56 ----
  Special2 = Reserver_Battery
  BattRecharge = 1
+ 
+ [Names]
+ NumNames = 2
+ CaptName1 = Nethrecus
+ CaptName2 = Sytliirk

Index: shpstrsc.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpstrsc.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpstrsc.ini	8 Jun 2003 17:55:18 -0000	1.3
--- shpstrsc.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 51,52 ****
--- 51,57 ----
  Special2 = Front
  
+ [Names]
+ NumNames = 3
+ CaptName1 = N'ssrel
+ CaptName2 = Osselus
+ CaptName3 = Vissyrn

Index: shpuxjba.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpuxjba.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpuxjba.ini	26 Oct 2003 10:43:17 -0000	1.2
--- shpuxjba.ini	23 Nov 2003 09:58:22 -0000	1.3
***************
*** 46,48 ****
--- 46,56 ----
  
  
+ [Names]
+ NumNames = 6
+ CaptName1 = Hudre-vare
+ CaptName2 = N'kre-Ardrus
+ CaptName3 = Ikre-Elenkrez
+ CaptName4 = Xiz-gark
+ CaptName5 = Firif-Teloi
+ CaptName6 = Kymn-Nordre
  

Index: shpvezba.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpvezba.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpvezba.ini	8 Jun 2003 17:55:29 -0000	1.3
--- shpvezba.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 48,49 ****
--- 48,52 ----
  
  
+ [Names]
+ NumNames = 1
+ CaptName1 = Izandrode

Index: shpwassu.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpwassu.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpwassu.ini	8 Jun 2003 17:55:30 -0000	1.3
--- shpwassu.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 42,43 ****
--- 42,47 ----
  Weapon = Field
  Special = Max_Battery
+ 
+ [Names]
+ NumNames = 1
+ CaptName1 = N'tlorm

Index: shpwistr.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpwistr.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpwistr.ini	8 Jun 2003 17:55:30 -0000	1.3
--- shpwistr.ini	23 Nov 2003 09:58:22 -0000	1.4
***************
*** 61,62 ****
--- 61,69 ----
  Special = Defense
  SpecialFreq = 1
+ 
+ [Names]
+ NumNames = 4
+ CaptName1 = Yotris
+ CaptName2 = Lidretis
+ CaptName3 = Tikrest
+ CaptName4 = Tycerrn

Index: shpxilcr.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpxilcr.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpxilcr.ini	26 Oct 2003 10:43:17 -0000	1.6
--- shpxilcr.ini	23 Nov 2003 09:58:22 -0000	1.7
***************
*** 56,57 ****
--- 56,64 ----
  Special = Defense
  SpecialFreq = 1
+ 
+ [Names]
+ NumNames = 4
+ CaptName1 = Visxiik
+ CaptName2 = Jizxixorn
+ CaptName3 = Hizxiri
+ CaptName4 = Kunlixk

Index: shpyevme.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpyevme.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpyevme.ini	15 Nov 2003 11:04:18 -0000	1.4
--- shpyevme.ini	23 Nov 2003 09:58:22 -0000	1.5
***************
*** 41,42 ****
--- 41,45 ----
  Special = No_Proximity
  
+ [Names]
+ NumNames = 1
+ CaptName1 = Yuilde

[Timewarp-commit] source/twgui twgui.cpp,1.9,1.10 twgui.h,1.8,1.9

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

Update of /cvsroot/timewarp/source/twgui
In directory sc8-pr-cvs1:/tmp/cvs-serv18409/source/twgui

Modified Files:
	twgui.cpp twgui.h 
Log Message:
made the hasmouse() sensitive to bitmap shape

Index: twgui.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** twgui.cpp	18 Nov 2003 16:59:00 -0000	1.9
--- twgui.cpp	22 Nov 2003 23:10:34 -0000	1.10
***************
*** 12,15 ****
--- 12,28 ----
  
  
+ bool check_pixel(BITMAP *bmp, int x, int y)
+ {
+ 	if (!bmp)
+ 		return false;
+ 	
+ 	int col;
+ 	col = getpixel(bmp, x, y);
+ 	if (col != makecol(255,0,255))
+ 		return true;
+ 	else
+ 		return false;
+ }
+ 
  
  
***************
*** 400,403 ****
--- 413,428 ----
  
  
+ bool Button::hasmouse()
+ {
+ 	// the first rough check whether it's in the boxed bitmap area
+ 	if (AreaBox::hasmouse())
+ 	{
+ 		// now check the bitmap, if the mouse is touching a non-transparent sprite.
+ 		// only check the default bitmap (buttons that change size aren't cool)
+ 		return check_pixel(bmp_default, mouse.xpos()-x, mouse.ypos()-y);
+ 
+ 	} else
+ 		return false;
+ }
  
  
***************
*** 1137,1140 ****
--- 1162,1178 ----
  
  
+ bool SwitchButton::hasmouse()
+ {
+ 	// the first rough check whether it's in the boxed bitmap area
+ 	if (AreaBox::hasmouse())
+ 	{
+ 		// now check the bitmap, if the mouse is touching a non-transparent sprite.
+ 		// only check the default bitmap (buttons that change size aren't cool)
+ 		return check_pixel(bmp_on, mouse.xpos()-x, mouse.ypos()-y);
+ 
+ 	} else
+ 		return false;
+ }
+ 
  
  
***************
*** 2467,2470 ****
--- 2505,2521 ----
  }
  
+ 
+ bool AreaTablet::hasmouse()
+ {
+ 	// the first rough check whether it's in the boxed bitmap area
+ 	if (AreaBox::hasmouse())
+ 	{
+ 		// now check the bitmap, if the mouse is touching a non-transparent sprite.
+ 		// only check the default bitmap (buttons that change size aren't cool)
+ 		return check_pixel(backgr, mouse.xpos()-x, mouse.ypos()-y);
+ 
+ 	} else
+ 		return false;
+ }
  
  

Index: twgui.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** twgui.h	18 Nov 2003 16:59:00 -0000	1.8
--- twgui.h	22 Nov 2003 23:10:34 -0000	1.9
***************
*** 28,31 ****
--- 28,33 ----
  	virtual void draw_focus();
  	virtual void draw_selected();
+ 
+ 	virtual bool hasmouse();
  };
  
***************
*** 40,44 ****
  
  	AreaTablet(AreaReserve *menu, char *identbranch, int ax, int ay, int asciicode, bool akeepkey = 0);
! 	AreaTablet::~AreaTablet();
  
  	void initbackgr(bool autoplace);
--- 42,46 ----
  
  	AreaTablet(AreaReserve *menu, char *identbranch, int ax, int ay, int asciicode, bool akeepkey = 0);
! 	virtual AreaTablet::~AreaTablet();
  
  	void initbackgr(bool autoplace);
***************
*** 47,55 ****
  	void animate();		// shouldn't be changed.
  	virtual void subanimate();
  };
  
  
  
! class ScrollBar : public AreaTablet	// hmm?
  {
  protected:
--- 49,59 ----
  	void animate();		// shouldn't be changed.
  	virtual void subanimate();
+ 
+ 	virtual bool hasmouse();
  };
  
  
  
! class ScrollBar : public AreaTablet
  {
  protected:
***************
*** 66,70 ****
  	// x, y, W, H are inside the draw area
  	ScrollBar(AreaReserve *menu, char *identbranch, int ax, int ay);
! 	~ScrollBar();
  
  	virtual void handle_lhold();
--- 70,74 ----
  	// x, y, W, H are inside the draw area
  	ScrollBar(AreaReserve *menu, char *identbranch, int ax, int ay);
! 	virtual ~ScrollBar();
  
  	virtual void handle_lhold();
***************
*** 275,278 ****
--- 279,283 ----
  	void draw_off();
  
+ 	virtual bool hasmouse();
  	//void locate_by_backgr(char *stron);
  };

[Timewarp-commit] source/newships shpestgu.cpp,1.9,1.10

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

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

Modified Files:
	shpestgu.cpp 
Log Message:
disabled shot rebounce on request of MRT

Index: shpestgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpestgu.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpestgu.cpp	1 Nov 2003 13:24:26 -0000	1.9
--- shpestgu.cpp	22 Nov 2003 18:29:09 -0000	1.10
***************
*** 195,202 ****
  
  void EstionShot::inflict_damage(SpaceObject *other) {
! 	STACKTRACE
  	if (other == last_shooter) return;
  	if (!sameShip(other) || other == mother_ship) {
  		// don't explode on contact, just damage [cyhawk]
  		SpaceObject::inflict_damage(other);
  		// and get bumped back
--- 195,204 ----
  
  void EstionShot::inflict_damage(SpaceObject *other) {
! 	STACKTRACE;
  	if (other == last_shooter) return;
  	if (!sameShip(other) || other == mother_ship) {
  		// don't explode on contact, just damage [cyhawk]
+ 		Shot::inflict_damage(other);
+ 		/*Removed on request of MRT - makes the ship too powerful as a camper
  		SpaceObject::inflict_damage(other);
  		// and get bumped back
***************
*** 228,231 ****
--- 230,234 ----
  			vel = v * unit_vector(delta);
  			}
+ 			*/
  		return;
  		}

[Timewarp-commit] source/melee mship.h,1.10,1.11 mshppan.cpp,1.13,1.14

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

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

Modified Files:
	mship.h mshppan.cpp 
Log Message:
makes it easier to manipulate a ship panel by a ship

Index: mship.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mship.h	15 Nov 2003 11:04:17 -0000	1.10
--- mship.h	22 Nov 2003 18:16:31 -0000	1.11
***************
*** 159,165 ****
  
  	virtual RGB crewPanelColor(int k = 0);
- 
  	virtual RGB battPanelColor(int k = 0);
! 
  
  
--- 159,164 ----
  
  	virtual RGB crewPanelColor(int k = 0);
  	virtual RGB battPanelColor(int k = 0);
! 	virtual bool custom_panel_update(BITMAP *panel, int display_type) {return false;};
  
  

Index: mshppan.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshppan.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mshppan.cpp	31 Oct 2003 13:58:34 -0000	1.13
--- mshppan.cpp	22 Nov 2003 18:16:31 -0000	1.14
***************
*** 210,214 ****
  
  void ShipPanel::draw_stuff (int x, int y, int w, int h, int dx, int dy, int m, int value, int max, int display_type, int bcolor)
! {STACKTRACE
  
  	// erase the background...
--- 210,219 ----
  
  void ShipPanel::draw_stuff (int x, int y, int w, int h, int dx, int dy, int m, int value, int max, int display_type, int bcolor)
! {
! 	STACKTRACE;
! 
! 	// custom update by the ship ...
! 	if (ship->custom_panel_update(panel, display_type))
! 		return;
  
  	// erase the background...

[Timewarp-commit] ships shptauar.ini,1.4,1.5

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

Update of /cvsroot/timewarp/ships
In directory sc8-pr-cvs1:/tmp/cvs-serv1273/ships

Modified Files:
	shptauar.ini 
Log Message:
on request of MRT

Index: shptauar.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shptauar.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shptauar.ini	21 Nov 2003 17:17:49 -0000	1.4
--- shptauar.ini	22 Nov 2003 18:15:13 -0000	1.5
***************
*** 48,52 ****
  [Special]
  Velocity = 200
! Range = 120
  MaxDivergence = 0.15
  RangeLimiter = 0.15
--- 48,52 ----
  [Special]
  Velocity = 200
! Range = 95
  MaxDivergence = 0.15
  RangeLimiter = 0.15

[Timewarp-commit] ships shpbatde.ini,1.6,1.7

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

Update of /cvsroot/timewarp/ships
In directory sc8-pr-cvs1:/tmp/cvs-serv21207/ships

Modified Files:
	shpbatde.ini 
Log Message:
MRT tweak

Index: shpbatde.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shpbatde.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpbatde.ini	9 Nov 2003 11:27:21 -0000	1.6
--- shpbatde.ini	22 Nov 2003 17:03:48 -0000	1.7
***************
*** 1,55 ****
! [Info]
! Origin = TW
! SC1Cost = 12
! SC2Cost = 12
! TWCost  = 12
! Name1 = Batha
! Name2 = Deviant
! Coders = GeomanNL
! Code = BathaDeviant
! ; the name, and idea: IamTheSongMan
! ; graphix: GeomanNL
! 
! [Ship]
! Crew           = 20
! CrewMax        = 20
! Batt           = 14
! BattMax        = 14
! SpeedMax       = 50		;35
! AccelRate      = 0.1		;8
! TurnRate       = 2
! RechargeAmount = 1
! RechargeRate   = 2
! WeaponDrain    = 6		;8
! WeaponRate     = 6
! SpecialDrain   = 1
! SpecialRate    = 1
! HotspotRate    = 6
! Mass           = 12
! 
! [Weapon]
! Range    = 45
! Velocity = 70
! Damage   = 2		;6
! Armour   = 3		;4
! TurnRate = 12		;10
! Mass = 4
! TailDelay = 0.02	; in seconds, how much time between updates of the tail
! 
! [Special]
! ; gas cloud :)
! LifeTime = 3.0
! Damage = 1
! 
! 
! [Quirk]
! CrewDieTime     = 5000
! WhipFactor = 0.1
! WhipAccMax = 0.25
! WellSize = 50		;25
! GravityForce = 1.5	;0.75
! DrainDistance = 80.0	;20.0		; batt drain per X movement
! DieAsteroid = 1
! DieShip     = 4
! DiePlanet   = 8
! GravRange   = 26
--- 1,55 ----
! [Info]  
! Origin = TW  
! SC1Cost = 12  
! SC2Cost = 12  
! TWCost  = 12  
! Name1 = Batha  
! Name2 = Deviant  
! Coders = GeomanNL  
! Code = BathaDeviant  
! ; the name, and idea: IamTheSongMan  
! ; graphix: GeomanNL  
!   
! [Ship]  
! Crew           = 20  
! CrewMax        = 20  
! Batt           = 14  
! BattMax        = 14  
! SpeedMax       = 50  
! AccelRate      = 5  
! TurnRate       = 2  
! RechargeAmount = 1  
! RechargeRate   = 2  
! WeaponDrain    = 6  
! WeaponRate     = 6  
! SpecialDrain   = 1  
! SpecialRate    = 0.25  
! HotspotRate    = 6  
! Mass           = 12  
!   
! [Weapon]  
! Range    = 45  
! Velocity = 70  
! Damage   = 3  
! Armour   = 3  
! TurnRate = 12  
! Mass = 0  
! TailDelay = 0.02     ; in seconds, how much time between updates of the tail  
!   
! [Special]  
! ; gas cloud :)  
! Damage = 1  
! LifeTime = 4.0  
!   
!   
! [Quirk]  
! CrewDieTime     = 5000  
! WhipFactor = 0.1  
! WhipAccMax = 0.25  
! WellSize = 15  
! GravityForce = 1.0  
! DrainDistance = 80.0          ; batt drain per X movement  
! DieAsteroid = 1  
! DieShip     = 4  
! DiePlanet   = 8  
! GravRange   = 25   
\ No newline at end of file

[Timewarp-commit] source/games dialog.cpp,1.1,1.2

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

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv6701/source/games

Modified Files:
	dialog.cpp 
Log Message:
Compilation problem

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/dialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dialog.cpp	21 Nov 2003 08:29:01 -0000	1.1
--- dialog.cpp	21 Nov 2003 20:33:20 -0000	1.2
***************
*** 1,8 ****
  #include <string.h>
! extern "C" {
  #include <lua.h>
  #include <lualib.h>
  #include <lauxlib.h>
! }
  #include <allegro.h>
  #include "dialog.h"
--- 1,8 ----
  #include <string.h>
! 
  #include <lua.h>
  #include <lualib.h>
  #include <lauxlib.h>
! 
  #include <allegro.h>
  #include "dialog.h"

[Timewarp-commit] include lauxlib.h,1.1,1.2 lua.h,1.1,1.2 lualib.h,1.1,1.2

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

Update of /cvsroot/timewarp/include
In directory sc8-pr-cvs1:/tmp/cvs-serv6476/include

Modified Files:
	lauxlib.h lua.h lualib.h 
Log Message:
Compilation problem

Index: lauxlib.h
===================================================================
RCS file: /cvsroot/timewarp/include/lauxlib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lauxlib.h	19 Nov 2003 08:20:04 -0000	1.1
--- lauxlib.h	21 Nov 2003 20:32:00 -0000	1.2
***************
*** 9,12 ****
--- 9,15 ----
  #define lauxlib_h
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
  
  #include <stddef.h>
***************
*** 140,143 ****
--- 143,149 ----
  #define luaL_opt_long	luaL_optlong
  
+ #ifdef __cplusplus
+ }
+ #endif
  
  #endif

Index: lua.h
===================================================================
RCS file: /cvsroot/timewarp/include/lua.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lua.h	19 Nov 2003 08:20:05 -0000	1.1
--- lua.h	21 Nov 2003 20:32:01 -0000	1.2
***************
*** 11,14 ****
--- 11,18 ----
  #define lua_h
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  #include <stdarg.h>
  #include <stddef.h>
***************
*** 387,390 ****
--- 391,398 ----
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ******************************************************************************/
+ 
+ #ifdef __cplusplus
+ }
+ #endif
  
  

Index: lualib.h
===================================================================
RCS file: /cvsroot/timewarp/include/lualib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lualib.h	19 Nov 2003 08:20:05 -0000	1.1
--- lualib.h	21 Nov 2003 20:32:01 -0000	1.2
***************
*** 11,14 ****
--- 11,18 ----
  #include "lua.h"
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  
  #ifndef LUALIB_API
***************
*** 53,56 ****
--- 57,64 ----
  #define lua_mathlibopen	luaopen_math
  #define lua_dblibopen	luaopen_debug
+ 
+ #ifdef __cplusplus
+ }
+ #endif
  
  #endif

[Timewarp-commit] source/newships shptauar.cpp,1.10,1.11

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

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

Modified Files:
	shptauar.cpp 
Log Message:
MRT Archon fix

Index: shptauar.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauar.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shptauar.cpp	26 Oct 2003 10:43:17 -0000	1.10
--- shptauar.cpp	21 Nov 2003 17:17:46 -0000	1.11
***************
*** 1,2 ****
--- 1,6 ----
+ // Modifed by Jad: Changed at *Jumping Peppers*'s request to make this a Behemoth
+ // so non-standard things were removed (IE: non-standard batt regen, and crew colors)
+ #include <stdio.h>
+ 
  #include "../ship.h"
  #include "../util/aastr.h"
***************
*** 36,40 ****
  	double		specialRangeLimiter;
  	double		specialMaxDivergence;
! 	int			base_recharge_rate;
  
  public:
--- 40,48 ----
  	double		specialRangeLimiter;
  	double		specialMaxDivergence;
! 	//int			base_recharge_rate; removed by Jad
! 	int			orig_amount; // added by Jad
! 	int			numDamage_steps, currentStep;
! 	bool		bCoolDownThenCharge; // added by Jad
! 	bool*		bDamage_steps;
  
  public:
***************
*** 46,53 ****
  	virtual void calculate_fire_special();
  	virtual void animate(Frame *space);
! 	virtual RGB crewPanelColor(int k = 0);
! 	virtual RGB battPanelColor(int k = 0);
  	virtual void calculate_hotspots();
  
  };
  
--- 54,63 ----
  	virtual void calculate_fire_special();
  	virtual void animate(Frame *space);
! //	virtual RGB crewPanelColor(int k = 0); removed by Jad
! //	virtual RGB battPanelColor(int k = 0); also removed by Jad
  	virtual void calculate_hotspots();
  
+ 	bool ShotTakeBatt();
+ 
  };
  
***************
*** 62,65 ****
--- 72,77 ----
  	SpaceLocation	*rotation_base;
  	bool		do_reactive_damage;
+ 	
+ 	TauArchon*  owner; //added by Jad
  
  public:
***************
*** 112,116 ****
  	specialRangeLimiter	= fabs(get_config_float("Special", "RangeLimiter", 0));
  	if (specialRangeLimiter > 1) specialRangeLimiter = 1;
! 	base_recharge_rate	= recharge_rate;
  }
  
--- 124,168 ----
  	specialRangeLimiter	= fabs(get_config_float("Special", "RangeLimiter", 0));
  	if (specialRangeLimiter > 1) specialRangeLimiter = 1;
! 	
! 	//base_recharge_rate	= recharge_rate;	removed by Jad
! 	
! 	// all code below added by Jad
! 	
! 	currentStep = 0;
! 	
! 	orig_amount			= get_config_int("Ship", "RechargeAmount", 0);
! 	bCoolDownThenCharge = bool(get_config_int("Ship", "CoolDownThenCharge", 0));
! 	
! 	numDamage_steps		= get_config_int("Weapon", "DamageSteps", 0);
! 
! 	bDamage_steps = new bool[numDamage_steps];
! 	//char* read = "Step#";
! 	char read[6] = "Step#";
! 	for(int i=0; i < numDamage_steps;i++)
! 	{
! 		// portability is in question here...
! 		//read[4] = '1' + i;//char(i+1+48);
! 		sprintf(read, "Step%i", i+1);
! 		bDamage_steps[i] = bool(get_config_int("Weapon", read,0));
! 
! 	}
! 
! 	// </Jad's additions>
! }
! 
! bool TauArchon::ShotTakeBatt()
! {
! 	if(numDamage_steps > 0)
! 	{
! 		bool bWhat2Do;
! 
! 		bWhat2Do = bDamage_steps[currentStep];
! 
! 		currentStep = (currentStep + 1) % numDamage_steps;
! 		
! 		return bWhat2Do;
! 	}
! 		
! 	return true;
  }
  
***************
*** 119,122 ****
--- 171,175 ----
  {
  STACKTRACE
+ /* Removed by Jad at *Jumping Peppers*'s behest
  	recharge_rate = base_recharge_rate * (1 - batt / (double)batt_max);
  	if (recharge_rate <= frame_time)
***************
*** 125,132 ****
  		recharge_rate = 2*weapon_rate + 1;
  	recharge_amount = batt_max;
! 
  	Ship::calculate();
  	
! 	if ((fire_weapon || fire_special) && (batt >= weapon_drain/(double)special_drain)/* && (weapon_recharge <= 0)*/) {
  		weapon_charge_counter += frame_time;
  		if (weapon_charge_counter > weaponChargeTime)
--- 178,186 ----
  		recharge_rate = 2*weapon_rate + 1;
  	recharge_amount = batt_max;
! */
  	Ship::calculate();
  	
! 	if ((fire_weapon || fire_special) && (batt >= weapon_drain/(double)special_drain)/* && (weapon_recharge <= 0)*/)
! 	{
  		weapon_charge_counter += frame_time;
  		if (weapon_charge_counter > weaponChargeTime)
***************
*** 134,141 ****
  //		recharge_step = recharge_rate;
  	}
! 	else {
  		weapon_charge_counter -= frame_time;
  		if (weapon_charge_counter < 0)
! 			weapon_charge_counter = 0; }
  
  	if (weapon_sound_timer > 0)
--- 188,203 ----
  //		recharge_step = recharge_rate;
  	}
! 	else 
! 	{
! 		if(bCoolDownThenCharge)
! 			recharge_amount = 0;
  		weapon_charge_counter -= frame_time;
  		if (weapon_charge_counter < 0)
! 		{
! 			weapon_charge_counter = 0;
! 			if(bCoolDownThenCharge)
! 				recharge_amount = orig_amount;
! 		}
! 	}
  
  	if (weapon_sound_timer > 0)
***************
*** 153,161 ****
  	if ((fire_weapon || fire_special) && (weapon_charge_counter >= weaponChargeTime))
  
! 		while (weapon_recharge <= 0) {
  			
! 			if (batt < weapon_drain/(double)special_drain) {
  				weapon_low = true;
! 				return; }
  
  			double rx = tw_random(-12.0, 12.0);
--- 215,226 ----
  	if ((fire_weapon || fire_special) && (weapon_charge_counter >= weaponChargeTime))
  
! 		while (weapon_recharge <= 0)
! 		{
  			
! 			if (batt < weapon_drain/(double)special_drain)
! 			{
  				weapon_low = true;
! 				return; 
! 			}
  
  			double rx = tw_random(-12.0, 12.0);
***************
*** 172,176 ****
  			batt -= (weapon_drain/(double)special_drain);//*0.9999;
  
! 			if (batt < 0) batt = 0;
  
  			recharge_step = recharge_rate;
--- 237,242 ----
  			batt -= (weapon_drain/(double)special_drain);//*0.9999;
  
! 			if (batt < 0) 
! 				batt = 0;
  
  			recharge_step = recharge_rate;
***************
*** 178,187 ****
  			weapon_recharge += weapon_rate;
  
! 			if (weapon_sound_timer <= 0) {
  				if (fire_special)
  					play_sound(data->sampleSpecial[0]);
  				else
  					play_sound(data->sampleWeapon[0]);
! 				weapon_sound_timer = weaponSoundTimer * tw_random(0.49, 1.63); }
  		}
  	return;
--- 244,255 ----
  			weapon_recharge += weapon_rate;
  
! 			if (weapon_sound_timer <= 0) 
! 			{
  				if (fire_special)
  					play_sound(data->sampleSpecial[0]);
  				else
  					play_sound(data->sampleWeapon[0]);
! 				weapon_sound_timer = weaponSoundTimer * tw_random(0.49, 1.63);
! 			}
  		}
  	return;
***************
*** 201,211 ****
  STACKTRACE
  	int aa = get_tw_aa_mode();
! 	if ((weapon_charge_counter > 0) && (aa & AA_BLEND) && !(aa & AA_NO_AA)) {
  		int	_old_trans = aa_get_trans();
  		sprite->animate(pos, sprite_index, space);
  		aa_set_trans(255.0*(1-weapon_charge_counter/(double)weaponChargeTime));
  		if (aa_get_trans() < 255)
  			data->more_sprites[0]->animate(pos, sprite_index, space);
! 		aa_set_trans(_old_trans); }
  	else
  		if (weapon_charge_counter > weaponChargeTime/2.0)
--- 269,285 ----
  STACKTRACE
  	int aa = get_tw_aa_mode();
! 	if ((weapon_charge_counter > 0) && (aa & AA_BLEND) && !(aa & AA_NO_AA)) 
! 	{
  		int	_old_trans = aa_get_trans();
+ 		
  		sprite->animate(pos, sprite_index, space);
+ 
  		aa_set_trans(255.0*(1-weapon_charge_counter/(double)weaponChargeTime));
+ 
  		if (aa_get_trans() < 255)
  			data->more_sprites[0]->animate(pos, sprite_index, space);
! 
! 		aa_set_trans(_old_trans); 
! 	}
  	else
  		if (weapon_charge_counter > weaponChargeTime/2.0)
***************
*** 215,219 ****
  }
  
! 
  RGB TauArchon::crewPanelColor(int k)
  {
--- 289,293 ----
  }
  
! /*	Removed by Jad
  RGB TauArchon::crewPanelColor(int k)
  {
***************
*** 228,232 ****
  	return c;
  }
! 
  
  void TauArchon::calculate_hotspots()
--- 302,306 ----
  	return c;
  }
! */
  
  void TauArchon::calculate_hotspots()
***************
*** 236,240 ****
  		game->add(new Animation( this, 
  				normal_pos() - unit_vector(angle) * 15,
! 				meleedata.hotspotSprite, 0, HOTSPOT_FRAMES, time_ratio, DEPTH_HOTSPOTS));
  		hotspot_frame += hotspot_rate; }
  	if (hotspot_frame > 0) hotspot_frame -= frame_time;
--- 310,314 ----
  		game->add(new Animation( this, 
  				normal_pos() - unit_vector(angle) * 15,
! 				data->spriteExtra, 0, 12, time_ratio, DEPTH_HOTSPOTS));
  		hotspot_frame += hotspot_rate; }
  	if (hotspot_frame > 0) hotspot_frame -= frame_time;
***************
*** 287,290 ****
--- 361,367 ----
  		rotation_base = NULL;
  
+ 	// added by Jad
+ 	owner = ((TauArchon*)creator);
+ 
  }
  
***************
*** 325,352 ****
  	double d_f = damage_factor;
  
! 	if (other->isShip()) {
! 		double bt = ((Ship*)other)->batt;
! 		other->handle_fuel_sap(this, fuel_sap);
! 		bt -= ((Ship*)other)->batt;
! 		if ((bt > 0) && (fuel_sap > 0)) {
! 			bt /= fuel_sap;
! 			if (bt < 1)
! 				damage_factor *= 1 - bt;
! 			else 
! 				damage_factor = 0;}
! 		if (damage_factor < min_damage)
! 			damage_factor = min_damage;
  	}
! 	else {
  		other->handle_fuel_sap(this, fuel_sap);
! 		damage_factor = min_damage; }
  
  	bool freeze = false;
  
! 	if (other->isShip() && do_freeze) {
! 		if ((((Ship*)other)->crew <= damage_factor ) && (!other->isProtected())) {
  			freeze = true;
  			other->die();
! 			game->ship_died(((Ship*)other), this); }
  	}
  /*	else
--- 402,442 ----
  	double d_f = damage_factor;
  
! 	if (other->isShip()) 
! 	{
! 		// added by Jad
! 		if(((TauArchon*)owner)->ShotTakeBatt())
! 		{	// </addition>
! 		
! 			double bt = ((Ship*)other)->batt;
! 			other->handle_fuel_sap(this, fuel_sap);
! 			bt -= ((Ship*)other)->batt;
! 			if ((bt > 0) && (fuel_sap > 0)) 
! 			{
! 				bt /= fuel_sap;
! 				if (bt < 1)
! 					damage_factor *= 1 - bt;
! 				else 
! 					damage_factor = 0;
! 			}
! 			if (damage_factor < min_damage)
! 				damage_factor = min_damage;
! 		}
  	}
! 	else 
! 	{
  		other->handle_fuel_sap(this, fuel_sap);
! 		damage_factor = min_damage; 
! 	}
  
  	bool freeze = false;
  
! 	if (other->isShip() && do_freeze) 
! 	{
! 		if ((((Ship*)other)->crew <= damage_factor ) && (!other->isProtected())) 
! 		{
  			freeze = true;
  			other->die();
! 			game->ship_died(((Ship*)other), this); 
! 		}
  	}
  /*	else
***************
*** 360,364 ****
  		}*/
  
! 	if (freeze) {
  		BITMAP* bmp = other->get_sprite()->get_bitmap_readonly( other->get_sprite_index() );
  		BITMAP* tmp;
--- 450,455 ----
  		}*/
  
! 	if (freeze) 
! 	{
  		BITMAP* bmp = other->get_sprite()->get_bitmap_readonly( other->get_sprite_index() );
  		BITMAP* tmp;

[Timewarp-commit] ships shptauar.dat,1.3,1.4 shptauar.ini,1.3,1.4

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

Update of /cvsroot/timewarp/ships
In directory sc8-pr-cvs1:/tmp/cvs-serv7079/ships

Modified Files:
	shptauar.dat shptauar.ini 
Log Message:
MRT Archon fix

Index: shptauar.dat
===================================================================
RCS file: /cvsroot/timewarp/ships/shptauar.dat,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvseoSTlm and /tmp/cvscXUh6Q differ

Index: shptauar.ini
===================================================================
RCS file: /cvsroot/timewarp/ships/shptauar.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shptauar.ini	8 Jun 2003 17:55:20 -0000	1.3
--- shptauar.ini	21 Nov 2003 17:17:49 -0000	1.4
***************
*** 1,26 ****
  [Info]
! TWCost  = 27
  Name1 = Tau
  Name2 = Archon
  Origin = TW
! Coders = Tau
  Code = TauArchon
  
  [Ship]
! Crew           = 20
! CrewMax        = 20
! Batt           = 20
! BattMax        = 20
! SpeedMax       = 34.5
  AccelRate      = 5.7
! TurnRate       = 2.9
! RechargeAmount = 20
! RechargeRate   = 47
! WeaponDrain    = 1
  WeaponRate     = -0.5
  SpecialDrain   = 5
  SpecialRate    = 0
! HotspotRate    = 2
! Mass           = 14
  
  [Weapon]
--- 1,28 ----
  [Info]
! TWCost  = 30
  Name1 = Tau
  Name2 = Archon
  Origin = TW
! Coders = Tau (and Jad)
  Code = TauArchon
  
  [Ship]
! Crew           = 42
! CrewMax        = 42
! Batt           = 42
! BattMax        = 42
! SpeedMax       = 30
  AccelRate      = 5.7
! TurnRate       = 4.2
! RechargeAmount = 1
! RechargeRate   = 2.5
! WeaponDrain    = 3
  WeaponRate     = -0.5
  SpecialDrain   = 5
  SpecialRate    = 0
! HotspotRate    = 5
! Mass           = 23
! 
! CoolDownThenCharge = 1
  
  [Weapon]
***************
*** 28,42 ****
  Velocity = 90
  Range = 19
! Damage = 0.5
  DamageMin = 0.125
  Armour = 1
! FuelSap = 2
  DoFreeze = 1
  SoundTimer = 250
  DoReactiveDamage = 1
  
  [Special]
! Velocity = 45
! Range = 77
  MaxDivergence = 0.15
  RangeLimiter = 0.15
--- 30,52 ----
  Velocity = 90
  Range = 19
! Damage = 1
  DamageMin = 0.125
  Armour = 1
! FuelSap = 1
  DoFreeze = 1
  SoundTimer = 250
  DoReactiveDamage = 1
  
+ ; The steps the ship takes to damage a ship
+ ; set DamageSteps to 0 to return to original (all batt first) style
+ DamageSteps = 2
+ 
+ ; Batt = 1, Crew = 0.
+ Step1 = 1
+ Step2 = 0
+ 
  [Special]
! Velocity = 200
! Range = 120
  MaxDivergence = 0.15
  RangeLimiter = 0.15

[Timewarp-commit] source/newships shpartem.cpp,1.7,1.8

[<or...@us...>]

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

Modified Files:
	shpartem.cpp 
Log Message:
bug fix

Index: shpartem.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpartem.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpartem.cpp	25 Oct 2003 14:30:20 -0000	1.7
--- shpartem.cpp	21 Nov 2003 10:24:43 -0000	1.8
***************
*** 293,296 ****
--- 293,298 ----
  		sprite_index = iround(shit_angle / 5.625) + 192;
  
+ 	sprite_index &= 255;
+ 
  	if (!wave_range && tempest->exists()) {
  

[Timewarp-commit] source/util aastr.h,1.3,1.4 base.cpp,1.3,1.4 base.h,1.3,1.4 errors.h,1.6,1.7 errors_c.c,1.4,1.5 history.cpp,1.3,1.4 pmask.c,1.5,1.6 random.cpp,1.5,1.6 round.c,1.4,1.5 vector2.cpp,1.8,1.9

[<or...@us...>]

Update of /cvsroot/timewarp/source/util
In directory sc8-pr-cvs1:/tmp/cvs-serv27080/source/util

Modified Files:
	aastr.h base.cpp base.h errors.h errors_c.c history.cpp 
	pmask.c random.cpp round.c vector2.cpp 
Log Message:
minor changes

Index: aastr.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/aastr.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aastr.h	8 Jun 2003 16:07:28 -0000	1.3
--- aastr.h	21 Nov 2003 10:24:29 -0000	1.4
***************
*** 22,26 ****
  #define __bma_aastr_h
  
! #include <allegro.h>
  
  /*
--- 22,26 ----
  #define __bma_aastr_h
  
! 
  
  /*

Index: base.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/base.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** base.cpp	8 Jun 2003 16:07:28 -0000	1.3
--- base.cpp	21 Nov 2003 10:24:29 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  
+ #include <stdlib.h>
  #include "base.h"
  #include "errors.h"
***************
*** 11,14 ****
--- 12,40 ----
  	func();
  }
+ 
+ #ifdef TW_MALLOC_CHECK
+ #	undef malloc
+ #	undef realloc
+ #	undef free
+ 	void *tw_malloc(int size) {
+ 		void *r = malloc(size);
+ 		if (!r) error_oom();
+ 		return r;
+ 	}
+ 	void *tw_realloc(void *old, int size) {
+ 		void *r = realloc(old, size);
+ 		if (!r && size) error_oom();
+ 		return r;
+ 	}
+ 	void tw_free(void *mem) {
+ 		free(mem);
+ 	}
+ /*	void *operator new(unsigned int size) {
+ 		return tw_malloc(size);
+ 	}
+ 	void operator delete(void *mem) {
+ 		tw_free(mem);
+ 	}*/
+ #endif
  
  /*------------------------------

Index: base.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/base.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** base.h	8 Jun 2003 16:07:28 -0000	1.3
--- base.h	21 Nov 2003 10:24:29 -0000	1.4
***************
*** 11,14 ****
--- 11,32 ----
  #endif
  
+ //#define TW_MALLOC_CHECK
+ #ifdef TW_MALLOC_CHECK
+ #	ifdef __cplusplus
+ 		extern "C" {
+ #	endif
+ 	void *tw_malloc(int size);
+ 	void *tw_realloc(void *old, int size);
+ 	void tw_free(void *item);
+ #	define malloc  tw_malloc
+ #	define realloc tw_realloc
+ #	define free    tw_free
+ #	ifdef __cplusplus
+ 		}
+ 		static inline void *operator new(unsigned int size) {return tw_malloc(size);}
+ 		static inline void operator delete(void *item) {tw_free(item);}
+ #	endif
+ #endif
+ 
  #ifdef __cplusplus
  

Index: errors.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/errors.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** errors.h	2 Nov 2003 22:39:52 -0000	1.6
--- errors.h	21 Nov 2003 10:24:29 -0000	1.7
***************
*** 127,130 ****
--- 127,140 ----
  void tw_exit(int errorcode) ;
  
+ /*
+  * void error_oom()
+  *
+  * If you have a critical Out Of Memory error, call this function.  
+  * It will quit TW and attempt to notify the user.  
+  *
+  */
+ void error_oom();
+ 
+ 
  // not for user-code
  //this flag is set to 0 normally, or 1 to bypass error catching

Index: errors_c.c
===================================================================
RCS file: /cvsroot/timewarp/source/util/errors_c.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** errors_c.c	25 Oct 2003 02:35:52 -0000	1.4
--- errors_c.c	21 Nov 2003 10:24:29 -0000	1.5
***************
*** 97,100 ****
--- 97,109 ----
  }
  
+ void error_oom() {
+ 	if (debug_log_file) {
+ 		fprintf(debug_log_file, "\nCritical error: OUT OF MEMORY\n");
+ 		fflush(debug_log_file);
+ 		fclose(debug_log_file);
+ 	}
+ 	tw_exit(1);
+ }
+ 
  #if defined(USE_ALLEGRO) && defined(DO_STACKTRACE)
  #else

Index: history.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/history.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** history.cpp	8 Jun 2003 17:55:57 -0000	1.3
--- history.cpp	21 Nov 2003 10:24:29 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  #include <stdlib.h>
  #include <math.h>
+ #include "base.h"
  #include "history.h"
  

Index: pmask.c
===================================================================
RCS file: /cvsroot/timewarp/source/util/pmask.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pmask.c	20 Oct 2003 14:46:14 -0000	1.5
--- pmask.c	21 Nov 2003 10:24:29 -0000	1.6
***************
*** 2,6 ****
  #include <string.h>
  #include <math.h>
! #include "round.h"
  #include "pmask.h"
  
--- 2,6 ----
  #include <string.h>
  #include <math.h>
! 
  #include "pmask.h"
  
***************
*** 17,20 ****
--- 17,24 ----
  #	include <SDL_endian.h>
  #endif
+ 
+ 
+ #include "base.h"
+ #include "round.h"
  
  

Index: random.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/random.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** random.cpp	26 Oct 2003 09:25:49 -0000	1.5
--- random.cpp	21 Nov 2003 10:24:29 -0000	1.6
***************
*** 27,31 ****
  		return r;
  #	elif defined(__GNUC__) && defined(__i386__) && !defined(NO_ASM)
! 		asm ("mull %0" : "=d" (r) : "a" (m), "0" (r) );
  		return r;
  #	else //add gcc asm sometime
--- 27,31 ----
  		return r;
  #	elif defined(__GNUC__) && defined(__i386__) && !defined(NO_ASM)
! 		asm ("mull %0" : "=d" (r) : "%a" (m), "0" (r) );
  		return r;
  #	else //add gcc asm sometime
***************
*** 42,46 ****
  }
  Uint32 RNG_lcg64a::raw32() {
- 
  #	if defined(_MSC_VER) && defined(__i386__) && !defined(NO_ASM)
  		split_int_64 i64 = s64;
--- 42,45 ----
***************
*** 56,62 ****
  		_asm { mov [i64.s.high], ecx } 
  		s64 = i64;
! #	elif 0
! 		//defined(__GNUC__) && !defined(NO_ASM)
! 		//haven't written gcc code yet
  #	else
  		s64.whole = (s64.whole * MULTIPLIER) + ADDITIVE;
--- 55,68 ----
  		_asm { mov [i64.s.high], ecx } 
  		s64 = i64;
! #	elif 0 && defined(__GNUC__) && !defined(NO_ASM)
! 		Uint32 _blah;
! 		asm (
! 			"imull %3, %5"	"\n\t"
! 			"mull  %3"		"\n\t"
! 			"addl  %6, %1"	"\n\t"
! 			"adcl  %0, %2"
! 			: "=d" (_blah),      "=a" (i64.s.low), "=b" (i64.s.high)
! 			: "0"  (MULTIPLIER), "1"  (i64.s.low),  "2" (i64.s.high),  "i" (ADDITIVE) 
! 		);
  #	else
  		s64.whole = (s64.whole * MULTIPLIER) + ADDITIVE;

Index: round.c
===================================================================
RCS file: /cvsroot/timewarp/source/util/round.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** round.c	25 Oct 2003 02:35:52 -0000	1.4
--- round.c	21 Nov 2003 10:24:29 -0000	1.5
***************
*** 25,29 ****
  #include <float.h>
  
! //#include "types.h"
  #include "round.h"
  
--- 25,29 ----
  #include <float.h>
  
! #include "base.h"
  #include "round.h"
  

Index: vector2.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/util/vector2.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vector2.cpp	26 Oct 2003 10:43:18 -0000	1.8
--- vector2.cpp	21 Nov 2003 10:24:29 -0000	1.9
***************
*** 1,2 ****
--- 1,3 ----
+ #include <stdlib.h>
  #include <math.h>
  #include "base.h"
***************
*** 4,8 ****
  #include "random.h"
  #include "round.h"
! #include "../melee.h"
  
  Vector2::Vector2(Vector2i v2i) : x(v2i.x), y(v2i.y) {}
--- 5,9 ----
  #include "random.h"
  #include "round.h"
! //#include "../melee.h"
  
  Vector2::Vector2(Vector2i v2i) : x(v2i.x), y(v2i.y) {}
***************
*** 23,27 ****
  	if (*this == 0) return 0;
  	double a = atan2(y, x);
! 	if (a < 0) a += PI2;
  	return a;
  }
--- 24,28 ----
  	if (*this == 0) return 0;
  	double a = atan2(y, x);
! 	if (a < 0) a += 3.14159265358979 * 2;
  	return a;
  }

[Timewarp-commit] source/melee mcontrol.cpp,1.9,1.10 mcontrol.h,1.4,1.5 mgame.cpp,1.22,1.23 msprite.cpp,1.9,1.10

[<or...@us...>]

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

Modified Files:
	mcontrol.cpp mcontrol.h mgame.cpp msprite.cpp 
Log Message:
minor changes

Index: mcontrol.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mcontrol.cpp	12 Nov 2003 01:51:09 -0000	1.9
--- mcontrol.cpp	21 Nov 2003 10:24:29 -0000	1.10
***************
*** 184,189 ****
  	if (ship) {
  		ship->control = this;
! 		if ((channel != Game::channel_none) && (already != 0) && (already != game->lag_frames)) 
! 			tw_error ("Control - known error");
  		}
  	target_stuff() ;
--- 184,189 ----
  	if (ship) {
  		ship->control = this;
! 		if (temporary && (channel != Game::channel_none) && (already != 0) && (already != game->lag_frames)) 
! 			tw_error ("Control::select_ship - bad operation (incompatible with networking)");
  		}
  	target_stuff() ;
***************
*** 375,380 ****
--- 375,394 ----
  	return;
  	}
+ 
+ /*
+ lag / already state:
+ 
+ 	name				traffic							mark
+ 	stable presence		( old lf:1 new )				a = lf
+ 	buffering			( old a:1 (lf-a):0 new )		a >= 0
+ 	unbuffering			( old (lf-a):0 a:1 new )		a < 0
+ 
+ 
+ */
+ 
  void Control::calculate() {STACKTRACE
  
+ 	if (!exists()) return;
+ 
  	target_stuff();
  
***************
*** 387,410 ****
  		}
  	
! 	if (!ship) keys = 0;
  
- 	//THIS WILL CRASH
- 	//IF A NETWORKED SHIP IS DESTROYED IN THE FIRST FEW FRAMES OF IT'S LIFE
- 	//!!!!!!!!
  	if (channel != Game::channel_none) {
! 		int lag = game->lag_frames;
! 		if (!ship) {
! 			lag = 0;
! 			if (!already) {
! 				if (temporary) this->die();
! 				return;
! 				}
! 			}
  		_prediction_keys[_prediction_keys_index] = keys;
  		_prediction_keys_index = (_prediction_keys_index + 1) & (_prediction_keys_size-1);
! 		if (already == lag) {
! 			game->log_short(channel + Game::_channel_buffered, keys);
  			}
! 		else if (already < lag) {
  			keys = intel_ordering_short(keys);
  			game->log->buffer(channel + Game::_channel_buffered, &keys, sizeof(KeyCode));
--- 401,426 ----
  		}
  	
! 	if (!ship) {
! 		keys = 0;
! 		if (temporary) state = 0;
! 		}
  
  	if (channel != Game::channel_none) {
! 		//prediction stuff
  		_prediction_keys[_prediction_keys_index] = keys;
  		_prediction_keys_index = (_prediction_keys_index + 1) & (_prediction_keys_size-1);
! 		
! 		//network prep for dieing (set state to unbuffering)
! 		if (!ship && temporary && (already > 0)) already = -already;
! 		
! 		//network traffic
! 		int lf = game->lag_frames;
! 		if (0) ;
! 		else if (already < 0) {//unbuffering
! 			game->log->unbuffer(channel + Game::_channel_buffered, &keys, sizeof(KeyCode));
! 			keys = intel_ordering_short(keys);
! 			already += 1;
  			}
! 		else if (already < lf) {//buffering
  			keys = intel_ordering_short(keys);
  			game->log->buffer(channel + Game::_channel_buffered, &keys, sizeof(KeyCode));
***************
*** 412,419 ****
  			already += 1;
  			}
! 		else {
! 			game->log->unbuffer(channel + Game::_channel_buffered, &keys, sizeof(KeyCode));
! 			keys = intel_ordering_short(keys);
! 			already -= 1;
  			}
  		}
--- 428,436 ----
  			already += 1;
  			}
! 		else if (already > lf) {//stupid error check
! 			tw_error("Control::calculate() - inconcievable!");
! 			}
! 		else {//stable, perform no action
! 			game->log_short(channel + Game::_channel_buffered, keys);
  			}
  		}
***************
*** 427,430 ****
--- 444,451 ----
  	return iname;
  	}
+ void Control::_event(Event *e) {STACKTRACE
+ 	//add code for lag increase / decrease here
+ 	return;
+ }
  Control::Control(const char *name, int _channel) : temporary(false), target_sign_color(255), 
  	already(0), channel(_channel), ship(NULL), 

Index: mcontrol.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mcontrol.h	12 Nov 2003 01:51:09 -0000	1.4
--- mcontrol.h	21 Nov 2003 10:24:29 -0000	1.5
***************
*** 23,27 ****
  	bool temporary;                   //true if this control will delete itself when it's ship dies
  	unsigned char target_sign_color;
! 	int already;
  	int channel;
  
--- 23,27 ----
  	bool temporary;                   //true if this control will delete itself when it's ship dies
  	unsigned char target_sign_color;
! 	int already;//this pertains to network traffic - see comment above calculate() in mcontrol.cpp
  	int channel;
  
***************
*** 85,88 ****
--- 85,91 ----
  	KeyCode *_prediction_keys;
  	unsigned char _prediction_keys_index;
+ 
+ //for future mid-game lag changes
+ 	virtual void _event ( Event *e );
  	};
  

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mgame.cpp	12 Nov 2003 20:33:33 -0000	1.22
--- mgame.cpp	21 Nov 2003 10:24:29 -0000	1.23
***************
*** 1226,1246 ****
  		break;
  		case KEY_F7: {
! 			if (!physics_locked) {
! 				if (frame_time < 7) {
! 					frame_time = 50;
! 				}
! 				else if (frame_time < 15) {
! 					frame_time = 5;
! 				}
! 				else if (frame_time < 30) {
! 					frame_time = 10;
! 				}
! 				else {
! 					frame_time = 25;
! 				}
! 				message.print(1000, 15, "Game Tic rate set to %f / second", 1000./frame_time);
! 				return true;
  			}
! 			return false;
  		}
  		break;
--- 1226,1244 ----
  		break;
  		case KEY_F7: {
! 			if (physics_locked) return false;
! 			if (frame_time < 7) {
! 				frame_time = 50;
  			}
! 			else if (frame_time < 15) {
! 				frame_time = 5;
! 			}
! 			else if (frame_time < 30) {
! 				frame_time = 10;
! 			}
! 			else {
! 				frame_time = 25;
! 			}
! 			message.print(1000, 15, "Game Tic rate set to %f / second", 1000./frame_time);
! 			return true;
  		}
  		break;

Index: msprite.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/msprite.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** msprite.cpp	15 Oct 2003 16:04:20 -0000	1.9
--- msprite.cpp	21 Nov 2003 10:24:29 -0000	1.10
***************
*** 363,367 ****
  		}
  	}
! 	delete tmp;
  	return;
  }
--- 363,367 ----
  		}
  	}
! 	delete tmp2;
  	return;
  }

[Timewarp-commit] source melee.h,1.9,1.10 scp.h,1.4,1.5

[<or...@us...>]

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

Modified Files:
	melee.h scp.h 
Log Message:
minor changes

Index: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** melee.h	12 Nov 2003 20:33:33 -0000	1.9
--- melee.h	21 Nov 2003 10:24:28 -0000	1.10
***************
*** 209,212 ****
--- 209,213 ----
  void video_menu (Game *game) ;
  void audio_menu (Game *game) ;
+ void view_menu (Game *game) ;
  void config_menu (Game *game) ;
  void physics_menu (Game *game) ;

Index: scp.h
===================================================================
RCS file: /cvsroot/timewarp/source/scp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scp.h	18 Oct 2003 11:54:11 -0000	1.4
--- scp.h	21 Nov 2003 10:24:28 -0000	1.5
***************
*** 6,10 ****
  void change_teams();
  void edit_fleet(int player) ;
! void change_options() ;
  int connect_menu(VideoWindow *window, char **address, int *port) ;
  int is_escape_pressed() ;
--- 6,10 ----
  void change_teams();
  void edit_fleet(int player) ;
! //void change_options() ;
  int connect_menu(VideoWindow *window, char **address, int *port) ;
  int is_escape_pressed() ;

[Timewarp-commit] source/games ggob.cpp,1.9,1.10

[<or...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv27080/source/games

Modified Files:
	ggob.cpp 
Log Message:
minor changes

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ggob.cpp	25 Oct 2003 14:30:19 -0000	1.9
--- ggob.cpp	21 Nov 2003 10:24:28 -0000	1.10
***************
*** 233,237 ****
  	this->change_view("Hero");
  	//view = get_view ( "Hero", NULL );
! 	//view_locked = true;
  	view->window->locate(
  		0,0,
--- 233,237 ----
  	this->change_view("Hero");
  	//view = get_view ( "Hero", NULL );
! 	view_locked = true;
  	view->window->locate(
  		0,0,

[Timewarp-commit] source/melee mmain.cpp,1.16,1.17

[<or...@us...>]

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

Modified Files:
	mmain.cpp 
Log Message:
changed indicator keys

Index: mmain.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mmain.cpp	12 Nov 2003 17:35:30 -0000	1.16
--- mmain.cpp	21 Nov 2003 10:23:21 -0000	1.17
***************
*** 345,357 ****
  				SpaceLocation *o;
  				o = physics->item[i];
- 				
  				if (!(o && o->exists()))
  					continue;
- 				
  				if (o->isPlanet() || o->isAsteroid())
  					continue;
- 				
  				o->die();
- 
  			}
  		}
--- 345,353 ----
***************
*** 450,461 ****
  			}
  		break;
  		case KEY_H:
! 			indhealthtoggle = ~indhealthtoggle;
  			break;
  		case KEY_T:
! 			indteamtoggle = ~indteamtoggle;
  			break;
  		}
- 
  	return false;
  	}
--- 446,457 ----
  			}
  		break;
+ 		//don't use hardwired normal keys
  		case KEY_H:
! 			if ((k & 255) == 'H'-'A'+1) indhealthtoggle = ~indhealthtoggle;
  			break;
  		case KEY_T:
! 			if ((k & 255) == 'T'-'A'+1) indteamtoggle = ~indteamtoggle;
  			break;
  		}
  	return false;
  	}
***************
*** 473,476 ****
--- 469,473 ----
  	virtual void calculate();
  	virtual void animate(Frame *space);
+ 	virtual void animate_predict(Frame *frame, int time);
  };
  
***************
*** 547,562 ****
  		add(new TeamIndicator(s, &indteamtoggle));
  
- 
- 
  		
  		// CHECK FILE SIZES !! to intercept desynch before they happen.
- 
  		int myfsize, otherfsize;
  
  		myfsize = file_size(s->type->data->file);
  		otherfsize = myfsize;
! 		log_int(player_control[i]->channel, otherfsize);
! 
! 
  
  		if (otherfsize != myfsize)
--- 544,556 ----
  		add(new TeamIndicator(s, &indteamtoggle));
  
  		
  		// CHECK FILE SIZES !! to intercept desynch before they happen.
  		int myfsize, otherfsize;
  
  		myfsize = file_size(s->type->data->file);
  		otherfsize = myfsize;
! 		if (player_control[i]->channel != channel_none) {
! 			log_int(player_control[i]->channel, otherfsize);
! 		}
  
  		if (otherfsize != myfsize)
***************
*** 591,598 ****
  		return;
  	}
- 
  }
  
! void TeamIndicator::animate(Frame *space)
  {
  	if (!*indtoggle)
--- 585,594 ----
  		return;
  	}
  }
  
! void TeamIndicator::animate(Frame *space) {
! 	animate_predict(space, 0);
! }
! void TeamIndicator::animate_predict(Frame *space, int time)
  {
  	if (!*indtoggle)
***************
*** 602,613 ****
  		return;
  
! 	Vector2 co1, co2, D;
  
! 	co1 = corner(mother->pos - 0.5 * mother->size);
  	//co2 = corner(mother->pos + Vector2(d2, -mother->size.y * 0.6));
  
- 	D = mother->size * space_zoom;
- 	co2 = co1 + D;
- 
  	if (co2.x < 0) return;
  	if (co2.y < 0) return;
--- 598,607 ----
  		return;
  
! 	Vector2i co1, co2, D;
  
! 	co1 = corner(mother->pos - 0.5 * mother->size).round();
! 	co2 = corner(mother->pos + 0.5 * mother->size).round();
  	//co2 = corner(mother->pos + Vector2(d2, -mother->size.y * 0.6));
  
  	if (co2.x < 0) return;
  	if (co2.y < 0) return;
***************
*** 618,622 ****
  	col = palette_color[mother->get_team() + 1];	// team 0 is black ...
  
! 	rect(space->surface, (int)co1.x, (int)co1.y, (int)co2.x, (int)co2.y, col);
  	space->add_box(co1.x, co1.y, co2.x, co2.y);
  }
--- 612,616 ----
  	col = palette_color[mother->get_team() + 1];	// team 0 is black ...
  
! 	rect(space->surface, co1.x, co1.y, co2.x, co2.y, col);
  	space->add_box(co1.x, co1.y, co2.x, co2.y);
  }

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

[<or...@us...>]

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

Modified Files:
	mmath.cpp 
Log Message:
error checking improvement

Index: mmath.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmath.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mmath.cpp	30 Oct 2003 15:25:45 -0000	1.4
--- mmath.cpp	21 Nov 2003 10:21:23 -0000	1.5
***************
*** 84,88 ****
  	__asm fstp b;
  */
! 	if (max < 0) {
  		tw_error ("normalize - bad \n%f\n %% %f", value, max);
  		return normalize2(value, max);
--- 84,88 ----
  	__asm fstp b;
  */
! 	if (max <= 0) {
  		tw_error ("normalize - bad \n%f\n %% %f", value, max);
  		return normalize2(value, max);

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

[<or...@us...>]

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

Modified Files:
	mlog.cpp 
Log Message:
portability fix

Index: mlog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mlog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mlog.cpp	8 Jun 2003 17:55:51 -0000	1.3
--- mlog.cpp	21 Nov 2003 10:20:44 -0000	1.4
***************
*** 25,29 ****
  	type = Log::log_normal;
  	return;
! 	}
  
  void Log::set_direction ( int channel, char direction ) {STACKTRACE
--- 25,29 ----
  	type = Log::log_normal;
  	return;
! }
  
  void Log::set_direction ( int channel, char direction ) {STACKTRACE
***************
*** 31,38 ****
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 		}
  	log_dir[channel] = direction;
  	return;
! 	}
  
  char Log::get_direction ( int channel ) {STACKTRACE
--- 31,38 ----
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 	}
  	log_dir[channel] = direction;
  	return;
! }
  
  char Log::get_direction ( int channel ) {STACKTRACE
***************
*** 40,46 ****
  	if (channel >= log_num) {
  		expand_logs(channel+1);
- 		}
- 	return (log_dir[channel]);
  	}
  
  void Log::set_all_directions ( char direction ) {STACKTRACE
--- 40,46 ----
  	if (channel >= log_num) {
  		expand_logs(channel+1);
  	}
+ 	return (log_dir[channel]);
+ }
  
  void Log::set_all_directions ( char direction ) {STACKTRACE
***************
*** 49,60 ****
  	for (i = 0; i < log_num; i += 1) {
  		log_dir[i] = direction;
- 		}
- 	return;
  	}
  
  Log::~Log() {STACKTRACE
  	if (log_data) for (int i = 0; i < log_num; i += 1) {
  		free(log_data[i]);
! 		}
  	free(log_len);
  	free(log_size);
--- 49,60 ----
  	for (i = 0; i < log_num; i += 1) {
  		log_dir[i] = direction;
  	}
+ 	return;
+ }
  
  Log::~Log() {STACKTRACE
  	if (log_data) for (int i = 0; i < log_num; i += 1) {
  		free(log_data[i]);
! 	}
  	free(log_len);
  	free(log_size);
***************
*** 63,67 ****
  	free(log_dir);
  	log_num = 0;
! 	}
  
  void Log::log ( int channel, void *data, int size) {STACKTRACE
--- 63,67 ----
  	free(log_dir);
  	log_num = 0;
! }
  
  void Log::log ( int channel, void *data, int size) {STACKTRACE
***************
*** 70,78 ****
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 		}
  	if (log_dir[channel] & direction_write) _log ( channel, data, size);
  	if (log_dir[channel] & direction_read) _unlog ( channel, data, size);
  	return;
! 	}
  void Log::_log(int channel, const void *data, int size) {STACKTRACE
  	log_len[channel] += size;
--- 70,78 ----
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 	}
  	if (log_dir[channel] & direction_write) _log ( channel, data, size);
  	if (log_dir[channel] & direction_read) _unlog ( channel, data, size);
  	return;
! }
  void Log::_log(int channel, const void *data, int size) {STACKTRACE
  	log_len[channel] += size;
***************
*** 81,88 ****
  		else log_size[channel] = 32;
  		log_data[channel] = (unsigned char *) realloc(log_data[channel], log_size[channel]);
! 		}
  	memcpy(log_data[channel]+(log_len[channel]-size), data, size);
  	return;
! 	}
  void Log::_unlog(int channel, void *data, int size) {STACKTRACE
  	if (log_len[channel] < log_pos[channel] + size) tw_error ("Game::_unlog - went past end (%d+%d/%d on %d)", log_pos[channel], size, log_len[channel], channel);
--- 81,88 ----
  		else log_size[channel] = 32;
  		log_data[channel] = (unsigned char *) realloc(log_data[channel], log_size[channel]);
! 	}
  	memcpy(log_data[channel]+(log_len[channel]-size), data, size);
  	return;
! }
  void Log::_unlog(int channel, void *data, int size) {STACKTRACE
  	if (log_len[channel] < log_pos[channel] + size) tw_error ("Game::_unlog - went past end (%d+%d/%d on %d)", log_pos[channel], size, log_len[channel], channel);
***************
*** 90,94 ****
  	log_pos[channel] += size;
  	return;
! 	}
  
  void Log::save (const char *fname) {STACKTRACE
--- 90,94 ----
  	log_pos[channel] += size;
  	return;
! }
  
  void Log::save (const char *fname) {STACKTRACE
***************
*** 107,114 ****
  		pack_fwrite ( log_data[i], log_len[i], f);
  		f = pack_fclose_chunk(f);
! 		}
  	pack_fclose (f);
  	return;
! 	}
  void Log::load (const char *fname) {STACKTRACE
  	PACKFILE *f;
--- 107,114 ----
  		pack_fwrite ( log_data[i], log_len[i], f);
  		f = pack_fclose_chunk(f);
! 	}
  	pack_fclose (f);
  	return;
! }
  void Log::load (const char *fname) {STACKTRACE
  	PACKFILE *f;
***************
*** 132,141 ****
  			l -= k;
  			_log(i, buffy, tl);
- 			}
- 		f = pack_fclose_chunk(f);
  		}
  	pack_fclose (f);
  	return;
! 	}
  void Log::expand_logs(int num_channels) {STACKTRACE
  	int old_log_num = log_num;
--- 132,141 ----
  			l -= k;
  			_log(i, buffy, tl);
  		}
+ 		f = pack_fclose_chunk(f);
+ 	}
  	pack_fclose (f);
  	return;
! }
  void Log::expand_logs(int num_channels) {STACKTRACE
  	int old_log_num = log_num;
***************
*** 153,164 ****
  		log_pos[i] = 0;
  		log_dir[i] = default_direction;
- 		}
- 	return;
  	}
  int Log::ready(int channel) {
  	if (channel < 0) tw_error ("log_ready - negative channel!");
  	if (channel >= log_num) return 0;
  	return log_len[channel] - log_pos[channel];
! 	}
  int Log::file_ready(const char *fname, void **location) {STACKTRACE
  	if (log_num <= channel_file_data) return -1;
--- 153,164 ----
  		log_pos[i] = 0;
  		log_dir[i] = default_direction;
  	}
+ 	return;
+ }
  int Log::ready(int channel) {
  	if (channel < 0) tw_error ("log_ready - negative channel!");
  	if (channel >= log_num) return 0;
  	return log_len[channel] - log_pos[channel];
! }
  int Log::file_ready(const char *fname, void **location) {STACKTRACE
  	if (log_num <= channel_file_data) return -1;
***************
*** 167,184 ****
  		if (strcmp((char*) log_data[channel_file_names] + i, fname)) {
  			i += strlen((char*) log_data[channel_file_names] + i) + 1;
! 			j += intel_ordering(*((int*)(log_data[channel_file_names] + i)));
! 			i += 4;
! 			}
  		else {
  			i += strlen((char*) log_data[channel_file_names] + i) + 1;
  			int k;
  			memcpy(&k, (log_data[channel_file_names] + i), sizeof(int));
  			if (j+k > log_len[channel_file_data]) tw_error ("Log::file_ready - uh, that's bad");
  			if (location) *location = log_data[channel_file_data] + j;
  			return k;
- 			}
  		}
- 	return -1;
  	}
  void Log::log_file(const char *fname) {STACKTRACE
  	void *loc;
--- 167,188 ----
  		if (strcmp((char*) log_data[channel_file_names] + i, fname)) {
  			i += strlen((char*) log_data[channel_file_names] + i) + 1;
! //			j += intel_ordering(*((int*)(log_data[channel_file_names] + i)));
! 			int k;
! 			memcpy(&k, (log_data[channel_file_names] + i), sizeof(int));
! 			j += intel_ordering(k);
! 			i += sizeof(int);
! 		}
  		else {
  			i += strlen((char*) log_data[channel_file_names] + i) + 1;
  			int k;
  			memcpy(&k, (log_data[channel_file_names] + i), sizeof(int));
+ 
  			if (j+k > log_len[channel_file_data]) tw_error ("Log::file_ready - uh, that's bad");
  			if (location) *location = log_data[channel_file_data] + j;
  			return k;
  		}
  	}
+ 	return -1;
+ }
  void Log::log_file(const char *fname) {STACKTRACE
  	void *loc;
***************
*** 186,201 ****
  		set_config_file(fname);
  		return;
! 		}
  	int len = file_ready(fname, &loc);
  	if (len >= 0) {
  		set_config_data((char*)loc, len);
  		return;
! 		}
  	if (!(log_dir[channel_file_data] & direction_write)) {
  		tw_error("Log::log_file - file logs read only, \"%s\" not found", fname);
! 		}
  	if (log_num <= channel_file_data) {
  		expand_logs(channel_file_data + 1);
! 		}
  	char buffy[2048];
  	PACKFILE *f;
--- 190,205 ----
  		set_config_file(fname);
  		return;
! 	}
  	int len = file_ready(fname, &loc);
  	if (len >= 0) {
  		set_config_data((char*)loc, len);
  		return;
! 	}
  	if (!(log_dir[channel_file_data] & direction_write)) {
  		tw_error("Log::log_file - file logs read only, \"%s\" not found", fname);
! 	}
  	if (log_num <= channel_file_data) {
  		expand_logs(channel_file_data + 1);
! 	}
  	char buffy[2048];
  	PACKFILE *f;
***************
*** 208,214 ****
  			_log(channel_file_data, buffy, i);
  			j += i;
- 			}
- 		else break;
  		}
  	sprintf(buffy, "%s", fname);
  	j = intel_ordering(j);
--- 212,218 ----
  			_log(channel_file_data, buffy, i);
  			j += i;
  		}
+ 		else break;
+ 	}
  	sprintf(buffy, "%s", fname);
  	j = intel_ordering(j);
***************
*** 218,226 ****
  	set_config_data((char*)loc, len);
  	return;
! 	}
  
  void Log::deinit() {STACKTRACE
  	return;
! 	}
  
  bool Log::buffer ( int channel, void *data, int size ) {STACKTRACE
--- 222,230 ----
  	set_config_data((char*)loc, len);
  	return;
! }
  
  void Log::deinit() {STACKTRACE
  	return;
! }
  
  bool Log::buffer ( int channel, void *data, int size ) {STACKTRACE
***************
*** 230,247 ****
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 		}
  	if (data == NULL) {
  		data = zeros;
  		if (size > 128) tw_error("Log::buffer - overflow");
  		memset(zeros, 0, size);
! 		}
  	if (log_dir[channel] & direction_write) {
  		_log ( channel, data, size);
  //		if (!(log_dir[channel] & direction_immediate)) send_packet();
  		return true;
! 		}
  //	if (log_dir[channel] & direction_read) _unlog ( channel, data, size);
  	return false;
! 	}
  
  bool Log::unbuffer ( int channel, void *data, int size ) {STACKTRACE
--- 234,251 ----
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 	}
  	if (data == NULL) {
  		data = zeros;
  		if (size > 128) tw_error("Log::buffer - overflow");
  		memset(zeros, 0, size);
! 	}
  	if (log_dir[channel] & direction_write) {
  		_log ( channel, data, size);
  //		if (!(log_dir[channel] & direction_immediate)) send_packet();
  		return true;
! 	}
  //	if (log_dir[channel] & direction_read) _unlog ( channel, data, size);
  	return false;
! }
  
  bool Log::unbuffer ( int channel, void *data, int size ) {STACKTRACE
***************
*** 251,259 ****
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 		}
  	if (data == NULL) {
  		data = zeros;
  		if (size > 128) tw_error("Log::buffer - overflow");
! 		}
  
  //	if (log_dir[channel] & direction_write) _log ( channel, data, size);
--- 255,263 ----
  	if (channel >= log_num) {
  		expand_logs(channel+1);
! 	}
  	if (data == NULL) {
  		data = zeros;
  		if (size > 128) tw_error("Log::buffer - overflow");
! 	}
  
  //	if (log_dir[channel] & direction_write) _log ( channel, data, size);
***************
*** 261,275 ****
  		_unlog ( channel, data, size);
  		return true;
- 		}
- 	return false;
  	}
  
  void Log::flush() {
  	return;
! 	}
  
  bool Log::listen() {
  	return false;
! 	}
  
  void Log::reset() {
--- 265,279 ----
  		_unlog ( channel, data, size);
  		return true;
  	}
+ 	return false;
+ }
  
  void Log::flush() {
  	return;
! }
  
  bool Log::listen() {
  	return false;
! }
  
  void Log::reset() {
***************
*** 279,283 ****
  		}
  	return;
! 	}
  
  
--- 283,287 ----
  		}
  	return;
! }
  
  
***************
*** 290,302 ****
  	Log::set_direction(Game::channel_playback + Game::_channel_buffered, Log::direction_read | Log::direction_write | Log::direction_forget);
  	return;
! 	}
  
  void PlaybackLog::set_direction (int channel, char direction) {STACKTRACE
  	tw_error("set_direction - your not supposed to do that in a demo playback!");
  	return;
! 	}
  
  void PlaybackLog::set_all_directions( char direction ) {STACKTRACE
  	tw_error("set_all_directions - your not supposed to do that in a demo playback!");
  	return;
! 	}
--- 294,306 ----
  	Log::set_direction(Game::channel_playback + Game::_channel_buffered, Log::direction_read | Log::direction_write | Log::direction_forget);
  	return;
! }
  
  void PlaybackLog::set_direction (int channel, char direction) {STACKTRACE
  	tw_error("set_direction - your not supposed to do that in a demo playback!");
  	return;
! }
  
  void PlaybackLog::set_all_directions( char direction ) {STACKTRACE
  	tw_error("set_all_directions - your not supposed to do that in a demo playback!");
  	return;
! }

[Timewarp-commit] source/melee mview.cpp,1.7,1.8

[<or...@us...>]

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

Modified Files:
	mview.cpp 
Log Message:
changed order of view "Everything"

Index: mview.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mview.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mview.cpp	11 Oct 2003 21:01:01 -0000	1.7
--- mview.cpp	21 Nov 2003 10:20:18 -0000	1.8
***************
*** 984,988 ****
  
  REGISTER_VIEW ( View_Hero, "Hero" )
- REGISTER_VIEW ( View_Everything, "Everything" )
  REGISTER_VIEW ( View_Enemy, "Enemy" )
  REGISTER_VIEW ( View_Enemy_Discrete, "Enemy_Discrete" )
--- 984,987 ----
***************
*** 991,993 ****
--- 990,993 ----
  REGISTER_VIEW ( View_Split3, "Split_3_Horizontal" )
  REGISTER_VIEW ( View_Split4, "Split_4_Quad" )
+ REGISTER_VIEW ( View_Everything, "Everything" )
  

[Timewarp-commit] source input.cpp,1.4,1.5

[<or...@us...>]

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

Modified Files:
	input.cpp 
Log Message:
changed joystick init message

Index: input.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/input.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** input.cpp	11 Oct 2003 21:00:59 -0000	1.4
--- input.cpp	21 Nov 2003 10:15:47 -0000	1.5
***************
*** 166,170 ****
  			log_debug("joystick failed initialization\n");
  		}	else {
! 			log_debug("joystick initialized\n");
  			poll_joystick();
  		}
--- 166,170 ----
  			log_debug("joystick failed initialization\n");
  		}	else {
! 			log_debug("joystick initialized (%d joysticks)\n", num_joysticks);
  			poll_joystick();
  		}

[Timewarp-commit] dialog.lua,NONE,1.1 pkunk-standing.bmp,NONE,1.1 twwin.dsp,1.40,1.41

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

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

Modified Files:
	twwin.dsp 
Added Files:
	dialog.lua pkunk-standing.bmp 
Log Message:
dialog support

--- NEW FILE: pkunk-standing.bmp ---
(This appears to be a binary file; contents omitted.)

Index: twwin.dsp
===================================================================
RCS file: /cvsroot/timewarp/twwin.dsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** twwin.dsp	20 Nov 2003 18:34:17 -0000	1.40
--- twwin.dsp	21 Nov 2003 08:30:34 -0000	1.41
***************
*** 459,462 ****
--- 459,466 ----
  # Begin Source File
  
+ SOURCE=.\source\games\dialog.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\source\games\gamehierarchy.cpp
  # End Source File