Versionsnumer moved completly to the prj file

bomberclone.prj

@@ -43,7 +43,7 @@ anjuta.compatibility.level=1
 project.name=bomberclone
 project.type=GENERIC
 project.target.type=EXECUTABLE
-project.version=0.9
+project.version=0.9.7
 project.author=steffen
 project.source.target=bomberclone
 
@@ -53,9 +53,9 @@ project.has.gettext=0
 
 project.programming.language=C
 
-project.menu.entry=bomberclone Version 0.9
+project.menu.entry=bomberclone Version 0.9.7
 project.menu.group=Games
-project.menu.comment=bomberclone Version 0.9
+project.menu.comment=bomberclone Version 0.9.7
 project.menu.icon=
 project.menu.need.terminal=0
 
@@ -105,7 +105,8 @@ module.source.files=\
 	multiwait.c\
 	chat.h\
 	keybinput.c\
-	keybinput.h
+	keybinput.h\
+	single.c
 
 module.pixmap.name=pixmaps
 module.pixmap.type=

bomberclone.pws

@@ -6,7 +6,7 @@ RunInTerminal=false
 ShowLocals=true
 
 [filenumbers]
-0=11
+0=5
 1=1
 2=7
 3=477
@@ -31,10 +31,6 @@ ShowLocals=true
 9=
 10=
 
-[filelist]
-0=/home/steffen/Daten/Programmierung/Linux/bomberclone/src/pkgcache.c
-1=/home/steffen/Daten/Programmierung/Linux/bomberclone/ChangeLog
-
 [replace_text]
 0=fieldsize
 1=(struct _net_addr *addr

configure

@@ -787,7 +787,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=bomberclone
-VERSION=0.9
+VERSION=0.9.7
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF

configure.in

@@ -4,7 +4,7 @@ dnl If you don't want it to overwrite it,
 dnl 	Please disable it in the Anjuta project configuration
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(bomberclone, 0.9)
+AM_INIT_AUTOMAKE(bomberclone, 0.9.7)
 AM_CONFIG_HEADER(config.h)
 
 AC_ISC_POSIX

src/basic.h

@@ -4,8 +4,6 @@
 
 #define _BC_BASIC_H_
 
-#define SUB_VERSION 6
-
 #define GAME_SPECIAL_ITEMBOMB 10
 #define GAME_SPECIAL_ITEMFIRE 10
 #define GAME_SPECIAL_ITEMSHOE 15

src/configuration.c

@@ -370,7 +370,7 @@ configuration ()
                 debug = 0;
             else {
                 debug = 1;
-                d_printf ("BomberClone ver.%s (%d) \n", VERSION, SUB_VERSION);
+                d_printf ("BomberClone ver.%s\n", VERSION);
             }
             break;
         case (8):              // Save Configuration

src/gamesrv.c

@@ -429,7 +429,7 @@ gamesrv_sendmode (int maxplayer, int curplayers)
 
     d_printf ("** Notify GameMaster Server\n");
 
-    sprintf (data, "AV%s.%d\n", VERSION, SUB_VERSION);
+    sprintf (data, "AV%s\n", VERSION);
     sprintf (data, "%sP%d,%d\n", data, curplayers, maxplayer);
     sprintf (data, "%sS%d,%d,%d\n", data, bman.state, bman.multitype, bman.gametype);
     if (bman.net_ai_family == PF_INET)

src/main.c

@@ -26,7 +26,7 @@ main (int argc, char **argv)
     }
 
 	game_init (argv);
-	d_printf ("\n\n ***** Bomberclone Version %s (%d)\n\n",VERSION,SUB_VERSION);
+	d_printf ("\n\n ***** Bomberclone Version %s \n\n",VERSION);
 	if (ReadConfig()) {	
 		gfx_init ();
 		menu_get_text ("Please You Playername", bman.playername, LEN_PLAYERNAME-1);

src/menu.c

@@ -73,7 +73,7 @@ draw_menu (char *text, _menu menu[], int *x, int *y)
         draw_text (x1, y1, menu[i].text, 1);
         y1 = y1 + gfx.font.size.y;
     }
-    sprintf (vers, "v%s.%d", VERSION, SUB_VERSION);
+    sprintf (vers, "v%s", VERSION);
     draw_text (gfx.res.x - gfx.font.size.x * strlen (vers), gfx.res.y - gfx.font.size.y, vers, 1);
 };
 

src/packets.c

@@ -72,14 +72,15 @@ do_playerid (struct pkg_playerid *p_id, _net_addr * addr)
       pl_nr,
       j,
       vma,
-      vmi;
+      vmi,
+	  vsu;
     char text[255];
 
-    sscanf (VERSION, "%d.%d", &vma, &vmi);
+    sscanf (VERSION, "%d.%d.%d", &vma, &vmi, &vsu);
 
     pl_nr = get_player_nr (addr->host, addr->port);
-    if (p_id->ver_sub != SUB_VERSION || p_id->ver_major != vma || p_id->ver_minor != vmi) {
-        sprintf (text, "Version Error - Host/Server Version: %s.%d", VERSION, SUB_VERSION);
+    if (p_id->ver_sub != vsu || p_id->ver_major != vma || p_id->ver_minor != vmi) {
+        sprintf (text, "Version Error - Host/Server Version: %s", VERSION);
         send_error (addr, text);
         return;
     }
@@ -184,16 +185,16 @@ send_playerid (_net_addr * addr, char *name, char *pladdr, char *plport, int pl_
 {
     struct pkg_playerid p_id;
     int vmi,
-      vma;
+      vma, vsu;
 
     d_printf ("send_playerid SendTo: %s:%s (Name:%16s p_nr:%d)\n", addr->host, addr->port, name,
               pl_nr);
-    sscanf (VERSION, "%d.%d", &vma, &vmi);
+    sscanf (VERSION, "%d.%d.%d", &vma, &vmi, &vsu);
 
     p_id.h.typ = PKG_playerid;
     p_id.h.flags = PKGF_ackreq;
     p_id.h.len = sizeof (struct pkg_playerid);
-    p_id.ver_sub = SUB_VERSION;
+    p_id.ver_sub = vsu;
     p_id.ver_major = vma;
     p_id.ver_minor = vmi;
 

src/single.c

@@ -57,10 +57,9 @@ void single_create_ai () {
 	/* find free players */
 	for (pl = NULL, p = 0; (pl == NULL && p < MAX_PLAYERS); p++)
 		if (!(PS_IS_used (bman.players[p].state)))
-			pl = &bman.players[p].state;
+			pl = &bman.players[p];
 	
 	if (pl == NULL)
 		return;
 	
 };
-};