- bezpecnejsie prepiannie screenov ( uz sa to nedeje v event() daneho screenu aj ked to on vyvolal )

- do laveho horneho rohu s nevypisuju blbiny
- moduly pouzivaju funkcie actionSpace a actionSpaceFromLocation
- dane funkcie sa pouzivaju aj pri vykreslovani objektov
- btw. je jedno kolko zeru tuxanci top, na kerneli-2.6.25.* to zralo X a na kerneli 2.6.26 to zere 2*X
 


git-svn-id: http://opensvn.csie.org/tuxanci_ng@159 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 1 insertions, 15 deletions

diff --git a/src/base/gun.c b/src/base/gun.c
index aeb2478..45234af 100644
--- a/src/base/gun.c
+++ b/src/base/gun.c
@@ -19,8 +19,6 @@
 
 #ifndef PUBLIC_SERVER
 #include "interface.h"
-#include "term.h"
-
 #include "screen_world.h"
 #endif
 
@@ -85,13 +83,7 @@ static void addShotTrivial(tux_t *tux, int x, int y, int px, int py, int gun)
 
 	shot = newShot(tux->x + dest_x, tux->y + dest_y, dest_px, dest_py, gun, tux->id);
 
-	if(1)// isFreeSpace(getCurrentArena(), shot->x, shot->y, shot->w, shot->h) )
-	{
-		addObjectToSpace(getCurrentArena()->spaceShot, shot);
-		return;
-	}
-
-	destroyShot(shot);
+	addObjectToSpace(getCurrentArena()->spaceShot, shot);
 }
 
 static void addShot(tux_t *tux,int x, int y, int px, int py)
@@ -261,15 +253,9 @@ static void putInGunMine(tux_t *tux)
 	if( isFreeSpace(getCurrentArena(), x, y, ITEM_MINE_WIDTH, ITEM_MINE_HEIGHT) )
 	{
 		item_t *item;
-
-#ifndef PUBLIC_SERVER
-		char msg[STR_SIZE];
 #ifndef NO_SOUND
 		playSound("put_mine", SOUND_GROUP_BASE);
 #endif
-		sprintf(msg, "tux with id %d pu mine\n", tux->id);
-		appendTextInTerm(msg);
-#endif
 
 		tux->shot[tux->gun]--;