bzflag-commits — CVS commits get mailed here

CVS: bzflag/win32 bzflag.dsw,1.7,1.8

[Jeremiah <co...@us...>]

Update of /cvsroot/bzflag/bzflag/win32
In directory usw-pr-cvs1:/tmp/cvs-serv30836

Modified Files:
	bzflag.dsw 
Log Message:
Broke bzflag.dsw, reverting

Index: bzflag.dsw
===================================================================
RCS file: /cvsroot/bzflag/bzflag/win32/bzflag.dsw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bzflag.dsw	2001/08/29 02:41:19	1.7
+++ bzflag.dsw	2001/08/31 00:23:43	1.8
@@ -1,170 +1,182 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "bzflag"=.\bzflag.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name common
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name geometry
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name obstacle
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ogl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name platform
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name scene
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "bzfls"=.\bzfls.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bzfrelay"=.\bzfrelay.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bzfs"=.\bzfs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "common"=.\common.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "geometry"=.\geometry.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "net"=.\net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "obstacle"=.\obstacle.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ogl"=.\ogl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "platform"=.\platform.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "scene"=.\scene.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "bzflag"=.\bzflag.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name common
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name geometry
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name net
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name obstacle
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ogl
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name platform
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name scene
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "bzfls"=.\bzfls.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name common
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name net
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "bzfrelay"=.\bzfrelay.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bzfs"=.\bzfs.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name common
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name net
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "common"=.\common.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "geometry"=.\geometry.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "net"=.\net.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "obstacle"=.\obstacle.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ogl"=.\ogl.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "platform"=.\platform.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "scene"=.\scene.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

CVS: bzflag/win32 bzflag.dsw,1.6,1.7

[Jeremiah <co...@us...>]

Update of /cvsroot/bzflag/bzflag/win32
In directory usw-pr-cvs1:/tmp/cvs-serv31797

Modified Files:
	bzflag.dsw 
Log Message:
CR/LF issues with MSVC++

Index: bzflag.dsw
===================================================================
RCS file: /cvsroot/bzflag/bzflag/win32/bzflag.dsw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bzflag.dsw	2001/03/02 20:05:20	1.6
+++ bzflag.dsw	2001/08/29 02:41:19	1.7
@@ -1,182 +1,170 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "bzflag"=.\bzflag.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name common
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name geometry
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name obstacle
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ogl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name platform
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name scene
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "bzfls"=.\bzfls.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name common
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "bzfrelay"=.\bzfrelay.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "bzfs"=.\bzfs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name common
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "common"=.\common.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "geometry"=.\geometry.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "net"=.\net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "obstacle"=.\obstacle.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ogl"=.\ogl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "platform"=.\platform.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "scene"=.\scene.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "bzflag"=.\bzflag.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name common
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name geometry
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name net
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name obstacle
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ogl
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name platform
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name scene
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "bzfls"=.\bzfls.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bzfrelay"=.\bzfrelay.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "bzfs"=.\bzfs.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "common"=.\common.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "geometry"=.\geometry.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "net"=.\net.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "obstacle"=.\obstacle.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ogl"=.\ogl.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "platform"=.\platform.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "scene"=.\scene.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

CVS: bzflag/src/bzflag playing.cxx,1.34,1.35

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv25304/src/bzflag

Modified Files:
	playing.cxx 
Log Message:
test rear view

Index: playing.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- playing.cxx	2001/07/12 19:22:39	1.34
+++ playing.cxx	2001/08/08 20:55:04	1.35
@@ -3750,6 +3750,18 @@
 	// draw right channel
 	sceneRenderer->render(True, True, True);
 
+#if defined(DEBUG_RENDERING)
+	// set up for drawing rear channel
+	mainWindow->setQuadrant(MainWindow::UpperLeft);
+	// FIXME -- this assumes up is along +z
+	targetPoint[0] = eyePoint[0] - myTankDir[0];
+	targetPoint[1] = eyePoint[1] - myTankDir[1];
+	targetPoint[2] = eyePoint[2] + myTankDir[2];
+	sceneRenderer->getViewFrustum().setView(eyePoint, targetPoint);
+
+	// draw rear channel
+	sceneRenderer->render(True, True, True);
+#endif
 	// back to center channel
 	mainWindow->setQuadrant(MainWindow::UpperRight);
       }

CVS: bzedit Makefile.am,1.3,1.4 Makefile.in,1.3,1.4 element.cpp,1.3,1.4 objects.cpp,1.3,1.4 objects.h,1.3,1.4 ui_list.cpp,1.1.1.1,1.2 ui_main.cpp,1.4,1.5 ui_main.h,1.3,1.4 world.cpp,1.4,1.5 world.h,1.4,1.5

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit
In directory usw-pr-cvs1:/tmp/cvs-serv18440

Modified Files:
	Makefile.am Makefile.in element.cpp objects.cpp objects.h 
	ui_list.cpp ui_main.cpp ui_main.h world.cpp world.h 
Log Message:
Link improvements, base beginnings (for custom CTF)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bzflag/bzedit/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2001/07/17 00:48:06	1.3
+++ Makefile.am	2001/07/24 23:26:57	1.4
@@ -36,6 +36,7 @@
 	@GL_LIBS@
 
 EXTRA_DIST = \
+	data/basicon.png \
 	data/boxicon.png \
 	data/boxwall.tga \
 	data/caution.tga \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bzflag/bzedit/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in	2001/07/17 00:48:06	1.3
+++ Makefile.in	2001/07/24 23:26:57	1.4
@@ -169,7 +169,7 @@
 bzedit_LDADD =  	@GNOME_LIBS@ 	@GTK_LIBS@ 	@GTKGL_LIBS@ 	@GL_LIBS@
 
 
-EXTRA_DIST =  	data/boxicon.png 	data/boxwall.tga 	data/caution.tga 	data/ground.tga 	data/lnkicon.png 	data/pyricon.png 	data/pyrwall.tga 	data/roof.tga 	data/telicon.png 	data/wall.tga 	help/index.html 	help/intro.html 	help/mainwin.html 	help/topic.dat
+EXTRA_DIST =  	data/basicon.png 	data/boxicon.png 	data/boxwall.tga 	data/caution.tga 	data/ground.tga 	data/lnkicon.png 	data/pyricon.png 	data/pyrwall.tga 	data/roof.tga 	data/telicon.png 	data/wall.tga 	help/index.html 	help/intro.html 	help/mainwin.html 	help/topic.dat
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Index: element.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/element.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- element.cpp	2001/07/17 00:48:06	1.3
+++ element.cpp	2001/07/24 23:26:57	1.4
@@ -186,8 +186,6 @@
     dest << (*src.p);
   } else if(src.type == Element::TELEPORTER) {
     dest << (*src.t);
-  } else if(src.type == Element::LINK) {
-    dest << (*src.l);
   }
   return dest;
 }

Index: objects.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/objects.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- objects.cpp	2001/07/17 00:48:06	1.3
+++ objects.cpp	2001/07/24 23:26:57	1.4
@@ -439,6 +439,83 @@
   return dest;
 }
 
+Base::Base() : Object() {
+  color = 1;
+}
+
+Base::Base(const Base &b) {
+  this->px = b.px;
+  this->py = b.py;
+  this->pz = b.pz;
+  this->color = b.color;
+  this->sx = b.sx;
+  this->sy = b.sy;
+  this->sz = b.sz;
+  this->color = b.color;
+}
+
+Base Base::operator = (const Base &b) {
+  this->px = b.px;
+  this->py = b.py;
+  this->pz = b.pz;
+  this->color = b.color;
+  this->sx = b.sx;
+  this->sy = b.sy;
+  this->sz = b.sz;
+  this->color = b.color;
+  return *this;
+}
+
+void Base::render(Camera &c, bool transparent) {
+  glLoadIdentity();
+  c.setup();
+  glDisable(GL_TEXTURE_2D);
+  glEnable(GL_COLOR_MATERIAL);
+  switch(color) {
+    case 1:
+      glColor3f(1.0, 0.0, 0.0);
+      break;
+    case 2:
+      glColor3f(0.0, 1.0, 0.0);
+      break;
+    case 3:
+      glColor3f(0.0, 0.0, 1.0);
+      break;
+    case 4:
+      glColor3f(1.0, 0.0, 1.0);
+      break;
+  }
+  glColor3f(1.0, 1.0, 1.0);
+  glTranslatef(px, py, pz);
+  glRotatef(angle, 0, 0, 1);
+  glBegin(GL_QUADS); {
+    glVertex3f(-sx, -sy, 0);
+    glVertex3f(-sx, sy, 0);
+    glVertex3f(sx, sy, 0);
+    glVertex3f(sx, -sy, 0);
+  } glEnd();
+  glDisable(GL_COLOR_MATERIAL);
+  glEnable(GL_TEXTURE_2D);
+}
+
+void Base::set_color(int color) {
+  this->color = color;
+}
+
+int Base::get_color() {
+  return color;
+}
+
+ostream & operator << (ostream &dest, Base &src) {
+  dest << "base\n";
+  dest << "position " << src.get_px() << ' ' << src.get_py() << ' ' << src.get_pz() << endl;
+  dest << "rotation " << src.get_angle() << endl;
+  dest << "size " << src.get_sx() << ' ' << src.get_sy() << ' ' << src.get_sz() << endl;
+  dest << "color " << src.get_color() << endl;
+  dest << "end\n\n";
+  return dest;
+}
+
 Link::Link() {
   from = "";
   from_side = 0;
@@ -547,12 +624,4 @@
 
 int Link::get_to_side() {
   return to_side;
-}
-
-ostream & operator << (ostream &dest, Link &src) {
-  dest << "link" << endl;
-  dest << "from " << src.from << endl;
-  dest << "to " << src.to << endl;
-  dest << "end" << endl;
-  return dest;
 }

Index: objects.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/objects.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- objects.h	2001/07/17 00:48:06	1.3
+++ objects.h	2001/07/24 23:26:57	1.4
@@ -71,6 +71,19 @@
     float border;
 };
 
+class Base : public Object {
+  public:
+    Base();
+    Base(const Base &b);
+    Base operator = (const Base &b);
+    void render(Camera &c, bool transparent);
+    void set_color(int color);
+    int get_color();
+    friend ostream & operator << (ostream &dest, Base &src);
+  protected:
+    int color;
+};
+
 class Link {
   public:
     Link();
@@ -85,7 +98,6 @@
     int get_from_side();
     string get_to();
     int get_to_side();
-    friend ostream & operator << (ostream &dest, Link &src);
   protected:
     string from;
     int from_side;

Index: ui_list.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_list.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ui_list.cpp	2001/06/28 18:49:51	1.1.1.1
+++ ui_list.cpp	2001/07/24 23:26:57	1.2
@@ -57,6 +57,8 @@
   World *world = (World *) gtk_object_get_data(GTK_OBJECT(clist), "world");
   MainWindow *mainw = (MainWindow *) gtk_object_get_data(GTK_OBJECT(clist), "mainw");
   (*world)[row].selected = true;
+  if((*world)[row].type == Element::LINK)
+    mainw->showLinkWin(&((*world)[row]));
   mainw->update(MW::EDITWINS | MW::SPINVALUES);
   mainw->update(MW::SPINS);
   return TRUE;
@@ -66,6 +68,8 @@
   World *world = (World *) gtk_object_get_data(GTK_OBJECT(clist), "world");
   MainWindow *mainw = (MainWindow *) gtk_object_get_data(GTK_OBJECT(clist), "mainw");
   (*world)[row].selected = false;
+  if((*world)[row].type == Element::LINK)
+    mainw->destroyLinkWin();
   mainw->update(MW::EDITWINS | MW::SPINVALUES);
   mainw->update(MW::SPINS);
   return TRUE;

Index: ui_main.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ui_main.cpp	2001/07/17 06:54:42	1.4
+++ ui_main.cpp	2001/07/24 23:26:57	1.5
@@ -382,6 +382,7 @@
   gtk_object_set_data(GTK_OBJECT(ok), "clist1", clist1);
   gtk_object_set_data(GTK_OBJECT(ok), "clist2", clist2);
   gtk_object_set_data(GTK_OBJECT(ok), "dialog", dialog);
+  gtk_object_set_data(GTK_OBJECT(ok), "mainw", this);
   gtk_widget_show(ok);
   gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(MW::linkok), link);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), ok, TRUE, TRUE, 0);
@@ -391,6 +392,12 @@
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), cancel, TRUE, TRUE, 0);
   gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
   gtk_widget_show(dialog);
+
+  linkwin = dialog;
+}
+
+void MainWindow::destroyLinkWin() {
+  gtk_widget_destroy(linkwin);
 }
 
 namespace MW {
@@ -773,6 +780,7 @@
   GtkWidget *clist1 = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(button), "clist1"));
   GtkWidget *clist2 = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(button), "clist2"));
   GtkWidget *dialog = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(button), "dialog"));
+  MainWindow *mainw = (MainWindow *) gtk_object_get_data(GTK_OBJECT(button), "mainw");
   char **text;
   int selection1 = (int) gtk_object_get_data(GTK_OBJECT(clist1), "selection") - 1;
   int selection2 = (int) gtk_object_get_data(GTK_OBJECT(clist2), "selection") - 1;
@@ -799,7 +807,7 @@
   link->l->set_from_side(side1);
   link->l->set_to(name2);
   link->l->set_to_side(side2);
-  gtk_widget_destroy(dialog);
+  mainw->destroyLinkWin();
   return TRUE;
 }
 

Index: ui_main.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ui_main.h	2001/07/17 06:54:42	1.3
+++ ui_main.h	2001/07/24 23:26:57	1.4
@@ -134,6 +134,7 @@
     void showList();
     void setWorld(World *world);
     void showLinkWin(Element *link);
+    void destroyLinkWin();
     World *getWorld();
     GtkWidget *getWindow();
     ListWindow &getListWindow();
@@ -148,6 +149,7 @@
     GtkWidget *sbborder;
     GtkWidget *enname;
     GtkWidget *testworld;
+    GtkWidget *linkwin;
     GtkAdjustment *sa;
     vector<EditWindow *> edits;
     ListWindow lw;

Index: world.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- world.cpp	2001/07/17 06:54:42	1.4
+++ world.cpp	2001/07/24 23:26:57	1.5
@@ -304,6 +304,28 @@
       delete el;
       continue;
     } else if(x == "link") {
+      el = new Element;
+      el->makeLink();
+      while(x != "end") {
+	if(x == "to") {
+	  file >> x;
+	  el->l->set_to_side((atoi(x.c_str()) % 2));
+	  el->l->set_to(getElementByTypeNumber(Element::TELEPORTER, (int) (atoi(x.c_str()) / 2)).name);
+	}
+	if(x == "from") {
+	  file >> x;
+	  el->l->set_from_side((atoi(x.c_str()) % 2));
+	  el->l->set_from(getElementByTypeNumber(Element::TELEPORTER, (int) (atoi(x.c_str()) / 2)).name);
+	}
+	file >> x;
+      }
+      if(nextname != "") {
+	el->name = nextname;
+	nextname = "";
+      }
+      uniqueName(*el);
+      push_back(*el);
+      delete el;
     } else if(x.c_str()[0] == '#') {
       file.get(temp2, 82);
       file.ignore(82, '\n');
@@ -430,6 +452,28 @@
       push_back(*el);
       delete el;
     } else if(x == "link") {
+      el = new Element;
+      el->makeLink();
+      while(x != "end") {
+	if(x == "to") {
+	  file >> x;
+	  el->l->set_to_side((atoi(x.c_str()) % 2));
+	  el->l->set_to(getElementByTypeNumber(Element::TELEPORTER, (int) (atoi(x.c_str()) / 2)).name);
+	}
+	if(x == "from") {
+	  file >> x;
+	  el->l->set_from_side((atoi(x.c_str()) % 2));
+	  el->l->set_from(getElementByTypeNumber(Element::TELEPORTER, (int) (atoi(x.c_str()) / 2)).name);
+	}
+	file >> x;
+      }
+      if(nextname != "") {
+	el->name = nextname;
+	nextname = "";
+      }
+      uniqueName(*el);
+      push_back(*el);
+      delete el;
     } else if(x.c_str()[0] == '#') {
       file.get(temp2, 82);
       file.ignore(82, '\n');
@@ -451,7 +495,18 @@
   file << "# http://jupiter.babylonia.flatirons.org/\n\n";
   for(unsigned int i = 0; i < size(); i++) {
     file << "#!name " << (*this)[i].name << endl;
-    file << (*this)[i];
+    if((*this)[i].type != Element::LINK) {
+      file << (*this)[i];
+    } else {
+      int from = getElementTypeNumberByName((*this)[i].l->get_from()) * 2;
+      from += ((*this)[i].l->get_from_side());
+      int to = getElementTypeNumberByName((*this)[i].l->get_to()) * 2;
+      to += ((*this)[i].l->get_to_side());
+      file << "link\n";
+      file << "from " << from << endl;
+      file << "to " << to << endl;
+      file << "end\n\n";
+    }
   }
   return true;
 }
@@ -484,6 +539,7 @@
   }
   for(int i = 0; i < size(); i++) {
     if((*this)[i].type == Element::LINK) {
+      neww.push_back((*this)[i]);
     }
   }
   neww.boxicon = boxicon;
@@ -500,4 +556,32 @@
   lnkicon = w.lnkicon;
   (vector<Element>) (*this) = (vector<Element>) w;
   return *this;
+}
+
+Element World::getElementByTypeNumber(int type, int number) {
+  int num = 0;
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == type) {
+      if(num == number) {
+	return (*this)[i];
+      } else {
+        num++;
+      }
+    }
+  }
+  return Element();
+}
+
+int World::getElementTypeNumberByName(string name) {
+  Element el = getElementByName(name);
+  int num = 0;
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == el.type) {
+      if((*this)[i].name == name) {
+	return num;
+      } else {
+	num++;
+      }
+    }
+  }
 }

Index: world.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- world.h	2001/07/17 06:54:42	1.4
+++ world.h	2001/07/24 23:26:57	1.5
@@ -3,6 +3,7 @@
 
 #include <gnome.h>
 #include <vector>
+#include <string>
 #include "camera.h"
 #include "element.h"
 
@@ -20,6 +21,8 @@
     bool append(char *filename);
     bool write(char *filename);
     Element getElementByName(string name);
+    Element getElementByTypeNumber(int type, int number);
+    int getElementTypeNumberByName(string name);
     World operator = (World &w);
   private:
     void sort();

CVS: bzedit/data basicon.png,NONE,1.1 Makefile.am,1.2,1.3 Makefile.in,1.2,1.3

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit/data
In directory usw-pr-cvs1:/tmp/cvs-serv18440/data

Modified Files:
	Makefile.am Makefile.in 
Added Files:
	basicon.png 
Log Message:
Link improvements, base beginnings (for custom CTF)


--- NEW FILE: basicon.png ---
‰PNG


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bzflag/bzedit/data/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/07/17 00:48:06	1.2
+++ Makefile.am	2001/07/24 23:26:57	1.3
@@ -8,4 +8,5 @@
 	    boxicon.png \
 	    pyricon.png \
 	    telicon.png \
-	    lnkicon.png
+	    lnkicon.png \
+	    basicon.png

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bzflag/bzedit/data/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in	2001/07/17 00:48:06	1.2
+++ Makefile.in	2001/07/24 23:26:57	1.3
@@ -155,7 +155,7 @@
 smbfs = @smbfs@
 
 data1dir = /usr/local/share/bzedit/data
-data1_DATA = boxwall.tga             caution.tga 	    ground.tga 	    pyrwall.tga 	    roof.tga 	    wall.tga 	    boxicon.png 	    pyricon.png 	    telicon.png 	    lnkicon.png
+data1_DATA = boxwall.tga             caution.tga 	    ground.tga 	    pyrwall.tga 	    roof.tga 	    wall.tga 	    boxicon.png 	    pyricon.png 	    telicon.png 	    lnkicon.png 	    basicon.png
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h

CVS: bzedit ui_main.cpp,1.3,1.4 ui_main.h,1.2,1.3 world.cpp,1.3,1.4 world.h,1.3,1.4

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit
In directory usw-pr-cvs1:/tmp/cvs-serv29577

Modified Files:
	ui_main.cpp ui_main.h world.cpp world.h 
Log Message:
Additional link schtuff


Index: ui_main.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ui_main.cpp	2001/07/17 00:48:06	1.3
+++ ui_main.cpp	2001/07/17 06:54:42	1.4
@@ -359,6 +359,9 @@
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_show(sw1);
   clist1 = gtk_clist_new_with_titles(2, titles);
+  gtk_object_set_data(GTK_OBJECT(clist1), "selection", 0);
+  gtk_signal_connect(GTK_OBJECT(clist1), "select-row", GTK_SIGNAL_FUNC(MW::sellink), NULL);
+  gtk_signal_connect(GTK_OBJECT(clist1), "unselect-row", GTK_SIGNAL_FUNC(MW::unsellink), NULL);
   world->buildTeleporterList(clist1);
   gtk_widget_show(clist1);
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw1), clist1);
@@ -367,12 +370,18 @@
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_show(sw2);
   clist2 = gtk_clist_new_with_titles(2, titles);
+  gtk_object_set_data(GTK_OBJECT(clist2), "selection", 0);
+  gtk_signal_connect(GTK_OBJECT(clist2), "select-row", GTK_SIGNAL_FUNC(MW::sellink), NULL);
+  gtk_signal_connect(GTK_OBJECT(clist2), "unselect-row", GTK_SIGNAL_FUNC(MW::unsellink), NULL);
   world->buildTeleporterList(clist2);
   gtk_widget_show(clist2);
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw2), clist2);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw2, TRUE, TRUE, 0);
 
   ok = gnome_stock_button(GNOME_STOCK_BUTTON_OK);
+  gtk_object_set_data(GTK_OBJECT(ok), "clist1", clist1);
+  gtk_object_set_data(GTK_OBJECT(ok), "clist2", clist2);
+  gtk_object_set_data(GTK_OBJECT(ok), "dialog", dialog);
   gtk_widget_show(ok);
   gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(MW::linkok), link);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), ok, TRUE, TRUE, 0);
@@ -751,7 +760,46 @@
   return TRUE;
 }
 
+gint sellink(GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data) {
+  gtk_object_set_data(GTK_OBJECT(clist), "selection", (gpointer) (row + 1));
+  return TRUE;
+}
+
+gint unsellink(GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data) {
+  gtk_object_set_data(GTK_OBJECT(clist), "selection", 0);
+}
+
 gint linkok(GtkWidget *button, Element *link) {
+  GtkWidget *clist1 = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(button), "clist1"));
+  GtkWidget *clist2 = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(button), "clist2"));
+  GtkWidget *dialog = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(button), "dialog"));
+  char **text;
+  int selection1 = (int) gtk_object_get_data(GTK_OBJECT(clist1), "selection") - 1;
+  int selection2 = (int) gtk_object_get_data(GTK_OBJECT(clist2), "selection") - 1;
+  string name1, name2;
+  int side1, side2;
+  if(selection1 == -1 || selection2 == -1) {
+    GtkWidget *err = gnome_dialog_new("Error", GNOME_STOCK_BUTTON_OK, NULL);
+    GtkWidget *errl = gtk_label_new("link attributes must be selected");
+    gtk_widget_show(errl);
+    gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(err)->vbox), errl, TRUE, TRUE, 0);
+    gnome_dialog_set_parent(GNOME_DIALOG(err), GTK_WINDOW(dialog));
+    gnome_dialog_run_and_close(GNOME_DIALOG(err));
+    return FALSE;
+  }
+  gtk_clist_get_text(GTK_CLIST(clist1), selection1, 0, text);
+  name1 = text[0];
+  gtk_clist_get_text(GTK_CLIST(clist1), selection1, 1, text);
+  side1 = atoi(text[0]);
+  gtk_clist_get_text(GTK_CLIST(clist2), selection2, 0, text);
+  name2 = text[0];
+  gtk_clist_get_text(GTK_CLIST(clist2), selection2, 1, text);
+  side2 = atoi(text[0]);
+  link->l->set_from(name1);
+  link->l->set_from_side(side1);
+  link->l->set_to(name2);
+  link->l->set_to_side(side2);
+  gtk_widget_destroy(dialog);
   return TRUE;
 }
 

Index: ui_main.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ui_main.h	2001/07/17 00:48:06	1.2
+++ ui_main.h	2001/07/17 06:54:42	1.3
@@ -49,6 +49,8 @@
 gint chname(GtkWidget *enname, gpointer data);
 gint showlist(GtkWidget *window, gpointer data);
 gint testw(GtkWidget *button, gpointer data);
+gint sellink(GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data);
+gint unsellink(GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data);
 gint linkok(GtkWidget *button, Element *link);
 
 static GnomeUIInfo file_menu[] = {

Index: world.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- world.cpp	2001/07/17 00:48:06	1.3
+++ world.cpp	2001/07/17 06:54:42	1.4
@@ -10,6 +10,14 @@
   lnkicon = GNOME_PIXMAP(gnome_pixmap_new_from_file("/usr/local/share/bzedit/data/lnkicon.png"));
 }
 
+World::World(World &w) {
+  boxicon = w.boxicon;
+  pyricon = w.pyricon;
+  telicon = w.telicon;
+  lnkicon = w.lnkicon;
+  (vector<Element>) (*this) = (vector<Element>) w;
+}
+
 World::~World() {
   gtk_widget_destroy(GTK_WIDGET(boxicon));
   gtk_widget_destroy(GTK_WIDGET(pyricon));
@@ -45,6 +53,7 @@
 }
 
 void World::buildList(GtkWidget *clist) {
+//  sort();
   gchar *text[] = {"", NULL};
   
   gtk_clist_freeze(GTK_CLIST(clist));
@@ -453,4 +462,42 @@
       return (*this)[i];
   }
   return Element();
+}
+
+void World::sort() {
+  World neww;
+
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == Element::BOX) {
+      neww.push_back((*this)[i]);
+    }
+  }
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == Element::PYRAMID) {
+      neww.push_back((*this)[i]);
+    }
+  }
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == Element::TELEPORTER) {
+      neww.push_back((*this)[i]);
+    }
+  }
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == Element::LINK) {
+    }
+  }
+  neww.boxicon = boxicon;
+  neww.pyricon = pyricon;
+  neww.telicon = telicon;
+  neww.lnkicon = lnkicon;
+  *this = neww;
+}
+
+World World::operator = (World &w) {
+  boxicon = w.boxicon;
+  pyricon = w.pyricon;
+  telicon = w.telicon;
+  lnkicon = w.lnkicon;
+  (vector<Element>) (*this) = (vector<Element>) w;
+  return *this;
 }

Index: world.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- world.h	2001/07/17 00:48:06	1.3
+++ world.h	2001/07/17 06:54:42	1.4
@@ -9,6 +9,7 @@
 class World : public vector<Element> {
   public:
     World();
+    World(World &w);
     ~World();
     void render(Camera &c);
     void render_targets(Camera &c);
@@ -19,7 +20,9 @@
     bool append(char *filename);
     bool write(char *filename);
     Element getElementByName(string name);
+    World operator = (World &w);
   private:
+    void sort();
     GnomePixmap *boxicon;
     GnomePixmap *pyricon;
     GnomePixmap *telicon;

CVS: bzedit/data lnkicon.png,NONE,1.1

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit/data
In directory usw-pr-cvs1:/tmp/cvs-serv14130/data

Added Files:
	lnkicon.png 
Log Message:
Added icon


--- NEW FILE: lnkicon.png ---
‰PNG


CVS: bzedit/data Makefile.am,1.1,1.2 Makefile.in,1.1,1.2

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit/data
In directory usw-pr-cvs1:/tmp/cvs-serv13180/data

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Link implementation


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bzflag/bzedit/data/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2001/07/15 22:16:19	1.1
+++ Makefile.am	2001/07/17 00:48:06	1.2
@@ -7,4 +7,5 @@
 	    wall.tga \
 	    boxicon.png \
 	    pyricon.png \
-	    telicon.png
+	    telicon.png \
+	    lnkicon.png

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bzflag/bzedit/data/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in	2001/07/15 22:16:19	1.1
+++ Makefile.in	2001/07/17 00:48:06	1.2
@@ -155,7 +155,7 @@
 smbfs = @smbfs@
 
 data1dir = /usr/local/share/bzedit/data
-data1_DATA = boxwall.tga             caution.tga 	    ground.tga 	    pyrwall.tga 	    roof.tga 	    wall.tga 	    boxicon.png 	    pyricon.png 	    telicon.png
+data1_DATA = boxwall.tga             caution.tga 	    ground.tga 	    pyrwall.tga 	    roof.tga 	    wall.tga 	    boxicon.png 	    pyricon.png 	    telicon.png 	    lnkicon.png
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h

CVS: bzedit Makefile.am,1.2,1.3 Makefile.in,1.2,1.3 element.cpp,1.2,1.3 element.h,1.2,1.3 objects.cpp,1.2,1.3 objects.h,1.2,1.3 ui_main.cpp,1.2,1.3 ui_main.h,1.1.1.1,1.2 world.cpp,1.2,1.3 world.h,1.2,1.3

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit
In directory usw-pr-cvs1:/tmp/cvs-serv13180

Modified Files:
	Makefile.am Makefile.in element.cpp element.h objects.cpp 
	objects.h ui_main.cpp ui_main.h world.cpp world.h 
Log Message:
Link implementation


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bzflag/bzedit/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	2001/07/15 22:16:19	1.2
+++ Makefile.am	2001/07/17 00:48:06	1.3
@@ -40,6 +40,7 @@
 	data/boxwall.tga \
 	data/caution.tga \
 	data/ground.tga \
+	data/lnkicon.png \
 	data/pyricon.png \
 	data/pyrwall.tga \
 	data/roof.tga \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bzflag/bzedit/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in	2001/07/15 22:16:19	1.2
+++ Makefile.in	2001/07/17 00:48:06	1.3
@@ -169,7 +169,7 @@
 bzedit_LDADD =  	@GNOME_LIBS@ 	@GTK_LIBS@ 	@GTKGL_LIBS@ 	@GL_LIBS@
 
 
-EXTRA_DIST =  	data/boxicon.png 	data/boxwall.tga 	data/caution.tga 	data/ground.tga 	data/pyricon.png 	data/pyrwall.tga 	data/roof.tga 	data/telicon.png 	data/wall.tga 	help/index.html 	help/intro.html 	help/mainwin.html 	help/topic.dat
+EXTRA_DIST =  	data/boxicon.png 	data/boxwall.tga 	data/caution.tga 	data/ground.tga 	data/lnkicon.png 	data/pyricon.png 	data/pyrwall.tga 	data/roof.tga 	data/telicon.png 	data/wall.tga 	help/index.html 	help/intro.html 	help/mainwin.html 	help/topic.dat
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Index: element.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/element.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- element.cpp	2001/07/15 22:16:19	1.2
+++ element.cpp	2001/07/17 00:48:06	1.3
@@ -70,6 +70,18 @@
     delete l;
 }
 
+void Element::makeLink() {
+  type = LINK;
+  if(b != NULL)
+    delete b;
+  if(p != NULL)
+    delete p;
+  if(t != NULL)
+    delete t;
+  if(l == NULL)
+    l = new Link;
+}
+
 void Element::render(Camera &c, bool transparent) {
   switch(type) {
     case BOX:
@@ -80,14 +92,93 @@
       return;
     case TELEPORTER:
       t->render(c, transparent);
+      return;
+    case LINK:
+      // links are rendered directly, because
+      // of their weird attributes
       return;
-//    case LINK:
-//      return;
     case NONE:
       return;
   }
 }
 
+float Element::get_px() {
+  if(type == BOX)
+    return b->get_px();
+  else if(type == PYRAMID)
+    return p->get_px();
+  else if(type == TELEPORTER)
+    return t->get_px();
+  else
+    return 0.0;
+}
+
+float Element::get_py() {
+  if(type == BOX)
+    return b->get_py();
+  else if(type == PYRAMID)
+    return p->get_py();
+  else if(type == TELEPORTER)
+    return t->get_py();
+  else
+    return 0.0;
+}
+
+float Element::get_pz() {
+  if(type == BOX)
+    return b->get_pz();
+  else if(type == PYRAMID)
+    return p->get_pz();
+  else if(type == TELEPORTER)
+    return t->get_pz();
+  else
+    return 0.0;
+}
+
+float Element::get_angle() {
+  if(type == BOX)
+    return b->get_angle();
+  else if(type == PYRAMID)
+    return p->get_angle();
+  else if(type == TELEPORTER)
+    return t->get_angle();
+  else
+    return 0.0;
+}
+
+float Element::get_sx() {
+  if(type == BOX)
+    return b->get_sx();
+  else if(type == PYRAMID)
+    return p->get_sx();
+  else if(type == TELEPORTER)
+    return t->get_sx();
+  else
+    return 0.0;
+}
+
+float Element::get_sy() {
+  if(type == BOX)
+    return b->get_sy();
+  else if(type == PYRAMID)
+    return p->get_sy();
+  else if(type == TELEPORTER)
+    return t->get_sy();
+  else
+    return 0.0;
+}
+
+float Element::get_sz() {
+  if(type == BOX)
+    return b->get_sz();
+  else if(type == PYRAMID)
+    return p->get_sz();
+  else if(type == TELEPORTER)
+    return t->get_sz();
+  else
+    return 0.0;
+}
+
 ostream & operator << (ostream & dest, Element &src) {
   if(src.type == Element::BOX) {
     dest << (*src.b);
@@ -95,8 +186,8 @@
     dest << (*src.p);
   } else if(src.type == Element::TELEPORTER) {
     dest << (*src.t);
-//  } else if(src.type == Element::LINK) {
-//    dest << (*src.l);
+  } else if(src.type == Element::LINK) {
+    dest << (*src.l);
   }
   return dest;
 }

Index: element.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/element.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- element.h	2001/07/15 22:16:19	1.2
+++ element.h	2001/07/17 00:48:06	1.3
@@ -6,8 +6,7 @@
 
 class Element {
   public:
-//    enum {BOX, PYRAMID, TELEPORTER, LINK, NONE} type;
-    enum {BOX, PYRAMID, TELEPORTER, NONE} type;
+    enum {BOX, PYRAMID, TELEPORTER, LINK, NONE} type;
     Box *b;
     Pyramid *p;
     Teleporter *t;
@@ -22,7 +21,15 @@
     void makeBox();
     void makePyramid();
     void makeTeleporter();
+    void makeLink();
     void render(Camera &c, bool transparent);
+    float get_px();
+    float get_py();
+    float get_pz();
+    float get_angle();
+    float get_sx();
+    float get_sy();
+    float get_sz();
     friend ostream & operator << (ostream & dest, Element &src);
 };
 

Index: objects.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/objects.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- objects.cpp	2001/07/15 22:16:19	1.2
+++ objects.cpp	2001/07/17 00:48:06	1.3
@@ -441,7 +441,9 @@
 
 Link::Link() {
   from = "";
+  from_side = 0;
   to = "";
+  to_side = 0;
 }
 
 Link::Link(const Link &r) {
@@ -456,24 +458,95 @@
 }
 
 void Link::render(Camera &c, World *w) {
+  if(from == "" || to == "") {
+    return;
+  }
   Element fromE = w->getElementByName(from);
   Element toE = w->getElementByName(to);
+  if(fromE.type == Element::NONE || toE.type == Element::NONE)
+    return;
+  glDisable(GL_TEXTURE_2D);
+  glEnable(GL_COLOR_MATERIAL);
+
+  // in
+  glLoadIdentity();
+  c.setup();
+  glTranslatef(fromE.get_px(), fromE.get_py(), fromE.get_pz());
+  glRotatef(fromE.get_angle(), 0, 0, 1);
+  if(from_side == 1)
+    glRotatef(180, 0, 0, 1);
+  glColor3f(0.0, 1.0, 0.0);
+  glBegin(GL_TRIANGLES); {
+    // arrow head
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, -8, fromE.get_sz() / 2);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, -4, fromE.get_sz() / 2 + 2);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, -4, fromE.get_sz() / 2 - 2);
+    // arrow tail
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, -4, fromE.get_sz() / 2 - 1);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, -4, fromE.get_sz() / 2 + 1);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, 0,  fromE.get_sz() / 2 + 1);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, 0,  fromE.get_sz() / 2 + 1);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, 0,  fromE.get_sz() / 2 - 1);
+    glVertex3f(-fromE.get_sx() / 2 - 0.1, -4, fromE.get_sz() / 2 - 1);
+  } glEnd();
+
+  // out
+  glLoadIdentity();
+  c.setup();
+  glTranslatef(toE.get_px(), toE.get_py(), toE.get_pz());
+  glRotatef(toE.get_angle(), 0, 0, 1);
+  if(to_side == 1)
+    glRotatef(180, 0, 0, 1);
+  glColor3f(1.0, 0.0, 0.0);
+  glBegin(GL_TRIANGLES); {
+    // arrow head
+    glVertex3f(-toE.get_sx() / 2 - 0.1, -8, toE.get_sz() / 2);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, -4, toE.get_sz() / 2 + 2);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, -4, toE.get_sz() / 2 - 2);
+    // arrow tail
+    glVertex3f(-toE.get_sx() / 2 - 0.1, -4, toE.get_sz() / 2 - 1);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, -4, toE.get_sz() / 2 + 1);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, 0,  toE.get_sz() / 2 + 1);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, 0,  toE.get_sz() / 2 + 1);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, 0,  toE.get_sz() / 2 - 1);
+    glVertex3f(-toE.get_sx() / 2 - 0.1, -4, toE.get_sz() / 2 - 1);
+  } glEnd();
+
+  glColor3f(1.0, 1.0, 1.0);
+  glDisable(GL_COLOR_MATERIAL);
+  glEnable(GL_TEXTURE_2D);
 }
 
 void Link::set_from(string from) {
   this->from = from;
 }
 
+void Link::set_from_side(int from_side) {
+  this->from_side = from_side;
+}
+
 void Link::set_to(string to) {
   this->to = to;
 }
 
+void Link::set_to_side(int to_side) {
+  this->to_side = to_side;
+}
+
 string Link::get_from() {
   return from;
 }
 
+int Link::get_from_side() {
+  return from_side;
+}
+
 string Link::get_to() {
   return to;
+}
+
+int Link::get_to_side() {
+  return to_side;
 }
 
 ostream & operator << (ostream &dest, Link &src) {

Index: objects.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/objects.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- objects.h	2001/07/15 22:16:19	1.2
+++ objects.h	2001/07/17 00:48:06	1.3
@@ -78,13 +78,19 @@
     Link operator = (const Link &r);
     void render(Camera &c, World *w);
     void set_from(string from);
+    void set_from_side(int from_side);
     void set_to(string to);
+    void set_to_side(int from_side);
     string get_from();
+    int get_from_side();
     string get_to();
+    int get_to_side();
     friend ostream & operator << (ostream &dest, Link &src);
   protected:
     string from;
+    int from_side;
     string to;
+    int to_side;
 };
 
 #endif

Index: ui_main.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ui_main.cpp	2001/07/15 22:16:19	1.2
+++ ui_main.cpp	2001/07/17 00:48:06	1.3
@@ -24,6 +24,7 @@
   gtk_object_set_data(GTK_OBJECT(MW::eAdd_menu[0].widget), "main_window", this);
   gtk_object_set_data(GTK_OBJECT(MW::eAdd_menu[1].widget), "main_window", this);
   gtk_object_set_data(GTK_OBJECT(MW::eAdd_menu[2].widget), "main_window", this);
+  gtk_object_set_data(GTK_OBJECT(MW::eAdd_menu[3].widget), "main_window", this);
   gtk_object_set_data(GTK_OBJECT(MW::edit_menu[0].widget), "main_window", this);
   gtk_object_set_data(GTK_OBJECT(MW::edit_menu[1].widget), "main_window", this);
   gtk_object_set_data(GTK_OBJECT(MW::edit_menu[3].widget), "main_window", this);
@@ -347,6 +348,42 @@
   return lw;
 }
 
+void MainWindow::showLinkWin(Element *link) {
+  GtkWidget *dialog, *ok, *cancel, *vbox, *hbox;
+  GtkWidget *sw1, *sw2, *clist1, *clist2;
+  gchar *titles[2] = {"Teleporter", "Side"};
+
+  dialog = gtk_dialog_new();
+  
+  sw1 = gtk_scrolled_window_new(NULL, NULL);
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_widget_show(sw1);
+  clist1 = gtk_clist_new_with_titles(2, titles);
+  world->buildTeleporterList(clist1);
+  gtk_widget_show(clist1);
+  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw1), clist1);
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw1, TRUE, TRUE, 0);
+  sw2 = gtk_scrolled_window_new(NULL, NULL);
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  gtk_widget_show(sw2);
+  clist2 = gtk_clist_new_with_titles(2, titles);
+  world->buildTeleporterList(clist2);
+  gtk_widget_show(clist2);
+  gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw2), clist2);
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw2, TRUE, TRUE, 0);
+
+  ok = gnome_stock_button(GNOME_STOCK_BUTTON_OK);
+  gtk_widget_show(ok);
+  gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(MW::linkok), link);
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), ok, TRUE, TRUE, 0);
+  cancel = gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL);
+  gtk_widget_show(cancel);
+  gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog));
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), cancel, TRUE, TRUE, 0);
+  gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+  gtk_widget_show(dialog);
+}
+
 namespace MW {
 
 gint quit(GtkWidget *window, gpointer data) {
@@ -495,11 +532,27 @@
   teleporter.selected = true;
   mainWin->getWorld()->uniqueName(teleporter);
   mainWin->getWorld()->push_back(teleporter);
-  mainWin->getWorld()->buildList(list);
   mainWin->update(MW::SPINVALUES | MW::LIST | MW::EDITWINS | MW::LIST);
   return TRUE;
 }
 
+gint alnk(GtkWidget *window, gpointer data) {
+  MainWindow *mainWin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(window), "main_window");
+  ListWindow &lw = mainWin->getListWindow();
+  GtkWidget *list = lw.getList();
+  Element link;
+  link.makeLink();
+  for(unsigned int i = 0; i < mainWin->getWorld()->size(); i++) {
+    (*(mainWin->getWorld()))[i].selected = false;
+  }
+  link.selected = true;
+  mainWin->getWorld()->uniqueName(link);
+  mainWin->getWorld()->push_back(link);
+  mainWin->update(MW::SPINVALUES | MW::LIST | MW::EDITWINS | MW::LIST);
+  mainWin->showLinkWin(&(*mainWin->getWorld())[mainWin->getWorld()->size() - 1]);
+  return TRUE;
+}
+
 gint undo(GtkWidget *window, gpointer data) {
   return TRUE;
 }
@@ -695,6 +748,10 @@
   strcpy(filename, "/tmp/bzedit-XXXXXX");
   mktemp(filename);
   cout << "Writing world file to " << filename << "...\n";
+  return TRUE;
+}
+
+gint linkok(GtkWidget *button, Element *link) {
   return TRUE;
 }
 

Index: ui_main.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ui_main.h	2001/06/28 18:49:52	1.1.1.1
+++ ui_main.h	2001/07/17 00:48:06	1.2
@@ -29,6 +29,7 @@
 gint abox(GtkWidget *window, gpointer data);
 gint apyr(GtkWidget *window, gpointer data);
 gint atel(GtkWidget *window, gpointer data);
+gint alnk(GtkWidget *window, gpointer data);
 gint undo(GtkWidget *window, gpointer data);
 gint redo(GtkWidget *window, gpointer data);
 gint cut(GtkWidget *window, gpointer data);
@@ -48,6 +49,7 @@
 gint chname(GtkWidget *enname, gpointer data);
 gint showlist(GtkWidget *window, gpointer data);
 gint testw(GtkWidget *button, gpointer data);
+gint linkok(GtkWidget *button, Element *link);
 
 static GnomeUIInfo file_menu[] = {
   GNOMEUIINFO_MENU_NEW_WINDOW_ITEM(MW::neww, NULL),
@@ -62,9 +64,10 @@
   GNOMEUIINFO_END
 };
 static GnomeUIInfo eAdd_menu[] = {
-  GNOMEUIINFO_ITEM_STOCK("Box", "Add a box to the current world", MW::abox, GNOME_STOCK_MENU_BOOK_RED),
-  GNOMEUIINFO_ITEM_STOCK("Pyramid", "Add a pyramid to the current world", MW::apyr, GNOME_STOCK_MENU_BOOK_BLUE),
-  GNOMEUIINFO_ITEM_STOCK("Teleporter", "Add a teleporter to the current world", MW::atel, GNOME_STOCK_MENU_BOOK_YELLOW),
+  GNOMEUIINFO_ITEM_NONE("Box", "Add a box to the current world", MW::abox),
+  GNOMEUIINFO_ITEM_NONE("Pyramid", "Add a pyramid to the current world", MW::apyr),
+  GNOMEUIINFO_ITEM_NONE("Teleporter", "Add a teleporter to the current world", MW::atel),
+  GNOMEUIINFO_ITEM_NONE("Link", "Add a link to the current world", MW::alnk),
   GNOMEUIINFO_END
 };
 static GnomeUIInfo edit_menu[] = {
@@ -128,6 +131,7 @@
     void addEW(EditWindow *ew);
     void showList();
     void setWorld(World *world);
+    void showLinkWin(Element *link);
     World *getWorld();
     GtkWidget *getWindow();
     ListWindow &getListWindow();

Index: world.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- world.cpp	2001/07/15 22:16:19	1.2
+++ world.cpp	2001/07/17 00:48:06	1.3
@@ -7,8 +7,16 @@
   boxicon = GNOME_PIXMAP(gnome_pixmap_new_from_file("/usr/local/share/bzedit/data/boxicon.png"));
   pyricon = GNOME_PIXMAP(gnome_pixmap_new_from_file("/usr/local/share/bzedit/data/pyricon.png"));
   telicon = GNOME_PIXMAP(gnome_pixmap_new_from_file("/usr/local/share/bzedit/data/telicon.png"));
+  lnkicon = GNOME_PIXMAP(gnome_pixmap_new_from_file("/usr/local/share/bzedit/data/lnkicon.png"));
 }
 
+World::~World() {
+  gtk_widget_destroy(GTK_WIDGET(boxicon));
+  gtk_widget_destroy(GTK_WIDGET(pyricon));
+  gtk_widget_destroy(GTK_WIDGET(telicon));
+  gtk_widget_destroy(GTK_WIDGET(lnkicon));
+}
+
 void World::render(Camera &c) {
   ground.render(c);
   walls.render(c);
@@ -22,6 +30,8 @@
   it = begin();
   while(it != end()) {
     it->render(c, (transparent && (!it->selected)));
+    if(it->type == Element::LINK && it->selected)
+      it->l->render(c, this);
     it++;
   }
 }
@@ -51,6 +61,8 @@
       gtk_clist_set_pixtext(GTK_CLIST(clist), row, 0, it->name.c_str(), 8, pyricon->pixmap, pyricon->mask);
     } else if(it->type == Element::TELEPORTER) {
       gtk_clist_set_pixtext(GTK_CLIST(clist), row, 0, it->name.c_str(), 8, telicon->pixmap, telicon->mask);
+    } else if(it->type == Element::LINK) {
+      gtk_clist_set_pixtext(GTK_CLIST(clist), row, 0, it->name.c_str(), 8, lnkicon->pixmap, lnkicon->mask);
     } else {
       gtk_clist_set_text(GTK_CLIST(clist), row, 0, "Unknown object type!");
     }
@@ -63,6 +75,31 @@
   gtk_clist_thaw(GTK_CLIST(clist));
 }
 
+void World::buildTeleporterList(GtkWidget *clist) {
+  gchar *text[] = {"", "", NULL};
+
+  gtk_clist_freeze(GTK_CLIST(clist));
+  gtk_clist_clear(GTK_CLIST(clist));
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == Element::TELEPORTER) {
+      gtk_clist_append(GTK_CLIST(clist), text);
+      gtk_clist_append(GTK_CLIST(clist), text);
+    }
+  }
+  int row = 0;
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].type == Element::TELEPORTER) {
+      gtk_clist_set_text(GTK_CLIST(clist), row, 0, (*this)[i].name.c_str());
+      gtk_clist_set_text(GTK_CLIST(clist), row, 1, "0");
+      row++;
+      gtk_clist_set_text(GTK_CLIST(clist), row, 0, (*this)[i].name.c_str());
+      gtk_clist_set_text(GTK_CLIST(clist), row, 1, "1");
+      row++;
+    }
+  }
+  gtk_clist_thaw(GTK_CLIST(clist));
+}
+
 void World::uniqueName(Element &el) {
   // This is horribly inefficient. Come up with something better!
   string base;
@@ -101,6 +138,8 @@
     base = "pyramid";
   } else if(el.type == Element::TELEPORTER) {
     base = "teleporter";
+  } else if(el.type == Element::LINK) {
+    base = "link";
   } else {
     base = "unknown";
   }
@@ -182,9 +221,7 @@
 	el->name = nextname;
 	nextname = "";
       }
-      cout << "uniqueName()\n";
       uniqueName(*el);
-      cout << "pushBack()\n";
       push_back(*el);
       delete el;
       continue;

Index: world.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- world.h	2001/07/15 22:16:19	1.2
+++ world.h	2001/07/17 00:48:06	1.3
@@ -9,9 +9,11 @@
 class World : public vector<Element> {
   public:
     World();
+    ~World();
     void render(Camera &c);
     void render_targets(Camera &c);
     void buildList(GtkWidget *clist);
+    void buildTeleporterList(GtkWidget *clist);
     void uniqueName(Element &el);
     bool load(char *filename);
     bool append(char *filename);
@@ -21,6 +23,7 @@
     GnomePixmap *boxicon;
     GnomePixmap *pyricon;
     GnomePixmap *telicon;
+    GnomePixmap *lnkicon;
     Ground ground;
     Walls walls;
 };

CVS: bzedit/help AUTHORS,NONE,1.1 COPYING,NONE,1.1 ChangeLog,NONE,1.1 INSTALL,NONE,1.1 Makefile.am,NONE,1.1 Makefile.in,NONE,1.1 NEWS,NONE,1.1 README,NONE,1.1 config.h.in,NONE,1.1 configure.in,NONE,1.1 index.html,NONE,1.1 intro.html,NONE,1.1 mainwin.html,NONE,1.1 topic.dat,NONE,1.1

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit/help
In directory usw-pr-cvs1:/tmp/cvs-serv21930/help

Added Files:
	AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS 
	README config.h.in configure.in index.html intro.html 
	mainwin.html topic.dat 
Log Message:
Lots of changes, mostly with the GNU autotools


--- NEW FILE: AUTHORS ---
David Trowbridge <ju...@ba...>

--- NEW FILE: COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                          675 Mass Ave, Cambridge, MA 02139, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	Appendix: How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) 19yy  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) 19yy name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

--- NEW FILE: ChangeLog ---
Tue Jun 05 17:00:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Added autoconf/automake support

Thu May 31 13:01:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Discarded most code for v2.0 rewrite

Thu May 31 13:00:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Small bugfix release

Tue May 29 12:47:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Initial version released

--- NEW FILE: INSTALL ---
Basic Installation
==================
you need GNOME, GTK+, and GtkGLArea to start

./configure
make
mkdir /usr/local/share/bzedit
cp -R data /usr/local/share/bzedit
cp -R help/bzedit /usr/share/gnome/help

--- NEW FILE: Makefile.am ---
helpdir = /usr/share/gnome/help/bzedit/C
help_DATA = index.html \
            intro.html \
	    mainwin.html \
	    topic.dat

--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am

# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.


SHELL = @SHELL@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@

bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include

DESTDIR =

pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@

top_builddir = ..

ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@

INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@

NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
AWK = @AWK@
BONOBO_CFLAGS = @BONOBO_CFLAGS@
BONOBO_LIBS = @BONOBO_LIBS@
BUILD_GUILE = @BUILD_GUILE@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
DATADIRNAME = @DATADIRNAME@
GENCAT = @GENCAT@
GHTTP_LIB = @GHTTP_LIB@
GL_CFLAGS = @GL_CFLAGS@
GL_LIBS = @GL_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
GNOMEUI_LIBS = @GNOMEUI_LIBS@
GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@
GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_CONFIG = @GNOME_CONFIG@
GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@
GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
GNOME_LIBDIR = @GNOME_LIBDIR@
GNOME_LIBS = @GNOME_LIBS@
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
GNOME_XML_CFLAGS = @GNOME_XML_CFLAGS@
GNOME_XML_LIB = @GNOME_XML_LIB@
GNORBA_CFLAGS = @GNORBA_CFLAGS@
GNORBA_LIBS = @GNORBA_LIBS@
GTKGL_CFLAGS = @GTKGL_CFLAGS@
GTKGL_LIBS = @GTKGL_LIBS@
GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
GTK_LIBS = @GTK_LIBS@
GT_NO = @GT_NO@
GT_YES = @GT_YES@
GUILE_INCS = @GUILE_INCS@
GUILE_LIBS = @GUILE_LIBS@
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
LIBGTOP_BINARY_AGE = @LIBGTOP_BINARY_AGE@
LIBGTOP_BINDIR = @LIBGTOP_BINDIR@
LIBGTOP_CONFIG = @LIBGTOP_CONFIG@
LIBGTOP_EXTRA_LIBS = @LIBGTOP_EXTRA_LIBS@
LIBGTOP_INCLUDEDIR = @LIBGTOP_INCLUDEDIR@
LIBGTOP_INCS = @LIBGTOP_INCS@
LIBGTOP_INTERFACE_AGE = @LIBGTOP_INTERFACE_AGE@
LIBGTOP_LIBDIR = @LIBGTOP_LIBDIR@
LIBGTOP_LIBS = @LIBGTOP_LIBS@
LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@
LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@
LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@
LIBGTOP_NAMES_INCS = @LIBGTOP_NAMES_INCS@
LIBGTOP_NAMES_LIBS = @LIBGTOP_NAMES_LIBS@
LIBGTOP_SERVER = @LIBGTOP_SERVER@
LIBGTOP_SERVER_VERSION = @LIBGTOP_SERVER_VERSION@
LIBGTOP_VERSION = @LIBGTOP_VERSION@
LIBGTOP_VERSION_CODE = @LIBGTOP_VERSION_CODE@
LIBOBJS = @LIBOBJS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
ORBIT_CFLAGS = @ORBIT_CFLAGS@
ORBIT_CONFIG = @ORBIT_CONFIG@
ORBIT_IDL = @ORBIT_IDL@
ORBIT_LIBS = @ORBIT_LIBS@
PACKAGE = @PACKAGE@
POFILES = @POFILES@
POSUB = @POSUB@
PTHREAD_LIB = @PTHREAD_LIB@
QTTHREADS_LIB = @QTTHREADS_LIB@
RANLIB = @RANLIB@
READLINE_LIB = @READLINE_LIB@
SAMBAFILES = @SAMBAFILES@
TERMCAP_LIB = @TERMCAP_LIB@
TERMNET = @TERMNET@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XPM_LIBS = @XPM_LIBS@
ZVT_LIBS = @ZVT_LIBS@
cflags_set = @cflags_set@
cxxflags_set = @cxxflags_set@
l = @l@
localedir = @localedir@
mcserv = @mcserv@
need_gnome_support = @need_gnome_support@
smbfs = @smbfs@

helpdir = /usr/share/gnome/help/bzedit/C
help_DATA = index.html             intro.html 	    mainwin.html 	    topic.dat

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = 
DATA =  $(help_DATA)

DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS configure.in


DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
	cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile

Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
	cd $(top_builddir) \
	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status


install-helpDATA: $(help_DATA)
	@$(NORMAL_INSTALL)
	$(mkinstalldirs) $(DESTDIR)$(helpdir)
	@list='$(help_DATA)'; for p in $$list; do \
	  if test -f $(srcdir)/$$p; then \
	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(helpdir)/$$p"; \
	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(helpdir)/$$p; \
	  else if test -f $$p; then \
	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(helpdir)/$$p"; \
	    $(INSTALL_DATA) $$p $(DESTDIR)$(helpdir)/$$p; \
	  fi; fi; \
	done

uninstall-helpDATA:
	@$(NORMAL_UNINSTALL)
	list='$(help_DATA)'; for p in $$list; do \
	  rm -f $(DESTDIR)$(helpdir)/$$p; \
	done
tags: TAGS
TAGS:


distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

subdir = help

distdir: $(DISTFILES)
	here=`cd $(top_builddir) && pwd`; \
	top_distdir=`cd $(top_distdir) && pwd`; \
	distdir=`cd $(distdir) && pwd`; \
	cd $(top_srcdir) \
	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu help/Makefile
	@for file in $(DISTFILES); do \
	  d=$(srcdir); \
	  if test -d $$d/$$file; then \
	    cp -pr $$d/$$file $(distdir)/$$file; \
	  else \
	    test -f $(distdir)/$$file \
	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
	    || cp -p $$d/$$file $(distdir)/$$file || :; \
	  fi; \
	done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am

install-data-am: install-helpDATA
install-data: install-data-am

install-am: all-am
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-helpDATA
uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
	$(mkinstalldirs)  $(DESTDIR)$(helpdir)


mostlyclean-generic:

clean-generic:

distclean-generic:
	-rm -f Makefile $(CONFIG_CLEAN_FILES)
	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

maintainer-clean-generic:
mostlyclean-am:  mostlyclean-generic

mostlyclean: mostlyclean-am

clean-am:  clean-generic mostlyclean-am

clean: clean-am

distclean-am:  distclean-generic clean-am

distclean: distclean-am

maintainer-clean-am:  maintainer-clean-generic distclean-am
	@echo "This command is intended for maintainers to use;"
	@echo "it deletes files that may require special tools to rebuild."

maintainer-clean: maintainer-clean-am

.PHONY: uninstall-helpDATA install-helpDATA tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
install-exec install-data-am install-data install-am install \
uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean


# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

--- NEW FILE: NEWS ---

--- NEW FILE: README ---
                        bzedit
                        ------

bzedit is an application to allow you to create worlds for
the game BZFlag (see http://www.bzflag.org/). It runs
under the GNOME/GTK+ environment on linux, and uses
OpenGL/gtkglarea for visualization.

--- NEW FILE: config.h.in ---
/* config.h.in.  Generated automatically from configure.in by autoheader.  */

/* Define if using alloca.c.  */
#undef C_ALLOCA

/* Define to empty if the keyword does not work.  */
#undef const

/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
   This function is required for alloca.c support on those systems.  */
#undef CRAY_STACKSEG_END

/* Define if you have alloca, as a function or macro.  */
#undef HAVE_ALLOCA

/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
#undef HAVE_ALLOCA_H

/* Define if you have a working `mmap' system call.  */
#undef HAVE_MMAP

/* Define as __inline if that's what the C compiler calls it.  */
#undef inline

/* Define to `long' if <sys/types.h> doesn't define.  */
#undef off_t

/* Define if you need to in order for stat and other things to work.  */
#undef _POSIX_SOURCE

/* Define to `unsigned' if <sys/types.h> doesn't define.  */
#undef size_t

/* If using the C implementation of alloca, define if you know the
   direction of stack growth for your system; otherwise it will be
   automatically deduced at run-time.
 STACK_DIRECTION > 0 => grows toward higher addresses
 STACK_DIRECTION < 0 => grows toward lower addresses
 STACK_DIRECTION = 0 => direction of growth unknown
 */
#undef STACK_DIRECTION

/* Define if you have the ANSI C header files.  */
#undef STDC_HEADERS

#undef ENABLE_NLS
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
#undef HAVE_STPCPY

/* Define if you have the __argz_count function.  */
#undef HAVE___ARGZ_COUNT

/* Define if you have the __argz_next function.  */
#undef HAVE___ARGZ_NEXT

/* Define if you have the __argz_stringify function.  */
#undef HAVE___ARGZ_STRINGIFY

/* Define if you have the dcgettext function.  */
#undef HAVE_DCGETTEXT

/* Define if you have the getcwd function.  */
#undef HAVE_GETCWD

/* Define if you have the getpagesize function.  */
#undef HAVE_GETPAGESIZE

/* Define if you have the munmap function.  */
#undef HAVE_MUNMAP

/* Define if you have the putenv function.  */
#undef HAVE_PUTENV

/* Define if you have the setenv function.  */
#undef HAVE_SETENV

/* Define if you have the setlocale function.  */
#undef HAVE_SETLOCALE

/* Define if you have the stpcpy function.  */
#undef HAVE_STPCPY

/* Define if you have the strcasecmp function.  */
#undef HAVE_STRCASECMP

/* Define if you have the strchr function.  */
#undef HAVE_STRCHR

/* Define if you have the strdup function.  */
#undef HAVE_STRDUP

/* Define if you have the <argz.h> header file.  */
#undef HAVE_ARGZ_H

/* Define if you have the <limits.h> header file.  */
#undef HAVE_LIMITS_H

/* Define if you have the <locale.h> header file.  */
#undef HAVE_LOCALE_H

/* Define if you have the <malloc.h> header file.  */
#undef HAVE_MALLOC_H

/* Define if you have the <nl_types.h> header file.  */
#undef HAVE_NL_TYPES_H

/* Define if you have the <stl.h> header file.  */
#undef HAVE_STL_H

/* Define if you have the <string.h> header file.  */
#undef HAVE_STRING_H

/* Define if you have the <sys/param.h> header file.  */
#undef HAVE_SYS_PARAM_H

/* Define if you have the <unistd.h> header file.  */
#undef HAVE_UNISTD_H

/* Define if you have the i library (-li).  */
#undef HAVE_LIBI

/* Name of package */
#undef PACKAGE

/* Version number of package */
#undef VERSION


--- NEW FILE: configure.in ---
AC_INIT(bzedit.cpp)
AM_INIT_AUTOMAKE(bzedit, 2.0)
AM_CONFIG_HEADER(config.h)

# Checks for programs.
AC_PROG_CXX
AC_PROG_CXXCPP
AC_PROG_INSTALL
AC_PROG_MAKE_SET

# GNOME macros
GNOME_INIT
GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS

# Internationalization
ALL_LINGUAS=""
AM_GNOME_GETTEXT

# Locale directory
AC_ARG_WITH(locale-dir, [  --with-locale-dir=DIR    install locale files in DIR [DATADIR/locale]])
if test "$USE_NLS" = "yes" ; then
	if test -n "$with_locale_dir" ; then
		localedir="$with_locale_dir"
	else
		localedir=${datadir}/locale
	fi
else
	localedir="none"
fi
AC_SUBST(localedir)

# Checks for libraries.

### GTK+ ###
AM_PATH_GTK(1.2.1, , AC_MSG_ERROR([Cannot find proper GTK+ version]))
### GTK+ ###

### OpenGL/Mesa3D ###
AC_ARG_WITH(GL-prefix,  [  --with-GL-prefix=PFX     Prefix where GL/Mesa3D is installed (optional)])
AC_ARG_WITH(lib-GL,     [  --with-lib-GL            use '-lGL' (default)])
AC_ARG_WITH(lib-MesaGL, [  --with-lib-MesaGL        use '-lMesaGL'])

if test -n "$with_GL_prefix" ; then
	GL_CFLAGS="-I$with_GL_prefix/include"
	GL_LDOPTS="-L$with_GL_prefix/lib"
else
	GL_CFLAGS=""
	GL_LDOPTS=""
fi

AC_CHECK_LIB(MesaGL, glBegin, have_MesaGL=yes, , $GTK_LIBS $GL_LDOPTS)
AC_CHECK_LIB(GL,     glBegin, have_GL=yes,     , $GTK_LIBS $GL_LDOPTS)

if test "$with_lib_GL" = "yes" ; then
	# Want to use '-lGL'
	if test "$have_GL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lGL -lGLU"
	else
		AC_MSG_ERROR([Missing GL library])
	fi
elif test "$with_lib_MesaGL" = "yes" ; then
	# Want to use '-lMesaGL'
	if test "$have_MesaGL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lMesaGL -lMesaGLU"
	else
		AC_MSG_ERROR([Missing Mesa3D library])
	fi
else
	# Want to use whatever is available
	# Probably '-lGL'
	if test "$have_GL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lGL -lGLU"
	elif test "$have_MesaGL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lMesaGL -lMesaGLU"
	else
		AC_MSG_ERROR([You need the GL or Mesa3D libraries])
	fi
fi

AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS)
### OpenGL/Mesa3D ###

### GtkGLArea ###
AC_ARG_WITH(gtkgl-prefix,  [  --with-gtkgl-prefix=PFX     Prefix where gtkglarea is installed (optional)])

if test -n "$with_gtkgl_prefix" ; then
	GTKGL_CFLAGS="-I$with_gtkgl_prefix/include"
	GTKGL_LDOPTS="-L$with_gtkgl_prefix/lib"
else
	GTKGL_CFLAGS=""
	GTKGL_LDOPTS=""
fi

AC_CHECK_LIB(gtkgl, gtk_gl_area_new, gtkgl_ok=yes, , $GTKGL_LDOPTS $GTK_LIBS $GL_LIBS)

if test "$gtkgl_ok" = "yes" ; then
	GTKGL_LIBS="$GTKGL_LDOPTS -lgtkgl"
else
	AC_MSG_ERROR([Cannot find gtkglarea])
fi

AC_SUBST(GTKGL_CFLAGS)
AC_SUBST(GTKGL_LIBS)
### GtkGLArea ###

####
#### dnl Replace `main' with a function in -lgtkgl:
#### AC_CHECK_LIB(gtkgl, gtk_gl_area_new)
####

AC_LANG_CPLUSPLUS

# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(stl.h)

# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

# Checks for library functions.

# Add GNOME CFLAGS
GNOME_CFLAGS="`gnome-config --cflags gnome gnomeui`"
GNOME_LIBS="`gnome-config --libs gnome gnomeui`"
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)

AC_OUTPUT([
Makefile
data/Makefile
help/Makefile
])

--- NEW FILE: index.html ---
<HTML
><HEAD
><TITLE
>bzedit Documentation</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.49"><LINK
REL="NEXT"
TITLE="Introduction"
HREF="intro.html"></HEAD
><BODY
CLASS="BOOK"
><DIV
CLASS="BOOK"
><A
NAME="INDEX"
></A
><DIV
CLASS="TITLEPAGE"
><H1
CLASS="TITLE"
><A
NAME="AEN2"
>bzedit Documentation</A
></H1
><H3
CLASS="AUTHOR"
><A
NAME="AEN5"
>David Trowbridge</A
></H3
><H3
CLASS="AUTHOR"
><A
NAME="AEN5"
>David North</A
></H3
><DIV
CLASS="AFFILIATION"
><DIV
CLASS="ADDRESS"
><P
CLASS="ADDRESS"
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ju...@ba...<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</P
></DIV
></DIV
><P
CLASS="COPYRIGHT"
><A
HREF="ln21.html"
>Copyright</A
> &copy; 2001 by <SPAN
CLASS="HOLDER"
>David S. Trowbridge</SPAN
></P
><HR></DIV
><DIV
CLASS="TOC"
><DL
><DT
><B
>Table of Contents</B
></DT
><DT
>1. <A
HREF="intro.html"
>Introduction</A
></DT
><DT
>2. <A
HREF="mainwin.html"
>The main bzedit window</A
></DT
><DT
>3. <A
HREF="editwin.html"
>The edit window</A
></DT
><DT
>4. <A
HREF="treewin.html"
>The tree window</A
></DT
><DT
>5. <A
HREF="menuopts.html"
>Menu options</A
></DT
><DT
>6. <A
HREF="prefs.html"
>Setting the bzedit preferences</A
></DT
><DT
>7. <A
HREF="probs.html"
>Known problems with BZFlag</A
></DT
></DL
></DIV
></DIV
><DIV
CLASS="NAVFOOTER"
><HR
ALIGN="LEFT"
WIDTH="100%"><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
>&nbsp;</TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
>&nbsp;</TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
HREF="intro.html"
>Next</A
></TD
></TR
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
>&nbsp;</TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
>&nbsp;</TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
>Introduction</TD
></TR
></TABLE
></DIV
></BODY
></HTML
>

--- NEW FILE: intro.html ---
<HTML
><HEAD
><TITLE
>Introduction</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.49"><LINK
REL="HOME"
TITLE="bzedit Documentation"
HREF="index.html"><LINK
REL="PREVIOUS"
TITLE="bzedit Documentation"
HREF="index.html"><LINK
REL="NEXT"
TITLE="The main bzedit window"
HREF="mainwin.html"></HEAD
><BODY
CLASS="CHAPTER"
><DIV
CLASS="NAVHEADER"
><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TH
COLSPAN="3"
ALIGN="center"
>bzedit Documentation</TH
></TR
><TR
><TD
WIDTH="10%"
ALIGN="left"
VALIGN="bottom"
><A
HREF="index.html"
>Prev</A
></TD
><TD
WIDTH="80%"
ALIGN="center"
VALIGN="bottom"
></TD
><TD
WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
><A
HREF="mainwin.html"
>Next</A
></TD
></TR
></TABLE
><HR
ALIGN="LEFT"
WIDTH="100%"></DIV
><DIV
CLASS="CHAPTER"
><H1
><A
NAME="INTRO"
>Chapter 1. Introduction</A
></H1
><P
>		bzedit is an editor for the online tank game
		BZFlag. It is designed to allow easy editing
		of worlds for use on BZFlag servers, using
		OpenGL to provide a similar look to the
		actual game.
	</P
><P
>bzedit is designed with precision in mind - everything is
    positioned in terms of coordinates, with a resolution
    down to 1/10 of a unit. Angles are represented in the
    easier to understand degree unit (rather than the radian
    unit used internally in BZFlag worlds).
    </P
></DIV
><DIV
CLASS="NAVFOOTER"
><HR
ALIGN="LEFT"
WIDTH="100%"><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
HREF="index.html"
>Prev</A
></TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
HREF="index.html"
>Home</A
></TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
HREF="mainwin.html"
>Next</A
></TD
></TR
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
>bzedit Documentation</TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
>&nbsp;</TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
>The main bzedit window</TD
></TR
></TABLE
></DIV
></BODY
></HTML
>

--- NEW FILE: mainwin.html ---
<HTML
><HEAD
><TITLE
>The main bzedit window</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.49"><LINK
REL="HOME"
TITLE="bzedit Documentation"
HREF="index.html"><LINK
REL="PREVIOUS"
TITLE="Introduction"
HREF="intro.html"><LINK
REL="NEXT"
TITLE="The edit window"
HREF="editwin.html"></HEAD
><BODY
CLASS="CHAPTER"
><DIV
CLASS="NAVHEADER"
><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TH
COLSPAN="3"
ALIGN="center"
>bzedit Documentation</TH
></TR
><TR
><TD
WIDTH="10%"
ALIGN="left"
VALIGN="bottom"
><A
HREF="intro.html"
>Prev</A
></TD
><TD
WIDTH="80%"
ALIGN="center"
VALIGN="bottom"
></TD
><TD
WIDTH="10%"
ALIGN="right"
VALIGN="bottom"
><A
HREF="editwin.html"
>Next</A
></TD
></TR
></TABLE
><HR
ALIGN="LEFT"
WIDTH="100%"></DIV
><DIV
CLASS="CHAPTER"
><H1
><A
NAME="MAINWIN"
>Chapter 2. The main bzedit window</A
></H1
><P
>    	The bzedit main window consists of a menubar, and a group
	of options used primarily for setting attributes of each
	object. Initially, most of these options will be disabled.
	When an object is selected, however, some or all of these
	will become available for modification. At any time, you
	can test the world you are building by clicking "Test World."
	This will launch a server locally on your computer (not
	listed in the server list) and connect automatically with
	BZFlag.
    	</P
><P
></P
><UL
><LI
><P
>Main View. The main view displays the document page. If
	the monitor is large enough or if the page is small enough,
	the view will display the entire page, otherwise you will only
	section of it. In the sake of simplicity, we will refer to the
	main view as the view.
	</P
></LI
><LI
><P
>Scrolling pane.  The scrolling pane is the rectangular
	area at the top left corner of GGv. The scrolling pane is a
	visual representation of the complete page currently displayed
	in the view. The scrolling pane has an engraved rectangle
	inside. This rectangle is a representation of the current view
	(as displayed by the  view) with regard to the complete
	current page. An example might be the easiest way to
	understand this: load a document, resize GGv to the point that
	you can only see part of the document; look now at the
	scrolling pane. The smaller the window, the smaller the
	engraved rectangle. We will refer to the engraved rectangle as
	the slider. The slider, as it name implies, can be moved
	around. Drag it around, and you will see what I mean. In other
	words, the size of the slider with respect to the scrolling
	pane represents how large is the view with respect to the
	document, and the location of the slider represents the
	location of the view. If the complete page is being displayed
	in the view, then the size of the slider is the same as the
	scrolling pane.
	</P
></LI
><LI
><P
>List of Pages. The list of numbers at the bottom left is
	the list of pages available in the PostScript document. 
        </P
></LI
></UL
><P
>		There are several different ways to move: the cursor keys
                can be used to move in the desired direction, the spacebar
                moves in the direction of reading (assuming this is
                left-to-right and top-to-bottom) and backspace moves in the
                inverse direction. One can also move by dragging the scroll
                pane around and, finally and most intuitively, by clicking
                and dragging the text itself in the PostScript view.
	</P
><P
>                Clicking in the PostScript pane will pop up a menu, allowing
                you to navigate pages, zoom in or out, recenter the page or
                toggle the visibility of menu bar or the side panel.
        </P
><P
>                It is also possible to drag a list of files from the file
                manager to the GGv window, making GGv load and display them
                in different windows.
        </P
><P
>                From the File menu, you can open a new viewing window, open
                a new document or reload the existing one. You can also close
                the window (which exits GGv if no more windows exist) or exit
                the viewer completely.
        </P
><P
>                The Document menu lets you proceed to the next or previous page,
                recenter the page and set the orientation of the document's pages
                or zoom to one of the preset magnifications.
        </P
><P
>                In Settings menu you can bring up the Preferences dialog or
                toggle the visibility of the menu bar and the side panel of
                the current window.
        </P
></DIV
><DIV
CLASS="NAVFOOTER"
><HR
ALIGN="LEFT"
WIDTH="100%"><TABLE
WIDTH="100%"
BORDER="0"
CELLPADDING="0"
CELLSPACING="0"
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
><A
HREF="intro.html"
>Prev</A
></TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
><A
HREF="index.html"
>Home</A
></TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
><A
HREF="menuopts.html"
>Next</A
></TD
></TR
><TR
><TD
WIDTH="33%"
ALIGN="left"
VALIGN="top"
>Introduction</TD
><TD
WIDTH="34%"
ALIGN="center"
VALIGN="top"
>&nbsp;</TD
><TD
WIDTH="33%"
ALIGN="right"
VALIGN="top"
>Menu options</TD
></TR
></TABLE
></DIV
></BODY
></HTML
>

--- NEW FILE: topic.dat ---
index.html bzedit User's guide

CVS: bzedit/data AUTHORS,NONE,1.1 COPYING,NONE,1.1 ChangeLog,NONE,1.1 INSTALL,NONE,1.1 Makefile.am,NONE,1.1 Makefile.in,NONE,1.1 NEWS,NONE,1.1 README,NONE,1.1 config.h.in,NONE,1.1 configure,NONE,1.1 configure.in,NONE,1.1

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit/data
In directory usw-pr-cvs1:/tmp/cvs-serv21930/data

Added Files:
	AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS 
	README config.h.in configure configure.in 
Log Message:
Lots of changes, mostly with the GNU autotools


--- NEW FILE: AUTHORS ---
David Trowbridge <ju...@ba...>

--- NEW FILE: COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                          675 Mass Ave, Cambridge, MA 02139, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	Appendix: How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) 19yy  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) 19yy name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

--- NEW FILE: ChangeLog ---
Tue Jun 05 17:00:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Added autoconf/automake support

Thu May 31 13:01:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Discarded most code for v2.0 rewrite

Thu May 31 13:00:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Small bugfix release

Tue May 29 12:47:00 MDT 2000 David Trowbridge <ju...@ba...>

	* Initial version released

--- NEW FILE: INSTALL ---
Basic Installation
==================
you need GNOME, GTK+, and GtkGLArea to start

./configure
make
mkdir /usr/local/share/bzedit
cp -R data /usr/local/share/bzedit
cp -R help/bzedit /usr/share/gnome/help

--- NEW FILE: Makefile.am ---
data1dir = /usr/local/share/bzedit/data
data1_DATA = boxwall.tga \
            caution.tga \
	    ground.tga \
	    pyrwall.tga \
	    roof.tga \
	    wall.tga \
	    boxicon.png \
	    pyricon.png \
	    telicon.png

--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am

# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.


SHELL = @SHELL@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@

bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include

DESTDIR =

pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@

top_builddir = ..

ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@

INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@

NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
AWK = @AWK@
BONOBO_CFLAGS = @BONOBO_CFLAGS@
BONOBO_LIBS = @BONOBO_LIBS@
BUILD_GUILE = @BUILD_GUILE@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
DATADIRNAME = @DATADIRNAME@
GENCAT = @GENCAT@
GHTTP_LIB = @GHTTP_LIB@
GL_CFLAGS = @GL_CFLAGS@
GL_LIBS = @GL_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
GNOMEUI_LIBS = @GNOMEUI_LIBS@
GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@
GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
GNOME_CFLAGS = @GNOME_CFLAGS@
GNOME_CONFIG = @GNOME_CONFIG@
GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@
GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
GNOME_LIBDIR = @GNOME_LIBDIR@
GNOME_LIBS = @GNOME_LIBS@
GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
GNOME_XML_CFLAGS = @GNOME_XML_CFLAGS@
GNOME_XML_LIB = @GNOME_XML_LIB@
GNORBA_CFLAGS = @GNORBA_CFLAGS@
GNORBA_LIBS = @GNORBA_LIBS@
GTKGL_CFLAGS = @GTKGL_CFLAGS@
GTKGL_LIBS = @GTKGL_LIBS@
GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
GTK_LIBS = @GTK_LIBS@
GT_NO = @GT_NO@
GT_YES = @GT_YES@
GUILE_INCS = @GUILE_INCS@
GUILE_LIBS = @GUILE_LIBS@
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
LIBGTOP_BINARY_AGE = @LIBGTOP_BINARY_AGE@
LIBGTOP_BINDIR = @LIBGTOP_BINDIR@
LIBGTOP_CONFIG = @LIBGTOP_CONFIG@
LIBGTOP_EXTRA_LIBS = @LIBGTOP_EXTRA_LIBS@
LIBGTOP_INCLUDEDIR = @LIBGTOP_INCLUDEDIR@
LIBGTOP_INCS = @LIBGTOP_INCS@
LIBGTOP_INTERFACE_AGE = @LIBGTOP_INTERFACE_AGE@
LIBGTOP_LIBDIR = @LIBGTOP_LIBDIR@
LIBGTOP_LIBS = @LIBGTOP_LIBS@
LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@
LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@
LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@
LIBGTOP_NAMES_INCS = @LIBGTOP_NAMES_INCS@
LIBGTOP_NAMES_LIBS = @LIBGTOP_NAMES_LIBS@
LIBGTOP_SERVER = @LIBGTOP_SERVER@
LIBGTOP_SERVER_VERSION = @LIBGTOP_SERVER_VERSION@
LIBGTOP_VERSION = @LIBGTOP_VERSION@
LIBGTOP_VERSION_CODE = @LIBGTOP_VERSION_CODE@
LIBOBJS = @LIBOBJS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
ORBIT_CFLAGS = @ORBIT_CFLAGS@
ORBIT_CONFIG = @ORBIT_CONFIG@
ORBIT_IDL = @ORBIT_IDL@
ORBIT_LIBS = @ORBIT_LIBS@
PACKAGE = @PACKAGE@
POFILES = @POFILES@
POSUB = @POSUB@
PTHREAD_LIB = @PTHREAD_LIB@
QTTHREADS_LIB = @QTTHREADS_LIB@
RANLIB = @RANLIB@
READLINE_LIB = @READLINE_LIB@
SAMBAFILES = @SAMBAFILES@
TERMCAP_LIB = @TERMCAP_LIB@
TERMNET = @TERMNET@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XPM_LIBS = @XPM_LIBS@
ZVT_LIBS = @ZVT_LIBS@
cflags_set = @cflags_set@
cxxflags_set = @cxxflags_set@
l = @l@
localedir = @localedir@
mcserv = @mcserv@
need_gnome_support = @need_gnome_support@
smbfs = @smbfs@

data1dir = /usr/local/share/bzedit/data
data1_DATA = boxwall.tga             caution.tga 	    ground.tga 	    pyrwall.tga 	    roof.tga 	    wall.tga 	    boxicon.png 	    pyricon.png 	    telicon.png

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = 
DATA =  $(data1_DATA)

DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS configure configure.in


DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
	cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile

Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
	cd $(top_builddir) \
	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status


install-data1DATA: $(data1_DATA)
	@$(NORMAL_INSTALL)
	$(mkinstalldirs) $(DESTDIR)$(data1dir)
	@list='$(data1_DATA)'; for p in $$list; do \
	  if test -f $(srcdir)/$$p; then \
	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(data1dir)/$$p"; \
	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(data1dir)/$$p; \
	  else if test -f $$p; then \
	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(data1dir)/$$p"; \
	    $(INSTALL_DATA) $$p $(DESTDIR)$(data1dir)/$$p; \
	  fi; fi; \
	done

uninstall-data1DATA:
	@$(NORMAL_UNINSTALL)
	list='$(data1_DATA)'; for p in $$list; do \
	  rm -f $(DESTDIR)$(data1dir)/$$p; \
	done
tags: TAGS
TAGS:


distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

subdir = data

distdir: $(DISTFILES)
	here=`cd $(top_builddir) && pwd`; \
	top_distdir=`cd $(top_distdir) && pwd`; \
	distdir=`cd $(distdir) && pwd`; \
	cd $(top_srcdir) \
	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/Makefile
	@for file in $(DISTFILES); do \
	  d=$(srcdir); \
	  if test -d $$d/$$file; then \
	    cp -pr $$d/$$file $(distdir)/$$file; \
	  else \
	    test -f $(distdir)/$$file \
	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
	    || cp -p $$d/$$file $(distdir)/$$file || :; \
	  fi; \
	done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am

install-data-am: install-data1DATA
install-data: install-data-am

install-am: all-am
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-data1DATA
uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
	$(mkinstalldirs)  $(DESTDIR)$(data1dir)


mostlyclean-generic:

clean-generic:

distclean-generic:
	-rm -f Makefile $(CONFIG_CLEAN_FILES)
	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

maintainer-clean-generic:
mostlyclean-am:  mostlyclean-generic

mostlyclean: mostlyclean-am

clean-am:  clean-generic mostlyclean-am

clean: clean-am

distclean-am:  distclean-generic clean-am

distclean: distclean-am

maintainer-clean-am:  maintainer-clean-generic distclean-am
	@echo "This command is intended for maintainers to use;"
	@echo "it deletes files that may require special tools to rebuild."

maintainer-clean: maintainer-clean-am

.PHONY: uninstall-data1DATA install-data1DATA tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
install-exec install-data-am install-data install-am install \
uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean


# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

--- NEW FILE: NEWS ---

--- NEW FILE: README ---
                        bzedit
                        ------

bzedit is an application to allow you to create worlds for
the game BZFlag (see http://www.bzflag.org/). It runs
under the GNOME/GTK+ environment on linux, and uses
OpenGL/gtkglarea for visualization.

--- NEW FILE: config.h.in ---
/* config.h.in.  Generated automatically from configure.in by autoheader.  */

/* Define if using alloca.c.  */
#undef C_ALLOCA

/* Define to empty if the keyword does not work.  */
#undef const

/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
   This function is required for alloca.c support on those systems.  */
#undef CRAY_STACKSEG_END

/* Define if you have alloca, as a function or macro.  */
#undef HAVE_ALLOCA

/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
#undef HAVE_ALLOCA_H

/* Define if you have a working `mmap' system call.  */
#undef HAVE_MMAP

/* Define as __inline if that's what the C compiler calls it.  */
#undef inline

/* Define to `long' if <sys/types.h> doesn't define.  */
#undef off_t

/* Define if you need to in order for stat and other things to work.  */
#undef _POSIX_SOURCE

/* Define to `unsigned' if <sys/types.h> doesn't define.  */
#undef size_t

/* If using the C implementation of alloca, define if you know the
   direction of stack growth for your system; otherwise it will be
   automatically deduced at run-time.
 STACK_DIRECTION > 0 => grows toward higher addresses
 STACK_DIRECTION < 0 => grows toward lower addresses
 STACK_DIRECTION = 0 => direction of growth unknown
 */
#undef STACK_DIRECTION

/* Define if you have the ANSI C header files.  */
#undef STDC_HEADERS

#undef ENABLE_NLS
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
#undef HAVE_STPCPY

/* Define if you have the __argz_count function.  */
#undef HAVE___ARGZ_COUNT

/* Define if you have the __argz_next function.  */
#undef HAVE___ARGZ_NEXT

/* Define if you have the __argz_stringify function.  */
#undef HAVE___ARGZ_STRINGIFY

/* Define if you have the dcgettext function.  */
#undef HAVE_DCGETTEXT

/* Define if you have the getcwd function.  */
#undef HAVE_GETCWD

/* Define if you have the getpagesize function.  */
#undef HAVE_GETPAGESIZE

/* Define if you have the munmap function.  */
#undef HAVE_MUNMAP

/* Define if you have the putenv function.  */
#undef HAVE_PUTENV

/* Define if you have the setenv function.  */
#undef HAVE_SETENV

/* Define if you have the setlocale function.  */
#undef HAVE_SETLOCALE

/* Define if you have the stpcpy function.  */
#undef HAVE_STPCPY

/* Define if you have the strcasecmp function.  */
#undef HAVE_STRCASECMP

/* Define if you have the strchr function.  */
#undef HAVE_STRCHR

/* Define if you have the strdup function.  */
#undef HAVE_STRDUP

/* Define if you have the <argz.h> header file.  */
#undef HAVE_ARGZ_H

/* Define if you have the <limits.h> header file.  */
#undef HAVE_LIMITS_H

/* Define if you have the <locale.h> header file.  */
#undef HAVE_LOCALE_H

/* Define if you have the <malloc.h> header file.  */
#undef HAVE_MALLOC_H

/* Define if you have the <nl_types.h> header file.  */
#undef HAVE_NL_TYPES_H

/* Define if you have the <stl.h> header file.  */
#undef HAVE_STL_H

/* Define if you have the <string.h> header file.  */
#undef HAVE_STRING_H

/* Define if you have the <sys/param.h> header file.  */
#undef HAVE_SYS_PARAM_H

/* Define if you have the <unistd.h> header file.  */
#undef HAVE_UNISTD_H

/* Define if you have the i library (-li).  */
#undef HAVE_LIBI

/* Name of package */
#undef PACKAGE

/* Version number of package */
#undef VERSION


--- NEW FILE: configure ---
#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13 
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.

# Defaults:
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
  --with-gnome-includes   Specify location of GNOME headers"
ac_help="$ac_help
  --with-gnome-libs       Specify location of GNOME libs"
ac_help="$ac_help
  --with-gnome            Specify prefix for GNOME files"
[...4727 lines suppressed...]
  fi
done
EOF
cat >> $CONFIG_STATUS <<EOF



EOF
cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
case "$CONFIG_FILES" in *po/Makefile.in*)
        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
      esac

exit 0
EOF
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1


--- NEW FILE: configure.in ---
AC_INIT(bzedit.cpp)
AM_INIT_AUTOMAKE(bzedit, 2.0)
AM_CONFIG_HEADER(config.h)

# Checks for programs.
AC_PROG_CXX
AC_PROG_CXXCPP
AC_PROG_INSTALL
AC_PROG_MAKE_SET

# GNOME macros
GNOME_INIT
GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS

# Internationalization
ALL_LINGUAS=""
AM_GNOME_GETTEXT

# Locale directory
AC_ARG_WITH(locale-dir, [  --with-locale-dir=DIR    install locale files in DIR [DATADIR/locale]])
if test "$USE_NLS" = "yes" ; then
	if test -n "$with_locale_dir" ; then
		localedir="$with_locale_dir"
	else
		localedir=${datadir}/locale
	fi
else
	localedir="none"
fi
AC_SUBST(localedir)

# Checks for libraries.

### GTK+ ###
AM_PATH_GTK(1.2.1, , AC_MSG_ERROR([Cannot find proper GTK+ version]))
### GTK+ ###

### OpenGL/Mesa3D ###
AC_ARG_WITH(GL-prefix,  [  --with-GL-prefix=PFX     Prefix where GL/Mesa3D is installed (optional)])
AC_ARG_WITH(lib-GL,     [  --with-lib-GL            use '-lGL' (default)])
AC_ARG_WITH(lib-MesaGL, [  --with-lib-MesaGL        use '-lMesaGL'])

if test -n "$with_GL_prefix" ; then
	GL_CFLAGS="-I$with_GL_prefix/include"
	GL_LDOPTS="-L$with_GL_prefix/lib"
else
	GL_CFLAGS=""
	GL_LDOPTS=""
fi

AC_CHECK_LIB(MesaGL, glBegin, have_MesaGL=yes, , $GTK_LIBS $GL_LDOPTS)
AC_CHECK_LIB(GL,     glBegin, have_GL=yes,     , $GTK_LIBS $GL_LDOPTS)

if test "$with_lib_GL" = "yes" ; then
	# Want to use '-lGL'
	if test "$have_GL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lGL -lGLU"
	else
		AC_MSG_ERROR([Missing GL library])
	fi
elif test "$with_lib_MesaGL" = "yes" ; then
	# Want to use '-lMesaGL'
	if test "$have_MesaGL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lMesaGL -lMesaGLU"
	else
		AC_MSG_ERROR([Missing Mesa3D library])
	fi
else
	# Want to use whatever is available
	# Probably '-lGL'
	if test "$have_GL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lGL -lGLU"
	elif test "$have_MesaGL" = "yes" ; then
		GL_LIBS="$GL_LDOPTS -lMesaGL -lMesaGLU"
	else
		AC_MSG_ERROR([You need the GL or Mesa3D libraries])
	fi
fi

AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS)
### OpenGL/Mesa3D ###

### GtkGLArea ###
AC_ARG_WITH(gtkgl-prefix,  [  --with-gtkgl-prefix=PFX     Prefix where gtkglarea is installed (optional)])

if test -n "$with_gtkgl_prefix" ; then
	GTKGL_CFLAGS="-I$with_gtkgl_prefix/include"
	GTKGL_LDOPTS="-L$with_gtkgl_prefix/lib"
else
	GTKGL_CFLAGS=""
	GTKGL_LDOPTS=""
fi

AC_CHECK_LIB(gtkgl, gtk_gl_area_new, gtkgl_ok=yes, , $GTKGL_LDOPTS $GTK_LIBS $GL_LIBS)

if test "$gtkgl_ok" = "yes" ; then
	GTKGL_LIBS="$GTKGL_LDOPTS -lgtkgl"
else
	AC_MSG_ERROR([Cannot find gtkglarea])
fi

AC_SUBST(GTKGL_CFLAGS)
AC_SUBST(GTKGL_LIBS)
### GtkGLArea ###

####
#### dnl Replace `main' with a function in -lgtkgl:
#### AC_CHECK_LIB(gtkgl, gtk_gl_area_new)
####

AC_LANG_CPLUSPLUS

# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(stl.h)

# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

# Checks for library functions.

# Add GNOME CFLAGS
GNOME_CFLAGS="`gnome-config --cflags gnome gnomeui`"
GNOME_LIBS="`gnome-config --libs gnome gnomeui`"
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)

AC_OUTPUT([
Makefile
data/Makefile
help/Makefile
])

CVS: bzedit INSTALL,1.1.1.1,1.2 Makefile.am,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2 TODO,1.1.1.1,1.2 configure,1.1.1.1,1.2 configure.in,1.1.1.1,1.2 element.cpp,1.1.1.1,1.2 element.h,1.1.1.1,1.2 objects.cpp,1.1.1.1,1.2 objects.h,1.1.1.1,1.2 ui_main.cpp,1.1.1.1,1.2 world.cpp,1.1.1.1,1.2 world.h,1.1.1.1,1.2

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit
In directory usw-pr-cvs1:/tmp/cvs-serv21930

Modified Files:
	INSTALL Makefile.am Makefile.in TODO configure configure.in 
	element.cpp element.h objects.cpp objects.h ui_main.cpp 
	world.cpp world.h 
Log Message:
Lots of changes, mostly with the GNU autotools


Index: INSTALL
===================================================================
RCS file: /cvsroot/bzflag/bzedit/INSTALL,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- INSTALL	2001/06/28 18:49:49	1.1.1.1
+++ INSTALL	2001/07/15 22:16:19	1.2
@@ -1,11 +1,9 @@
 Basic Installation
 ==================
-There shouldn't be too much involved in installing bzedit.
-These three lines should suffice:
-	# make
-	# make install
+you need GNOME, GTK+, and GtkGLArea to start
 
-If you need custom compiler/linker options, you can
-change these by editing the makefile.
-
-bzedit requires OpenGL, GLU, GTK+, GNOME, and gtkglarea
+./configure
+make
+mkdir /usr/local/share/bzedit
+cp -R data /usr/local/share/bzedit
+cp -R help/bzedit /usr/share/gnome/help

Index: Makefile.am
===================================================================
RCS file: /cvsroot/bzflag/bzedit/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.am	2001/06/28 18:49:49	1.1.1.1
+++ Makefile.am	2001/07/15 22:16:19	1.2
@@ -4,6 +4,8 @@
 	@GTKGL_CFLAGS@ \
 	@GL_CFLAGS@
 
+SUBDIRS = . data help
+
 bin_PROGRAMS = bzedit
 noinst_HEADERS = \
 	camera.h \
@@ -34,13 +36,16 @@
 	@GL_LIBS@
 
 EXTRA_DIST = \
+	data/boxicon.png \
 	data/boxwall.tga \
 	data/caution.tga \
 	data/ground.tga \
+	data/pyricon.png \
 	data/pyrwall.tga \
 	data/roof.tga \
+	data/telicon.png \
 	data/wall.tga \
-	help/bzedit/C/index.html \
-	help/bzedit/C/intro.html \
-	help/bzedit/C/mainwin.html \
-	help/bzedit/C/topic.dat
+	help/index.html \
+	help/intro.html \
+	help/mainwin.html \
+	help/topic.dat

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bzflag/bzedit/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.in	2001/06/28 18:49:49	1.1.1.1
+++ Makefile.in	2001/07/15 22:16:19	1.2
@@ -157,6 +157,8 @@
 INCLUDES =  	@GNOME_CFLAGS@ 	@GTK_CFLAGS@ 	@GTKGL_CFLAGS@ 	@GL_CFLAGS@
 
 
+SUBDIRS = . data help
+
 bin_PROGRAMS = bzedit
 noinst_HEADERS =  	camera.h 	objects.h 	element.h 	ui_edit.h 	ui_main.h 	ui_list.h 	textures.h 	tga.h 	world.h
 
@@ -167,7 +169,7 @@
 bzedit_LDADD =  	@GNOME_LIBS@ 	@GTK_LIBS@ 	@GTKGL_LIBS@ 	@GL_LIBS@
 
 
-EXTRA_DIST =  	data/boxwall.tga 	data/caution.tga 	data/ground.tga 	data/pyrwall.tga 	data/roof.tga 	data/wall.tga 	help/bzedit/C/index.html 	help/bzedit/C/intro.html 	help/bzedit/C/mainwin.html 	help/bzedit/C/topic.dat
+EXTRA_DIST =  	data/boxicon.png 	data/boxwall.tga 	data/caution.tga 	data/ground.tga 	data/pyricon.png 	data/pyrwall.tga 	data/roof.tga 	data/telicon.png 	data/wall.tga 	help/index.html 	help/intro.html 	help/mainwin.html 	help/topic.dat
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -199,6 +201,9 @@
 
 TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/bzedit.P .deps/element.P .deps/objects.P \
+.deps/textures.P .deps/tga.P .deps/ui_edit.P .deps/ui_list.P \
+.deps/ui_main.P .deps/world.P
 SOURCES = $(bzedit_SOURCES)
 OBJECTS = $(bzedit_OBJECTS)
 
@@ -206,9 +211,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .cpp .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -273,9 +278,6 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -298,6 +300,61 @@
 .cpp.o:
 	$(CXXCOMPILE) -c $<
 
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+@SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	  test "$$subdir" = "." && dot_seen=yes; \
+	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -308,9 +365,14 @@
 	here=`pwd` && cd $(srcdir) \
 	  && mkid -f$$here/ID $$unique $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
+	done; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
 	  awk '    { files[$$0] = 1; } \
@@ -365,7 +427,12 @@
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
-	$(mkinstalldirs) $(distdir)/data $(distdir)/help/bzedit/C
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+	$(mkinstalldirs) $(distdir)/data $(distdir)/help
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -375,50 +442,96 @@
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
+	done
+	for subdir in $(SUBDIRS); do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
 	done
-bzedit.o: bzedit.cpp ui_main.h ui_edit.h camera.h world.h element.h \
-	objects.h ui_list.h textures.h
-element.o: element.cpp element.h objects.h camera.h
-objects.o: objects.cpp objects.h camera.h textures.h
-textures.o: textures.cpp tga.h textures.h
-tga.o: tga.cpp tga.h
-tree_element.o: tree_element.cpp tree_element.h objects.h camera.h
-ui_edit.o: ui_edit.cpp ui_edit.h camera.h world.h element.h objects.h \
-	textures.h ui_main.h ui_list.h
-ui_list.o: ui_list.cpp ui_list.h element.h objects.h camera.h world.h \
-	ui_main.h ui_edit.h
-ui_main.o: ui_main.cpp ui_main.h ui_edit.h camera.h world.h element.h \
-	objects.h ui_list.h
-ui_tree.o: ui_tree.cpp ui_tree.h tree_element.h objects.h camera.h
-world.o: world.cpp world.h camera.h element.h objects.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cpp
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cpp
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
-info: info-am
+info: info-recursive
 dvi-am:
-dvi: dvi-am
+dvi: dvi-recursive
 check-am: all-am
-check: check-am
+check: check-recursive
 installcheck-am:
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 all-recursive-am: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 install-exec-am: install-binPROGRAMS
-install-exec: install-exec-am
+install-exec: install-exec-recursive
 
 install-data-am:
-install-data: install-data-am
+install-data: install-data-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
+install: install-recursive
 uninstall-am: uninstall-binPROGRAMS
-uninstall: uninstall-am
+uninstall: uninstall-recursive
 all-am: Makefile $(PROGRAMS) $(HEADERS) config.h
-all-redirect: all-am
+all-redirect: all-recursive-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 
 
@@ -432,41 +545,50 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-		clean-generic mostlyclean-am
+		clean-depend clean-generic mostlyclean-am
 
-clean: clean-am
+clean: clean-recursive
 
 distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 	-rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
 mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck all-recursive-am install-exec-am \
+maintainer-clean-compile install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-am \
 install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

Index: TODO
===================================================================
RCS file: /cvsroot/bzflag/bzedit/TODO,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- TODO	2001/06/28 18:49:49	1.1.1.1
+++ TODO	2001/07/15 22:16:19	1.2
@@ -1,7 +1,7 @@
 1) Make it work
-3) That whole bonobo thing would be nice
+3) That whole GNOME thing would be nice
 	* Add support for GConf (+configuration)
-	* Add support for bonobo
-	* Add support for gnome-vfs
+	* Add support for bonobo (?)
+	* Add support for gnome-vfs (?)
 	* Add support for gnome-print(?)
 2) Release v2.0

Index: configure
===================================================================
RCS file: /cvsroot/bzflag/bzedit/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure	2001/06/28 18:49:51	1.1.1.1
+++ configure	2001/07/15 22:16:19	1.2
@@ -4385,7 +4385,11 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "
+Makefile
+data/Makefile
+help/Makefile
+ config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4528,7 +4532,10 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile
+data/Makefile
+help/Makefile
+"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

Index: configure.in
===================================================================
RCS file: /cvsroot/bzflag/bzedit/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure.in	2001/06/28 18:49:51	1.1.1.1
+++ configure.in	2001/07/15 22:16:19	1.2
@@ -127,4 +127,8 @@
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT([
+Makefile
+data/Makefile
+help/Makefile
+])

Index: element.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/element.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- element.cpp	2001/06/28 18:49:51	1.1.1.1
+++ element.cpp	2001/07/15 22:16:19	1.2
@@ -8,6 +8,7 @@
   b = NULL;
   p = NULL;
   t = NULL;
+  l = NULL;
 }
 
 Element::Element(const Element &r) {
@@ -15,6 +16,7 @@
   b = r.b;
   p = r.p;
   t = r.t;
+  l = r.l;
   name = r.name;
   visible = r.visible;
   selected = r.selected;
@@ -25,6 +27,7 @@
   b = r.b;
   p = r.p;
   t = r.t;
+  l = r.l;
   name = r.name;
   visible = r.visible;
   selected = r.selected;
@@ -39,6 +42,8 @@
     delete p;
   if(t != NULL)
     delete t;
+  if(l != NULL)
+    delete l;
 }
 
 void Element::makePyramid() {
@@ -49,6 +54,8 @@
     p = new Pyramid;
   if(t != NULL)
     delete t;
+  if(l != NULL)
+    delete l;
 }
 
 void Element::makeTeleporter() {
@@ -59,6 +66,8 @@
     delete p;
   if(t == NULL)
     t = new Teleporter;
+  if(l != NULL)
+    delete l;
 }
 
 void Element::render(Camera &c, bool transparent) {
@@ -72,6 +81,8 @@
     case TELEPORTER:
       t->render(c, transparent);
       return;
+//    case LINK:
+//      return;
     case NONE:
       return;
   }
@@ -84,6 +95,8 @@
     dest << (*src.p);
   } else if(src.type == Element::TELEPORTER) {
     dest << (*src.t);
+//  } else if(src.type == Element::LINK) {
+//    dest << (*src.l);
   }
   return dest;
 }

Index: element.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/element.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- element.h	2001/06/28 18:49:52	1.1.1.1
+++ element.h	2001/07/15 22:16:19	1.2
@@ -6,10 +6,12 @@
 
 class Element {
   public:
+//    enum {BOX, PYRAMID, TELEPORTER, LINK, NONE} type;
     enum {BOX, PYRAMID, TELEPORTER, NONE} type;
     Box *b;
     Pyramid *p;
     Teleporter *t;
+    Link *l;
     string name;
     bool visible;
     bool selected;

Index: objects.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/objects.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- objects.cpp	2001/06/28 18:49:51	1.1.1.1
+++ objects.cpp	2001/07/15 22:16:19	1.2
@@ -1,4 +1,5 @@
 #include "objects.h"
+#include "world.h"
 #include "textures.h"
 #include <math.h>
 #include <GL/gl.h>
@@ -279,8 +280,6 @@
   sz = 20.16;
   angle = 0;
   border = 1;
-  link1 = link2 = NULL;
-  link1_side = link2_side = 0;
 }
 
 Teleporter::Teleporter(const Teleporter &r) {
@@ -292,10 +291,6 @@
   this->sz = r.sz;
   this->angle = r.angle;
   this->border = r.border;
-  this->link1 = r.link1;
-  this->link1_side = r.link1_side;
-  this->link2 = r.link2;
-  this->link2_side = r.link2_side;
 }
 
 Teleporter Teleporter::operator = (const Teleporter &r) {
@@ -307,10 +302,6 @@
   this->sz = r.sz;
   this->angle = r.angle;
   this->border = r.border;
-  this->link1 = r.link1;
-  this->link1_side = r.link1_side;
-  this->link2 = r.link2;
-  this->link2_side = r.link2_side;
   return *this;
 }
 
@@ -427,56 +418,68 @@
     glDisable(GL_BLEND);
     glColor4f(1.0, 1.0, 1.0, 1.0);
   }
-  // draw arrows (pass bool selected?)
 }
 
 void Teleporter::set_border(float border) {
   this->border = border;
 }
 
-void Teleporter::set_link1(Teleporter *link1) {
-  this->link1 = link1;
+float Teleporter::get_border() {
+  return border;
 }
 
-void Teleporter::set_link1_side(int link1_side) {
-  this->link1_side = link1_side;
+ostream & operator << (ostream &dest, Teleporter &src) {
+  dest << "teleporter" << endl;
+  dest << "position " << src.px << ' ' << src.py << ' ' << src.pz << endl;
+  dest << "rotation " << (((src.angle / 180.0) - 90) * M_PI) << endl;
+  dest << "size " << src.sy << ' ' << src.sx << ' ' << src.sz << endl;
+  dest << "border " << src.border << endl;
+  dest << "end" << endl;
+  dest << endl;
+  return dest;
 }
 
-void Teleporter::set_link2(Teleporter *link2) {
-  this->link2 = link2;
+Link::Link() {
+  from = "";
+  to = "";
 }
 
-void Teleporter::set_link2_side(int link2_side) {
-  this->link2_side = link2_side;
+Link::Link(const Link &r) {
+  from = r.from;
+  to = r.to;
 }
 
-float Teleporter::get_border() {
-  return border;
+Link Link::operator = (const Link &r) {
+  from = r.from;
+  to = r.to;
+  return *this;
 }
 
-Teleporter *Teleporter::get_link1() {
-  return link1;
+void Link::render(Camera &c, World *w) {
+  Element fromE = w->getElementByName(from);
+  Element toE = w->getElementByName(to);
 }
 
-int Teleporter::get_link1_side() {
-  return link1_side;
+void Link::set_from(string from) {
+  this->from = from;
 }
 
-Teleporter *Teleporter::get_link2() {
-  return link2;
+void Link::set_to(string to) {
+  this->to = to;
 }
 
-int Teleporter::get_link2_side() {
-  return link2_side;
+string Link::get_from() {
+  return from;
 }
 
-ostream & operator << (ostream &dest, Teleporter &src) {
-  dest << "teleporter" << endl;
-  dest << "position " << src.px << ' ' << src.py << ' ' << src.pz << endl;
-  dest << "rotation " << (((src.angle / 180.0) - 90) * M_PI) << endl;
-  dest << "size " << src.sy << ' ' << src.sx << ' ' << src.sz << endl;
-  dest << "border " << src.border << endl;
+string Link::get_to() {
+  return to;
+}
+
+ostream & operator << (ostream &dest, Link &src) {
+  dest << "link" << endl;
+  dest << "from " << src.from << endl;
+  dest << "to " << src.to << endl;
   dest << "end" << endl;
-  dest << endl;
   return dest;
 }

Index: objects.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/objects.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- objects.h	2001/06/28 18:49:52	1.1.1.1
+++ objects.h	2001/07/15 22:16:19	1.2
@@ -3,7 +3,10 @@
 
 #include "camera.h"
 #include <iostream.h>
+#include <string>
 
+class World;
+
 class Object {
   public:
     void set_px(float px);
@@ -61,23 +64,27 @@
     Teleporter(const Teleporter &r);
     Teleporter operator = (const Teleporter &r);
     void render(Camera &c, bool transparent);
-    friend ostream & operator << (ostream &dest, Teleporter &src);
     void set_border(float border);
-    void set_link1(Teleporter *link1);
-    void set_link1_side(int link1_side);
-    void set_link2(Teleporter *link2);
-    void set_link2_side(int link2_side);
     float get_border();
-    Teleporter *get_link1();
-    int get_link1_side();
-    Teleporter *get_link2();
-    int get_link2_side();
+    friend ostream & operator << (ostream &dest, Teleporter &src);
   protected:
     float border;
-    int link1_side;
-    Teleporter *link1;
-    int link2_side;
-    Teleporter *link2;
+};
+
+class Link {
+  public:
+    Link();
+    Link(const Link &r);
+    Link operator = (const Link &r);
+    void render(Camera &c, World *w);
+    void set_from(string from);
+    void set_to(string to);
+    string get_from();
+    string get_to();
+    friend ostream & operator << (ostream &dest, Link &src);
+  protected:
+    string from;
+    string to;
 };
 
 #endif

Index: ui_main.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/ui_main.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ui_main.cpp	2001/06/28 18:49:51	1.1.1.1
+++ ui_main.cpp	2001/07/15 22:16:19	1.2
@@ -540,7 +540,7 @@
     gdk_window_raise(dialog->window);
     return TRUE;
   }
-  dialog = gnome_about_new("bzedit", "2.0a", "(c) 2001 David Trowbridge", authors, "Editor for the popular game BZFlag\nWritten out of utter boredom.\nSpecial thanks to:\n  m0nkey_b0y, Gerbil,\n  Quinn Buchanan, Steve Houston,\n  and others.", NULL);
+  dialog = gnome_about_new("bzedit", "2.0a", "(c) 2001 David Trowbridge", authors, "Editor for the popular game BZFlag\nWritten out of utter boredom.\nSpecial thanks to:\n  m0nkey_b0y, Gerbil, Quinn Buchanan,\n  Steve Houston, and others.", NULL);
   // TODO: set parent
   gtk_signal_connect(GTK_OBJECT(dialog), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dialog);
   gtk_widget_show(dialog);

Index: world.cpp
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- world.cpp	2001/06/28 18:49:52	1.1.1.1
+++ world.cpp	2001/07/15 22:16:19	1.2
@@ -154,7 +154,6 @@
     if(x == "#!name") {
       file >> x;
       nextname = x;
-      cout << "Read name " << nextname << endl;
     } else if(x == "box") {
       el = new Element;
       el->makeBox();
@@ -180,11 +179,12 @@
 	file >> x;
       }
       if(nextname != "") {
-	cout << "Creating box, name = " << nextname << endl;
 	el->name = nextname;
 	nextname = "";
       }
+      cout << "uniqueName()\n";
       uniqueName(*el);
+      cout << "pushBack()\n";
       push_back(*el);
       delete el;
       continue;
@@ -408,4 +408,12 @@
     file << (*this)[i];
   }
   return true;
+}
+
+Element World::getElementByName(string name) {
+  for(int i = 0; i < size(); i++) {
+    if((*this)[i].name == name)
+      return (*this)[i];
+  }
+  return Element();
 }

Index: world.h
===================================================================
RCS file: /cvsroot/bzflag/bzedit/world.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- world.h	2001/06/28 18:49:52	1.1.1.1
+++ world.h	2001/07/15 22:16:19	1.2
@@ -16,6 +16,7 @@
     bool load(char *filename);
     bool append(char *filename);
     bool write(char *filename);
+    Element getElementByName(string name);
   private:
     GnomePixmap *boxicon;
     GnomePixmap *pyricon;

CVS: bzedit/help/bzedit/C index.html,1.1.1.1,NONE intro.html,1.1.1.1,NONE mainwin.html,1.1.1.1,NONE topic.dat,1.1.1.1,NONE

[David T. <dav...@us...>]

Update of /cvsroot/bzflag/bzedit/help/bzedit/C
In directory usw-pr-cvs1:/tmp/cvs-serv7538/bzedit/C

Removed Files:
	index.html intro.html mainwin.html topic.dat 
Log Message:
Removed help files to move them because I don't know how to modify the repository directly :P


--- index.html DELETED ---

--- intro.html DELETED ---

--- mainwin.html DELETED ---

--- topic.dat DELETED ---

CVS: bzflag/src/bzflag HUDRenderer.cxx,1.13,1.14

[Pier D. <cy...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv9022

Modified Files:
	HUDRenderer.cxx 
Log Message:
score bugfix


Index: HUDRenderer.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/HUDRenderer.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HUDRenderer.cxx	2001/07/12 15:57:12	1.13
+++ HUDRenderer.cxx	2001/07/15 17:31:01	1.14
@@ -756,8 +756,14 @@
 
 int HUDRenderer::tankScoreCompare(const void* _a, const void* _b)
 {
+#if defined(PTR_SCORE_SORT)
   LocalPlayer *a = (LocalPlayer *) _a;
   LocalPlayer *b = (LocalPlayer *) _b;
+#else
+  // See below, alternative to buggy qsort
+  RemotePlayer* a = World::getWorld()->getPlayer(*(int*)_a);
+  RemotePlayer* b = World::getWorld()->getPlayer(*(int*)_b);
+#endif
 
   return a->getScore() - b->getScore();
 }
@@ -788,6 +794,11 @@
   int plrCount = 0;
   const int maxPlayers = World::getWorld()->getMaxPlayers();
   // run a sort by score
+
+#if defined(PTR_SCORE_SORT)
+  // Bugged at least under Solaris gcc 2.95.2. The call to qsort() may 
+  // invalidate the array. Might reveal a buffer overflow elsewhere?
+
   RemotePlayer **players = (RemotePlayer **)alloca(maxPlayers * sizeof(RemotePlayer *));
   for (j = 0; j < maxPlayers; j++) {
      players[j] = World::getWorld()->getPlayer(j);
@@ -802,6 +813,24 @@
     y -= (int)dy;
     drawPlayerScore(player, x1, x2, x3, (float)y);
   }
+#else
+  // Alternative: sort players indexes
+
+  int* players = new int[maxPlayers];
+
+  for (j = 0; j < maxPlayers; j++)
+    if (World::getWorld()->getPlayer(j))
+      players[plrCount++] = j;
+
+  qsort(players, plrCount, sizeof(int), tankScoreCompare);
+
+  for (i = 0; i < plrCount; i++) {
+    RemotePlayer* player = World::getWorld()->getPlayer(players[i]);
+    y -= (int)dy;
+    drawPlayerScore(player, x1, x2, x3, (float)y);
+  }
+  delete[] players;
+#endif
 
   y -= (int)dy;
   const int maxDeadPlayers = World::getWorld()->getMaxDeadPlayers();

CVS: bzflag ChangeLog,1.34,1.35

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv32165

Modified Files:
	ChangeLog 
Log Message:
keyboard movement

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bzflag/bzflag/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	2001/07/12 15:57:12	1.34
+++ ChangeLog	2001/07/12 20:54:15	1.35
@@ -15,6 +15,7 @@
 * random height pyramids too - Tim Riker
 * dim rogue color when blind - Colin Bayer
 * colorize shots on radar - Colin Bayer
+* keyboard movement - Pier Donini
 
 BZFlag 1.7e2
 ------------

CVS: bzflag/src/bzflag KeyMap.cxx,1.7,1.8

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv31945/src/bzflag

Modified Files:
	KeyMap.cxx 
Log Message:
enter = fire, L = lock

Index: KeyMap.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/KeyMap.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KeyMap.cxx	2001/07/11 08:42:50	1.7
+++ KeyMap.cxx	2001/07/12 20:53:12	1.8
@@ -36,9 +36,9 @@
 
 			};
 const BzfKeyEvent	BzfKeyMap::defaults2[] = {
-				{ 0, 0, 0 },
+				{ '\r', 0, 0 },
 				{ ' ', 0, 0 },
-				{ 0, 0, 0 },
+				{ 'l', 0, 0 },
 				{ 0, 0, 0 },
 				{ 0, 0, 0 },
 				{ 0, 0, 0 },

CVS: bzflag/src/bzflag menus.cxx,1.16,1.17

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv26521/src/bzflag

Modified Files:
	menus.cxx 
Log Message:
add nemesis key to keymap menu

Index: menus.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/menus.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- menus.cxx	2001/07/11 08:42:50	1.16
+++ menus.cxx	2001/07/12 20:25:35	1.17
@@ -630,6 +630,7 @@
   controls.append(createLabel(NULL, "Radar Long:"));
   controls.append(createLabel(NULL, "Send to All:"));
   controls.append(createLabel(NULL, "Send to Teammates:"));
+  controls.append(createLabel(NULL, "Send to Nemesis:"));
   controls.append(createLabel(NULL, "Jump:"));
   controls.append(createLabel(NULL, "Binoculars:"));
   controls.append(createLabel(NULL, "Toggle Score:"));
@@ -662,8 +663,9 @@
   controls[16]->setNext(controls[17]);
   controls[17]->setNext(controls[18]);
   controls[18]->setNext(controls[19]);
-  controls[19]->setNext(controls[1]);
-  controls[1]->setPrev(controls[19]);
+  controls[19]->setNext(controls[20]);
+  controls[20]->setNext(controls[1]);
+  controls[1]->setPrev(controls[20]);
   controls[2]->setPrev(controls[1]);
   controls[3]->setPrev(controls[2]);
   controls[4]->setPrev(controls[3]);
@@ -682,6 +684,7 @@
   controls[17]->setPrev(controls[16]);
   controls[18]->setPrev(controls[17]);
   controls[19]->setPrev(controls[18]);
+  controls[20]->setPrev(controls[19]);
   // set initial focus
   setFocus(controls[1]);
 }
@@ -755,8 +758,8 @@
   // use a big font for title, smaller font for the rest
   const float titleFontWidth = (float)height / 10.0f;
   const float titleFontHeight = (float)height / 10.0f;
-  const float fontWidth = (float)height / 36.0f;
-  const float fontHeight = (float)height / 36.0f;
+  const float fontWidth = (float)height / 38.0f;
+  const float fontHeight = (float)height / 38.0f;
 
   // reposition title
   HUDuiControlList& list = getControls();

CVS: bzflag/src/bzflag LocalPlayer.cxx,1.6,1.7 LocalPlayer.h,1.5,1.6 bzflag.cxx,1.14,1.15 playing.cxx,1.33,1.34 playing.h,1.7,1.8

[Pier D. <cy...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv12671/src/bzflag

Modified Files:
	LocalPlayer.cxx LocalPlayer.h bzflag.cxx playing.cxx playing.h 
Log Message:
Added keyboard moving


Index: LocalPlayer.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/LocalPlayer.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalPlayer.cxx	2001/07/11 08:42:50	1.6
+++ LocalPlayer.cxx	2001/07/12 19:22:39	1.7
@@ -16,6 +16,7 @@
 #include "ServerLink.h"
 #include "sound.h"
 #include "Flag.h"
+#include "BzfEvent.h"
 #include <stdlib.h>
 #include <math.h>
 
@@ -662,6 +663,9 @@
   move(pos, _azimuth);
   setVelocity(zero);
   setAngularVelocity(0.0f);
+  setKeyboardSpeed(0.0f);
+  setKeyboardAngVel(0.0f);
+  keyButton = BzfKeyEvent::NoButton;
   doUpdateMotion(0.0f);
 
   // make me alive now

Index: LocalPlayer.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/LocalPlayer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalPlayer.h	2001/07/11 08:42:50	1.5
+++ LocalPlayer.h	2001/07/12 19:22:39	1.6
@@ -108,6 +108,14 @@
 
     void		addAntidote(SceneDatabase*);
 
+    void 		setKeyboardSpeed(float speed);
+    void 		setKeyboardAngVel(float angVel);
+    float 		getKeyboardSpeed() const;
+    float 		getKeyboardAngVel() const;
+    void 		setKey(int button, boolean pressed);
+    boolean             getKeyPressed() const;
+    int                 getKeyButton() const;
+
     static LocalPlayer*	getMyTank();
     static void		setMyTank(LocalPlayer*);
 
@@ -142,6 +150,10 @@
     const Player*	target;
     const Player*	nemesis;
     static LocalPlayer*	mainPlayer;
+    float		keyboardSpeed;
+    float		keyboardAngVel;
+    int			keyButton;
+    boolean             keyPressed;
 };
 
 //
@@ -176,6 +188,42 @@
 inline const Obstacle*	LocalPlayer::getContainingBuilding() const
 {
   return insideBuilding;
+}
+
+inline void LocalPlayer::setKeyboardSpeed(float speed)
+{
+  keyboardSpeed = speed;
+}
+
+inline void LocalPlayer::setKeyboardAngVel(float angVel)
+{
+  keyboardAngVel = angVel;
+}
+
+inline float LocalPlayer::getKeyboardSpeed() const
+{
+  return keyboardSpeed;
+}
+
+inline float LocalPlayer::getKeyboardAngVel() const
+{
+  return keyboardAngVel;
+}
+
+inline void LocalPlayer::setKey(int button, boolean pressed)
+{
+  keyButton = button;
+  keyPressed = pressed;
+}
+
+inline boolean LocalPlayer::getKeyPressed() const
+{
+  return keyPressed;
+}
+
+inline int LocalPlayer::getKeyButton() const
+{
+  return keyButton;
 }
 
 #endif // BZF_LOCAL_PLAYER_H

Index: bzflag.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/bzflag.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bzflag.cxx	2001/04/03 02:38:13	1.14
+++ bzflag.cxx	2001/07/12 19:22:39	1.15
@@ -612,6 +612,7 @@
 {
   // collect new configuration
 
+  db.addValue("keyboardmoving", startupInfo.keyboardMoving ? "yes" : "no"); 
   db.addValue("udpnet", startupInfo.useUDPconnection ? "yes" : "no");	
   db.addValue("callsign", startupInfo.callsign);
   db.addValue("team", Team::getName(startupInfo.team));
@@ -878,6 +879,8 @@
 			startupInfo.useUDPconnection=false;
 		}
 	}
+        
+   
     // ignore window name in config file (it's used internally)
     db.removeValue("window");
     db.removeValue("multisample");
@@ -1132,6 +1135,10 @@
   // set server list URL
   if (db.hasValue("list"))
     startupInfo.listServerURL = db.getValue("list");
+
+  // keyboard moving
+  if (db.hasValue("keyboardmoving"))
+    startupInfo.keyboardMoving = db.getValue("keyboardmoving") == "yes";
 
   // start playing
   startPlaying(display, renderer, db, &startupInfo);

Index: playing.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- playing.cxx	2001/07/11 09:13:53	1.33
+++ playing.cxx	2001/07/12 19:22:39	1.34
@@ -428,6 +428,22 @@
   else {
     // built-in unchangeable keys.  only perform if not masked.
     switch (key.ascii) {
+      case 'K':
+      case 'k':
+	if (keymap.isMapped(key.ascii) == BzfKeyMap::LastKey) {
+	  if (pressed) {
+            if (!startupInfo.keyboardMoving) 
+              controlPanel->addMessage("Keyboard movement");
+            else if (mainWindow->joystick())
+              controlPanel->addMessage("Joystick movement");
+            else
+              controlPanel->addMessage("Mouse movement");
+            startupInfo.keyboardMoving = !startupInfo.keyboardMoving;
+          }
+          return True;
+        }
+        break;
+
       case 'T':
       case 't':
 	// toggle frames-per-second display
@@ -545,6 +561,7 @@
     // toggle motion freeze
     motionFreeze = !motionFreeze;
   }
+  //  else
 #endif
 #if defined(ROAMING)
   if (key.ascii == '~' && pressed) {
@@ -606,6 +623,7 @@
 	break;
     }
   }
+  //  else
 #endif
 
   if (keymap.isMappedTo(BzfKeyMap::FireShot, key)) {
@@ -803,6 +821,16 @@
       }
     }
   }
+  // Might be a direction key. Save it for later.
+  else if (myTank->isAlive() && startupInfo.keyboardMoving) 
+    myTank->setKey(key.button, pressed);
+}
+
+static float getKeyValue(bool pressed)
+{
+  if (pressed)
+    return 1;
+  return 0;
 }
 
 static void		doMotion()
@@ -811,12 +839,40 @@
   if (motionFreeze) return;
 #endif
 
-  // get mouse position
-  int mx, my;
-  if (mainWindow->joystick()) {
-    mainWindow->getJoyPosition(mx, my);
+  float rotation, speed, rotationModifier = 1.0f;
 
-    static const BzfKeyEvent::Button button_map[] = { BzfKeyEvent::LeftMouse,
+  if (startupInfo.keyboardMoving) {
+    rotation = myTank->getKeyboardAngVel();
+    speed = myTank->getKeyboardSpeed();
+    switch (myTank->getKeyButton())
+    {
+    case BzfKeyEvent::Left:
+      rotation = getKeyValue(myTank->getKeyPressed());
+      break;
+    case BzfKeyEvent::Right:
+      rotation = - getKeyValue(myTank->getKeyPressed());
+      break;
+    case BzfKeyEvent::Up:
+      speed = getKeyValue(myTank->getKeyPressed());
+      break;
+    case BzfKeyEvent::Down:
+      speed = - getKeyValue(myTank->getKeyPressed()) / 2.0;
+      break;
+    }
+    if (myTank->getMagnify())
+      rotationModifier = 0.2;
+
+    myTank->setKeyboardAngVel(rotation);
+    myTank->setKeyboardSpeed(speed);
+    myTank->setKey(BzfKeyEvent::NoButton, false);
+  }
+  else {
+    // get mouse position
+    int mx, my;
+    if (mainWindow->joystick()) {
+      mainWindow->getJoyPosition(mx, my);
+
+      static const BzfKeyEvent::Button button_map[] = { BzfKeyEvent::LeftMouse,
                                 BzfKeyEvent::MiddleMouse,
                                 BzfKeyEvent::RightMouse,
                                 BzfKeyEvent::F1,
@@ -828,47 +884,48 @@
                                 BzfKeyEvent::F7,
                                 BzfKeyEvent::F8,
                                 BzfKeyEvent::F9
-    };
+      };
  
-    static unsigned long old_buttons = 0;
-    unsigned long new_buttons = mainWindow->getJoyButtonSet();
-    if (old_buttons != new_buttons)
-      for (int j = 0; j<12; j++)
-        if ((old_buttons & (1<<j)) != (new_buttons & (1<<j))) {
-         BzfKeyEvent ev;
-         ev.button = button_map[j];
-          ev.ascii = 0;
-          ev.shift = 0;
-          doKeyPlaying(ev, new_buttons&(1<<j));
-       } 
-    old_buttons = new_buttons;
-  } else
-    mainWindow->getMousePosition(mx, my);
-
-  // calculate desired rotation
-  const int noMotionSize = hud->getNoMotionSize();
-  const int maxMotionSize = hud->getMaxMotionSize();
-  float rotation = 0.0f;
-  if (mx < -noMotionSize) {
-    rotation = float(-mx - noMotionSize) / float(maxMotionSize);
-    if (rotation > 1.0f) rotation = 1.0f;
-  }
-  else if (mx > noMotionSize) {
-    rotation = -float(mx - noMotionSize) / float(maxMotionSize);
-    if (rotation < -1.0f) rotation = -1.0f;
-  }
-  myTank->setDesiredAngVel(rotation);
-
-  // calculate desired speed
-  float speed = 0.0f;
-  if (my < -noMotionSize) {
-    speed = float(-my - noMotionSize) / float(maxMotionSize);
-    if (speed > 1.0f) speed = 1.0f;
-  }
-  else if (my > noMotionSize) {
-    speed = -float(my - noMotionSize) / float(maxMotionSize);
-    if (speed < -0.5f) speed = -0.5f;
+      static unsigned long old_buttons = 0;
+      unsigned long new_buttons = mainWindow->getJoyButtonSet();
+      if (old_buttons != new_buttons)
+        for (int j = 0; j<12; j++)
+          if ((old_buttons & (1<<j)) != (new_buttons & (1<<j))) {
+            BzfKeyEvent ev;
+            ev.button = button_map[j];
+            ev.ascii = 0;
+            ev.shift = 0;
+            doKeyPlaying(ev, new_buttons&(1<<j));
+          } 
+      old_buttons = new_buttons;
+    } else
+      mainWindow->getMousePosition(mx, my);
+
+    // calculate desired rotation
+    const int noMotionSize = hud->getNoMotionSize();
+    const int maxMotionSize = hud->getMaxMotionSize();
+    rotation = 0.0f;
+    if (mx < -noMotionSize) {
+      rotation = float(-mx - noMotionSize) / float(maxMotionSize);
+      if (rotation > 1.0f) rotation = 1.0f;
+    }
+    else if (mx > noMotionSize) {
+      rotation = -float(mx - noMotionSize) / float(maxMotionSize);
+      if (rotation < -1.0f) rotation = -1.0f;
+    }
+
+    // calculate desired speed
+    speed = 0.0f;
+    if (my < -noMotionSize) {
+      speed = float(-my - noMotionSize) / float(maxMotionSize);
+      if (speed > 1.0f) speed = 1.0f;
+    }
+    else if (my > noMotionSize) {
+      speed = -float(my - noMotionSize) / float(maxMotionSize);
+      if (speed < -0.5f) speed = -0.5f;
+    }
   }
+  myTank->setDesiredAngVel(rotation * rotationModifier);
   myTank->setDesiredSpeed(speed);
 }
 

Index: playing.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/playing.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- playing.h	2001/03/09 02:38:24	1.7
+++ playing.h	2001/07/12 19:22:39	1.8
@@ -44,6 +44,7 @@
     int			listServerPort;
     boolean		joystick;
     BzfString		joystickName;
+    boolean		keyboardMoving;
 };
 
 typedef void		(*JoinGameCallback)(boolean success, void* data);

CVS: bzflag ChangeLog,1.33,1.34

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv1634

Modified Files:
	ChangeLog 
Log Message:
better, faster, stronger, able to leap tall buildings score sort

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bzflag/bzflag/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	2001/07/12 08:24:36	1.33
+++ ChangeLog	2001/07/12 15:57:12	1.34
@@ -9,7 +9,7 @@
 * send to nemesis - Dave Brosius
 * USB joystick support - Nick Sayer
 * new (faster?) radar jamming code - Mathias Gumz
-* sort by score - Colin Bayer
+* sort by score - Colin Bayer, Dave Brosius
 * world file rad -> deg - Tim Riker
 * add player flag display to HUD - Tim Riker (prompted by Colin Bayer)
 * random height pyramids too - Tim Riker

CVS: bzflag/src/bzflag HUDRenderer.cxx,1.12,1.13 HUDRenderer.h,1.6,1.7

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv1634/src/bzflag

Modified Files:
	HUDRenderer.cxx HUDRenderer.h 
Log Message:
better, faster, stronger, able to leap tall buildings score sort

Index: HUDRenderer.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/HUDRenderer.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HUDRenderer.cxx	2001/07/12 02:18:53	1.12
+++ HUDRenderer.cxx	2001/07/12 15:57:12	1.13
@@ -23,6 +23,7 @@
 #include "World.h"
 #include "OpenGLGState.h"
 #include "texture.h"
+#include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -753,6 +754,14 @@
   majorFont.draw(buffer, x, y);
 }
 
+int HUDRenderer::tankScoreCompare(const void* _a, const void* _b)
+{
+  LocalPlayer *a = (LocalPlayer *) _a;
+  LocalPlayer *b = (LocalPlayer *) _b;
+
+  return a->getScore() - b->getScore();
+}
+
 void			HUDRenderer::renderScoreboard(SceneRenderer& renderer)
 {
   int i, j;
@@ -776,44 +785,24 @@
   int y = (int)(y0 - dy);
   drawPlayerScore(myTank, x1, x2, x3, (float)y);
   y -= (int)dy;
-  RemotePlayer **players_unsorted;
-  RemotePlayer **players;
-  int hiScore;
-  int hiScoreIndex;
-  RemotePlayer* hiScorePlayer;
   int plrCount = 0;
-  int maxPlayers = World::getWorld()->getMaxPlayers();
+  const int maxPlayers = World::getWorld()->getMaxPlayers();
   // run a sort by score
-  players_unsorted = (RemotePlayer **)malloc(maxPlayers * sizeof(RemotePlayer *));
-  players = (RemotePlayer **)malloc(maxPlayers * sizeof(RemotePlayer *));
+  RemotePlayer **players = (RemotePlayer **)alloca(maxPlayers * sizeof(RemotePlayer *));
   for (j = 0; j < maxPlayers; j++) {
-    players_unsorted[j] = World::getWorld()->getPlayer(j);
-    if (players_unsorted[j]) plrCount++;
-  }
-  for (i = 0; i < plrCount; i++) {
-    hiScoreIndex = -1;
-    hiScore = 0;
-    hiScorePlayer = (RemotePlayer *)NULL;
-    for (j = 0; j < maxPlayers; j++) {
-      if (players_unsorted[j] && (hiScoreIndex < 0 || (players_unsorted[j]->getScore() > hiScore))) {
-	hiScore = players_unsorted[j]->getScore();
-	hiScorePlayer = players_unsorted[j];
-        hiScoreIndex = j;
-      }
-    }
-    if (hiScoreIndex >= 0) {
-      players[i] = hiScorePlayer;
-      players_unsorted[hiScoreIndex] = (RemotePlayer *)NULL;
-    }
+     players[j] = World::getWorld()->getPlayer(j);
+     if (players[j]) plrCount++;
   }
-  free(players_unsorted);
+
+  qsort(players, plrCount, sizeof(LocalPlayer*), tankScoreCompare);
+
   for (i = 0; i < plrCount; i++) {
     RemotePlayer* player = players[i];
     if (!player) continue;
     y -= (int)dy;
     drawPlayerScore(player, x1, x2, x3, (float)y);
   }
-  free(players);
+
   y -= (int)dy;
   const int maxDeadPlayers = World::getWorld()->getMaxDeadPlayers();
   DeadPlayer** deadPlayers = World::getWorld()->getDeadPlayers();

Index: HUDRenderer.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/HUDRenderer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HUDRenderer.h	2001/07/11 08:42:50	1.6
+++ HUDRenderer.h	2001/07/12 15:57:12	1.7
@@ -124,6 +124,7 @@
 
     void		resize(boolean firstTime);
     static void		resizeCallback(void*);
+    static int		tankScoreCompare(const void* _a, const void* _b);
 
     class Marker {
       public:

CVS: CVSROOT loginfo,1.2,1.3

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv10123

Modified Files:
	loginfo 
Log Message:
move to unified

Index: loginfo
===================================================================
RCS file: /cvsroot/bzflag/CVSROOT/loginfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** loginfo	2001/07/12 08:19:20	1.2
--- loginfo	2001/07/12 08:39:28	1.3
***************
*** 26,28 ****
  #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
  
! DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} bzf...@li...
--- 26,28 ----
  #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
  
! DEFAULT $CVSROOT/CVSROOT/syncmail -u %{sVv} bzf...@li...

CVS: bzflag ChangeLog,1.32,1.33

[Tim R. <tim...@us...>]

Update of /cvsroot/bzflag/bzflag
In directory usw-pr-cvs1:/tmp/cvs-serv8095

Modified Files:
	ChangeLog 
Log Message:
name cleanup as a test of the new list

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bzflag/bzflag/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** ChangeLog	2001/07/12 05:02:02	1.32
--- ChangeLog	2001/07/12 08:24:36	1.33
***************
*** 11,17 ****
  * new (faster?) radar jamming code - Mathias Gumz
  * sort by score - Colin Bayer
! * world file rad -> deg - TimR
! * add player flag display to HUD - TimR (prompted by Colin Bayer)
! * random height pyramids too - TimR
  * dim rogue color when blind - Colin Bayer
  * colorize shots on radar - Colin Bayer
--- 11,17 ----
  * new (faster?) radar jamming code - Mathias Gumz
  * sort by score - Colin Bayer
! * world file rad -> deg - Tim Riker
! * add player flag display to HUD - Tim Riker (prompted by Colin Bayer)
! * random height pyramids too - Tim Riker
  * dim rogue color when blind - Colin Bayer
  * colorize shots on radar - Colin Bayer
***************
*** 24,28 ****
  * *bsd cleanups from new ports maintainer - Nick Sayer
  * scrollback cleanups - crs
! * minimum size now 256x192 - TimR
  * various bug fixes - many
  
--- 24,28 ----
  * *bsd cleanups from new ports maintainer - Nick Sayer
  * scrollback cleanups - crs
! * minimum size now 256x192 - Tim Riker
  * various bug fixes - many
  
***************
*** 36,54 ****
  * Scrollback and Line wrap (use pageup/down keys) - Digit1
  * radar tank dots are larger - frank
! * robots have playerxx names and player's email - TimR
! * colorize console messages - TimR
  * robots score when killing 'owner' - chestal <th...@un...>
  * flags under high buildings - Jeremiah
  * "world" section in world from file - Jeremiah
  * dim paused/nr tanks on radar - chestal
! * fix bzfls for servers on non-5155 - TimR
  * pgup/pgdn support in help menu - Kris Verbeeck
! * stop using signal() as suggested by Frank Thilo - TimR
  * Triple buffering support (actually n way buffering) - XiGraphics
  * Joystick support - XiGraphics
  * teleporter shot handling improved - chestal
! * udp network code reworking to select() on one server port - TimR
  * rogue tank placement on enter - chestal
! * pseudo variable height buildings in cf mode - TimR
  * don't drain and flush audio on solaris - frank
  * alpha Macintosh port - Darrell Walisser <dwa...@pu...>
--- 36,54 ----
  * Scrollback and Line wrap (use pageup/down keys) - Digit1
  * radar tank dots are larger - frank
! * robots have playerxx names and player's email - Tim Riker
! * colorize console messages - Tim Riker
  * robots score when killing 'owner' - chestal <th...@un...>
  * flags under high buildings - Jeremiah
  * "world" section in world from file - Jeremiah
  * dim paused/nr tanks on radar - chestal
! * fix bzfls for servers on non-5155 - Tim Riker
  * pgup/pgdn support in help menu - Kris Verbeeck
! * stop using signal() as suggested by Frank Thilo - Tim Riker
  * Triple buffering support (actually n way buffering) - XiGraphics
  * Joystick support - XiGraphics
  * teleporter shot handling improved - chestal
! * udp network code reworking to select() on one server port - Tim Riker
  * rogue tank placement on enter - chestal
! * pseudo variable height buildings in cf mode - Tim Riker
  * don't drain and flush audio on solaris - frank
  * alpha Macintosh port - Darrell Walisser <dwa...@pu...>