Attachment #169204 for bug #208709

View | Details | Raw Unified | Return to bug 208709
Collapse All | Expand All





PORTNAME=	znibbles
PORTVERSION=	0.0.7
PORTREVISION=	8
CATEGORIES=	games
MASTER_SITES=	http://www.zyllius.com/vmallet/archives/
		http://www.jfouffa.com/vmallet/archives/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Multi-player networked nibbles game

BROKEN=		unfetchable

LICENSE=	GPLv2+

OPTIONS_DEFINE=	GTK1
OPTIONS_DEFAULT=	GTK1

USES=		motif
GNU_CONFIGURE=	yes

DESKTOP_ENTRIES="Znibbles" "" "" "znibblesX" "" ""

PLIST_FILES=	bin/nibbles bin/znibbles bin/znibblesX \
		man/man6/nibbles.6.gz man/man6/znibbles.6.gz \
		man/man6/znibblesX.6.gz

OPTIONS_DEFINE=		GTK1
OPTIONS_DEFAULT=	GTK1

GTK1_USE=		GNOME=gtk12
GTK1_PLIST_FILES=	bin/gznibbles man/man6/gznibbles.6.gz
GTK1_CONFIGURE_ENABLE=	gtk


post-install:
	(cd ${WRKSRC}/doc && ${INSTALL_MAN} nibbles.6 znibbles.6 znibblesX.6 \
		${STAGEDIR}${MAN6PREFIX}/man/man6)

post-install-GTK1-on:
	(cd ${WRKSRC}/doc && ${INSTALL_MAN} gznibbles.6 \
		${STAGEDIR}${MAN6PREFIX}/man/man6)

.include <bsd.port.mk>




--- src/Nibble.C.orig	1998-11-17 08:36:32 UTC
+++ src/Nibble.C
@@ -58,7 +58,7 @@ void Nibble:: add_description(Trame &t)
 void Nibble:: read_description(Trame &t)
 {
   if (t.get_char() != NEW_NIBBLE) {
-    cerr << "Nibble::read_description(): ohhh le bordel!\n";
+    std::cerr << "Nibble::read_description(): ohhh le bordel!\n";
     exit(1);
   }
   
@@ -81,10 +81,10 @@ void Nibble::read_description0(Trame &t)
 
 void Nibble::display()
 {
-  cout << "   ID:"<< id;
+  std::cout << "   ID:"<< id;
   printf(" %04x", classtype);
-  cout << " Nibble  " << pos.x << "x" << pos.y << " value=" << value 
-       << " type=" << type << endl;
+  std::cout << " Nibble  " << pos.x << "x" << pos.y << " value=" << value 
+       << " type=" << type << std::endl;
 }
 
 

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Base.H (-4 / +4 lines)
1	--- src/Base.H Wed May 12 11:40:22 1999	1	--- src/Base.H.orig 1999-05-12 01:40:22 UTC
2	+++ src/Base.H Sat Oct 26 00:30:09 2002	2	+++ src/Base.H
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	#define __H_BASE__	4	#define __H_BASE__
5		5
Lines 9-15 Link Here
9		9
10		10
11	// #define DEBUG	11	// #define DEBUG
12	@@ -55,8 +55,8 @@	12	@@ -55,8 +55,8 @@ public:
13	inline ~Base()	13	inline ~Base()
14	{	14	{
15	total--;	15	total--;
Lines 20-26 Link Here
20	}	20	}
21	#else	21	#else
22		22
23	@@ -65,7 +65,7 @@	23	@@ -65,7 +65,7 @@ public:
24		24
25	#endif	25	#endif
26		26

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__DLList.cc (-3 / +3 lines)
1	--- src/DLList.cc Sun Apr 4 06:03:04 1999	1	--- src/DLList.cc.orig 1999-04-03 20:03:04 UTC
2	+++ src/DLList.cc Sat Oct 26 00:48:24 2002	2	+++ src/DLList.cc
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,7 @@ Foundation, 59 Temple Place - Suite 330,
4	//#pragma implementation	4	//#pragma implementation
5	#endif	5	#endif
6	#include <limits.h>	6	#include <limits.h>

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__GTK__ClientGtk.C (-3 / +3 lines)
1	--- src/GTK/ClientGtk.C Sat Apr 24 02:47:47 1999	1	--- src/GTK/ClientGtk.C.orig 1999-04-23 16:47:47 UTC
2	+++ src/GTK/ClientGtk.C Sat Oct 26 00:38:02 2002	2	+++ src/GTK/ClientGtk.C
3	@@ -51,7 +51,7 @@	3	@@ -51,7 +51,7 @@ int main(int argc, char **argv)
4		4
5	world.run(); // start the client	5	world.run(); // start the client
6		6




--- src/GTK/GtkInterface.C.orig	1999-05-12 11:43:29 UTC
+++ src/GTK/GtkInterface.C
@@ -37,7 +37,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>

 
 #include <unistd.h>
 #include <stdlib.h>
@@ -138,7 +138,7 @@ void GtkInterface::init(int argc, char *
   display_version();
     
   if (_two_key)

 
 
   // connect pipe_handler to SIGPIPE signal
@@ -154,9 +154,9 @@ void GtkInterface::init(int argc, char *
     exit(2); 
   }
 

   
   // create and bind socket to any port 
   port = 0;
@@ -168,8 +168,8 @@ void GtkInterface::init(int argc, char *
   } 
 
   if (_debug)

   
   // Build server address 
   server_address.sin_family = AF_INET;
@@ -186,7 +186,7 @@ void GtkInterface::init(int argc, char *
 
   display_play_help();
 

 
   _hack_socket_client = _socket_client; // hack for signal handling
   action.sa_handler = stop_handler;
@@ -196,7 +196,7 @@ void GtkInterface::init(int argc, char *
 
   init_messages(options.get_message_file());
 

   make(argc, argv);
 }
 
@@ -294,7 +294,7 @@ gint GtkInterface::key_cb(GtkWidget *wid
   case 'z':
     {
 //       if (_debug)

 	
 	Trame tzz;
 	tzz.reset();
@@ -315,7 +315,7 @@ gint GtkInterface::key_cb(GtkWidget *wid
 
   default:
     if (mythis._debug)

     return FALSE;
   }
   
@@ -337,7 +337,7 @@ gint GtkInterface::configure_event (GtkW
 				   GtkInterface *pthis) 
 {
   if (pthis->_debug)

 
   return FALSE;
 }
@@ -349,7 +349,7 @@ gint GtkInterface::expose_event (GtkWidg
 				 GtkInterface *pthis)
 {
   if (pthis->_debug)

   
   return FALSE;
 }
@@ -476,7 +476,7 @@ void GtkInterface::make(int argc, char *
   // GTK, the proper way to do this would be to use the
   // gdk_input_add() function.
 

 
   gdk_input_add(_socket_client, 
 		GDK_INPUT_READ,
@@ -487,57 +487,57 @@ void GtkInterface::make(int argc, char *
 // display version numbers (long format)
 void GtkInterface::display_version() 
 {

 }
 
 
@@ -547,7 +547,7 @@ void GtkInterface::display_play_help()
 
 void GtkInterface::pipe_handler(int sig)
 {

   sig++; // warnings..
   _dead_server = 1;
 }
@@ -555,7 +555,7 @@ void GtkInterface::pipe_handler(int sig)
 
 void GtkInterface::stop_handler(int sig)
 {

 
   if (_hack_socket_client) {
     struct timeval tv;
@@ -647,11 +647,11 @@ void GtkInterface::display_message(Playe
   char buf[300];
   
   if (priv) {

     sprintf(buf, "%s> %s\n", from.get_name(), msg);
   }
   
@@ -707,7 +707,7 @@ void GtkInterface::run(void)
 void GtkInterface::join_game()
 {
   if (_debug)

   
   t.put_char(JOIN_GAME);
   t.put_string(_own_name);
@@ -740,21 +740,21 @@ void GtkInterface::handle_server_input_s
 					      gint source,
 					      GdkInputCondition cond)
 {

     if (_errors >= 5) {
       pipe_handler(SIGPIPE);
     }
@@ -762,9 +762,9 @@ void GtkInterface::handle_server_input()
   }
 
   _errors = 0;

   
   switch(t.peek_char()) {
   case TRAME_ERROR:
@@ -802,14 +802,14 @@ void GtkInterface::handle_server_input()
 
   case QUIT_GAME:
     if (_debug)

     break;
   }
 }
@@ -840,7 +840,7 @@ void GtkInterface::do_your_other_player(
   int my_other_player_id = t.get_int();
 
   if (_debug)

 
   Player& p = world.lookup_player(my_other_player_id);
 
@@ -848,8 +848,8 @@ void GtkInterface::do_your_other_player(
 
   if (_other_player == NULL) {
     if (_debug)

     return;
   }
 
@@ -870,7 +870,7 @@ void GtkInterface::do_your_other_player(
 void GtkInterface::do_void_trame() 
 {
   if (_debug)

   t.get_char();
   char *p = t.get_string();
   if (p && strcmp(p, "w") == 0)
@@ -978,8 +978,8 @@ void GtkInterface::set_own_player(Player
   
   if (gtk_player == NULL) {
     if (_debug)

     return;
   }
 
@@ -999,7 +999,7 @@ void GtkInterface::activate_other_player
 {
   if (_other_player == NULL) {
     if (_debug)

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__GTK__Menus.C (-3 / +3 lines)
1	--- src/GTK/Menus.C.orig 2008-09-15 17:23:52.000000000 +0000	1	--- src/GTK/Menus.C.orig 1999-05-12 01:51:42 UTC
2	+++ src/GTK/Menus.C 2008-09-15 17:25:14.000000000 +0000	2	+++ src/GTK/Menus.C
3	@@ -61,7 +61,7 @@	3	@@ -61,7 +61,7 @@ GtkInterface * Menus::_interface;
4	// Obligatory basic callback	4	// Obligatory basic callback
5	void Menus::menu_callback_static(gpointer data, gpointer action, GtkWidget *w) {	5	void Menus::menu_callback_static(gpointer data, gpointer action, GtkWidget *w) {
6		6

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__GTK__NibblesArea.C (-3 / +3 lines)
1	--- src/GTK/NibblesArea.C Wed May 12 11:48:25 1999	1	--- src/GTK/NibblesArea.C.orig 1999-05-12 01:48:25 UTC
2	+++ src/GTK/NibblesArea.C Sat Oct 26 00:37:26 2002	2	+++ src/GTK/NibblesArea.C
3	@@ -323,7 +323,7 @@	3	@@ -323,7 +323,7 @@ gint NibblesArea::draw_exp_cb(GtkWidget
4	GdkEventExpose *event,	4	GdkEventExpose *event,
5	NibblesArea *mythis)	5	NibblesArea *mythis)
6	{	6	{

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__LongObject.C (-4 / +4 lines)
1	--- src/LongObject.C Mon May 10 08:59:45 1999	1	--- src/LongObject.C.orig 1999-05-09 22:59:45 UTC
2	+++ src/LongObject.C Sat Oct 26 00:39:11 2002	2	+++ src/LongObject.C
3	@@ -128,7 +128,7 @@	3	@@ -128,7 +128,7 @@ void LongObject::add_description(Trame &
4	void LongObject::read_description(Trame &t)	4	void LongObject::read_description(Trame &t)
5	{	5	{
6	if (t.get_char() != NEW_LONGOBJ) {	6	if (t.get_char() != NEW_LONGOBJ) {
Lines 9-15 Link Here
9	exit(1);	9	exit(1);
10	}	10	}
11		11
12	@@ -161,17 +161,17 @@	12	@@ -161,17 +161,17 @@ void LongObject::read_description0(Trame
13		13
14	void LongObject::display()	14	void LongObject::display()
15	{	15	{




--- src/Map.C.orig	1999-05-10 03:39:48 UTC
+++ src/Map.C
@@ -32,7 +32,7 @@
 #endif 
 

 #include <string.h>
 
 #include "Map.H"
@@ -61,7 +61,7 @@ void Map::make(int x, int y)
 
   // @@ do something appropriate here
   if (_types == NULL)

 
   clear();
 }
@@ -112,39 +112,39 @@ void Map::draw_point(int x, int y, int c
 // Text based display of this map (debug purposes)
 void Map::display()
 {

   }
 
   _types[_types_index].object = &obj;
@@ -170,15 +170,15 @@ void Map::print_type(int x, int y) 
   MapType * mt = get_type(x, y);
 
   if (mt == NULL) 

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__Map.H (-3 / +3 lines)
1	--- src/Map.H Mon May 10 13:39:38 1999	1	--- src/Map.H.orig 1999-05-10 03:39:38 UTC
2	+++ src/Map.H Sat Oct 26 00:21:33 2002	2	+++ src/Map.H
3	@@ -45,7 +45,7 @@	3	@@ -45,7 +45,7 @@ typedef struct _MapType {
4		4
5	class Map {	5	class Map {
6		6




--- src/Motif/MotifInterface.C.orig	1999-05-12 11:43:51 UTC
+++ src/Motif/MotifInterface.C
@@ -32,7 +32,7 @@
 # include <config.h>

 
 #include <unistd.h>
 #include <stdlib.h>
@@ -131,7 +131,7 @@ void MotifInterface::init(int argc, char
   display_version();
 
   if (two_key)

 
   
   // connect pipe_handler to SIGPIPE signal
@@ -147,8 +147,8 @@ void MotifInterface::init(int argc, char
     exit(2); 
   }
 

   
   // create and bind socket to any port 
   port = 0;
@@ -158,7 +158,7 @@ void MotifInterface::init(int argc, char
   } 
 
   if (debug)

   
   // Build server address 
   server_address.sin_family = AF_INET;
@@ -175,7 +175,7 @@ void MotifInterface::init(int argc, char
 
   display_play_help();
 

 
   hack_socket_client = socket_client; // hack for signal handling
   action.sa_handler = stop_handler;
@@ -185,7 +185,7 @@ void MotifInterface::init(int argc, char
 
   init_messages(options.get_message_file());
 

   make(argc, argv);
 }
 
@@ -262,54 +262,54 @@ void MotifInterface::make(int argc, char
 
 void MotifInterface::display_version() 
 {

 }
 
 
@@ -318,7 +318,7 @@ void MotifInterface::display_play_help()
 
 void MotifInterface::pipe_handler(int sig)
 {

   sig++; // warnings..
   dead_server = 1;
 }
@@ -326,7 +326,7 @@ void MotifInterface::pipe_handler(int si
 
 void MotifInterface::stop_handler(int sig)
 {

 
   if (hack_socket_client) {
     struct timeval tv;
@@ -391,11 +391,11 @@ void MotifInterface::display_message(Pla
   char buf[300];
   
   if (priv) {

     sprintf(buf, "%s> %s\n", from.get_name(), msg);
   }
   textarea.add_line(buf);
@@ -545,7 +545,7 @@ Boolean MotifInterface::myWorkProc(XtPoi
       case VOID_TRAME:
 	{
 	  if (mythis.debug)

 	  mt.get_char();
 	  char *p = mt.get_string();
 	  if (p && strcmp(p, "w") == 0)
@@ -595,14 +595,14 @@ Boolean MotifInterface::myWorkProc(XtPoi
       
       case QUIT_GAME:
 	if (mythis.debug)

 	break;
       }
     }
@@ -661,7 +661,7 @@ void MotifInterface::pause_request(int p
 void MotifInterface::join_game()
 {
   if (debug)

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__Motif__menus.C (-4 / +4 lines)
1	--- src/Motif/menus.C.orig 1999-04-14 23:50:14.000000000 +0900	1	--- src/Motif/menus.C.orig 1999-04-14 14:50:14 UTC
2	+++ src/Motif/menus.C 2011-08-11 02:41:55.000000000 +0900	2	+++ src/Motif/menus.C
3	@@ -52,7 +52,7 @@	3	@@ -52,7 +52,7 @@ void Menus::file_handler(Widget w, XtPoi
4	{	4	{
5	w = w; cbs = cbs;	5	w = w; cbs = cbs;
6		6
Lines 9-15 Link Here
9	case ItemFileQuit:	9	case ItemFileQuit:
10	quit();	10	quit();
11	break;	11	break;
12	@@ -64,7 +64,7 @@	12	@@ -64,7 +64,7 @@ void Menus::help_handler(Widget w, XtPoi
13	{	13	{
14	w = w; cbs = cbs;	14	w = w; cbs = cbs;
15		15

Lines 1-4 Link Here

(-)games/znibbles/files/patch-src__Motif__textarea.C (-2 / +2 lines)
1	--- src/Motif/textarea.C.orig	1	--- src/Motif/textarea.C.orig 1998-11-17 08:40:25 UTC
2	+++ src/Motif/textarea.C	2	+++ src/Motif/textarea.C
3	@@ -33,7 +33,7 @@	3	@@ -33,7 +33,7 @@
4	#include <Xm/ScrollBar.h>	4	#include <Xm/ScrollBar.h>
Lines 9-15 Link Here
9	#include "string.h"	9	#include "string.h"
10		10
11	#include "motifutil.H"	11	#include "motifutil.H"
12	@@ -92,7 +92,7 @@	12	@@ -92,7 +92,7 @@ void TextArea::add_line(char *line)
13	XmTextSetCursorPosition(widget, XmTextGetLastPosition(widget));	13	XmTextSetCursorPosition(widget, XmTextGetLastPosition(widget));
14	XmTextShowPosition(widget, XmTextGetLastPosition(widget));	14	XmTextShowPosition(widget, XmTextGetLastPosition(widget));
15	if (length > 9500) {	15	if (length > 9500) {




--- src/Movable.C.orig	1999-05-11 02:15:20 UTC
+++ src/Movable.C
@@ -51,7 +51,7 @@ void Movable::add_description(Trame& t)
 void Movable::read_description(Trame& t)
 {
   if (t.get_char() != NEW_MOVABLE) {

     exit(1);
   }
   
@@ -91,19 +91,19 @@ void Movable::read_description0(Trame& t
 // for debug purposes
 void Movable::display()
 {

 }
 
 
@@ -282,7 +282,7 @@ int Movable::auto_dir()
 	       && !update_pos(p = pos, D_RIGHT))
 	newdir = D_RIGHT;
 //       else

 
     if (direction != newdir) {
       direction = newdir;
@@ -401,7 +401,7 @@ void Movable::getcut(_Position cutpos)
   _Position pos2 = pos;
   
   if (length == 1) {

     return;
   }
   
@@ -415,7 +415,7 @@ void Movable::getcut(_Position cutpos)
 
   // should never happen. (should be an assertion)
   if (!p) {

     return;
   }
     
@@ -447,7 +447,7 @@ void Movable::getcut(_Position cutpos)
     //evidemment ca bug!    world.add_object(worm);
   }
   //else




--- src/Nibble.C	Tue Nov 17 19:36:32 1998
+++ src/Nibble.C	Sat Oct 26 00:40:26 2002
@@ -58,7 +58,7 @@
 void Nibble:: read_description(Trame &t)
 {
   if (t.get_char() != NEW_NIBBLE) {
-    cerr << "Nibble::read_description(): ohhh le bordel!\n";
+    std::cerr << "Nibble::read_description(): ohhh le bordel!\n";
     exit(1);
   }
   
@@ -81,10 +81,10 @@
 
 void Nibble::display()
 {
-  cout << "   ID:"<< id;
+  std::cout << "   ID:"<< id;
   printf(" %04x", classtype);
-  cout << " Nibble  " << pos.x << "x" << pos.y << " value=" << value 
-       << " type=" << type << endl;
+  std::cout << " Nibble  " << pos.x << "x" << pos.y << " value=" << value 
+       << " type=" << type << std::endl;
 }
 
 

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Object.C (-3 / +3 lines)
1	--- src/Object.C Mon May 10 13:41:22 1999	1	--- src/Object.C.orig 1999-05-10 03:41:22 UTC
2	+++ src/Object.C Sat Oct 26 00:40:49 2002	2	+++ src/Object.C
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,7 @@
4	*/	4	*/
5		5
Lines 9-15 Link Here
9		9
10	#include "Object.H"	10	#include "Object.H"
11	#include "World.H"	11	#include "World.H"
12	@@ -89,7 +89,7 @@	12	@@ -89,7 +89,7 @@ void _Object::auto_position(Map& map)
13		13
14	do {	14	do {
15	// if (yes)	15	// if (yes)




--- src/Options.C.orig	1999-05-12 01:40:13 UTC
+++ src/Options.C
@@ -35,7 +35,7 @@
 
 #include <stdio.h>

 
 #include "Options.H"
 
@@ -150,7 +150,7 @@ bool Options::parse(int argc, char **arg
 	case 'p':
 	  _port = atoi(optarg);
 	  if (_port == 0) { // cannot be 0

 	    bad_params = true;
 	  }
 	  break;
@@ -160,7 +160,7 @@ bool Options::parse(int argc, char **arg
 	  if (2 != (ooo = sscanf(optarg, "%dx%d", &_width, &_height)) ||
 	      _height == 0 ||
 	      _width  == 0) {

 	    bad_params = true;
 	  }
 	  break;
@@ -168,8 +168,8 @@ bool Options::parse(int argc, char **arg
 	case 'g': // height (server only)
 	  _height = atoi(optarg);
 	  if (_height == 0) { // cannot be 0

 	    bad_params = true;
 	  }
 	  break;
@@ -177,8 +177,8 @@ bool Options::parse(int argc, char **arg
 	case 'w': // width (server only)
 	  _width = atoi(optarg);
 	  if (_width == 0) { // cannot be 0

 	    bad_params = true;
 	  }
 	  break;
@@ -194,7 +194,7 @@ bool Options::parse(int argc, char **arg
 
   if (_set == OPTIONS_CLIENT_SET) {
     if (argv[optind] == NULL) {

       bad_params = true;
     }
     else {
@@ -208,7 +208,7 @@ bool Options::parse(int argc, char **arg
       if (p != 0)
 	_port = p;
       else {

 	bad_params = true;
       }
     }
@@ -227,34 +227,34 @@ int main(int argc, char **argv)
   options.set_option_set(0);
   
   if (!options.parse(argc, argv)) {

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Player.C (-4 / +4 lines)
1	--- src/Player.C Tue May 11 12:17:08 1999	1	--- src/Player.C.orig 1999-05-11 02:17:08 UTC
2	+++ src/Player.C Sat Oct 26 00:41:14 2002	2	+++ src/Player.C
3	@@ -36,7 +36,7 @@	3	@@ -36,7 +36,7 @@
4	#include <string.h>	4	#include <string.h>
5	#include <time.h>	5	#include <time.h>
Lines 9-15 Link Here
9		9
10	#include "Player.H"	10	#include "Player.H"
11		11
12	@@ -78,7 +78,7 @@	12	@@ -78,7 +78,7 @@ void Player::add_description(Trame &t)
13	void Player::read_description(Trame &t)	13	void Player::read_description(Trame &t)
14	{	14	{
15	if (t.get_char() != PLAYER_DESC) {	15	if (t.get_char() != PLAYER_DESC) {
Lines 18-24 Link Here
18	exit(1);	18	exit(1);
19	}	19	}
20		20
21	@@ -98,10 +98,10 @@	21	@@ -98,10 +98,10 @@ void Player::read_description(Trame &t)
22	// debug: print a brief representation of the player	22	// debug: print a brief representation of the player
23	void Player::display()	23	void Player::display()
24	{	24	{




--- src/ServerInterface.C.orig	1999-05-11 02:13:52 UTC
+++ src/ServerInterface.C
@@ -48,6 +48,9 @@
 #include <errno.h>
 

 
 #include "DLList.h" // Doubly linked lists
 
@@ -118,9 +121,9 @@ void ServerInterface::init(int argc, cha
 
   display_version();
     

   
   srand(time(NULL));
 
@@ -144,12 +147,12 @@ void ServerInterface::init(int argc, cha
   sigaction(SIGCHLD, &action, NULL);
 */  
 

     exit(2);
   } 
 
@@ -170,36 +173,36 @@ void ServerInterface::init(int argc, cha
 // display version numbers (long format)
 void ServerInterface::display_version() 
 {

 }
 
 
@@ -230,9 +233,15 @@ void ServerInterface::run()
     socket_service = -1;
     while (socket_service == -1) {
       // wait for connection

       
       // Reception d'un signal (probablement SIGCHLD) 
       if(socket_service == -1 && errno == EINTR) {
@@ -277,7 +286,7 @@ void ServerInterface::run()
 	char *peol;
 
  	if (debug) {

  	}
 
 	fgets(line, MAXLINE, stdin);
@@ -305,28 +314,28 @@ void ServerInterface::run()
 	} else if (strcmp(line, "p") == 0) { // pause
 	  xpaused = !xpaused;
 	  display_system_message(((xpaused) 

  	    }
 	  } else
 	    display_system_message("Can't go faster :)\n");
@@ -388,7 +397,7 @@ void ServerInterface::run()
 void ServerInterface::pipe_handler(int sig)
 {
   sig++;

   //   pipe_rw_error = 1;
 }
 
@@ -407,9 +416,9 @@ void ServerInterface::set_timer(int nbse
 // void ServerInterface::alarm_handler(int sig)
 // {
 //   if (curworld) {

 //     startcycle = curworld->playcycle;
 //   }
 // }
@@ -433,9 +442,15 @@ int ServerInterface::accept_new(int sock
 
   while (read_ready(socketnum)) {
 

 
     // s'il y a une erreur, ce n'est pas une EINTR (cf appel a read_ready())
     if(socket_service == -1) { 
@@ -475,9 +490,9 @@ void ServerInterface::display_message(Pl
     return;
   
   if (priv) 

 }
 
 void ServerInterface::display_system_message(char   * msg, 
@@ -488,8 +503,8 @@ void ServerInterface::display_system_mes
     return;
 
   color++;




--- src/Trame.C.orig	1999-05-09 22:57:09 UTC
+++ src/Trame.C
@@ -39,7 +39,7 @@
 # include <config.h>
 #endif

 
 #include <stdlib.h>
 #include <stdio.h>
@@ -93,11 +93,11 @@ int Trame::send_to(int socket_number)
 #endif
 
 #ifdef DEBUG_TRACE

 #endif
 
   // always write at least 4 bytes
@@ -161,19 +161,19 @@ int Trame::receive_from(int socket_numbe
     return -1;
   
   if (retval <= 0) {

       break;
     }
 
@@ -196,14 +196,14 @@ int Trame::receive_from(int socket_numbe
     
     if (xx < 0) {
       if (errno == 0)

 	return -1;
       }
     }
@@ -212,11 +212,11 @@ int Trame::receive_from(int socket_numbe
   cursize = len;
   
 #ifdef DEBUG_TRACE

 #endif
   
 #ifdef DEBUG_LOAD
@@ -381,7 +381,7 @@ short Trame::get_short()
     idx += 2;
   }
   else {

     sh = -1;
   }
   
@@ -408,7 +408,7 @@ int Trame::peek_int()
     return val;
   }
   else

   
   return -1;
 }
@@ -423,7 +423,7 @@ int Trame::get_int()
     idx += 4;
   }
   else {

     sh = -1;
   }
 
@@ -454,10 +454,10 @@ char * Trame::get_string()
 
 void Trame::dump_left()
 {

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Trame.H (-2 / +2 lines)
1	--- src/Trame.H Mon May 10 08:58:39 1999	1	--- src/Trame.H.orig 1999-05-09 22:58:39 UTC
2	+++ src/Trame.H Sat Oct 26 00:28:25 2002	2	+++ src/Trame.H
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	#ifndef __H_TRAME__	4	#ifndef __H_TRAME__
5	#define __H_TRAME__	5	#define __H_TRAME__




--- src/World.C.orig	1999-05-12 01:45:46 UTC
+++ src/World.C
@@ -145,8 +145,8 @@ _Object& World::lookup_object(int obj_id
 
   if (!p) { // here it's really bad. Have to raise an exception !
     if (debug)

     return * objects.front(); /// @@ NNNNOOOOOONNNNNNNNNNNNNNNNNNNNNNNN!
   }
 
@@ -182,7 +182,7 @@ _Object * World::read_new_object(Trame &
     break;
   default:
     if (debug)

     break;
   }
 
@@ -201,7 +201,7 @@ void World::remove_object(int obj_id)
     remove_object0(p);
   else {
     if (debug)

   }
 }
 
@@ -243,8 +243,8 @@ Player& World::lookup_player(int player_
 
   if (!p) { // la, c'est tres grave. Faut faire une exception!
     if (debug)

     return * new Player(*this);  // <- en attendant mieux.
   }
 
@@ -269,7 +269,7 @@ void World::server_add_player(int socknu
 /* unlimited number of players!
   if (nbplayers >= maxplayers) {
     close(socknum);

     return;
   }
 */
@@ -278,16 +278,16 @@ void World::server_add_player(int socknu
   trame.set_timeout(5000);
   if (-1 == trame.receive_from(socknum)) {
     if (debug)

     return;
   }
   trame.get_char();
@@ -321,7 +321,7 @@ void World::server_add_player_other(int 
   trameZ.set_timeout(1);
 
   if (debug)

 
   Player& p = * new Player(*this, socknum);
 
@@ -357,8 +357,8 @@ void World::remove_player(int player_id)
 
   if (!p) { // la, c'est tres grave. Faut faire une exception!
     if (debug)

     return;
   }
 
@@ -513,11 +513,11 @@ void World::own_cycle()
 	  && ((Movable *) objects(p))->player_id == 0)
 	nbworm++;
     

       Movable& worm = * new Movable(*this);
       worm.auto_position(map);
       worm.add_type(map);
@@ -569,7 +569,7 @@ void World::read_description(Trame& t)  
 {
   if (t.get_char() != WORLD_DESC) {
     if (debug)

     exit(1);
   }
 
@@ -708,11 +708,11 @@ void World::read_changes(Trame &t)
     
     default:
       if (debug)

       t.dump_left();
       break;
     }
@@ -743,16 +743,16 @@ void World::build_maptype() 
 // for debug purposes
 void World::display()
 {

 
   for (Pix p = objects.first(); p; objects.next(p))
      objects(p)->display();
@@ -826,7 +826,7 @@ void World::get_client_responses()
 
     if (retval < 0) {
       if (debug)

       return; // bah violent comme d'hab.
     }
 
@@ -915,7 +915,7 @@ void World::read_player_response(Player&
 	int newdir = t.get_char();
 	
 	if (debug)

 	
 	Movable & mv = (Movable &) lookup_object(worm_id);
 	Player * other_player = NULL;
@@ -928,8 +928,8 @@ void World::read_player_response(Player&
 	    || other_player->socket_number != p.socket_number) {
 	  
 	  if (debug)

 	}
 	else {
 	  if (!paused) {
@@ -954,12 +954,12 @@ void World::read_player_response(Player&
 
     case TEXT_MESSAGE: 
       {

 
 	if (!dest_id) { // broadcast message
 	  cycle_trame.put_char(TEXT_MESSAGE);
@@ -1039,16 +1039,16 @@ void World::read_player_response(Player&
       
     case TRAME_ERROR:
       if (debug)

 	t.dump_left();
       }
       break;
@@ -1117,7 +1117,7 @@ Pix World::lookup_object0(int obj_id)
 
 void World::remove_object0(Pix& p)
 {




--- src/X11/X11Interface.C.orig	1999-05-12 11:43:42 UTC
+++ src/X11/X11Interface.C
@@ -38,7 +38,7 @@
 # include <config.h>
 #endif

 
 #include <unistd.h>
 #include <stdlib.h>
@@ -109,7 +109,7 @@ void X11Interface::init(int argc, char *
   display_version();
 
   if (_two_key)

 
   
   // connect pipe_handler to SIGPIPE signal
@@ -125,8 +125,8 @@ void X11Interface::init(int argc, char *
     exit(2); 
   }
 

   
   // create and bind socket to any port 
   port = 0;
@@ -136,7 +136,7 @@ void X11Interface::init(int argc, char *
   } 
 
 //   if (debug)

   
   // Build server address 
   server_address.sin_family = AF_INET;
@@ -153,7 +153,7 @@ void X11Interface::init(int argc, char *
 
   display_play_help();
 

 
 //   hack_socket_client = socket_client; // hack for signal handling
 //   action.sa_handler = stop_handler;
@@ -163,7 +163,7 @@ void X11Interface::init(int argc, char *
 
   init_messages(options.get_message_file());
 

   X11Init(argc, argv);
 }
 
@@ -201,56 +201,56 @@ void X11Interface::X11Init(int argc, cha
 // display version number (long format)
 void X11Interface::display_version() 
 {

 }
 
 
@@ -261,7 +261,7 @@ void X11Interface::display_play_help()
 
 void X11Interface::pipe_handler(int sig)
 {

   sig++; // warnings..
   dead_server = 1;
 }
@@ -285,7 +285,7 @@ void X11Interface::run()
 
     z++;
     if (t.receive_from(socket_client)) {

 
       handle_Xevent();
       
@@ -309,7 +309,7 @@ void X11Interface::run()
 	}
 	
 	if (dir) {

 	  tx.reset();
 	  tx.put_char(PLAYER_CHANGEDIR);
 	  tx.put_char(dir);
@@ -323,7 +323,7 @@ void X11Interface::run()
 	  break; // on verra ca plus tard.
 	  
 	case WORLD_DESC: 

 	  w.read_description(t);
 	  tx.reset();
 	  tx.put_char(CYCLE_ACK);
@@ -333,14 +333,14 @@ void X11Interface::run()
 	  break;
 	  
 	case CHANGE_NOTIFY:

 	    t.get_char();
 	    char *p = t.get_string();
 	    if (p && strcmp(p, "w") == 0)
@@ -358,10 +358,10 @@ void X11Interface::run()
 	
 	case TEXT_MESSAGE:
 	  {

 	  }
 	break;
 
@@ -393,13 +393,13 @@ void X11Interface::run()
 	break;
 
 	case QUIT_GAME:

 	  break;
 	}
     }
@@ -427,13 +427,13 @@ void X11Interface::handle_Xevent()
 	nibblesarea.redraw2();
       break;
     case ButtonPress:

       break;
     }
   }
@@ -442,30 +442,30 @@ void X11Interface::handle_Xevent()
 
 void X11Interface::add_player(Player& p)
 {

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__X11__textarea.C (-3 / +3 lines)
1	--- src/X11/textarea.C.orig Sat Oct 26 01:07:26 2002	1	--- src/X11/textarea.C.orig 1998-11-17 08:42:50 UTC
2	+++ src/X11/textarea.C Sat Oct 26 01:07:28 2002	2	+++ src/X11/textarea.C
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	#include <Xm/ScrollBar.h>	4	#include <Xm/ScrollBar.h>
5	#include <Xm/Text.h>	5	#include <Xm/Text.h>
Lines 9-15 Link Here
9	#include "string.h"	9	#include "string.h"
10		10
11	#include "motifutil.H"	11	#include "motifutil.H"
12	@@ -91,7 +91,7 @@	12	@@ -91,7 +91,7 @@ void TextArea::add_line(char *line)
13	XmTextSetCursorPosition(widget, XmTextGetLastPosition(widget));	13	XmTextSetCursorPosition(widget, XmTextGetLastPosition(widget));
14	XmTextShowPosition(widget, XmTextGetLastPosition(widget));	14	XmTextShowPosition(widget, XmTextGetLastPosition(widget));
15	if (length > 9500) {	15	if (length > 9500) {

Lines 20-23 Link Here

(-)games/znibbles/pkg-descr (-1 / +1 lines)
20	Run "nibbles" first as the ZNibbles server, and then run its clients to	20	Run "nibbles" first as the ZNibbles server, and then run its clients to
21	play.	21	play.
22		22
23	WWW: http://www.jfouffa.com/vmallet/ZNibbles.html	23	WWW: http://www.zyllius.com/vmallet/ZNibbles.html

Return to bug 208709

Lines 3-30 Link Here

(-)games/znibbles/Makefile (-9 / +12 lines)
3		3
4	PORTNAME= znibbles	4	PORTNAME= znibbles
5	PORTVERSION= 0.0.7	5	PORTVERSION= 0.0.7
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= http://old.koalateam.com/ftp/pub/games/znibbles/ \	8	MASTER_SITES= http://www.zyllius.com/vmallet/archives/
9	http://www.jfouffa.com/vmallet/archives/
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Multi-player networked nibbles game	11	COMMENT= Multi-player networked nibbles game
13		12
14	BROKEN= unfetchable
15
16	LICENSE= GPLv2+	13	LICENSE= GPLv2+
17		14
18	OPTIONS_DEFINE= GTK1
19	OPTIONS_DEFAULT= GTK1
20
21	USES= motif	15	USES= motif
22	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
23		17
		18	DESKTOP_ENTRIES="Znibbles" "" "" "znibblesX" "" ""
		19
24	PLIST_FILES= bin/nibbles bin/znibbles bin/znibblesX \	20	PLIST_FILES= bin/nibbles bin/znibbles bin/znibblesX \
25	man/man6/nibbles.6.gz man/man6/znibbles.6.gz \	21	man/man6/nibbles.6.gz man/man6/znibbles.6.gz \
26	man/man6/znibblesX.6.gz	22	man/man6/znibblesX.6.gz
27		23
		24	OPTIONS_DEFINE= GTK1
		25	OPTIONS_DEFAULT= GTK1
		26
28	GTK1_USE= GNOME=gtk12	27	GTK1_USE= GNOME=gtk12
29	GTK1_PLIST_FILES= bin/gznibbles man/man6/gznibbles.6.gz	28	GTK1_PLIST_FILES= bin/gznibbles man/man6/gznibbles.6.gz
30	GTK1_CONFIGURE_ENABLE= gtk	29	GTK1_CONFIGURE_ENABLE= gtk
Lines 46-51 Link Here
46		45
47	post-install:	46	post-install:
48	(cd ${WRKSRC}/doc && ${INSTALL_MAN} nibbles.6 znibbles.6 znibblesX.6 \	47	(cd ${WRKSRC}/doc && ${INSTALL_MAN} nibbles.6 znibbles.6 znibblesX.6 \
49	gznibbles.6 ${STAGEDIR}${MAN6PREFIX}/man/man6)	48	${STAGEDIR}${MAN6PREFIX}/man/man6)
		49
		50	post-install-GTK1-on:
		51	(cd ${WRKSRC}/doc && ${INSTALL_MAN} gznibbles.6 \
		52	${STAGEDIR}${MAN6PREFIX}/man/man6)
50		53
51	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Line 0 Link Here

(-)games/znibbles/files/patch-src_Nibble.C (+25 lines)
	1	--- src/Nibble.C.orig 1998-11-17 08:36:32 UTC
	2	+++ src/Nibble.C
	3	@@ -58,7 +58,7 @@ void Nibble:: add_description(Trame &t)
	4	void Nibble:: read_description(Trame &t)
	5	{
	6	if (t.get_char() != NEW_NIBBLE) {
	7	- cerr << "Nibble::read_description(): ohhh le bordel!\n";
	8	+ std::cerr << "Nibble::read_description(): ohhh le bordel!\n";
	9	exit(1);
	10	}
	11
	12	@@ -81,10 +81,10 @@ void Nibble::read_description0(Trame &t)
	13
	14	void Nibble::display()
	15	{
	16	- cout << " ID:"<< id;
	17	+ std::cout << " ID:"<< id;
	18	printf(" %04x", classtype);
	19	- cout << " Nibble " << pos.x << "x" << pos.y << " value=" << value
	20	- << " type=" << type << endl;
	21	+ std::cout << " Nibble " << pos.x << "x" << pos.y << " value=" << value
	22	+ << " type=" << type << std::endl;
	23	}
	24
	25

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__GTK__GtkInterface.C (-25 / +25 lines)
1	--- src/GTK/GtkInterface.C Wed May 12 21:43:29 1999	1	--- src/GTK/GtkInterface.C.orig 1999-05-12 11:43:29 UTC
2	+++ src/GTK/GtkInterface.C Sat Oct 26 00:36:57 2002	2	+++ src/GTK/GtkInterface.C
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	#include <gtk/gtk.h>	4	#include <gtk/gtk.h>
5	#include <gdk/gdkkeysyms.h>	5	#include <gdk/gdkkeysyms.h>
Lines 9-15 Link Here
9		9
10	#include <unistd.h>	10	#include <unistd.h>
11	#include <stdlib.h>	11	#include <stdlib.h>
12	@@ -138,7 +138,7 @@	12	@@ -138,7 +138,7 @@ void GtkInterface::init(int argc, char *
13	display_version();	13	display_version();
14		14
15	if (_two_key)	15	if (_two_key)
Lines 18-24 Link Here
18		18
19		19
20	// connect pipe_handler to SIGPIPE signal	20	// connect pipe_handler to SIGPIPE signal
21	@@ -154,9 +154,9 @@	21	@@ -154,9 +154,9 @@ void GtkInterface::init(int argc, char *
22	exit(2);	22	exit(2);
23	}	23	}
24		24
Lines 30-36 Link Here
30		30
31	// create and bind socket to any port	31	// create and bind socket to any port
32	port = 0;	32	port = 0;
33	@@ -168,8 +168,8 @@	33	@@ -168,8 +168,8 @@ void GtkInterface::init(int argc, char *
34	}	34	}
35		35
36	if (_debug)	36	if (_debug)
Lines 41-47 Link Here
41		41
42	// Build server address	42	// Build server address
43	server_address.sin_family = AF_INET;	43	server_address.sin_family = AF_INET;
44	@@ -186,7 +186,7 @@	44	@@ -186,7 +186,7 @@ void GtkInterface::init(int argc, char *
45		45
46	display_play_help();	46	display_play_help();
47		47
Lines 50-56 Link Here
50		50
51	_hack_socket_client = _socket_client; // hack for signal handling	51	_hack_socket_client = _socket_client; // hack for signal handling
52	action.sa_handler = stop_handler;	52	action.sa_handler = stop_handler;
53	@@ -196,7 +196,7 @@	53	@@ -196,7 +196,7 @@ void GtkInterface::init(int argc, char *
54		54
55	init_messages(options.get_message_file());	55	init_messages(options.get_message_file());
56		56
Lines 59-65 Link Here
59	make(argc, argv);	59	make(argc, argv);
60	}	60	}
61		61
62	@@ -294,7 +294,7 @@	62	@@ -294,7 +294,7 @@ gint GtkInterface::key_cb(GtkWidget *wid
63	case 'z':	63	case 'z':
64	{	64	{
65	// if (_debug)	65	// if (_debug)
Lines 68-74 Link Here
68		68
69	Trame tzz;	69	Trame tzz;
70	tzz.reset();	70	tzz.reset();
71	@@ -315,7 +315,7 @@	71	@@ -315,7 +315,7 @@ gint GtkInterface::key_cb(GtkWidget *wid
72		72
73	default:	73	default:
74	if (mythis._debug)	74	if (mythis._debug)
Lines 77-83 Link Here
77	return FALSE;	77	return FALSE;
78	}	78	}
79		79
80	@@ -337,7 +337,7 @@	80	@@ -337,7 +337,7 @@ gint GtkInterface::configure_event (GtkW
81	GtkInterface *pthis)	81	GtkInterface *pthis)
82	{	82	{
83	if (pthis->_debug)	83	if (pthis->_debug)
Lines 86-92 Link Here
86		86
87	return FALSE;	87	return FALSE;
88	}	88	}
89	@@ -349,7 +349,7 @@	89	@@ -349,7 +349,7 @@ gint GtkInterface::expose_event (GtkWidg
90	GtkInterface *pthis)	90	GtkInterface *pthis)
91	{	91	{
92	if (pthis->_debug)	92	if (pthis->_debug)
Lines 95-101 Link Here
95		95
96	return FALSE;	96	return FALSE;
97	}	97	}
98	@@ -476,7 +476,7 @@	98	@@ -476,7 +476,7 @@ void GtkInterface::make(int argc, char *
99	// GTK, the proper way to do this would be to use the	99	// GTK, the proper way to do this would be to use the
100	// gdk_input_add() function.	100	// gdk_input_add() function.
101		101
Lines 104-110 Link Here
104		104
105	gdk_input_add(_socket_client,	105	gdk_input_add(_socket_client,
106	GDK_INPUT_READ,	106	GDK_INPUT_READ,
107	@@ -487,57 +487,57 @@	107	@@ -487,57 +487,57 @@ void GtkInterface::make(int argc, char *
108	// display version numbers (long format)	108	// display version numbers (long format)
109	void GtkInterface::display_version()	109	void GtkInterface::display_version()
110	{	110	{
Lines 196-202 Link Here
196	}	196	}
197		197
198		198
199	@@ -547,7 +547,7 @@	199	@@ -547,7 +547,7 @@ void GtkInterface::display_play_help()
200		200
201	void GtkInterface::pipe_handler(int sig)	201	void GtkInterface::pipe_handler(int sig)
202	{	202	{
Lines 205-211 Link Here
205	sig++; // warnings..	205	sig++; // warnings..
206	_dead_server = 1;	206	_dead_server = 1;
207	}	207	}
208	@@ -555,7 +555,7 @@	208	@@ -555,7 +555,7 @@ void GtkInterface::pipe_handler(int sig)
209		209
210	void GtkInterface::stop_handler(int sig)	210	void GtkInterface::stop_handler(int sig)
211	{	211	{
Lines 214-220 Link Here
214		214
215	if (_hack_socket_client) {	215	if (_hack_socket_client) {
216	struct timeval tv;	216	struct timeval tv;
217	@@ -647,11 +647,11 @@	217	@@ -647,11 +647,11 @@ void GtkInterface::display_message(Playe
218	char buf[300];	218	char buf[300];
219		219
220	if (priv) {	220	if (priv) {
Lines 228-234 Link Here
228	sprintf(buf, "%s> %s\n", from.get_name(), msg);	228	sprintf(buf, "%s> %s\n", from.get_name(), msg);
229	}	229	}
230		230
231	@@ -707,7 +707,7 @@	231	@@ -707,7 +707,7 @@ void GtkInterface::run(void)
232	void GtkInterface::join_game()	232	void GtkInterface::join_game()
233	{	233	{
234	if (_debug)	234	if (_debug)
Lines 237-243 Link Here
237		237
238	t.put_char(JOIN_GAME);	238	t.put_char(JOIN_GAME);
239	t.put_string(_own_name);	239	t.put_string(_own_name);
240	@@ -740,21 +740,21 @@	240	@@ -740,21 +740,21 @@ void GtkInterface::handle_server_input_s
241	gint source,	241	gint source,
242	GdkInputCondition cond)	242	GdkInputCondition cond)
243	{	243	{
Lines 263-269 Link Here
263	if (_errors >= 5) {	263	if (_errors >= 5) {
264	pipe_handler(SIGPIPE);	264	pipe_handler(SIGPIPE);
265	}	265	}
266	@@ -762,9 +762,9 @@	266	@@ -762,9 +762,9 @@ void GtkInterface::handle_server_input()
267	}	267	}
268		268
269	_errors = 0;	269	_errors = 0;
Lines 275-281 Link Here
275		275
276	switch(t.peek_char()) {	276	switch(t.peek_char()) {
277	case TRAME_ERROR:	277	case TRAME_ERROR:
278	@@ -802,14 +802,14 @@	278	@@ -802,14 +802,14 @@ void GtkInterface::handle_server_input()
279		279
280	case QUIT_GAME:	280	case QUIT_GAME:
281	if (_debug)	281	if (_debug)
Lines 293-299 Link Here
293	break;	293	break;
294	}	294	}
295	}	295	}
296	@@ -840,7 +840,7 @@	296	@@ -840,7 +840,7 @@ void GtkInterface::do_your_other_player(
297	int my_other_player_id = t.get_int();	297	int my_other_player_id = t.get_int();
298		298
299	if (_debug)	299	if (_debug)
Lines 302-308 Link Here
302		302
303	Player& p = world.lookup_player(my_other_player_id);	303	Player& p = world.lookup_player(my_other_player_id);
304		304
305	@@ -848,8 +848,8 @@	305	@@ -848,8 +848,8 @@ void GtkInterface::do_your_other_player(
306		306
307	if (_other_player == NULL) {	307	if (_other_player == NULL) {
308	if (_debug)	308	if (_debug)
Lines 313-319 Link Here
313	return;	313	return;
314	}	314	}
315		315
316	@@ -870,7 +870,7 @@	316	@@ -870,7 +870,7 @@ void GtkInterface::do_your_other_player(
317	void GtkInterface::do_void_trame()	317	void GtkInterface::do_void_trame()
318	{	318	{
319	if (_debug)	319	if (_debug)
Lines 322-328 Link Here
322	t.get_char();	322	t.get_char();
323	char *p = t.get_string();	323	char *p = t.get_string();
324	if (p && strcmp(p, "w") == 0)	324	if (p && strcmp(p, "w") == 0)
325	@@ -978,8 +978,8 @@	325	@@ -978,8 +978,8 @@ void GtkInterface::set_own_player(Player
326		326
327	if (gtk_player == NULL) {	327	if (gtk_player == NULL) {
328	if (_debug)	328	if (_debug)
Lines 333-339 Link Here
333	return;	333	return;
334	}	334	}
335		335
336	@@ -999,7 +999,7 @@	336	@@ -999,7 +999,7 @@ void GtkInterface::activate_other_player
337	{	337	{
338	if (_other_player == NULL) {	338	if (_other_player == NULL) {
339	if (_debug)	339	if (_debug)

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Map.C (-5 / +5 lines)
1	--- src/Map.C Mon May 10 13:39:48 1999	1	--- src/Map.C.orig 1999-05-10 03:39:48 UTC
2	+++ src/Map.C Sat Oct 26 00:40:04 2002	2	+++ src/Map.C
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	#endif	4	#endif
5		5
Lines 9-15 Link Here
9	#include <string.h>	9	#include <string.h>
10		10
11	#include "Map.H"	11	#include "Map.H"
12	@@ -61,7 +61,7 @@	12	@@ -61,7 +61,7 @@ void Map::make(int x, int y)
13		13
14	// @@ do something appropriate here	14	// @@ do something appropriate here
15	if (_types == NULL)	15	if (_types == NULL)
Lines 18-24 Link Here
18		18
19	clear();	19	clear();
20	}	20	}
21	@@ -112,39 +112,39 @@	21	@@ -112,39 +112,39 @@ void Map::draw_point(int x, int y, int c
22	// Text based display of this map (debug purposes)	22	// Text based display of this map (debug purposes)
23	void Map::display()	23	void Map::display()
24	{	24	{
Lines 67-73 Link Here
67	}	67	}
68		68
69	_types[_types_index].object = &obj;	69	_types[_types_index].object = &obj;
70	@@ -170,15 +170,15 @@	70	@@ -170,15 +170,15 @@ void Map::print_type(int x, int y)
71	MapType * mt = get_type(x, y);	71	MapType * mt = get_type(x, y);
72		72
73	if (mt == NULL)	73	if (mt == NULL)

Lines 1-4 Link Here

(-)games/znibbles/files/patch-src__Motif__MotifInterface.C (-13 / +13 lines)
1	--- src/Motif/MotifInterface.C.orig	1	--- src/Motif/MotifInterface.C.orig 1999-05-12 11:43:51 UTC
2	+++ src/Motif/MotifInterface.C	2	+++ src/Motif/MotifInterface.C
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	# include <config.h>	4	# include <config.h>
Lines 9-15 Link Here
9		9
10	#include <unistd.h>	10	#include <unistd.h>
11	#include <stdlib.h>	11	#include <stdlib.h>
12	@@ -131,7 +131,7 @@	12	@@ -131,7 +131,7 @@ void MotifInterface::init(int argc, char
13	display_version();	13	display_version();
14		14
15	if (two_key)	15	if (two_key)
Lines 18-24 Link Here
18		18
19		19
20	// connect pipe_handler to SIGPIPE signal	20	// connect pipe_handler to SIGPIPE signal
21	@@ -147,8 +147,8 @@	21	@@ -147,8 +147,8 @@ void MotifInterface::init(int argc, char
22	exit(2);	22	exit(2);
23	}	23	}
24		24
Lines 29-35 Link Here
29		29
30	// create and bind socket to any port	30	// create and bind socket to any port
31	port = 0;	31	port = 0;
32	@@ -158,7 +158,7 @@	32	@@ -158,7 +158,7 @@ void MotifInterface::init(int argc, char
33	}	33	}
34		34
35	if (debug)	35	if (debug)
Lines 38-44 Link Here
38		38
39	// Build server address	39	// Build server address
40	server_address.sin_family = AF_INET;	40	server_address.sin_family = AF_INET;
41	@@ -175,7 +175,7 @@	41	@@ -175,7 +175,7 @@ void MotifInterface::init(int argc, char
42		42
43	display_play_help();	43	display_play_help();
44		44
Lines 47-53 Link Here
47		47
48	hack_socket_client = socket_client; // hack for signal handling	48	hack_socket_client = socket_client; // hack for signal handling
49	action.sa_handler = stop_handler;	49	action.sa_handler = stop_handler;
50	@@ -185,7 +185,7 @@	50	@@ -185,7 +185,7 @@ void MotifInterface::init(int argc, char
51		51
52	init_messages(options.get_message_file());	52	init_messages(options.get_message_file());
53		53
Lines 56-62 Link Here
56	make(argc, argv);	56	make(argc, argv);
57	}	57	}
58		58
59	@@ -262,54 +262,54 @@	59	@@ -262,54 +262,54 @@ void MotifInterface::make(int argc, char
60		60
61	void MotifInterface::display_version()	61	void MotifInterface::display_version()
62	{	62	{
Lines 144-150 Link Here
144	}	144	}
145		145
146		146
147	@@ -318,7 +318,7 @@	147	@@ -318,7 +318,7 @@ void MotifInterface::display_play_help()
148		148
149	void MotifInterface::pipe_handler(int sig)	149	void MotifInterface::pipe_handler(int sig)
150	{	150	{
Lines 153-159 Link Here
153	sig++; // warnings..	153	sig++; // warnings..
154	dead_server = 1;	154	dead_server = 1;
155	}	155	}
156	@@ -326,7 +326,7 @@	156	@@ -326,7 +326,7 @@ void MotifInterface::pipe_handler(int si
157		157
158	void MotifInterface::stop_handler(int sig)	158	void MotifInterface::stop_handler(int sig)
159	{	159	{
Lines 162-168 Link Here
162		162
163	if (hack_socket_client) {	163	if (hack_socket_client) {
164	struct timeval tv;	164	struct timeval tv;
165	@@ -391,11 +391,11 @@	165	@@ -391,11 +391,11 @@ void MotifInterface::display_message(Pla
166	char buf[300];	166	char buf[300];
167		167
168	if (priv) {	168	if (priv) {
Lines 176-182 Link Here
176	sprintf(buf, "%s> %s\n", from.get_name(), msg);	176	sprintf(buf, "%s> %s\n", from.get_name(), msg);
177	}	177	}
178	textarea.add_line(buf);	178	textarea.add_line(buf);
179	@@ -545,7 +545,7 @@	179	@@ -545,7 +545,7 @@ Boolean MotifInterface::myWorkProc(XtPoi
180	case VOID_TRAME:	180	case VOID_TRAME:
181	{	181	{
182	if (mythis.debug)	182	if (mythis.debug)
Lines 185-191 Link Here
185	mt.get_char();	185	mt.get_char();
186	char *p = mt.get_string();	186	char *p = mt.get_string();
187	if (p && strcmp(p, "w") == 0)	187	if (p && strcmp(p, "w") == 0)
188	@@ -595,14 +595,14 @@	188	@@ -595,14 +595,14 @@ Boolean MotifInterface::myWorkProc(XtPoi
189		189
190	case QUIT_GAME:	190	case QUIT_GAME:
191	if (mythis.debug)	191	if (mythis.debug)
Lines 203-209 Link Here
203	break;	203	break;
204	}	204	}
205	}	205	}
206	@@ -661,7 +661,7 @@	206	@@ -661,7 +661,7 @@ void MotifInterface::pause_request(int p
207	void MotifInterface::join_game()	207	void MotifInterface::join_game()
208	{	208	{
209	if (debug)	209	if (debug)

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__Movable.C (-8 / +8 lines)
1	--- src/Movable.C Tue May 11 12:15:20 1999	1	--- src/Movable.C.orig 1999-05-11 02:15:20 UTC
2	+++ src/Movable.C Sat Oct 26 00:40:14 2002	2	+++ src/Movable.C
3	@@ -51,7 +51,7 @@	3	@@ -51,7 +51,7 @@ void Movable::add_description(Trame& t)
4	void Movable::read_description(Trame& t)	4	void Movable::read_description(Trame& t)
5	{	5	{
6	if (t.get_char() != NEW_MOVABLE) {	6	if (t.get_char() != NEW_MOVABLE) {
Lines 9-15 Link Here
9	exit(1);	9	exit(1);
10	}	10	}
11		11
12	@@ -91,19 +91,19 @@	12	@@ -91,19 +91,19 @@ void Movable::read_description0(Trame& t
13	// for debug purposes	13	// for debug purposes
14	void Movable::display()	14	void Movable::display()
15	{	15	{
Lines 33-39 Link Here
33	}	33	}
34		34
35		35
36	@@ -282,7 +282,7 @@	36	@@ -282,7 +282,7 @@ int Movable::auto_dir()
37	&& !update_pos(p = pos, D_RIGHT))	37	&& !update_pos(p = pos, D_RIGHT))
38	newdir = D_RIGHT;	38	newdir = D_RIGHT;
39	// else	39	// else
Lines 42-48 Link Here
42		42
43	if (direction != newdir) {	43	if (direction != newdir) {
44	direction = newdir;	44	direction = newdir;
45	@@ -401,7 +401,7 @@	45	@@ -401,7 +401,7 @@ void Movable::getcut(_Position cutpos)
46	_Position pos2 = pos;	46	_Position pos2 = pos;
47		47
48	if (length == 1) {	48	if (length == 1) {
Lines 51-57 Link Here
51	return;	51	return;
52	}	52	}
53		53
54	@@ -415,7 +415,7 @@	54	@@ -415,7 +415,7 @@ void Movable::getcut(_Position cutpos)
55		55
56	// should never happen. (should be an assertion)	56	// should never happen. (should be an assertion)
57	if (!p) {	57	if (!p) {
Lines 60-66 Link Here
60	return;	60	return;
61	}	61	}
62		62
63	@@ -447,7 +447,7 @@	63	@@ -447,7 +447,7 @@ void Movable::getcut(_Position cutpos)
64	//evidemment ca bug! world.add_object(worm);	64	//evidemment ca bug! world.add_object(worm);
65	}	65	}
66	//else	66	//else

Lines 1-25 Link Here

(-)games/znibbles/files/patch-src__Niblle.C (-25 lines)
1	--- src/Nibble.C Tue Nov 17 19:36:32 1998
2	+++ src/Nibble.C Sat Oct 26 00:40:26 2002
3	@@ -58,7 +58,7 @@
4	void Nibble:: read_description(Trame &t)
5	{
6	if (t.get_char() != NEW_NIBBLE) {
7	- cerr << "Nibble::read_description(): ohhh le bordel!\n";
8	+ std::cerr << "Nibble::read_description(): ohhh le bordel!\n";
9	exit(1);
10	}
11
12	@@ -81,10 +81,10 @@
13
14	void Nibble::display()
15	{
16	- cout << " ID:"<< id;
17	+ std::cout << " ID:"<< id;
18	printf(" %04x", classtype);
19	- cout << " Nibble " << pos.x << "x" << pos.y << " value=" << value
20	- << " type=" << type << endl;
21	+ std::cout << " Nibble " << pos.x << "x" << pos.y << " value=" << value
22	+ << " type=" << type << std::endl;
23	}
24
25

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Options.C (-9 / +9 lines)
1	--- src/Options.C Wed May 12 11:40:13 1999	1	--- src/Options.C.orig 1999-05-12 01:40:13 UTC
2	+++ src/Options.C Sat Oct 26 00:41:03 2002	2	+++ src/Options.C
3	@@ -35,7 +35,7 @@	3	@@ -35,7 +35,7 @@
4		4
5	#include <stdio.h>	5	#include <stdio.h>
Lines 9-15 Link Here
9		9
10	#include "Options.H"	10	#include "Options.H"
11		11
12	@@ -150,7 +150,7 @@	12	@@ -150,7 +150,7 @@ bool Options::parse(int argc, char **arg
13	case 'p':	13	case 'p':
14	_port = atoi(optarg);	14	_port = atoi(optarg);
15	if (_port == 0) { // cannot be 0	15	if (_port == 0) { // cannot be 0
Lines 18-24 Link Here
18	bad_params = true;	18	bad_params = true;
19	}	19	}
20	break;	20	break;
21	@@ -160,7 +160,7 @@	21	@@ -160,7 +160,7 @@ bool Options::parse(int argc, char **arg
22	if (2 != (ooo = sscanf(optarg, "%dx%d", &_width, &_height)) \|\|	22	if (2 != (ooo = sscanf(optarg, "%dx%d", &_width, &_height)) \|\|
23	_height == 0 \|\|	23	_height == 0 \|\|
24	_width == 0) {	24	_width == 0) {
Lines 27-33 Link Here
27	bad_params = true;	27	bad_params = true;
28	}	28	}
29	break;	29	break;
30	@@ -168,8 +168,8 @@	30	@@ -168,8 +168,8 @@ bool Options::parse(int argc, char **arg
31	case 'g': // height (server only)	31	case 'g': // height (server only)
32	_height = atoi(optarg);	32	_height = atoi(optarg);
33	if (_height == 0) { // cannot be 0	33	if (_height == 0) { // cannot be 0
Lines 38-44 Link Here
38	bad_params = true;	38	bad_params = true;
39	}	39	}
40	break;	40	break;
41	@@ -177,8 +177,8 @@	41	@@ -177,8 +177,8 @@ bool Options::parse(int argc, char **arg
42	case 'w': // width (server only)	42	case 'w': // width (server only)
43	_width = atoi(optarg);	43	_width = atoi(optarg);
44	if (_width == 0) { // cannot be 0	44	if (_width == 0) { // cannot be 0
Lines 49-55 Link Here
49	bad_params = true;	49	bad_params = true;
50	}	50	}
51	break;	51	break;
52	@@ -194,7 +194,7 @@	52	@@ -194,7 +194,7 @@ bool Options::parse(int argc, char **arg
53		53
54	if (_set == OPTIONS_CLIENT_SET) {	54	if (_set == OPTIONS_CLIENT_SET) {
55	if (argv[optind] == NULL) {	55	if (argv[optind] == NULL) {
Lines 58-64 Link Here
58	bad_params = true;	58	bad_params = true;
59	}	59	}
60	else {	60	else {
61	@@ -208,7 +208,7 @@	61	@@ -208,7 +208,7 @@ bool Options::parse(int argc, char **arg
62	if (p != 0)	62	if (p != 0)
63	_port = p;	63	_port = p;
64	else {	64	else {
Lines 67-73 Link Here
67	bad_params = true;	67	bad_params = true;
68	}	68	}
69	}	69	}
70	@@ -227,34 +227,34 @@	70	@@ -227,34 +227,34 @@ int main(int argc, char **argv)
71	options.set_option_set(0);	71	options.set_option_set(0);
72		72
73	if (!options.parse(argc, argv)) {	73	if (!options.parse(argc, argv)) {

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__ServerInterface.C (-13 / +13 lines)
1	--- src/ServerInterface.C Tue May 11 12:13:52 1999	1	--- src/ServerInterface.C.orig 1999-05-11 02:13:52 UTC
2	+++ src/ServerInterface.C Sat Oct 26 00:50:26 2002	2	+++ src/ServerInterface.C
3	@@ -48,6 +48,9 @@	3	@@ -48,6 +48,9 @@
4	#include <errno.h>	4	#include <errno.h>
5		5
Lines 10-16 Link Here
10		10
11	#include "DLList.h" // Doubly linked lists	11	#include "DLList.h" // Doubly linked lists
12		12
13	@@ -118,9 +121,9 @@	13	@@ -118,9 +121,9 @@ void ServerInterface::init(int argc, cha
14		14
15	display_version();	15	display_version();
16		16
Lines 22-28 Link Here
22		22
23	srand(time(NULL));	23	srand(time(NULL));
24		24
25	@@ -144,12 +147,12 @@	25	@@ -144,12 +147,12 @@ void ServerInterface::init(int argc, cha
26	sigaction(SIGCHLD, &action, NULL);	26	sigaction(SIGCHLD, &action, NULL);
27	*/	27	*/
28		28
Lines 38-44 Link Here
38	exit(2);	38	exit(2);
39	}	39	}
40		40
41	@@ -170,36 +173,36 @@	41	@@ -170,36 +173,36 @@ void ServerInterface::init(int argc, cha
42	// display version numbers (long format)	42	// display version numbers (long format)
43	void ServerInterface::display_version()	43	void ServerInterface::display_version()
44	{	44	{
Lines 92-98 Link Here
92	}	92	}
93		93
94		94
95	@@ -230,9 +233,15 @@	95	@@ -230,9 +233,15 @@ void ServerInterface::run()
96	socket_service = -1;	96	socket_service = -1;
97	while (socket_service == -1) {	97	while (socket_service == -1) {
98	// wait for connection	98	// wait for connection
Lines 108-114 Link Here
108		108
109	// Reception d'un signal (probablement SIGCHLD)	109	// Reception d'un signal (probablement SIGCHLD)
110	if(socket_service == -1 && errno == EINTR) {	110	if(socket_service == -1 && errno == EINTR) {
111	@@ -277,7 +286,7 @@	111	@@ -277,7 +286,7 @@ void ServerInterface::run()
112	char *peol;	112	char *peol;
113		113
114	if (debug) {	114	if (debug) {
Lines 117-123 Link Here
117	}	117	}
118		118
119	fgets(line, MAXLINE, stdin);	119	fgets(line, MAXLINE, stdin);
120	@@ -305,28 +314,28 @@	120	@@ -305,28 +314,28 @@ void ServerInterface::run()
121	} else if (strcmp(line, "p") == 0) { // pause	121	} else if (strcmp(line, "p") == 0) { // pause
122	xpaused = !xpaused;	122	xpaused = !xpaused;
123	display_system_message(((xpaused)	123	display_system_message(((xpaused)
Lines 152-158 Link Here
152	}	152	}
153	} else	153	} else
154	display_system_message("Can't go faster :)\n");	154	display_system_message("Can't go faster :)\n");
155	@@ -388,7 +397,7 @@	155	@@ -388,7 +397,7 @@ void ServerInterface::run()
156	void ServerInterface::pipe_handler(int sig)	156	void ServerInterface::pipe_handler(int sig)
157	{	157	{
158	sig++;	158	sig++;
Lines 161-167 Link Here
161	// pipe_rw_error = 1;	161	// pipe_rw_error = 1;
162	}	162	}
163		163
164	@@ -407,9 +416,9 @@	164	@@ -407,9 +416,9 @@ void ServerInterface::set_timer(int nbse
165	// void ServerInterface::alarm_handler(int sig)	165	// void ServerInterface::alarm_handler(int sig)
166	// {	166	// {
167	// if (curworld) {	167	// if (curworld) {
Lines 173-179 Link Here
173	// startcycle = curworld->playcycle;	173	// startcycle = curworld->playcycle;
174	// }	174	// }
175	// }	175	// }
176	@@ -433,9 +442,15 @@	176	@@ -433,9 +442,15 @@ int ServerInterface::accept_new(int sock
177		177
178	while (read_ready(socketnum)) {	178	while (read_ready(socketnum)) {
179		179
Lines 189-195 Link Here
189		189
190	// s'il y a une erreur, ce n'est pas une EINTR (cf appel a read_ready())	190	// s'il y a une erreur, ce n'est pas une EINTR (cf appel a read_ready())
191	if(socket_service == -1) {	191	if(socket_service == -1) {
192	@@ -475,9 +490,9 @@	192	@@ -475,9 +490,9 @@ void ServerInterface::display_message(Pl
193	return;	193	return;
194		194
195	if (priv)	195	if (priv)
Lines 201-207 Link Here
201	}	201	}
202		202
203	void ServerInterface::display_system_message(char * msg,	203	void ServerInterface::display_system_message(char * msg,
204	@@ -488,8 +503,8 @@	204	@@ -488,8 +503,8 @@ void ServerInterface::display_system_mes
205	return;	205	return;
206		206
207	color++;	207	color++;

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__Trame.C (-10 / +10 lines)
1	--- src/Trame.C Mon May 10 08:57:09 1999	1	--- src/Trame.C.orig 1999-05-09 22:57:09 UTC
2	+++ src/Trame.C Sat Oct 26 00:41:28 2002	2	+++ src/Trame.C
3	@@ -39,7 +39,7 @@	3	@@ -39,7 +39,7 @@
4	# include <config.h>	4	# include <config.h>
5	#endif	5	#endif
Lines 9-15 Link Here
9		9
10	#include <stdlib.h>	10	#include <stdlib.h>
11	#include <stdio.h>	11	#include <stdio.h>
12	@@ -93,11 +93,11 @@	12	@@ -93,11 +93,11 @@ int Trame::send_to(int socket_number)
13	#endif	13	#endif
14		14
15	#ifdef DEBUG_TRACE	15	#ifdef DEBUG_TRACE
Lines 23-29 Link Here
23	#endif	23	#endif
24		24
25	// always write at least 4 bytes	25	// always write at least 4 bytes
26	@@ -161,19 +161,19 @@	26	@@ -161,19 +161,19 @@ int Trame::receive_from(int socket_numbe
27	return -1;	27	return -1;
28		28
29	if (retval <= 0) {	29	if (retval <= 0) {
Lines 48-54 Link Here
48	break;	48	break;
49	}	49	}
50		50
51	@@ -196,14 +196,14 @@	51	@@ -196,14 +196,14 @@ int Trame::receive_from(int socket_numbe
52		52
53	if (xx < 0) {	53	if (xx < 0) {
54	if (errno == 0)	54	if (errno == 0)
Lines 67-73 Link Here
67	return -1;	67	return -1;
68	}	68	}
69	}	69	}
70	@@ -212,11 +212,11 @@	70	@@ -212,11 +212,11 @@ int Trame::receive_from(int socket_numbe
71	cursize = len;	71	cursize = len;
72		72
73	#ifdef DEBUG_TRACE	73	#ifdef DEBUG_TRACE
Lines 81-87 Link Here
81	#endif	81	#endif
82		82
83	#ifdef DEBUG_LOAD	83	#ifdef DEBUG_LOAD
84	@@ -381,7 +381,7 @@	84	@@ -381,7 +381,7 @@ short Trame::get_short()
85	idx += 2;	85	idx += 2;
86	}	86	}
87	else {	87	else {
Lines 90-96 Link Here
90	sh = -1;	90	sh = -1;
91	}	91	}
92		92
93	@@ -408,7 +408,7 @@	93	@@ -408,7 +408,7 @@ int Trame::peek_int()
94	return val;	94	return val;
95	}	95	}
96	else	96	else
Lines 99-105 Link Here
99		99
100	return -1;	100	return -1;
101	}	101	}
102	@@ -423,7 +423,7 @@	102	@@ -423,7 +423,7 @@ int Trame::get_int()
103	idx += 4;	103	idx += 4;
104	}	104	}
105	else {	105	else {
Lines 108-114 Link Here
108	sh = -1;	108	sh = -1;
109	}	109	}
110		110
111	@@ -454,10 +454,10 @@	111	@@ -454,10 +454,10 @@ char * Trame::get_string()
112		112
113	void Trame::dump_left()	113	void Trame::dump_left()
114	{	114	{

Lines 1-6 Link Here

(-)games/znibbles/files/patch-src__World.C (-20 / +20 lines)
1	--- src/World.C Wed May 12 11:45:46 1999	1	--- src/World.C.orig 1999-05-12 01:45:46 UTC
2	+++ src/World.C Sat Oct 26 00:41:48 2002	2	+++ src/World.C
3	@@ -145,8 +145,8 @@	3	@@ -145,8 +145,8 @@ _Object& World::lookup_object(int obj_id
4		4
5	if (!p) { // here it's really bad. Have to raise an exception !	5	if (!p) { // here it's really bad. Have to raise an exception !
6	if (debug)	6	if (debug)
Lines 11-17 Link Here
11	return * objects.front(); /// @@ NNNNOOOOOONNNNNNNNNNNNNNNNNNNNNNNN!	11	return * objects.front(); /// @@ NNNNOOOOOONNNNNNNNNNNNNNNNNNNNNNNN!
12	}	12	}
13		13
14	@@ -182,7 +182,7 @@	14	@@ -182,7 +182,7 @@ _Object * World::read_new_object(Trame &
15	break;	15	break;
16	default:	16	default:
17	if (debug)	17	if (debug)
Lines 20-26 Link Here
20	break;	20	break;
21	}	21	}
22		22
23	@@ -201,7 +201,7 @@	23	@@ -201,7 +201,7 @@ void World::remove_object(int obj_id)
24	remove_object0(p);	24	remove_object0(p);
25	else {	25	else {
26	if (debug)	26	if (debug)
Lines 29-35 Link Here
29	}	29	}
30	}	30	}
31		31
32	@@ -243,8 +243,8 @@	32	@@ -243,8 +243,8 @@ Player& World::lookup_player(int player_
33		33
34	if (!p) { // la, c'est tres grave. Faut faire une exception!	34	if (!p) { // la, c'est tres grave. Faut faire une exception!
35	if (debug)	35	if (debug)
Lines 40-46 Link Here
40	return * new Player(*this); // <- en attendant mieux.	40	return * new Player(*this); // <- en attendant mieux.
41	}	41	}
42		42
43	@@ -269,7 +269,7 @@	43	@@ -269,7 +269,7 @@ void World::server_add_player(int socknu
44	/* unlimited number of players!	44	/* unlimited number of players!
45	if (nbplayers >= maxplayers) {	45	if (nbplayers >= maxplayers) {
46	close(socknum);	46	close(socknum);
Lines 49-55 Link Here
49	return;	49	return;
50	}	50	}
51	*/	51	*/
52	@@ -278,16 +278,16 @@	52	@@ -278,16 +278,16 @@ void World::server_add_player(int socknu
53	trame.set_timeout(5000);	53	trame.set_timeout(5000);
54	if (-1 == trame.receive_from(socknum)) {	54	if (-1 == trame.receive_from(socknum)) {
55	if (debug)	55	if (debug)
Lines 70-76 Link Here
70	return;	70	return;
71	}	71	}
72	trame.get_char();	72	trame.get_char();
73	@@ -321,7 +321,7 @@	73	@@ -321,7 +321,7 @@ void World::server_add_player_other(int
74	trameZ.set_timeout(1);	74	trameZ.set_timeout(1);
75		75
76	if (debug)	76	if (debug)
Lines 79-85 Link Here
79		79
80	Player& p = * new Player(*this, socknum);	80	Player& p = * new Player(*this, socknum);
81		81
82	@@ -357,8 +357,8 @@	82	@@ -357,8 +357,8 @@ void World::remove_player(int player_id)
83		83
84	if (!p) { // la, c'est tres grave. Faut faire une exception!	84	if (!p) { // la, c'est tres grave. Faut faire une exception!
85	if (debug)	85	if (debug)
Lines 90-96 Link Here
90	return;	90	return;
91	}	91	}
92		92
93	@@ -513,11 +513,11 @@	93	@@ -513,11 +513,11 @@ void World::own_cycle()
94	&& ((Movable *) objects(p))->player_id == 0)	94	&& ((Movable *) objects(p))->player_id == 0)
95	nbworm++;	95	nbworm++;
96		96
Lines 104-110 Link Here
104	Movable& worm = * new Movable(*this);	104	Movable& worm = * new Movable(*this);
105	worm.auto_position(map);	105	worm.auto_position(map);
106	worm.add_type(map);	106	worm.add_type(map);
107	@@ -569,7 +569,7 @@	107	@@ -569,7 +569,7 @@ void World::read_description(Trame& t)
108	{	108	{
109	if (t.get_char() != WORLD_DESC) {	109	if (t.get_char() != WORLD_DESC) {
110	if (debug)	110	if (debug)
Lines 113-119 Link Here
113	exit(1);	113	exit(1);
114	}	114	}
115		115
116	@@ -708,11 +708,11 @@	116	@@ -708,11 +708,11 @@ void World::read_changes(Trame &t)
117		117
118	default:	118	default:
119	if (debug)	119	if (debug)
Lines 128-134 Link Here
128	t.dump_left();	128	t.dump_left();
129	break;	129	break;
130	}	130	}
131	@@ -743,16 +743,16 @@	131	@@ -743,16 +743,16 @@ void World::build_maptype()
132	// for debug purposes	132	// for debug purposes
133	void World::display()	133	void World::display()
134	{	134	{
Lines 150-156 Link Here
150		150
151	for (Pix p = objects.first(); p; objects.next(p))	151	for (Pix p = objects.first(); p; objects.next(p))
152	objects(p)->display();	152	objects(p)->display();
153	@@ -826,7 +826,7 @@	153	@@ -826,7 +826,7 @@ void World::get_client_responses()
154		154
155	if (retval < 0) {	155	if (retval < 0) {
156	if (debug)	156	if (debug)
Lines 159-165 Link Here
159	return; // bah violent comme d'hab.	159	return; // bah violent comme d'hab.
160	}	160	}
161		161
162	@@ -915,7 +915,7 @@	162	@@ -915,7 +915,7 @@ void World::read_player_response(Player&
163	int newdir = t.get_char();	163	int newdir = t.get_char();
164		164
165	if (debug)	165	if (debug)
Lines 168-174 Link Here
168		168
169	Movable & mv = (Movable &) lookup_object(worm_id);	169	Movable & mv = (Movable &) lookup_object(worm_id);
170	Player * other_player = NULL;	170	Player * other_player = NULL;
171	@@ -928,8 +928,8 @@	171	@@ -928,8 +928,8 @@ void World::read_player_response(Player&
172	\|\| other_player->socket_number != p.socket_number) {	172	\|\| other_player->socket_number != p.socket_number) {
173		173
174	if (debug)	174	if (debug)
Lines 179-185 Link Here
179	}	179	}
180	else {	180	else {
181	if (!paused) {	181	if (!paused) {
182	@@ -954,12 +954,12 @@	182	@@ -954,12 +954,12 @@ void World::read_player_response(Player&
183		183
184	case TEXT_MESSAGE:	184	case TEXT_MESSAGE:
185	{	185	{
Lines 194-200 Link Here
194		194
195	if (!dest_id) { // broadcast message	195	if (!dest_id) { // broadcast message
196	cycle_trame.put_char(TEXT_MESSAGE);	196	cycle_trame.put_char(TEXT_MESSAGE);
197	@@ -1039,16 +1039,16 @@	197	@@ -1039,16 +1039,16 @@ void World::read_player_response(Player&
198		198
199	case TRAME_ERROR:	199	case TRAME_ERROR:
200	if (debug)	200	if (debug)
Lines 216-222 Link Here
216	t.dump_left();	216	t.dump_left();
217	}	217	}
218	break;	218	break;
219	@@ -1117,7 +1117,7 @@	219	@@ -1117,7 +1117,7 @@ Pix World::lookup_object0(int obj_id)
220		220
221	void World::remove_object0(Pix& p)	221	void World::remove_object0(Pix& p)
222	{	222	{

Lines 1-5 Link Here

(-)games/znibbles/files/patch-src__X11__X11Interface.C (-17 / +17 lines)
1	--- src/X11/X11Interface.C Wed May 12 21:43:42 1999	1	--- src/X11/X11Interface.C.orig 1999-05-12 11:43:42 UTC
2	+++ src/X11/X11Interface.C Sat Oct 26 00:32:49 2002	2	+++ src/X11/X11Interface.C
3	@@ -38,7 +38,7 @@	3	@@ -38,7 +38,7 @@
4	# include <config.h>	4	# include <config.h>
5	#endif	5	#endif
Lines 9-15 Link Here
9		9
10	#include <unistd.h>	10	#include <unistd.h>
11	#include <stdlib.h>	11	#include <stdlib.h>
12	@@ -109,7 +109,7 @@	12	@@ -109,7 +109,7 @@ void X11Interface::init(int argc, char *
13	display_version();	13	display_version();
14		14
15	if (_two_key)	15	if (_two_key)
Lines 18-24 Link Here
18		18
19		19
20	// connect pipe_handler to SIGPIPE signal	20	// connect pipe_handler to SIGPIPE signal
21	@@ -125,8 +125,8 @@	21	@@ -125,8 +125,8 @@ void X11Interface::init(int argc, char *
22	exit(2);	22	exit(2);
23	}	23	}
24		24
Lines 29-35 Link Here
29		29
30	// create and bind socket to any port	30	// create and bind socket to any port
31	port = 0;	31	port = 0;
32	@@ -136,7 +136,7 @@	32	@@ -136,7 +136,7 @@ void X11Interface::init(int argc, char *
33	}	33	}
34		34
35	// if (debug)	35	// if (debug)
Lines 38-44 Link Here
38		38
39	// Build server address	39	// Build server address
40	server_address.sin_family = AF_INET;	40	server_address.sin_family = AF_INET;
41	@@ -153,7 +153,7 @@	41	@@ -153,7 +153,7 @@ void X11Interface::init(int argc, char *
42		42
43	display_play_help();	43	display_play_help();
44		44
Lines 47-53 Link Here
47		47
48	// hack_socket_client = socket_client; // hack for signal handling	48	// hack_socket_client = socket_client; // hack for signal handling
49	// action.sa_handler = stop_handler;	49	// action.sa_handler = stop_handler;
50	@@ -163,7 +163,7 @@	50	@@ -163,7 +163,7 @@ void X11Interface::init(int argc, char *
51		51
52	init_messages(options.get_message_file());	52	init_messages(options.get_message_file());
53		53
Lines 56-62 Link Here
56	X11Init(argc, argv);	56	X11Init(argc, argv);
57	}	57	}
58		58
59	@@ -201,56 +201,56 @@	59	@@ -201,56 +201,56 @@ void X11Interface::X11Init(int argc, cha
60	// display version number (long format)	60	// display version number (long format)
61	void X11Interface::display_version()	61	void X11Interface::display_version()
62	{	62	{
Lines 146-152 Link Here
146	}	146	}
147		147
148		148
149	@@ -261,7 +261,7 @@	149	@@ -261,7 +261,7 @@ void X11Interface::display_play_help()
150		150
151	void X11Interface::pipe_handler(int sig)	151	void X11Interface::pipe_handler(int sig)
152	{	152	{
Lines 155-161 Link Here
155	sig++; // warnings..	155	sig++; // warnings..
156	dead_server = 1;	156	dead_server = 1;
157	}	157	}
158	@@ -285,7 +285,7 @@	158	@@ -285,7 +285,7 @@ void X11Interface::run()
159		159
160	z++;	160	z++;
161	if (t.receive_from(socket_client)) {	161	if (t.receive_from(socket_client)) {
Lines 164-170 Link Here
164		164
165	handle_Xevent();	165	handle_Xevent();
166		166
167	@@ -309,7 +309,7 @@	167	@@ -309,7 +309,7 @@ void X11Interface::run()
168	}	168	}
169		169
170	if (dir) {	170	if (dir) {
Lines 173-179 Link Here
173	tx.reset();	173	tx.reset();
174	tx.put_char(PLAYER_CHANGEDIR);	174	tx.put_char(PLAYER_CHANGEDIR);
175	tx.put_char(dir);	175	tx.put_char(dir);
176	@@ -323,7 +323,7 @@	176	@@ -323,7 +323,7 @@ void X11Interface::run()
177	break; // on verra ca plus tard.	177	break; // on verra ca plus tard.
178		178
179	case WORLD_DESC:	179	case WORLD_DESC:
Lines 182-188 Link Here
182	w.read_description(t);	182	w.read_description(t);
183	tx.reset();	183	tx.reset();
184	tx.put_char(CYCLE_ACK);	184	tx.put_char(CYCLE_ACK);
185	@@ -333,14 +333,14 @@	185	@@ -333,14 +333,14 @@ void X11Interface::run()
186	break;	186	break;
187		187
188	case CHANGE_NOTIFY:	188	case CHANGE_NOTIFY:
Lines 199-205 Link Here
199	t.get_char();	199	t.get_char();
200	char *p = t.get_string();	200	char *p = t.get_string();
201	if (p && strcmp(p, "w") == 0)	201	if (p && strcmp(p, "w") == 0)
202	@@ -358,10 +358,10 @@	202	@@ -358,10 +358,10 @@ void X11Interface::run()
203		203
204	case TEXT_MESSAGE:	204	case TEXT_MESSAGE:
205	{	205	{
Lines 212-218 Link Here
212	}	212	}
213	break;	213	break;
214		214
215	@@ -393,13 +393,13 @@	215	@@ -393,13 +393,13 @@ void X11Interface::run()
216	break;	216	break;
217		217
218	case QUIT_GAME:	218	case QUIT_GAME:
Lines 229-235 Link Here
229	break;	229	break;
230	}	230	}
231	}	231	}
232	@@ -427,13 +427,13 @@	232	@@ -427,13 +427,13 @@ void X11Interface::handle_Xevent()
233	nibblesarea.redraw2();	233	nibblesarea.redraw2();
234	break;	234	break;
235	case ButtonPress:	235	case ButtonPress:
Lines 245-251 Link Here
245	break;	245	break;
246	}	246	}
247	}	247	}
248	@@ -442,30 +442,30 @@	248	@@ -442,30 +442,30 @@ void X11Interface::handle_Xevent()
249		249
250	void X11Interface::add_player(Player& p)	250	void X11Interface::add_player(Player& p)
251	{	251	{