Merge branch 'upstream'

bomber.h

@@ -9,7 +9,6 @@ extern int xcolors[256];
 #define IXSIZE 640
 #define IYSIZE 480
 
-
 #define MYF1 0x180
 #define MYF2 0x181
 #define MYF3 0x182
@@ -36,9 +35,7 @@ extern int xcolors[256];
 #define MYSHIFTED 0x40
 #define MYALTED 0x200
 
-
-typedef struct gfxset
-{
+typedef struct gfxset {
 	uchar gs_colormap[768];
 	uchar gs_inout[256];
 	uchar *gs_pic;
@@ -46,15 +43,13 @@ typedef struct gfxset
 	int gs_ysize;
 } gfxset;
 
-typedef struct figure
-{
+typedef struct figure {
 	int	xsize,ysize;
 	int	xdelta,ydelta;
 	uchar *graphics;
 } figure;
 
-typedef struct solid
-{
+typedef struct solid {
 	int	xsize,ysize;
 	uchar	*graphics;
 } solid;
@@ -179,7 +174,7 @@ enum tile_types {
 };
 
 
-#define ACT_INVALID 0x88
+// #define ACT_INVALID 0x88
 #define ACT_NONE  0
 #define ACT_UP    1
 #define ACT_DOWN  2

menu.c

@@ -173,8 +173,9 @@ static void addexit(char *item,...) {
 
 /* game menues */
 
-char *densities[]={"PACKED","HIGH","MEDIUM","LOW"};
-char *generosities[]={"LOW","MEDIUM","HIGH","RIDICULOUS"};
+static const char *densities[]={"PACKED","HIGH","MEDIUM","LOW"};
+static const char *generosities[]={"LOW","MEDIUM","HIGH","RIDICULOUS"};
+static const char *dis_en_abled[]={"DISABLED","ENABLED"};
 
 static void config_menu(void) {
 	int sel;
@@ -187,6 +188,7 @@ static void config_menu(void) {
 		additem("GENEROSITY: %s",generosities[configopts.generosity]);
 		additem("INITIAL FLAME LENGTH: %d",configopts.flames+1);
 		additem("INITIAL NUMBER OF BOMBS: %d",configopts.bombs+1);
+		additem("SOUND: %s", dis_en_abled[sound_enabled]);
 		sel=domenu(MENU_CONFIG, NULL);
 		switch (sel) {
 		case 0:
@@ -207,6 +209,9 @@ static void config_menu(void) {
 			configopts.bombs+=menudelta;
 			configopts.bombs&=7;
 			break;
+		case 5:
+			sound_enabled = 1 - sound_enabled;
+			break;
 		}
 	}
 }

network.c

@@ -10,7 +10,7 @@
 #define MAXMSG 4096
 
 int udpsocket;
-const unsigned char gameversion[4]={0xda,0x01,0x00,0x08};
+const unsigned char gameversion[4]={0xda,0x01,0x00,0x09};
 
 struct netnode netnodes[MAXNETNODES];
 
@@ -297,6 +297,10 @@ int networktraffic(void) {
 					actions[i] = ACT_QUIT;
 			}
 		} else {
+			for (i = 1; i < MAXNETNODES; ++i) {
+				if (netnodes[i].used)
+					actions[i] &= ACT_MASK; /* only keep direction */
+			}
 			now = gtime();
 			for (;;) {
 				if (gtime() - now > 15) break;
@@ -312,7 +316,7 @@ int networktraffic(void) {
 				count = readuint32(mesg+5);
 				if (count > latestcounts[whosent]) {
 					latestcounts[whosent] = count;
-					actions[whosent] = mesg[9];
+					actions[whosent] = (actions[whosent] & ~ACT_MASK) | mesg[9]; /* don't drop "action" keys */
 				}
 			}
 		}

sound.c

@@ -11,6 +11,8 @@
 #define DATADIR "data"
 #endif
 
+int sound_enabled = 1;
+
 static char dirlist[]=DATADIR;
 
 static int readsound(int num);
@@ -181,6 +183,8 @@ int i,file,size,len;
 }
 
 void playsound(int n) {
+	if (sound_enabled) {
 		soundcommands[soundput]=n;
 		soundput=(soundput+1)&(MAXSOUNDCOMMANDS-1);
 	}
+}

sound.h

@@ -5,4 +5,6 @@ int soundopen(void);
 void soundclose(void);
 void playsound(int n);
 
+extern int sound_enabled;
+
 #endif