1 files changed, 0 insertions, 610 deletions
diff --git a/src/item.c b/src/item.c
deleted file mode 100644
index 7100e5c..0000000
--- a/src/item.c
+++ /dev/null
@@ -1,610 +0,0 @@
-
-#include <stdlib.h>
-#include <assert.h>
-
-#include "main.h"
-#include "arena.h"
-#include "tux.h"
-#include "item.h"
-#include "shot.h"
-#include "proto.h"
-#include "idManager.h"
-#include "net_multiplayer.h"
-
-#ifndef PUBLIC_SERVER
-#include "interface.h"
-#include "image.h"
-#include "sound.h"
-#include "fake_audio.h"
-#include "layer.h"
-#include "screen_world.h"
-#include "screen_setting.h"
-#include "term.h"
-#endif
-
-#ifdef PUBLIC_SERVER
-#include "publicServer.h"
-#endif
-
-#ifndef PUBLIC_SERVER	
-static SDL_Surface *g_item[ITEM_COUNT];
-#endif
-
-static bool_t isItemInit = FALSE;
-
-bool_t isItemInicialized()
-{
-	return isItemInit;
-}
-
-void initItem()
-{
-#ifndef PUBLIC_SERVER	
-	g_item[GUN_DUAL_SIMPLE] = addImageData("item.dual.png", IMAGE_ALPHA, "item_dual_simple", IMAGE_GROUP_BASE);
-	g_item[GUN_TOMMY] = addImageData("item.tommy.png", IMAGE_ALPHA, "item_tommy_simple", IMAGE_GROUP_BASE);
-	g_item[GUN_SCATTER] = addImageData("item.scatter.png", IMAGE_ALPHA, "item_scatter_simple", IMAGE_GROUP_BASE);
-	g_item[GUN_LASSER] = addImageData("item.lasser.png", IMAGE_ALPHA, "item_lasser_simple", IMAGE_GROUP_BASE);
-	g_item[GUN_MINE] = addImageData("item.mine.png", IMAGE_ALPHA, "item_mines_simple", IMAGE_GROUP_BASE);
-	g_item[GUN_BOMBBALL] = addImageData("item.bombball.png", IMAGE_ALPHA, "item_bombball_simple", IMAGE_GROUP_BASE);
-
-	g_item[ITEM_MINE] = addImageData("mine.png", IMAGE_ALPHA, "item_mine_simple", IMAGE_GROUP_BASE);
-	g_item[ITEM_EXPLOSION] = addImageData("explosion.png", IMAGE_ALPHA, "item_explosion_simple", IMAGE_GROUP_BASE);
-	g_item[ITEM_BIG_EXPLOSION] = addImageData("big-explosion.png", IMAGE_ALPHA, "item_big-explosion_simple", IMAGE_GROUP_BASE);
-	
-	g_item[BONUS_SPEED] = addImageData("item.bonus.speed.png", IMAGE_ALPHA, "item_bonus_speed", IMAGE_GROUP_BASE);
-	g_item[BONUS_SHOT] = addImageData("item.bonus.shot.png", IMAGE_ALPHA, "item_shot_speed", IMAGE_GROUP_BASE);
-	g_item[BONUS_TELEPORT] = addImageData("item.bonus.teleport.png", IMAGE_ALPHA, "item_teleport_speed", IMAGE_GROUP_BASE);
-	g_item[BONUS_GHOST] = addImageData("item.bonus.ghost.png", IMAGE_ALPHA, "item_ghost_speed", IMAGE_GROUP_BASE);
-	g_item[BONUS_4X] = addImageData("item.bonus.4x.png", IMAGE_ALPHA, "item_4x_speed", IMAGE_GROUP_BASE);
-	g_item[BONUS_HIDDEN] = addImageData("item.bonus.hidden.png", IMAGE_ALPHA, "item_hidden_speed", IMAGE_GROUP_BASE);
-#endif
-
-	isItemInit = TRUE;
-}
-
-item_t* newItem(int x, int y, int type, int author_id)
-{
-	item_t *new;
-	
-	new  = malloc( sizeof(item_t) );
-	assert( new != NULL );
-
-	new->type = type;
-
-	new->id = getNewID();
-	new->x = x;
-	new->y = y;
-	new->frame = 0;
-	new->count = 0;
-#ifndef PUBLIC_SERVER	
-	new->img = g_item[type];
-#endif	
-	new->author_id = author_id;
-
-	switch( type )
-	{
-		case GUN_DUAL_SIMPLE :
-		case GUN_SCATTER :
-		case GUN_TOMMY :
-		case GUN_LASSER :
-		case GUN_MINE :
-		case GUN_BOMBBALL :
-			new->w = ITEM_GUN_WIDTH;
-			new->h = ITEM_GUN_HEIGHT;
-		break;
-
-		case ITEM_MINE :
-			new->w = ITEM_MINE_WIDTH;
-			new->h = ITEM_MINE_HEIGHT;
-		break;
-
-		case ITEM_EXPLOSION :
-#ifndef PUBLIC_SERVER	
-			playSound("explozion", SOUND_GROUP_BASE);
-#endif	
-			new->w = ITEM_EXPLOSION_WIDTH;
-			new->h = ITEM_EXPLOSION_HEIGHT;
-		break;
-
-		case ITEM_BIG_EXPLOSION :
-#ifndef PUBLIC_SERVER	
-			playSound("explozion", SOUND_GROUP_BASE);
-#endif	
-			new->w = ITEM_BIG_EXPLOSION_WIDTH;
-			new->h = ITEM_BIG_EXPLOSION_HEIGHT;
-		break;
-
-		case BONUS_SPEED :
-		case BONUS_SHOT :
-		case BONUS_TELEPORT :
-		case BONUS_GHOST :
-		case BONUS_4X :
-		case BONUS_HIDDEN :
-			new->w = ITEM_BONUS_WIDTH;
-			new->h = ITEM_BONUS_HEIGHT;
-		break;
-	}
-
-	return new;
-}
-
-/*
-item_t* getItemID(list_t *listItem, int id)
-{
-	item_t *thisItem;
-	int i;
-
-	assert( listItem != NULL );
-
-	for( i = 0 ; i < listItem->count ; i++ )
-	{
-		thisItem  = (item_t *)listItem->list[i];
-		assert( thisItem != NULL );
-
-		if( thisItem->id == id )
-		{
-			return thisItem;
-		}
-	}
-
-	return NULL;
-}
-*/
-
-void getStatusItem(void *p, int *id, int *x, int *y ,int *w, int *h)
-{
-	item_t *item;
-
-	item = p;
-
-	*id = item->id;
-	*x = item->x;
-	*y = item->y;
-	*w = item->w;
-	*h = item->h;
-}
-
-void setStatusItem(void *p, int x, int y, int w, int h)
-{
-	item_t *item;
-
-	item = p;
-	item->x = x;
-	item->y = y;
-	item->w = w;
-	item->h = h;
-}
-
-void replaceItemID(item_t *item, int id)
-{
-	replaceID(item->id, id);
-	item->id = id;
-}
-
-void addNewItem(space_t *spaceItem, int author_id)
-{
-#ifndef PUBLIC_SERVER
-	char msg[STR_SIZE];
-#endif
-	arena_t *arena;
-	item_t *item;
-	int new_x, new_y;
-	int type;
-
-#ifndef PUBLIC_SERVER	
-	if( isSettingAnyItem() == FALSE ||
-	    getNetTypeGame() == NET_GAME_TYPE_CLIENT )
-	{
-		return;
-	}
-#endif
-
-	arena = getCurrentArena();
-	findFreeSpace(getCurrentArena(), &new_x, &new_y, ITEM_GUN_WIDTH, ITEM_GUN_HEIGHT);
-
-	type = GUN_DUAL_SIMPLE;
-
-#ifndef PUBLIC_SERVER
-	do{
-#endif
-		switch( random() % 12 )
-		{
-			case 0 : type = GUN_DUAL_SIMPLE;
-			break;
-			case 1 : type = GUN_SCATTER;
-			break;
-			case 2 : type = GUN_TOMMY;
-			break;
-			case 3 : type = GUN_MINE;
-			break;
-			case 4 : type = GUN_LASSER;
-			break;
-			case 5 : type = GUN_BOMBBALL;
-			break;
-			case 6 : type = BONUS_SPEED;
-			break;
-			case 7 : type = BONUS_SHOT;
-			break;
-			case 8 : type = BONUS_TELEPORT;
-			break;
-			case 9 : type = BONUS_GHOST;
-			break;
-			case 10 : type = BONUS_4X;
-			break;
-			case 11 : type = BONUS_HIDDEN;
-			break;
-		}
-#ifndef PUBLIC_SERVER
-	}while( isSettingItem(type) == FALSE ||
-	        (getNetTypeGame() == NET_GAME_TYPE_NONE && type == BONUS_HIDDEN) );
-#endif
-
-	item = newItem(new_x, new_y, type, author_id);
-	addObjectToSpace(spaceItem, item);
-
-	if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-	{
-		proto_send_additem_server(PROTO_SEND_ALL, NULL, item);
-	}
-
-#ifndef PUBLIC_SERVER
-	sprintf(msg, "in arena is new item\n");
-	appendTextInTerm(msg);
-#endif
-
-}
-
-#ifndef PUBLIC_SERVER	
-
-void drawItem(item_t *p)
-{
-	assert( p != NULL );
-
-	addLayer(p->img, p->x, p->y, p->frame * p->w, 0, p->w, p->h, TUX_LAYER);
-}
-
-void drawListItem(list_t *listItem)
-{
-	item_t *thisItem;
-	int i;
-
-	assert( listItem != NULL );
-
-	for( i = 0 ; i < listItem->count ; i++ )
-	{
-		thisItem  = (item_t *)listItem->list[i];
-		assert( thisItem != NULL );
-		drawItem(thisItem);
-	}
-}
-
-#endif
-
-void eventListItem(space_t *spaceItem)
-{
-	my_time_t currentTime;
-	item_t *thisItem;
-	int i;
-
-	currentTime = getMyTime();
-
-	assert( spaceItem != NULL );
-
-	for( i = 0 ; i < spaceItem->list->count ; i++ )
-	{
-		thisItem  = (item_t *)spaceItem->list->list[i];
-		assert( thisItem != NULL );
-
-		thisItem->count++;
-	
-		if( thisItem->count == ITEM_MAX_COUNT )
-		{
-			thisItem->count = 0;
-			thisItem->frame++;
-		}
-
-		switch( thisItem->type )
-		{
-			case GUN_TOMMY :
-			case GUN_DUAL_SIMPLE :
-			case GUN_SCATTER  :
-			case GUN_LASSER :
-			case GUN_MINE :
-			case GUN_BOMBBALL :
-				if( thisItem->frame == ITEM_GUN_MAX_FRAME )
-				{
-					thisItem->frame = 0;
-				}
-			break;
-
-			case ITEM_MINE :
-				if( thisItem->frame == ITEM_MINE_MAX_FRAME )
-				{
-					thisItem->frame = 0;
-				}
-			break;
-
-			case ITEM_EXPLOSION :
-			case ITEM_BIG_EXPLOSION :
-				if( thisItem->frame == ITEM_EXPLOSION_MAX_FRAME )
-				{
-					delObjectFromSpaceWithObject(spaceItem, thisItem, destroyItem);
-					i--;
-				}
-			break;
-
-			case BONUS_SPEED :
-			case BONUS_SHOT :
-			case BONUS_TELEPORT :
-			case BONUS_GHOST :
-			case BONUS_4X :
-			case BONUS_HIDDEN :
-				if( thisItem->frame == ITEM_GUN_MAX_FRAME )
-				{
-					thisItem->frame = 0;
-				}
-			break;
-		}
-	}
-}
-
-void mineExplosion(space_t *spaceItem, item_t *item)
-{
-	if( getNetTypeGame() != NET_GAME_TYPE_CLIENT )
-	{
-		int x, y;
-		item_t *item_explosion;
-
-		x = ( item->x + item->w/2 ) - ITEM_BIG_EXPLOSION_WIDTH/2;
-		y = ( item->y + item->h/2 ) - ITEM_BIG_EXPLOSION_HEIGHT/2;
-
-		item_explosion = newItem(x, y, ITEM_BIG_EXPLOSION, item->author_id);
-
-		if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-		{
-			proto_send_additem_server(PROTO_SEND_ALL, NULL, item_explosion);
-		}
-
-		addObjectToSpace(spaceItem, item_explosion );
-	}
-
-	if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-	{
-			proto_send_del_server(PROTO_SEND_ALL, NULL, item->id);
-	}
-
-	delObjectFromSpaceWithObject(spaceItem, item, destroyItem);
-}
-
-void eventConflictShotWithItem(arena_t *arena)
-{
-	shot_t *thisShot;
-	item_t *thisItem;
-	int i, j;
-
-	if( getNetTypeGame() == NET_GAME_TYPE_CLIENT )
-	{
-		return; 
-	}
-
-	for( i = 0 ; i < arena->spaceShot->list->count ; i++ )
-	{
-		bool_t isDelShot;
-
-		isDelShot = FALSE;
-		thisShot  = (shot_t *)arena->spaceShot->list->list[i];
-		assert( thisShot != NULL );
-
-		listDoEmpty(listHelp);
-		getObjectFromSpace(arena->spaceItem, thisShot->x, thisShot->y, thisShot->w, thisShot->h, listHelp);
-
-		for( j = 0 ; j < listHelp->count ; j++ )
-		{
-			thisItem  = (item_t *)listHelp->list[j];
-			assert( thisItem != NULL );
-
-			switch( thisItem->type )
-			{
-				case ITEM_MINE :
-					if( getNetTypeGame() != NET_GAME_TYPE_CLIENT )
-					{
-						mineExplosion(arena->spaceItem, thisItem);
-					}
-				break;
-	
-				case ITEM_EXPLOSION :
-				case ITEM_BIG_EXPLOSION :
-					isDelShot = TRUE;	
-				break;
-			}
-		}
-
-		if( isDelShot )
-		{
-			if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-			{
-				proto_send_del_server(PROTO_SEND_ALL, NULL, thisShot->id);
-			}
-	
-			delObjectFromSpaceWithObject(arena->spaceShot, thisShot, destroyShot);
-			i--;
-		}
-	}
-}
-
-static void eventTuxIsDeadWithItem(tux_t *tux, item_t *item)
-{
-	if( tux->bonus == BONUS_GHOST )
-	{
-		return;
-	}
-
-	if( tux->bonus == BONUS_TELEPORT )
-	{
-		tuxTeleport(tux);
-		return;
-	}
-
-	if( item->author_id != tux->id )
-	{
-		tux_t *author;
-
-		author = getObjectFromSpaceWithID(getCurrentArena()->spaceTux, item->author_id);
-
-		if( author != NULL )
-		{
-			author->score++;
-	
-			if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-			{
-				proto_send_newtux_server(PROTO_SEND_ALL, NULL, author);
-			}
-		}
-	}
-
-	countRoundInc();
-	eventTuxIsDead(tux);
-}
-
-static void tuxGiveBonus(tux_t *tux, item_t *item)
-{
-#ifndef PUBLIC_SERVER	
-	char msg[STR_SIZE];
-	playSound("item_bonus", SOUND_GROUP_BASE);
-#endif
-	tux->bonus = item->type;
-	tux->bonus_time = TUX_MAX_BONUS;
-
-#ifndef PUBLIC_SERVER
-	sprintf(msg, "tux with id %d bonus enabled\n", tux->id);
-	appendTextInTerm(msg);
-#endif
-
-	if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-	{
-		proto_send_newtux_server(PROTO_SEND_ALL, NULL, tux);
-	}
-}
-
-static void tuxGiveGun(tux_t *tux, item_t *item)
-{
-#ifndef PUBLIC_SERVER	
-	char msg[STR_SIZE];
-	playSound("item_gun", SOUND_GROUP_BASE);
-#endif
-
-	tux->pickup_time = 0;
-	tux->shot[ item->type ] += GUN_MAX_SHOT;
-	tux->gun = item->type;
-
-#ifndef PUBLIC_SERVER
-	sprintf(msg, "tux with id %d has new gun\n", tux->id);
-	appendTextInTerm(msg);
-#endif
-
-	if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-	{
-		proto_send_newtux_server(PROTO_SEND_ALL, NULL, tux);
-	}
-}
-
-void eventGiveTuxItem(tux_t *tux, item_t *item, space_t *spaceItem)
-{
-	switch( item->type )
-	{
-		case GUN_TOMMY :
-		case GUN_DUAL_SIMPLE :
-		case GUN_SCATTER :
-		case GUN_LASSER :
-		case GUN_MINE :
-		case GUN_BOMBBALL :
-			tuxGiveGun(tux, item);
-
-			if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-			{
-				proto_send_del_server(PROTO_SEND_ALL, NULL, item->id);
-			}
-
-			delObjectFromSpaceWithObject(spaceItem, item, destroyItem);
-		break;
-
-		case ITEM_MINE :
-			if( tux->bonus != BONUS_GHOST )
-			{
-				mineExplosion(spaceItem, item);
-			}
-		break;
-
-		case ITEM_EXPLOSION :
-		case ITEM_BIG_EXPLOSION :
-			eventTuxIsDeadWithItem(tux, item);
-		break;
-
-		case BONUS_SPEED :
-		case BONUS_SHOT :
-		case BONUS_TELEPORT :
-		case BONUS_GHOST :
-		case BONUS_4X :
-		case BONUS_HIDDEN :
-			tuxGiveBonus(tux, item);
-			
-			if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-			{
-				proto_send_del_server(PROTO_SEND_ALL, NULL, item->id);
-			}
-			
-			delObjectFromSpaceWithObject(spaceItem, item, destroyItem);
-		break;
-	}
-}
-
-void eventGiveTuxListItem(tux_t *tux, space_t *spaceItem)
-{
-	item_t *thisItem;
-	int x, y, w, h;
-	int i;
-
-	if( getNetTypeGame() == NET_GAME_TYPE_CLIENT )
-	{
-		return; 
-	}
-
-	assert( spaceItem != NULL );
-	assert( tux != NULL );
-
-	if( tux->status == TUX_STATUS_DEAD )
-	{
-		return;
-	}
-
-	getTuxProportion(tux, &x, &y, &w, &h);
-	
-	listDoEmpty(listHelp);
-	getObjectFromSpace(spaceItem, x, y, w, h, listHelp);
-
-	for( i = 0 ; i < listHelp->count ; i++ )
-	{
-		thisItem  = (item_t *)listHelp->list[i];
-		assert( thisItem != NULL );
-
-		eventGiveTuxItem(tux, thisItem, spaceItem);
-
-		if( getNetTypeGame() == NET_GAME_TYPE_SERVER )
-		{
-			//proto_send_item_server(PROTO_SEND_ALL, NULL, tux, thisItem);
-			proto_send_newtux_server(PROTO_SEND_ALL, NULL, tux);
-		}
-	}
-}
-
-void destroyItem(item_t *p)
-{
-	assert( p != NULL );
-	delID(p->id);
-	free(p);
-}
-
-void quitItem()
-{
-	isItemInit = FALSE;
-}