Mercurial > hg > batmud > maputils

changeset 277:5823ea312f79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused argument from putBlock()
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 16 Jun 2007 17:01:02 +0000
parents 69b29ecdc6fb
children cd4e3c071af8
files maputils.c maputils.h mkmap.c mkspecial.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/maputils.c	Sat Jun 16 12:43:57 2007 +0000
+++ b/maputils.c	Sat Jun 16 17:01:02 2007 +0000
@@ -326,7 +326,7 @@
 }
 
 
-int putBlock(mapblock_t **map, mapblock_t *b, int ox, int oy, int q)
+int putBlock(mapblock_t **map, mapblock_t *b, int ox, int oy)
 {
 	mapblock_t *tmp;
 	int x0, y0, x1, y1, mx, my;
--- a/maputils.h	Sat Jun 16 12:43:57 2007 +0000
+++ b/maputils.h	Sat Jun 16 17:01:02 2007 +0000
@@ -85,7 +85,7 @@
 mapblock_t *	parseFile(char *, BOOL);
 void		printBlock(FILE *, mapblock_t *);
 int		putBlockDo(mapblock_t *, mapblock_t *, int, int);
-int		putBlock(mapblock_t **, mapblock_t *, int, int, int);
+int		putBlock(mapblock_t **, mapblock_t *, int, int);
 void		cleanBlock(mapblock_t *, char *);
 
 #endif
--- a/mkmap.c	Sat Jun 16 12:43:57 2007 +0000
+++ b/mkmap.c	Sat Jun 16 17:01:02 2007 +0000
@@ -499,7 +499,7 @@
 			blockSearchBrute(worldMap, mapBlocks[i], &ox, &oy, optMatch, optFudge/100.0f)) ||
 			blockSearch(worldMap, mapBlocks[i], &ox, &oy, optMatch, optFudge/100.0f)) {
 				THPRINT(2, "X");
-				if (putBlock(&worldMap, mapBlocks[i], ox, oy, 15) < 0) {
+				if (putBlock(&worldMap, mapBlocks[i], ox, oy) < 0) {
 					THERR("putBlock(%d, %d, %d) failed!\n",
 						ox, oy, i);
 				}
--- a/mkspecial.c	Sat Jun 16 12:43:57 2007 +0000
+++ b/mkspecial.c	Sat Jun 16 17:01:02 2007 +0000
@@ -458,13 +458,13 @@
 	
 	/* Place optional initial map */
 	if (initialMap) {
-		if (putBlock(&worldMap, initialMap, offsetX+initialMap->x, offsetY+initialMap->y, 1) < 0) {
+		if (putBlock(&worldMap, initialMap, offsetX+initialMap->x, offsetY+initialMap->y) < 0) {
 			THERR("Initial map putBlock() failed!\n");
 			exit(9);
 		}
 	} else {
 		i = 0;
-		if (putBlock(&worldMap, mapBlocks[i], offsetX+mapBlocks[i]->x, offsetY+mapBlocks[i]->y, 1) < 0) {
+		if (putBlock(&worldMap, mapBlocks[i], offsetX+mapBlocks[i]->x, offsetY+mapBlocks[i]->y) < 0) {
 			THERR("Initial map putBlock() failed!\n");
 			exit(9);
 		}
@@ -501,7 +501,7 @@
 				isOK = FALSE;
 
 				if (matchBlock(worldMap, tmp, qx, qy, TRUE, optHardDrop) >= optMatch) {
-					if (putBlock(&worldMap, tmp, qx, qy, 1) < 0) {
+					if (putBlock(&worldMap, tmp, qx, qy) < 0) {
 						THERR("putBlock(%d, %d, %d) failed!\n",
 							offsetX, offsetY, i);
 						exit(9);