From 4112c78c118800c7409be309c7158808caa82de1 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 22 Aug 2004 12:42:47 +0000
Subject: [PATCH] Bad merge!

---
 dlls/fun/fun.cpp | 2 --
 dlls/fun/fun.h   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/dlls/fun/fun.cpp b/dlls/fun/fun.cpp
index 576efc22..693f6c85 100755
--- a/dlls/fun/fun.cpp
+++ b/dlls/fun/fun.cpp
@@ -192,7 +192,6 @@ static cell AMX_NATIVE_CALL give_item(AMX *amx, cell *params) // native give_ite
 	// Check index.
 	if (params[1] < 1 || params[1] > gpGlobals->maxClients)
 	{
-		MF_Log("Failed at first check.  Param: %d", params[1]);
 		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
@@ -202,7 +201,6 @@ static cell AMX_NATIVE_CALL give_item(AMX *amx, cell *params) // native give_ite
 
 	// Check entity validity
 	if (FNullEnt(pPlayer)) {
-		MF_Log("Failed at second check.  Param: %p", pPlayer);
 		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
diff --git a/dlls/fun/fun.h b/dlls/fun/fun.h
index b733aef6..5f22e0a9 100755
--- a/dlls/fun/fun.h
+++ b/dlls/fun/fun.h
@@ -30,7 +30,6 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#define SMALL_CELL_SIZE 64
 #include "amxxmodule.h"
 
 // Fun-specific defines below