From a075fd5a9a8e0fd78c7a80b51d95e2190bddda91 Mon Sep 17 00:00:00 2001
From: savask <savask@yandex.ru>
Date: Sat, 15 Oct 2011 22:39:35 +0700
Subject: Fix one merging error, and adjusted fighters' array.


diff --git a/includes/powder.h b/includes/powder.h
index 9bc823a..33b5794 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -981,7 +981,7 @@ extern int gravwl_timeout;
 extern float player[29];
 extern float player2[29];
 
-extern float fighters[256][28];
+extern float fighters[256][29];
 extern unsigned char fighcount;
 
 extern int gravityMode;
diff --git a/src/powder.c b/src/powder.c
index e5680eb..41f9196 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -2890,7 +2890,7 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags)
 	int wall = c - 100;
 	if (c==SPC_WIND || c==PT_FIGH)
 		return 0;
-	}
+
 	if(c==SPC_PROP){
 		prop_edit_ui(vid_buf, x, y);
 		return 0;
--
cgit v0.9.2-21-gd62e