No OneTemporary
Actions

Authored By

Unknown

Size

104 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/ArtefactDescriptionEntity.cpp b/src/ArtefactDescriptionEntity.cpp
	index 3d6c992..e8a2eb2 100644
	--- a/src/ArtefactDescriptionEntity.cpp
	+++ b/src/ArtefactDescriptionEntity.cpp
	@@ -1,122 +1,122 @@
	#include "ArtefactDescriptionEntity.h"
	#include "Constants.h"
	#include "sfml_game/ImageManager.h"
	#include "WitchBlastGame.h"
	#include "Items.h"

	ArtefactDescriptionEntity::ArtefactDescriptionEntity(enumItemType itemType)
	: SpriteEntity (ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP), 0, 0, ITEM_WIDTH, ITEM_HEIGHT)
	{
	this->setLifetime(6.0f);

	- this->setFrame(itemType - itemMagicianHat);
	+ this->setFrame(itemType - FirstEquipItem);
	this->setType(ENTITY_ARTIFACT_DESCRIPTION);

	float x0 = OFFSET_X + MAP_WIDTH * TILE_WIDTH * 0.5f - ARTEFACT_RECT_WIDTH * 0.5f;

	rectangle.setSize(sf::Vector2f(ARTEFACT_RECT_WIDTH, ARTEFACT_RECT_HEIGHT));
	rectangle.setPosition(sf::Vector2f(x0, ARTEFACT_POS_Y));
	rectangle.setFillColor(sf::Color(20, 20, 70, 180));

	rectangleBorder.setSize(sf::Vector2f(ARTEFACT_RECT_WIDTH + ARTEFACT_BORDER * 2.0f,
	ARTEFACT_RECT_HEIGHT + ARTEFACT_BORDER * 2.0f));
	rectangleBorder.setPosition(sf::Vector2f(x0 - ARTEFACT_BORDER, ARTEFACT_POS_Y - ARTEFACT_BORDER));
	rectangleBorder.setFillColor(sf::Color(255, 255, 255, 180));

	this->x = x0 + 50.0f;
	this->y = 500.0f;
	sprite.setScale(3.5f, 3.5f);

	z = 5000.0f;

	/*switch (itemType)
	{
	case (ItemEntity::itemMagicianHat):
	artefactName = "Enchanter Hat"; artefactDescription = "Increases fire rate"; break;
	case (ItemEntity::itemLeatherBoots):
	artefactName = "Leather Boots"; artefactDescription = "Increases speed"; break;
	case (ItemEntity::itemBookDualShots):
	artefactName = "Spell : Dual Bolts"; artefactDescription = "Shoots two bolts"; break;
	case (ItemEntity::itemConcentrationAmulet):
	artefactName = "Concentration Amulet"; artefactDescription = "Increases fire range"; break;
	case (ItemEntity::itemBossKey):
	artefactName = "Boss Key"; artefactDescription = "Open the boss gate"; break;
	case (ItemEntity::itemVibrationGloves):
	artefactName = "Vibration Gloves"; artefactDescription = "Vibrations + slighty increases fire rate"; break;
	case (ItemEntity::itemMahoganyStaff):
	artefactName = "Mahogany Staff"; artefactDescription = "Increases bolt's speed and damages"; break;
	case (ItemEntity::itemFairy):
	artefactName = "Fairy"; artefactDescription = "Help you in the dungeon"; break;
	case (ItemEntity::itemLeatherBelt):
	artefactName = "Leather Belt"; artefactDescription = "Increases fire rate"; break;
	case (ItemEntity::itemBloodSnake):
	artefactName = "Blood Snake"; artefactDescription = "Increases damages"; break;
	default: break;
	}*/

	if (items[itemType].type == itemType)
	{
	artefactName = items[itemType].name;
	artefactDescription = items[itemType].description;
	}
	else
	{
	artefactName = "Unknown";
	artefactDescription = "Report to developper";
	}
	}

	ArtefactDescriptionEntity::~ArtefactDescriptionEntity()
	{
	}

	void ArtefactDescriptionEntity::animate(float delay)
	{

	if (age < ARTEFACT_ZOOM_TIME)
	{
	float perc = 1.0f - age / ARTEFACT_ZOOM_TIME;
	sprite.setScale(3.5f + perc * 50.0f, 3.5f + perc * 50.0f);
	}
	else
	{
	sprite.setScale(3.5f, 3.5f);
	}
	SpriteEntity::animate(delay);
	}

	void ArtefactDescriptionEntity::render(sf::RenderWindow* app)
	{
	int nx = frame;
	int ny = 0;

	if (imagesProLine > 0)
	{
	nx = frame % imagesProLine;
	ny = frame / imagesProLine;
	}

	sprite.setTextureRect(sf::IntRect(nx * width, ny * height, /(nx + 1) / width, /(ny + 1) */ height));

	sprite.setPosition(x, y);
	sprite.setRotation(angle);

	if (isFading)
	{
	sprite.setColor(sf::Color(255, 255, 255, (sf::Uint8)(getFade() * 255)));
	}

	if (isShrinking)
	{
	sprite.setScale(getFade(), getFade());
	}


	app->draw(rectangleBorder);
	app->draw(rectangle);

	app->draw(sprite);

	game().Write(artefactName, 22, 315.0f, ARTEFACT_POS_Y + 15.0f, ALIGN_LEFT, sf::Color(255, 255, 255));
	game().Write(artefactDescription, 20, 315.0f, ARTEFACT_POS_Y + 55.0f, ALIGN_LEFT, sf::Color(255, 255, 255));
	}
	diff --git a/src/ChestEntity.cpp b/src/ChestEntity.cpp
	index 87835cf..4c2cf26 100644
	--- a/src/ChestEntity.cpp
	+++ b/src/ChestEntity.cpp
	@@ -1,82 +1,82 @@
	#include "ChestEntity.h"
	#include "PlayerEntity.h"
	#include "WitchBlastGame.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "sfml_game/SpriteEntity.h"
	#include "Constants.h"

	ChestEntity::ChestEntity(float x, float y, int chestType, bool isOpen)
	: CollidingSpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CHEST), x, y, 48, 48)
	{
	type = ENTITY_CHEST;
	imagesProLine = 2;
	this->isOpen = isOpen;
	this->chestType = chestType;
	frame = chestType * 2 + (isOpen ? 1 : 0);
	setMap(game().getCurrentMap(), TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}

	bool ChestEntity::getOpened()
	{
	return isOpen;
	}

	int ChestEntity::getChestType()
	{
	return chestType;
	}

	void ChestEntity::animate(float delay)
	{
	CollidingSpriteEntity::animate(delay);
	if (!isOpen) testSpriteCollisions();
	z = y + height/2;
	}

	void ChestEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2;
	boundingBox.width = width;
	boundingBox.top = (int)y - height / 2;
	boundingBox.height = height;
	}


	void ChestEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);

	if (collideWithEntity(entity))
	{
	if (!isOpen && playerEntity != NULL && !playerEntity->isDead())
	{
	open();
	frame += 1;
	}
	}
	}

	void ChestEntity::open()
	{
	isOpen = true;
	SoundManager::getSoundManager()->playSound(SOUND_CHEST_OPENING);

	if (chestType == CHEST_BASIC)
	{
	for (int i = 0; i < 5; i++)
	{
	- ItemEntity* newItem = new ItemEntity(itemCopperCoin, x, y);
	+ ItemEntity* newItem = new ItemEntity(ItemCopperCoin, x, y);
	newItem->setVelocity(Vector2D(50.0f + rand()% 150));
	newItem->setViscosity(0.96f);
	}
	}
	else if (chestType == CHEST_FAIRY)
	{
	- ItemEntity* newItem = new ItemEntity(itemFairy, x, y);
	+ ItemEntity* newItem = new ItemEntity(ItemFairy, x, y);
	newItem->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	newItem->setVelocity(Vector2D(50.0f + rand()% 150));
	newItem->setViscosity(0.96f);
	}
	}

	diff --git a/src/DungeonMap.cpp b/src/DungeonMap.cpp
	index da32581..2f2d35b 100644
	--- a/src/DungeonMap.cpp
	+++ b/src/DungeonMap.cpp
	@@ -1,478 +1,478 @@
	#include "DungeonMap.h"
	#include "GameFloor.h"
	#include "ItemEntity.h"
	#include "ChestEntity.h"
	#include "sfml_game/ImageManager.h"
	#include <cstdlib>
	#include <stdio.h>
	#include <iostream>

	DungeonMap::DungeonMap(int width, int height) : GameMap(width, height)
	{

	}

	DungeonMap::DungeonMap(GameFloor* gameFloor, int x, int y) : GameMap(MAP_WIDTH, MAP_HEIGHT)
	{
	this->gameFloor = gameFloor;
	this->x = x;
	this->y = y;
	cleared = false;
	visited = false;
	known = false;
	}

	DungeonMap::~DungeonMap()
	{
	//dtor
	}

	bool DungeonMap::isVisited()
	{
	return visited;
	}

	void DungeonMap::setVisited(bool b)
	{
	visited = b;
	}

	bool DungeonMap::isKnown()
	{
	return known;
	}

	void DungeonMap::setKnown(bool b)
	{
	known = b;
	}

	bool DungeonMap::isCleared()
	{
	return cleared;
	}

	void DungeonMap::setCleared(bool b)
	{
	cleared = b;
	}

	roomTypeEnum DungeonMap::getRoomType()
	{
	return roomType;
	}

	void DungeonMap::setRoomType(roomTypeEnum roomType)
	{
	this->roomType = roomType;
	}

	std::list<DungeonMap::itemListElement> DungeonMap::getItemList()
	{
	return (itemList);
	}

	std::list<DungeonMap::chestListElement> DungeonMap::getChestList()
	{
	return (chestList);
	}

	std::list<DungeonMap::spriteListElement> DungeonMap::getSpriteList()
	{
	return (spriteList);
	}


	void DungeonMap::displayToConsole()
	{
	for (int j=0; j < MAP_HEIGHT; j++)
	{
	for (int i=0; i < MAP_WIDTH; i++)
	{
	printf("%d", map[i][j]);
	}
	printf("\n");
	}
	printf("\n");
	}

	bool DungeonMap::isDownBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isUpBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isLeftBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isRightBlocking(int x, int y)
	{
	if (!inMap(x, y)) return false;
	if (map[x][y] >= MAP_WALL) return true;
	return false;
	}

	bool DungeonMap::isWalkable(int x, int y)
	{
	return (map[x][y] < MAP_WALL);
	}

	void DungeonMap::randomize(int n)
	{
	int i, j;
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;

	initRoom();

	// bonus
	if (n == 5)
	{
	roomType = roomTypeBonus;
	}
	// others
	else if (n > 0)
	{
	int r = rand() % 4;

	if (r == 0) // corner blocks
	{
	map[1][1] = 4;
	map[1][MAP_HEIGHT -2] = 4;
	map[MAP_WIDTH - 2][1] = 4;
	map[MAP_WIDTH - 2][MAP_HEIGHT -2] = 4;
	}

	else if (r == 1) // bloc in the middle
	{
	for (i = x0-1; i <= x0+1; i++)
	for (j = y0-1; j <= y0+1; j++)
	map[i][j] = 4;
	}

	else if (r == 2) // checker
	{
	for (i = 2; i < MAP_WIDTH - 2; i = i + 2)
	for (j = 2; j < MAP_HEIGHT - 2; j = j + 2)
	map[i][j] = 4;
	}

	cleared = false;
	roomType = (roomTypeEnum)(rand() % 3);
	}
	else
	{
	cleared = true;
	}
	}

	int DungeonMap::hasNeighbourLeft()
	{
	if (x > 0 && gameFloor->getRoom(x-1, y) > 0)
	{
	if (gameFloor->getRoom(x-1, y) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}
	int DungeonMap::hasNeighbourRight()
	{
	if (x < MAP_WIDTH -1 && gameFloor->getRoom(x+1, y) > 0)
	{
	if (gameFloor->getRoom(x+1, y) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}
	int DungeonMap::hasNeighbourUp()
	{
	if (y > 0 && gameFloor->getRoom(x, y-1) > 0)
	{
	if (gameFloor->getRoom(x, y-1) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}
	int DungeonMap::hasNeighbourDown()
	{
	if (y < MAP_HEIGHT -1 && gameFloor->getRoom(x, y+1) > 0)
	{
	if (gameFloor->getRoom(x, y+1) == roomTypeBoss) return 2;
	else return 1;
	}
	return 0;
	}

	void DungeonMap::initRoom()
	{
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;
	int i, j;

	map[0][0] = MAP_WALL_7;
	for ( i = 1 ; i < width -1 ; i++)
	{
	map[i][0] = MAP_WALL_8;
	map[i][height - 1] = MAP_WALL_2;
	}
	map[width - 1][0] = MAP_WALL_9;
	for ( int i = 1 ; i < height -1 ; i++)
	{
	map[0][i] = MAP_WALL_4;
	map[width - 1][i] = MAP_WALL_6;
	}
	map[0][height - 1] = MAP_WALL_1;
	map[width - 1][height - 1] = MAP_WALL_3;



	for ( i = 1 ; i < width - 1 ; i++)
	for ( j = 1 ; j < height - 1 ; j++)
	{
	map[i][j] = 0;
	if (rand()%8 == 0) map[i][j] = rand()%(MAP_NORMAL_FLOOR + 1);
	}

	if (gameFloor != NULL)
	{

	if (x > 0 && gameFloor->getRoom(x-1, y) > 0)
	{
	//map[0][y0-1] = 0;
	map[0][y0] = 0;
	//map[0][y0+1] = 0;
	}
	if (x < MAP_WIDTH -1 && gameFloor->getRoom(x+1, y) > 0)
	{
	//map[MAP_WIDTH -1][y0-1] = 0;
	map[MAP_WIDTH -1][y0] = 0;
	//map[MAP_WIDTH -1][y0+1] = 0;
	}
	if (y > 0 && gameFloor->getRoom(x, y-1) > 0)
	{
	//map[x0-1][0] = 0;
	map[x0][0] = 0;
	//map[x0+1][0] = 0;
	}
	if (y < MAP_HEIGHT -1 && gameFloor->getRoom(x, y+1) > 0)
	{
	//map[x0-1][MAP_HEIGHT -1] = 0;
	map[x0][MAP_HEIGHT -1] = 0;
	//map[x0+1][MAP_HEIGHT -1] = 0;
	}
	}
	}

	Vector2D DungeonMap::generateBonusRoom()
	{
	initRoom();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;

	map[x0 - 1][y0 - 1] = MAP_WALL;
	map[x0 - 1][y0 + 1] = MAP_WALL;
	map[x0 + 1][y0 - 1] = MAP_WALL;
	map[x0 + 1][y0 + 1] = MAP_WALL;

	return (Vector2D(OFFSET_X + x0 * TILE_WIDTH + TILE_WIDTH / 2, OFFSET_Y + y0 * TILE_HEIGHT + TILE_HEIGHT / 2));
	}

	void DungeonMap::generateCarpet(int x0, int y0, int w, int h, int n)
	{
	int xf = x0 + w - 1;
	int yf = y0 + h - 1;

	map[x0][y0] = n;
	map[x0][yf] = n + 6;
	map[xf][y0] = n + 2;
	map[xf][yf] = n + 8;

	int i, j;
	for (i = x0 + 1; i <= xf - 1; i++)
	{
	map[i][y0] = n + 1;
	map[i][yf] = n + 7;
	for (j = y0 + 1; j <= yf - 1; j++)
	map[i][j] = n + 4;
	}

	for (j = y0 + 1; j <= yf - 1; j++)
	{
	map[x0][j] = n + 3;
	map[xf][j] = n + 5;
	}
	}

	Vector2D DungeonMap::generateMerchantRoom()
	{
	initRoom();
	int x0 = 3;
	int y0 = 3;

	generateCarpet(3, 3, 9, 3, 20);


	return (Vector2D(OFFSET_X + x0 * TILE_WIDTH + TILE_WIDTH / 2, OFFSET_Y + y0 * TILE_HEIGHT + TILE_HEIGHT / 2));
	}

	Vector2D DungeonMap::generateKeyRoom()
	{
	initRoom();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;

	for (int i = x0 - 1; i <= x0 + 1; i++)
	for (int j = y0 - 1; j <= y0 + 1; j++)
	map[i][j] = MAP_WALL;

	map[x0][y0] = 0;
	map[x0][y0+1] = MAP_DOOR;

	return (Vector2D(OFFSET_X + x0 * TILE_WIDTH + TILE_WIDTH / 2, OFFSET_Y + y0 * TILE_HEIGHT + TILE_HEIGHT / 2));
	}

	void DungeonMap::generateRoom(int type)
	{
	initRoom();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;
	int i, j, r;

	if (type == 0)
	{
	if (roomType == roomTypeStarting)
	generateCarpet(5, 3, 5, 3, 30);
	}
	if (type == 1)
	{
	// corner block
	map[1][1] = MAP_WALL;
	map[1][MAP_HEIGHT -2] = MAP_WALL;
	map[MAP_WIDTH - 2][1] = MAP_WALL;
	map[MAP_WIDTH - 2][MAP_HEIGHT -2] = MAP_WALL;
	}
	if (type == 2)
	{
	r = 1 + rand() % 3;
	for (i = x0 - r; i <= x0 + r; i++)
	for (j = y0 - 1; j <= y0 + 1; j++)
	map[i][j] = MAP_WALL;
	}
	}

	void DungeonMap::addItem(int itemType, float x, float y, bool merch)
	{
	itemListElement ilm;
	ilm.type = itemType;
	ilm.x = x;
	ilm.y = y;
	ilm.merch = merch;
	itemList.push_back(ilm);
	}

	void DungeonMap::addSprite(int spriteType, int frame, float x, float y, float scale)
	{
	spriteListElement slm;
	slm.type = spriteType;
	slm.frame = frame;
	slm.x = x;
	slm.y = y;
	slm.scale = scale;
	spriteList.push_back(slm);
	}

	void DungeonMap::addChest(int chestType, bool state, float x, float y)
	{
	chestListElement clm;
	clm.type = chestType;
	clm.state = state;
	clm.x = x;
	clm.y = y;
	chestList.push_back(clm);
	}

	void DungeonMap::restoreItems()
	{
	ItemList::iterator it;
	for (it = itemList.begin (); it != itemList.end ();)
	{
	itemListElement ilm = *it;
	it++;

	ItemEntity* itemEntity = new ItemEntity((enumItemType)(ilm.type), ilm.x, ilm.y);
	itemEntity->setMerchandise(ilm.merch);
	}
	itemList.clear();
	}

	void DungeonMap::restoreSprites()
	{
	SpriteList::iterator it;

	for (it = spriteList.begin (); it != spriteList.end ();)
	{
	spriteListElement ilm = *it;
	it++;

	if (ilm.type == ENTITY_BLOOD)
	{
	SpriteEntity* blood = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BLOOD), ilm.x, ilm.y, 16, 16, 6);
	blood->setZ(OFFSET_Y - 1);
	blood->setFrame(ilm.frame);
	blood->setType(ENTITY_BLOOD);
	blood->setScale(ilm.scale, ilm.scale);
	}
	else if (ilm.type == ENTITY_CORPSE)
	{
	SpriteEntity* corpse;

	if (ilm.frame >= FRAME_CORPSE_KING_RAT)
	{
	corpse = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES_BIG), ilm.x, ilm.y, 128, 128);
	corpse->setFrame(ilm.frame - FRAME_CORPSE_KING_RAT);
	}
	else
	{
	corpse = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_CORPSES), ilm.x, ilm.y, 64, 64);
	corpse->setFrame(ilm.frame);
	}

	corpse->setZ(OFFSET_Y);
	corpse->setType(ENTITY_CORPSE);
	}
	}
	spriteList.clear();
	}

	void DungeonMap::restoreChests()
	{
	ChestList::iterator it;

	for (it = chestList.begin (); it != chestList.end ();)
	{
	chestListElement clm = *it;
	it++;

	- ChestEntity* chestEntity = new ChestEntity(clm.x, clm.y, clm.type, clm.state);
	+ new ChestEntity(clm.x, clm.y, clm.type, clm.state);
	}
	chestList.clear();
	}

	void DungeonMap::restoreMapObjects()
	{
	restoreItems();
	restoreSprites();
	restoreChests();
	}
	diff --git a/src/EnnemyEntity.cpp b/src/EnnemyEntity.cpp
	index 56d2d11..b46d611 100644
	--- a/src/EnnemyEntity.cpp
	+++ b/src/EnnemyEntity.cpp
	@@ -1,124 +1,124 @@
	#include "EnnemyEntity.h"
	#include "BoltEntity.h"
	#include "PlayerEntity.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include <iostream>
	#include "WitchBlastGame.h"

	EnnemyEntity::EnnemyEntity(sf::Texture* image, float x, float y)
	: BaseCreatureEntity (image, x, y, 64, 64)
	{
	type = ENTITY_ENNEMY;
	bloodColor = bloodRed;

	z = y;
	age = -0.001f * (rand()%800) - 0.4f;
	}

	void EnnemyEntity::animate(float delay)
	{
	if (canCollide()) testSpriteCollisions();
	if (age > 0.0f)
	BaseCreatureEntity::animate(delay);
	else
	age += delay;
	}

	void EnnemyEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2;
	boundingBox.width = width;
	boundingBox.top = (int)y - height / 2;
	boundingBox.height = height;
	}

	void EnnemyEntity::collideMapRight()
	{
	velocity.x = 0.0f;
	}

	void EnnemyEntity::collideMapLeft()
	{
	velocity.x = 0.0f;
	}

	void EnnemyEntity::collideMapTop()
	{
	velocity.y = 0.0f;
	}

	void EnnemyEntity::collideMapBottom()
	{
	velocity.y = 0.0f;
	}

	void EnnemyEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	if (collideWithEntity(entity) &&
	(entity->getType() == ENTITY_PLAYER \|\| entity->getType() == ENTITY_BOLT ))
	{
	PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);
	BoltEntity* boltEntity = dynamic_cast<BoltEntity*>(entity);

	if (playerEntity != NULL && !playerEntity->isDead())
	{
	- if (playerEntity->hurt(meleeDamages))
	+ if (playerEntity->hurt(meleeDamages, BoltStandard))
	{
	float xs = (x + playerEntity->getX()) / 2;
	float ys = (y + playerEntity->getY()) / 2;
	SpriteEntity* star = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_STAR_2), xs, ys);
	star->setFading(true);
	star->setZ(y+ 100);
	star->setLifetime(0.7f);
	star->setType(16);
	star->setSpin(400.0f);
	}
	}

	else if (boltEntity != NULL && !boltEntity->getDying() && boltEntity->getAge() > 0.05f)
	{
	boltEntity->collide();
	hurt(boltEntity->getDamages(), boltEntity->getBoltType());
	game().generateBlood(x, y, bloodColor);
	SoundManager::getSoundManager()->playSound(SOUND_IMPACT);

	float xs = (x + boltEntity->getX()) / 2;
	float ys = (y + boltEntity->getY()) / 2;
	SpriteEntity* star = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_STAR_2), xs, ys);
	star->setFading(true);
	star->setZ(y+ 100);
	star->setLifetime(0.7f);
	star->setType(16);
	star->setSpin(400.0f);
	}
	}
	}

	void EnnemyEntity::dying()
	{
	isDying = true;
	SpriteEntity* deadRat = new SpriteEntity(ImageManager::getImageManager()->getImage(3), x, y, 64, 64);
	//deadRat->setZ(y + height);
	deadRat->setZ(OFFSET_Y);
	deadRat->setFrame(2);
	deadRat->setType(13);
	}

	void EnnemyEntity::drop()
	{
	if (rand() % 5 == 0)
	{
	- ItemEntity* newItem = new ItemEntity(itemCopperCoin, x, y);
	+ ItemEntity* newItem = new ItemEntity(ItemCopperCoin, x, y);
	newItem->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	newItem->setVelocity(Vector2D(100.0f + rand()% 250));
	newItem->setViscosity(0.96f);
	}
	}

	bool EnnemyEntity::canCollide()
	{
	return true;
	}
	diff --git a/src/ItemEntity.cpp b/src/ItemEntity.cpp
	index abdd9af..d0a78d4 100644
	--- a/src/ItemEntity.cpp
	+++ b/src/ItemEntity.cpp
	@@ -1,137 +1,137 @@
	#include "ItemEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SpriteEntity.h"
	#include "Constants.h"
	#include "MagnetEntity.h"
	#include "WitchBlastGame.h"
	#include <iostream>
	#include <sstream>



	ItemEntity::ItemEntity(enumItemType itemType, float x, float y)
	- : CollidingSpriteEntity(ImageManager::getImageManager()->getImage(itemType >= itemMagicianHat ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS), x, y, ITEM_WIDTH, ITEM_HEIGHT)
	+ : CollidingSpriteEntity(ImageManager::getImageManager()->getImage(itemType >= FirstEquipItem ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS), x, y, ITEM_WIDTH, ITEM_HEIGHT)
	{
	type = ENTITY_ITEM;
	this->itemType = itemType;
	frame = itemType;
	- if (itemType >= itemMagicianHat) frame = itemType - itemMagicianHat;
	+ if (itemType >= FirstEquipItem) frame = itemType - FirstEquipItem;
	isMerchandise = false;
	imagesProLine = 10;
	setMap(game().getCurrentMap(), TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}

	void ItemEntity::setMerchandise(bool isMerchandise)
	{
	this->isMerchandise = isMerchandise;
	}
	bool ItemEntity::getMerchandise()
	{
	return isMerchandise;
	}

	int ItemEntity::getPrice()
	{
	return (items[itemType].price);
	}

	void ItemEntity::animate(float delay)
	{
	z = y + height;
	CollidingSpriteEntity::animate(delay);
	if (age > 0.7f) testSpriteCollisions();
	}

	void ItemEntity::render(sf::RenderWindow* app)
	{
	// shadow
	sprite.setTextureRect(sf::IntRect(9 * width, height, width, height));
	app->draw(sprite);

	// price
	if (isMerchandise)
	{
	std::ostringstream oss;
	oss << getPrice() << " $";
	game().Write(oss.str(), 16, x, y + 18.0f, ALIGN_CENTER, sf::Color(255, 255, 255));
	}

	CollidingSpriteEntity::render(app);
	}

	void ItemEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2;
	boundingBox.width = width;
	boundingBox.top = (int)y - height / 2;
	boundingBox.height = height;
	}

	void ItemEntity::dying()
	{
	isDying = true;
	}

	void ItemEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{
	PlayerEntity* playerEntity = dynamic_cast<PlayerEntity*>(entity);

	if (collideWithEntity(entity))
	{
	if (playerEntity != NULL && !playerEntity->isDead())
	{
	if (isMerchandise == false \|\| playerEntity->getGold() >= getPrice())
	{
	playerEntity->acquireItem(itemType);

	if (isMerchandise) playerEntity->pay(getPrice());

	//isDying = true;
	dying();

	- if (itemType >= itemMagicianHat)
	+ if (itemType >= FirstEquipItem)
	{

	game().showArtefactDescription(itemType);
	SpriteEntity* spriteItem = new SpriteEntity(
	image,
	playerEntity->getX(), playerEntity->getY() - 60.0f, ITEM_WIDTH, ITEM_HEIGHT);
	spriteItem->setFrame(frame);
	spriteItem->setImagesProLine(10);
	spriteItem->setZ(z);
	spriteItem->setLifetime(ACQUIRE_DELAY);

	SpriteEntity* spriteStar = new SpriteEntity(
	ImageManager::getImageManager()->getImage(IMAGE_STAR),
	playerEntity->getX(), playerEntity->getY() - 60.0f);
	spriteStar->setScale(4.0f, 4.0f);
	spriteStar->setZ(z-1.0f);
	spriteStar->setLifetime(ACQUIRE_DELAY);
	spriteStar->setSpin(50.0f);
	}
	else
	new MagnetEntity(x, y, playerEntity, itemType);
	}
	}
	}
	}

	void ItemEntity::collideMapRight()
	{
	velocity.x = -velocity.x * 0.66f;
	}

	void ItemEntity::collideMapLeft()
	{
	velocity.x = -velocity.x * 0.66f;
	}

	void ItemEntity::collideMapTop()
	{
	velocity.y = -velocity.y * 0.66f;
	}

	void ItemEntity::collideMapBottom()
	{
	velocity.y = -velocity.y * 0.66f;
	}
	diff --git a/src/PlayerEntity.cpp b/src/PlayerEntity.cpp
	index d1735f8..0e9074c 100644
	--- a/src/PlayerEntity.cpp
	+++ b/src/PlayerEntity.cpp
	@@ -1,693 +1,688 @@
	#include "PlayerEntity.h"
	#include "BoltEntity.h"
	#include "EnnemyBoltEntity.h"
	#include "ItemEntity.h"
	#include "FairyEntity.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "Constants.h"
	#include "WitchBlastGame.h"

	#include <iostream>

	-PlayerEntity::PlayerEntity(sf::Texture* image, float x = 0.0f, float y = 0.0f)
	- : BaseCreatureEntity (image, x, y, 64, 96)
	+PlayerEntity::PlayerEntity(float x = 0.0f, float y = 0.0f)
	+ : BaseCreatureEntity (ImageManager::getImageManager()->getImage(IMAGE_PLAYER), x, y, 64, 96)
	{
	currentFireDelay = -1.0f;
	canFirePlayer = true;
	type = ENTITY_PLAYER;

	imagesProLine = 8;
	playerStatus = playerStatusPlaying;
	hp = INITIAL_PLAYER_HP;
	hpDisplay = hp;
	hpMax = INITIAL_PLAYER_HP;
	gold = 0;

	boltLifeTime = INITIAL_BOLT_LIFE;
	specialBoltTimer = -1.0f;
	bloodColor = bloodRed;

	for (int i = 0; i < NUMBER_EQUIP_ITEMS; i++) equip[i] = false;
	- colliding = 0;
	+ collidingDirection = 0;

	computePlayer();

	firingDirection = 5;
	facingDirection = 2;
	}

	void PlayerEntity::moveTo(float newX, float newY)
	{
	float dx = newX - x;
	float dy = newY - y;

	x = newX;
	y = newY;

	if (equip[EQUIP_FAIRY])
	{
	fairy->setX(fairy->getX() + dx);
	fairy->setY(fairy->getY() + dy);
	}
	}

	int PlayerEntity::getFacingDirection()
	{
	return facingDirection;
	}

	float PlayerEntity::getPercentFireDelay()
	{
	if (canFirePlayer) return 1.0f;

	else return (1.0f - currentFireDelay / fireDelay);
	}

	-int PlayerEntity::getColliding()
	+int PlayerEntity::getCollidingDirection()
	{
	- return colliding;
	+ return collidingDirection;
	}

	bool PlayerEntity::isDead()
	{
	return playerStatus==playerStatusDead;
	}

	void PlayerEntity::setEntering()
	{
	playerStatus = playerStatusEntering;
	}

	void PlayerEntity::pay(int price)
	{
	gold -= price;
	if (gold < 0) gold = 0;
	SoundManager::getSoundManager()->playSound(SOUND_PAY);
	}

	void PlayerEntity::animate(float delay)
	{
	if (specialBoltTimer >= 0.0f)
	{
	specialBoltTimer -= delay;
	if (specialBoltTimer <= 0.0f)
	{
	if (equip[EQUIP_ICE_GEM]) SoundManager::getSoundManager()->playSound(SOUND_ICE_CHARGE);
	}
	}
	// rate of fire
	if (!canFirePlayer)
	{
	currentFireDelay -= delay;
	canFirePlayer = (currentFireDelay <= 0.0f);
	}
	// acquisition animation
	if (playerStatus == playerStatusAcquire)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	equip[acquiredItem] = true;
	computePlayer();
	playerStatus = playerStatusPlaying;

	if (acquiredItem == (int)EQUIP_FAIRY)
	{
	fairy = new FairyEntity(x, y - 50.0f, this);
	}
	}
	}
	// unlocking animation
	else if (playerStatus == playerStatusUnlocking)
	{
	acquireDelay -= delay;
	if (acquireDelay <= 0.0f)
	{
	playerStatus = playerStatusPlaying;
	}
	}
	//z = y;
	if (playerStatus != playerStatusDead) testSpriteCollisions();
	- colliding = 0;
	+ collidingDirection = 0;
	BaseCreatureEntity::animate(delay);

	if (firingDirection != 5)
	facingDirection = firingDirection;
	firingDirection = 5;

	if (isMoving())
	{
	frame = ((int)(age * 5.0f)) % 4;
	if (frame == 3) frame = 2;
	else if (frame == 2) frame = 0;
	SoundManager::getSoundManager()->playSound(SOUND_STEP);
	}
	else if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	frame = 3;
	else if (playerStatus == playerStatusDead)
	frame = 0;
	else
	frame = 0; //1;

	if (x < OFFSET_X)
	game().moveToOtherMap(4);
	else if (x > OFFSET_X + MAP_WIDTH * TILE_WIDTH)
	game().moveToOtherMap(6);
	else if (y < OFFSET_Y)
	game().moveToOtherMap(8);
	else if (y > OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT - 5)
	game().moveToOtherMap(2);

	if (playerStatus == playerStatusEntering)
	{
	if (boundingBox.left > OFFSET_X + TILE_WIDTH
	&& (boundingBox.left + boundingBox.width) < OFFSET_X + TILE_WIDTH * (MAP_WIDTH - 1)
	&& boundingBox.top > OFFSET_Y + TILE_HEIGHT
	&& (boundingBox.top + boundingBox.height) < OFFSET_Y + TILE_HEIGHT * (MAP_HEIGHT - 1))
	{
	playerStatus = playerStatusPlaying;
	game().closeDoors();
	}
	}

	if (playerStatus == playerStatusDead)
	{
	z = OFFSET_Y - 2;
	}
	}


	void PlayerEntity::render(sf::RenderWindow* app)
	{

	sprite.setPosition(x, y);

	/*
	int spriteDx = 0;
	if (facingDirection == 8) spriteDx = 3;
	if (facingDirection == 4) spriteDx = 6;
	if (facingDirection == 6) spriteDx = 9;

	// body
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height, width, height));
	app->draw(sprite);

	// head
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, 0, width, height));
	app->draw(sprite);

	// feet
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height * 2, width, height));
	app->draw(sprite);

	// staff
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height * 4, width, height));
	app->draw(sprite);

	// hands
	sprite.setTextureRect(sf::IntRect( (frame + spriteDx) * width, height * 3, width, height));
	app->draw(sprite);
	*/

	if (playerStatus == playerStatusDead)
	{
	// blood
	sprite.setTextureRect(sf::IntRect(6 * width, 0, width, height));
	app->draw(sprite);

	// body
	sprite.setTextureRect(sf::IntRect(3 * width, height, width, height));
	app->draw(sprite);

	// feet
	sprite.setTextureRect(sf::IntRect(3 * width, 2 * height, width, height));
	app->draw(sprite);

	// hand
	sprite.setTextureRect(sf::IntRect(3 * width, 3 * height, width, height));
	app->draw(sprite);
	}
	else
	{
	// shadow
	sprite.setTextureRect(sf::IntRect(7 * width, 0, width, height));
	app->draw(sprite);

	// body
	sprite.setTextureRect(sf::IntRect(frame * width, height, width, height));
	app->draw(sprite);

	// belt
	if (equip[EQUIP_LEATHER_BELT])
	{
	sprite.setTextureRect(sf::IntRect(frame * width, 6 *height, width, height));
	app->draw(sprite);
	}

	// head
	if (playerStatus != playerStatusAcquire && playerStatus != playerStatusUnlocking)
	{
	sprite.setTextureRect(sf::IntRect(0, 0, width, height));
	app->draw(sprite);

	// hat
	if (equip[EQUIP_ENCHANTER_HAT])
	{
	sprite.setTextureRect(sf::IntRect(3 * width, 0, width, height));
	app->draw(sprite);
	}
	}
	// feet
	if( equip[EQUIP_LEATHER_BOOTS])
	sprite.setTextureRect(sf::IntRect((frame + 4) * width, 2 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width, 2 * height, width, height));
	app->draw(sprite);

	// staff
	if ( equip[EQUIP_MAHOGANY_STAFF])
	sprite.setTextureRect(sf::IntRect((frame + 4) * width + 4, 4 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 4 * height, width, height));
	app->draw(sprite);

	// snake
	if (equip[EQUIP_BLOOD_SNAKE])
	{
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 7 *height, width, height));
	app->draw(sprite);
	}

	// ice gem
	if (equip[EQUIP_ICE_GEM])
	{
	sprite.setTextureRect(sf::IntRect(frame * width + 4, 8 *height, width, height));
	app->draw(sprite);

	int fade;
	if (specialBoltTimer <= 0.0f) fade = 255;
	else fade = ((STATUS_FROZEN_BOLT_DELAY - specialBoltTimer) / STATUS_FROZEN_BOLT_DELAY) * 128;

	sprite.setTextureRect(sf::IntRect(256, 0, 20, 20));
	sprite.setColor(sf::Color(255, 255, 255, fade));

	if (frame == 1)
	sprite.setPosition(x + 5, y + 3);
	else if (frame == 2)
	sprite.setPosition(x + 16, y + 3);
	else
	sprite.setPosition(x + 3, y + 1);

	sf::RenderStates r;
	r.blendMode = sf::BlendAdd;
	app->draw(sprite, r);

	sprite.setPosition(x, y);
	sprite.setColor(sf::Color(255, 255, 255, 255));
	}

	// hands
	if( equip[EQUIP_VIBRATION_GLOVES])
	sprite.setTextureRect(sf::IntRect((frame + 4) * width, 3 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(frame * width, 3 * height, width, height));
	app->draw(sprite);

	// head
	if (playerStatus == playerStatusAcquire \|\| playerStatus == playerStatusUnlocking)
	{
	sprite.setTextureRect(sf::IntRect(width, 0, width, height));
	app->draw(sprite);

	// hat
	if (equip[EQUIP_ENCHANTER_HAT])
	{
	sprite.setTextureRect(sf::IntRect(3 * width, 0, width, height));
	app->draw(sprite);
	}

	// staff
	if ( equip[EQUIP_MAHOGANY_STAFF])
	sprite.setTextureRect(sf::IntRect(5 * width + 4, 4 * height, width, height));
	else
	sprite.setTextureRect(sf::IntRect(width + 4, 4 * height, width, height));
	app->draw(sprite);

	// snake
	if (equip[EQUIP_BLOOD_SNAKE])
	{
	sprite.setTextureRect(sf::IntRect(1 * width + 4, 7 *height, width, height));
	app->draw(sprite);
	}

	// ice gem
	if (equip[EQUIP_ICE_GEM])
	{
	sprite.setTextureRect(sf::IntRect(1 * width + 4, 8 *height, width, height));
	app->draw(sprite);
	}
	}

	// necklace
	if (equip[EQUIP_CONCENTRATION_AMULET])
	{
	sprite.setTextureRect(sf::IntRect(frame * width, 5 * height, width, height));
	app->draw(sprite);

	sprite.setColor(sf::Color(255,255,255, (1.0f + sin(age * 5.0f)) * 100));
	sprite.setTextureRect(sf::IntRect(5 * width, 0, width, height));
	app->draw(sprite);
	sprite.setColor(sf::Color(255,255,255,255));
	}
	}
	}


	void PlayerEntity::calculateBB()
	{
	boundingBox.left = (int)x - width / 2;
	boundingBox.width = width;
	boundingBox.top = (int)y - height / 2;
	boundingBox.height = height;

	float fPrez = 10.0f;
	boundingBox.left += fPrez;
	boundingBox.width -= (fPrez + fPrez);
	boundingBox.top += 52.0f;
	boundingBox.height = boundingBox.width - 10.0f;
	}

	void PlayerEntity::readCollidingEntity(CollidingSpriteEntity* entity)
	{

	EnnemyBoltEntity* boltEntity = dynamic_cast<EnnemyBoltEntity*>(entity);

	if (collideWithEntity(entity))
	{
	if (boltEntity != NULL && !boltEntity->getDying())
	{
	boltEntity->collide();
	- hurt(boltEntity->getDamages());
	+ hurt(boltEntity->getDamages(), BoltStandard);
	game().generateBlood(x, y, bloodColor);
	}
	}
	}

	void PlayerEntity::move(int direction)
	{
	if (playerStatus == playerStatusPlaying)
	{
	float speedx = 0.0f, speedy = 0.0f;
	if (direction == 1 \|\| direction == 4 \|\| direction == 7)
	speedx = - creatureSpeed;
	else if (direction == 3 \|\| direction == 6 \|\| direction == 9)
	speedx = creatureSpeed;
	if (direction == 1 \|\| direction == 2 \|\| direction == 3)
	speedy = creatureSpeed;
	else if (direction == 7 \|\| direction == 8 \|\| direction == 9)
	speedy = - creatureSpeed;
	setVelocity(Vector2D(speedx, speedy));

	//if (firingDirection != 5)
	// facingDirection = firingDirection;
	//else
	{
	switch (direction)
	{
	case 8: facingDirection = 8; break;
	case 2: facingDirection = 2; break;
	case 4: facingDirection = 4; break;
	case 6: facingDirection = 6; break;
	case 7: if (facingDirection != 4 && facingDirection != 8) facingDirection = 4; break;
	case 1: if (facingDirection != 4 && facingDirection != 2) facingDirection = 4; break;
	case 9: if (facingDirection != 6 && facingDirection != 8) facingDirection = 6; break;
	case 3: if (facingDirection != 6 && facingDirection != 2) facingDirection = 6; break;
	}
	}

	//firingDirection = 5;
	}
	}

	bool PlayerEntity::isMoving()
	{
	if (velocity.x < -1.0f \|\| velocity.x > 1.0f) return true;
	if (velocity.y < -1.0f \|\| velocity.y > 1.0f) return true;
	return false;
	}

	bool PlayerEntity::isEquiped(int eq)
	{
	return equip[eq];
	}

	void PlayerEntity::setEquiped(int item, bool eq)
	{
	equip[item] = eq;
	if (eq && item == (int)EQUIP_FAIRY)
	{
	fairy = new FairyEntity(x, y - 50.0f, this);
	}
	computePlayer();
	}

	void PlayerEntity::generateBolt(float velx, float vely)
	{
	if (equip[EQUIP_ICE_GEM] && specialBoltTimer <= 0.0f)
	{
	boltType = BoltIce;
	specialBoltTimer = STATUS_FROZEN_BOLT_DELAY;
	}
	else
	boltType = BoltStandard;
	BoltEntity* bolt = new BoltEntity(ImageManager::getImageManager()->getImage(1), x, y + 20, boltLifeTime, boltType);
	bolt->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	bolt->setDamages(fireDamages);
	bolt->setVelocity(Vector2D(velx, vely));
	}

	void PlayerEntity::fire(int direction)
	{
	firingDirection = direction;
	if (equip[EQUIP_FAIRY] && playerStatus != playerStatusDead)
	fairy->fire(direction, map);

	if (canFirePlayer && playerStatus != playerStatusDead)
	{
	SoundManager::getSoundManager()->playSound(SOUND_BLAST_STANDARD);

	if (equip[EQUIP_BOOK_DUAL])
	{
	float shoot_angle = 0.2f;

	if ((direction == 4 && velocity.x < -1.0f) \|\| (direction == 6 && velocity.x > 1.0f)
	\|\| (direction == 8 && velocity.y < -1.0f) \|\| (direction == 2 && velocity.y > 1.0f))
	shoot_angle = 0.1f;
	else if ((direction == 6 && velocity.x < -1.0f) \|\| (direction == 4 && velocity.x > 1.0f)
	\|\| (direction == 2 && velocity.y < -1.0f) \|\| (direction == 8 && velocity.y > 1.0f))
	shoot_angle = 0.35f;

	if (equip[EQUIP_VIBRATION_GLOVES]) shoot_angle += (1000 - rand() % 2000) * 0.0001f;

	switch(direction)
	{
	case 4: generateBolt(-fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle));
	generateBolt(-fireVelocity * cos(shoot_angle), - fireVelocity * sin(shoot_angle));break;
	case 6: generateBolt(fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle));
	generateBolt(fireVelocity * cos(shoot_angle), - fireVelocity * sin(shoot_angle));break;
	case 8: generateBolt(fireVelocity * sin(shoot_angle), -fireVelocity * cos(shoot_angle));
	generateBolt(-fireVelocity * sin(shoot_angle), - fireVelocity * cos(shoot_angle));break;
	case 2: generateBolt(fireVelocity * sin(shoot_angle), fireVelocity * cos(shoot_angle));
	generateBolt(-fireVelocity * sin(shoot_angle), fireVelocity * cos(shoot_angle));break;
	}
	}
	else
	{
	if (equip[EQUIP_VIBRATION_GLOVES])
	{
	float shoot_angle = (1000 - rand() % 2000) * 0.0001f;
	switch(direction)
	{
	case 4: generateBolt(-fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle)); break;
	case 6: generateBolt(fireVelocity * cos(shoot_angle), fireVelocity * sin(shoot_angle)); break;
	case 8: generateBolt(fireVelocity * sin(shoot_angle), -fireVelocity * cos(shoot_angle)); break;
	case 2: generateBolt(fireVelocity * sin(shoot_angle), fireVelocity * cos(shoot_angle)); break;
	}
	}
	else
	{
	switch(direction)
	{
	case 4: generateBolt(-fireVelocity, 0.0f); break;
	case 6: generateBolt(fireVelocity, 0.0f); break;
	case 8: generateBolt(0.0f, -fireVelocity); break;
	case 2: generateBolt(0.0f, fireVelocity); break;
	}
	}
	}

	canFirePlayer = false;
	currentFireDelay = fireDelay;
	}
	}

	-bool PlayerEntity::canFire()
	-{
	- return canFirePlayer;
	-}
	-
	bool PlayerEntity::canMove()
	{
	return (playerStatus == playerStatusPlaying);
	}

	-bool PlayerEntity::hurt(int damages)
	+bool PlayerEntity::hurt(int damages, enumBoltType hurtingType)
	{
	if (!hurting)
	{
	SoundManager::getSoundManager()->playSound(SOUND_PLAYER_HIT);
	BaseCreatureEntity::hurt(damages, BoltStandard);
	game().generateBlood(x, y, bloodColor);
	game().generateBlood(x, y, bloodColor);
	return true;
	}
	return false;
	}

	void PlayerEntity::loseItem(enumItemType itemType, bool isEquip)
	{
	CollidingSpriteEntity* itemSprite
	= new CollidingSpriteEntity(ImageManager::getImageManager()->getImage(isEquip ? IMAGE_ITEMS_EQUIP : IMAGE_ITEMS), x, y, 32, 32);
	itemSprite->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	itemSprite->setZ(OFFSET_Y - 1);
	itemSprite->setFrame(itemType);
	itemSprite->setImagesProLine(10);
	itemSprite->setType(ENTITY_BLOOD);
	itemSprite->setVelocity(Vector2D(rand()%450));
	itemSprite->setViscosity(0.95f);
	itemSprite->setSpin( (rand() % 700) - 350.0f);
	}

	void PlayerEntity::dying()
	{
	playerStatus = playerStatusDead;
	hp = 0;
	SoundManager::getSoundManager()->playSound(SOUND_PLAYER_DIE);
	setVelocity(Vector2D(0.0f, 0.0f));

	int i;
	- for (i = 0; i < gold; i++) loseItem(itemCopperCoin, false);
	+ for (i = 0; i < gold; i++) loseItem(ItemCopperCoin, false);

	for (i = 0; i < NUMBER_EQUIP_ITEMS; i++)
	if (equip[i]) loseItem(enumItemType(i), true);

	for (i = 0; i < 8; i++) game().generateBlood(x, y, bloodColor);

	CollidingSpriteEntity* itemSprite
	= new CollidingSpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_PLAYER), x, y, 64, 64);
	itemSprite->setMap(map, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	itemSprite->setZ(OFFSET_Y - 1);
	itemSprite->setImagesProLine(10);
	itemSprite->setFrame(/11/1);
	itemSprite->setType(ENTITY_BLOOD);
	itemSprite->setVelocity(Vector2D(rand()%450));
	itemSprite->setViscosity(0.95f);
	itemSprite->setSpin( (rand() % 700) - 350.0f);
	}

	void PlayerEntity::acquireItem(enumItemType type)
	{
	- if (type >= itemMagicianHat) acquireStance(type);
	+ if (type >= FirstEquipItem) acquireStance(type);
	else switch (type)
	{
	- case itemCopperCoin: gold++;
	+ case ItemCopperCoin: gold++;
	SoundManager::getSoundManager()->playSound(SOUND_COIN_PICK_UP);
	break;
	- case itemSilverCoin: gold = gold + 5; break;
	- case itemGoldCoin: gold = gold + 10; break;
	+ case ItemSilverCoin: gold = gold + 5; break;
	+ case ItemGoldCoin: gold = gold + 10; break;
	case itemHealth: hp += 15;
	SoundManager::getSoundManager()->playSound(SOUND_DRINK);
	if (hp > hpMax) hp = hpMax; break;
	default: break;
	}
	}

	void PlayerEntity::computePlayer()
	{
	float boltLifeTimeBonus = 1.0f;
	float fireDelayBonus = 1.0f;
	float creatureSpeedBonus = 1.0f;
	float fireVelocityBonus = 1.0f;
	float fireDamagesBonus = 1.0f;
	boltType = BoltStandard;

	if (equip[EQUIP_VIBRATION_GLOVES]) fireDelayBonus -= 0.10f;
	if (equip[EQUIP_ENCHANTER_HAT]) fireDelayBonus -= 0.2f;
	if (equip[EQUIP_LEATHER_BELT]) fireDelayBonus -= 0.15f;
	if (equip[EQUIP_LEATHER_BOOTS]) creatureSpeedBonus += 0.25f;
	if (equip[EQUIP_BOOK_DUAL]) fireDelayBonus += 0.6f;
	if (equip[EQUIP_CONCENTRATION_AMULET]) boltLifeTimeBonus += 0.5f;
	if (equip[EQUIP_MAHOGANY_STAFF])
	{
	fireVelocityBonus += 0.15f;
	fireDamagesBonus += 0.5f;
	}
	if (equip[EQUIP_BLOOD_SNAKE]) fireDamagesBonus += 1.0f;
	if (equip[EQUIP_ICE_GEM]) boltType = BoltIce;

	fireDelay = INITIAL_PLAYER_FIRE_DELAY * fireDelayBonus;
	creatureSpeed = INITIAL_PLAYER_SPEED * creatureSpeedBonus;
	fireVelocity = INITIAL_BOLT_VELOCITY * fireVelocityBonus;
	fireDamages = INITIAL_BOLT_DAMAGES * fireDamagesBonus;
	boltLifeTime = INITIAL_BOLT_LIFE * boltLifeTimeBonus;
	}

	void PlayerEntity::acquireStance(enumItemType type)
	{
	velocity.x = 0.0f;
	velocity.y = 0.0f;
	playerStatus = playerStatusAcquire;
	acquireDelay = ACQUIRE_DELAY;
	- acquiredItem = (enumItemType)(type - itemMagicianHat);
	+ acquiredItem = (enumItemType)(type - FirstEquipItem);
	SoundManager::getSoundManager()->playSound(SOUND_BONUS);
	}

	void PlayerEntity::collideMapRight()
	{
	- colliding = 6;
	+ collidingDirection = 6;
	}

	void PlayerEntity::collideMapLeft()
	{
	- colliding = 4;
	+ collidingDirection = 4;
	}

	void PlayerEntity::collideMapTop()
	{
	- colliding = 8;
	+ collidingDirection = 8;
	}

	void PlayerEntity::collideMapBottom()
	{
	- colliding = 2;
	+ collidingDirection = 2;
	}

	void PlayerEntity::useBossKey()
	{
	velocity.x = 0.0f;
	velocity.y = 0.0f;
	playerStatus = playerStatusUnlocking;
	acquireDelay = UNLOCK_DELAY;
	- acquiredItem = (enumItemType)(type - itemMagicianHat);
	+ acquiredItem = (enumItemType)(type - FirstEquipItem);
	SoundManager::getSoundManager()->playSound(SOUND_BONUS);
	equip[EQUIP_BOSS_KEY] = false;


	SpriteEntity* spriteItem = new SpriteEntity(
	ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP),
	x, y - 60.0f, ITEM_WIDTH, ITEM_HEIGHT);
	spriteItem->setFrame(EQUIP_BOSS_KEY);
	spriteItem->setZ(z);
	spriteItem->setLifetime(UNLOCK_DELAY);
	}
	diff --git a/src/PlayerEntity.h b/src/PlayerEntity.h
	index 7cac9e3..9c22a85 100644
	--- a/src/PlayerEntity.h
	+++ b/src/PlayerEntity.h
	@@ -1,86 +1,300 @@
	#ifndef PLAYERSPRITE_H
	#define PLAYERSPRITE_H

	#include "BaseCreatureEntity.h"
	#include "ItemEntity.h"
	#include "Constants.h"

	class FairyEntity;

	+/*! \class PlayerEntity
	+* \brief Class for the player
	+*
	+* It contains the game logic of the player and the rendering.
	+*/
	class PlayerEntity : public BaseCreatureEntity
	{
	public:
	- PlayerEntity(sf::Texture* image, float x, float y);
	+ /*!
	+ * \brief Constructor
	+ *
	+ * Constructor of the PlayerEntity class.
	+ *
	+ * \param x : x position of the player
	+ * \param y : y position of the player
	+ */
	+ PlayerEntity(float x, float y);
	+
	+ /*!
	+ * \brief updates the player
	+ *
	+ * Updates the player.
	+ * Called in the game loop.
	+ *
	+ * \param delay : elapsed time since the last call
	+ */
	virtual void animate(float delay);
	+
	+ /*!
	+ * \brief render the player
	+ *
	+ * Render the player.
	+ * Called in the game loop.
	+ *
	+ * \param app : Rendering target
	+ */
	virtual void render(sf::RenderWindow* app);

	+ /*!
	+ * \brief Moves the player to another place
	+ *
	+ * Moves the player to another place.
	+ * Called when changing room, the "familiers" will move too.
	+ *
	+ * \param newX : target x position of the player
	+ * \param newY : target y position of the player
	+ */
	void moveTo(float newX, float newY);
	+
	+ /*!
	+ * \brief returns the direction the player is facing
	+ *
	+ * Return the direction the player is facing.
	+ * Use to know in which direction he has to fire with the "one button" gameplay.
	+ *
	+ * \return : the facing direction. 4 = left, 8 = north, 6 = right, 2 = south
	+ */
	int getFacingDirection();

	+ /*!
	+ * \brief update the bounding box
	+ *
	+ * Update the bounding box of the player.
	+ * Used before testing collision.
	+ */
	virtual void calculateBB();
	+
	+ /*!
	+ * \brief Moves the player in the given direction
	+ *
	+ * Moves the player in the given direction.
	+ *
	+ * \param direction : direction of the new map. Numeric pad, diagonals included : 4 = left, 8 = north, 7 = north-west...
	+ */
	void move(int direction);
	+
	+ /*!
	+ * \brief Fires in the given direction
	+ *
	+ * Fires the player in the given direction.
	+ *
	+ * \param direction : direction of the new map. 4 = left, 8 = north, 6 = right, 2 = south
	+ */
	void fire(int direction);
	- bool canFire();
	+
	+ /*!
	+ * \brief returns if the player is moving or not
	+ *
	+ * Returns if the player is moving or not.
	+ *
	+ * \return : True if the player is moving
	+ */
	bool isMoving();
	+
	+ /*!
	+ * \brief returns if an item is equipped or not
	+ *
	+ * Returns if an item is equipped or not.
	+ *
	+ * \param eq : the equip item ID
	+ * \return : True if the item is in possession of the player
	+ */
	bool isEquiped(int eq);
	+
	+ /*!
	+ * \brief updates the equipment of the player
	+ *
	+ * Updates the equipment of the player.
	+ *
	+ * \param item : the equip item ID
	+ * \param eq : True if the item has to be equipped
	+ */
	void setEquiped(int item, bool eq);
	+
	+ /*!
	+ * \brief updates the entering status of the player
	+ *
	+ * Updates the entering status of the player.
	+ * Used when the player is entering in a not yet cleared room.
	+ */
	void setEntering();
	+
	+ /*!
	+ * \brief returns if the player can move or not
	+ *
	+ * Returns if the player can move or not.
	+ *
	+ * \return : True if the player can move
	+ */
	bool canMove();
	+
	+ /*!
	+ * \brief called when the player is dying
	+ *
	+ * Called when the player is dying (HP <= 0).
	+ */
	virtual void dying();
	- virtual bool hurt(int damages); // return true if hurted
	+
	+ /*!
	+ * \brief hurts the player
	+ *
	+ * Hurts the player.
	+ * Calld when the player is hurt, usually when colliding with a monster or a missile.
	+ *
	+ * \param damages : the inflicted damages
	+ * \param hurtingType : damages type
	+ * \return : True if the player has been hurt
	+ */
	+ virtual bool hurt(int damages, enumBoltType hurtingType);
	+
	+ /*!
	+ * \brief returns if the player is dead or not
	+ *
	+ * Returns if the player is dead or not.
	+ *
	+ * \return : True if the player is dead
	+ */
	bool isDead();
	+
	+ /*!
	+ * \brief returns the fire delay percentage
	+ *
	+ * Returns the fire delay percentage.
	+ * Used (currently) when displaying the blue bar in the HUD.
	+ *
	+ * \return : the percentage (between 0.0f for empty to 1.0 for full)
	+ */
	float getPercentFireDelay();
	+
	+ /*!
	+ * \brief called when the player get an item
	+ *
	+ * Called when the player get an item.
	+ * When the item is an equip item, he starts an "acquiring stance".
	+ *
	+ * \param type : item ID
	+ */
	void acquireItem(enumItemType type);
	+
	+ /*!
	+ * \brief makes the player drop an item
	+ *
	+ * Makes the player drop an item.
	+ * Called when the player dies.
	+ *
	+ * \param itemType : item ID
	+ * \param isEquip : True if it's an equip item (not the same texture)
	+ */
	void loseItem(enumItemType itemType, bool isEquip);
	+
	+ /*!
	+ * \brief starts the acquire stance
	+ *
	+ * Starts the acquire stance.
	+ * Called when the player get an equip object. The item is "highlighted" and a description is displayed.
	+ *
	+ * \param type : item ID
	+ */
	void acquireStance(enumItemType type);
	+
	+ /*!
	+ * \brief starts the opening stance
	+ *
	+ * Starts the boss door opening animation.
	+ * Remove the key from the inventory.
	+ */
	void useBossKey();

	+ /*!
	+ * \brief accessor on the gold
	+ *
	+ * Accessor on the gold.
	+ *
	+ * \return : the gold
	+ */
	int getGold() {return gold; }
	+
	+ /*!
	+ * \brief mutator on the gold
	+ *
	+ * Mutator on the gold.
	+ *
	+ * \param gold : the new gold value
	+ */
	void setGold(int gold) { this->gold = gold; }
	+
	+ /*!
	+ * \brief pay some gold
	+ *
	+ * Pay some gold. Usually in shops.
	+ *
	+ * \param gold : the price to pay
	+ */
	void pay(int price);
	- int getColliding();

	+ /*!
	+ * \brief accessor on the colliding direction
	+ *
	+ * Accessor on the colliding direction.
	+ *
	+ * \return : the colliding direction
	+ */
	+ int getCollidingDirection();
	+
	+ /** Player status enum
	+ * The different player states.
	+ */
	enum playerStatusEnum
	{
	- playerStatusPlaying,
	- playerStatusEntering,
	- playerStatusAcquire,
	- playerStatusUnlocking,
	- playerStatusDead
	+ playerStatusPlaying, /*< Player is playing "normally" /
	+ playerStatusEntering, /*< Player is entering a not yet cleared room (walking is forced) /
	+ playerStatusAcquire, /*< Player is under acquiring stance /
	+ playerStatusUnlocking, /*< Player is under unlocking stance /
	+ playerStatusDead /*< Player RIP /
	};
	protected:
	void computePlayer();
	virtual void readCollidingEntity(CollidingSpriteEntity* entity);
	void generateBolt(float velx, float vely);

	virtual void collideMapRight();
	virtual void collideMapLeft();
	virtual void collideMapTop();
	virtual void collideMapBottom();

	private:
	int fireDamages;
	float fireVelocity;
	float fireDelay;
	float currentFireDelay;
	float boltLifeTime;
	int gold;

	bool canFirePlayer;
	playerStatusEnum playerStatus;
	float acquireDelay;
	enumItemType acquiredItem;

	bool equip[NUMBER_EQUIP_ITEMS];
	enumBoltType boltType;
	float specialBoltTimer;

	- int colliding;
	+ int collidingDirection; /!< Colliding direction (4, 8, 6, 2) to detect collision with closed doors /

	int facingDirection;
	int firingDirection;

	FairyEntity* fairy;
	};

	#endif // PLAYERSPRITE_H
	diff --git a/src/WitchBlastGame.cpp b/src/WitchBlastGame.cpp
	index 0b136ae..350b4dd 100644
	--- a/src/WitchBlastGame.cpp
	+++ b/src/WitchBlastGame.cpp
	@@ -1,1289 +1,1286 @@
	#include "WitchBlastGame.h"
	#include "sfml_game/SpriteEntity.h"
	#include "sfml_game/TileMapEntity.h"
	#include "DungeonMap.h"
	#include "sfml_game/ImageManager.h"
	#include "sfml_game/SoundManager.h"
	#include "sfml_game/EntityManager.h"
	#include "Constants.h"
	#include "RatEntity.h"
	#include "GreenRatEntity.h"
	#include "KingRatEntity.h"
	#include "BatEntity.h"
	#include "SlimeEntity.h"
	#include "ChestEntity.h"
	#include "EvilFlowerEntity.h"
	#include "ItemEntity.h"
	#include "ArtefactDescriptionEntity.h"
	#include "PnjEntity.h"
	#include "TextEntity.h"

	#include <iostream>
	#include <sstream>
	#include <fstream>

	namespace {
	WitchBlastGame* gameptr;
	}

	WitchBlastGame::WitchBlastGame(): Game(SCREEN_WIDTH, SCREEN_HEIGHT)
	{
	gameptr = this;
	app->setTitle(APP_NAME + " V" + APP_VERSION);

	// loading resources
	ImageManager::getImageManager()->addImage((char*)"media/sprite.png");
	ImageManager::getImageManager()->addImage((char*)"media/bolt.png");
	ImageManager::getImageManager()->addImage((char*)"media/tiles.png");
	ImageManager::getImageManager()->addImage((char*)"media/rat.png");
	ImageManager::getImageManager()->addImage((char*)"media/minimap.png");
	ImageManager::getImageManager()->addImage((char*)"media/doors.png");
	ImageManager::getImageManager()->addImage((char*)"media/items.png");
	ImageManager::getImageManager()->addImage((char*)"media/items_equip.png");
	ImageManager::getImageManager()->addImage((char*)"media/chest.png");
	ImageManager::getImageManager()->addImage((char*)"media/bat.png");
	ImageManager::getImageManager()->addImage((char*)"media/evil_flower.png");
	ImageManager::getImageManager()->addImage((char*)"media/slime.png");
	ImageManager::getImageManager()->addImage((char*)"media/king_rat.png");
	ImageManager::getImageManager()->addImage((char*)"media/blood.png");
	ImageManager::getImageManager()->addImage((char*)"media/corpses.png");
	ImageManager::getImageManager()->addImage((char*)"media/corpses_big.png");
	ImageManager::getImageManager()->addImage((char*)"media/star.png");
	ImageManager::getImageManager()->addImage((char*)"media/star2.png");
	ImageManager::getImageManager()->addImage((char*)"media/interface.png");
	ImageManager::getImageManager()->addImage((char*)"media/pnj.png");
	ImageManager::getImageManager()->addImage((char*)"media/fairy.png");

	SoundManager::getSoundManager()->addSound((char*)"media/sound/step.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/blast00.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/blast01.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/door_closing.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/door_opening.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/chest_opening.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/bonus.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/drink.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/player_hit.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/player_die.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/ennemy_dying.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/coin.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/pay.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/wall_impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/big_wall_impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/king_rat_cry_1.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/king_rat_cry_2.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/king_rat_die.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/slime_jump.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/slime_impact.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/slime_impact_weak.ogg");
	SoundManager::getSoundManager()->addSound((char*)"media/sound/ice_charge.ogg");

	if (font.loadFromFile("media/DejaVuSans-Bold.ttf"))
	{
	myText.setFont(font);
	}

	miniMap = NULL;
	currentMap = NULL;
	currentFloor = NULL;
	xGameState = xGameStateNone;
	isPausing = false;
	}

	WitchBlastGame::~WitchBlastGame()
	{
	// cleaning all entities
	EntityManager::getEntityManager()->clean();

	// cleaning data
	if (miniMap != NULL) delete (miniMap);
	if (currentFloor != NULL) delete (currentFloor);
	}

	DungeonMap* WitchBlastGame::getCurrentMap()
	{
	return currentMap;
	}

	PlayerEntity* WitchBlastGame::getPlayer()
	{
	return player;
	}

	void WitchBlastGame::onUpdate()
	{
	float delta = getAbsolutTime() - lastTime;
	lastTime = getAbsolutTime();

	if (!isPausing)
	{

	EntityManager::getEntityManager()->animate(delta);

	if (xGameState != xGameStateNone)
	{
	xGameTimer -= delta;
	if (xGameTimer <= 0.0f)
	{
	if (xGameState == xGameStateFadeOut)
	startNewGame(false);
	else
	xGameState = xGameStateNone;
	}
	}

	if (isPlayerAlive)
	{
	if (player->getHp() <= 0)
	{
	isPlayerAlive = false;
	playMusic(MusicEnding);
	}
	}
	}
	}

	void WitchBlastGame::startNewGame(bool fromSaveFile)
	{
	gameState = gameStateInit;

	// cleaning all entities
	EntityManager::getEntityManager()->clean();

	// cleaning data
	if (miniMap != NULL) delete (miniMap);
	if (currentFloor != NULL) delete (currentFloor);

	if (fromSaveFile)
	{
	if (!loadGame()) fromSaveFile = false;
	}
	if (!fromSaveFile)
	{
	currentFloor = new GameFloor(1);
	floorX = FLOOR_WIDTH / 2;
	floorY = FLOOR_HEIGHT / 2;

	// the player
	- player = new PlayerEntity(ImageManager::getImageManager()->getImage(0),
	- OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	+ player = new PlayerEntity(OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));

	// the boss room is closed
	bossRoomOpened = false;
	}

	// current map (tiles)
	currentTileMap = new TileMapEntity(ImageManager::getImageManager()->getImage(IMAGE_TILES), currentMap, 64, 64, 10);
	currentTileMap->setX(OFFSET_X);
	currentTileMap->setY(OFFSET_Y);

	miniMap = new GameMap(FLOOR_WIDTH, FLOOR_HEIGHT);
	refreshMinimap();

	// the interface
	SpriteEntity* interface = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_INTERFACE));
	interface->setZ(10000.0f);
	interface->removeCenter();
	interface->setType(0);

	// key symbol on the interface
	keySprite.setTexture(*ImageManager::getImageManager()->getImage(IMAGE_ITEMS_EQUIP));
	keySprite.setTextureRect(sf::IntRect(ITEM_WIDTH * EQUIP_BOSS_KEY, 0, ITEM_WIDTH, ITEM_HEIGHT));
	keySprite.setPosition(326, 616);

	// minimap on the interface
	TileMapEntity* miniMapEntity = new TileMapEntity(ImageManager::getImageManager()->getImage(4), miniMap, 16, 12, 10);
	miniMapEntity->setX(400);
	miniMapEntity->setY(607);
	miniMapEntity->setZ(10001.0f);

	// doors
	doorEntity[0] = new DoorEntity(8);
	doorEntity[1] = new DoorEntity(4);
	doorEntity[2] = new DoorEntity(2);
	doorEntity[3] = new DoorEntity(6);

	isPlayerAlive = true;

	// generate the map
	refreshMap();
	// items from save
	currentMap->restoreMapObjects();

	// first map is open
	roomClosed = false;

	// game time counter an state
	lastTime = getAbsolutTime();
	gameState = gameStatePlaying;

	playMusic(MusicDungeon);

	// fade in
	xGameState = xGameStateFadeIn;
	xGameTimer = FADE_IN_DELAY;

	float x0 = OFFSET_X + MAP_WIDTH * 0.5f * TILE_WIDTH;
	float y0 = OFFSET_Y + MAP_HEIGHT * 0.5f * TILE_HEIGHT + 40.0f;

	TextEntity* text = new TextEntity("Level 1", 30, x0, y0);
	text->setAlignment(ALIGN_CENTER);
	text->setLifetime(2.5f);
	text->setWeight(-36.0f);
	text->setZ(1000);
	text->setColor(TextEntity::COLOR_FADING_WHITE);
	}

	void WitchBlastGame::startGame()
	{
	startNewGame(true);

	// Start game loop
	while (app->isOpen())
	{
	// Process events
	sf::Event event;

	while (app->pollEvent(event))
	{
	// Close window : exit
	if (event.type == sf::Event::Closed)
	{
	if (gameState == gameStatePlaying && !player->isDead() && currentMap->isCleared()) saveGame();
	app->close();
	}

	if (event.type == sf::Event::KeyPressed)
	{
	if (event.key.code == sf::Keyboard::Escape)
	{
	if (gameState == gameStatePlaying && !isPausing) isPausing = true;
	else if (gameState == gameStatePlaying && isPausing) isPausing = false;
	}

	if (event.key.code == sf::Keyboard::Space)
	{
	if (gameState == gameStatePlaying && !isPausing) firingDirection = player->getFacingDirection();
	}

	if (event.key.code == sf::Keyboard::X)
	{
	startNewGame(false);
	}
	}

	if (event.type == sf::Event::LostFocus)
	isPausing = true;
	}

	if (gameState == gameStatePlaying && !isPausing)
	{
	if (player->canMove()) player->setVelocity(Vector2D(0.0f, 0.0f));

	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Q) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::A))
	{
	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Z) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::W))
	player->move(7);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
	player->move(1);
	else
	player->move(4);
	}
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::D))
	{
	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Z) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::W))
	player->move(9);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
	player->move(3);
	else
	player->move(6);
	}
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Z) \|\| sf::Keyboard::isKeyPressed(sf::Keyboard::W))
	{
	player->move(8);
	}
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))
	{
	player->move(2);
	}

	// normal 4 directions gameplay
	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Left))
	player->fire(4);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Right))
	player->fire(6);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Up))
	player->fire(8);
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Down))
	player->fire(2);
	// alternative "one button" gameplay
	else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Space))
	{
	player->fire(firingDirection);
	}
	// alternative "firing with the mouse" gameplay
	else if (sf::Mouse::isButtonPressed(sf::Mouse::Left))
	{
	sf::Vector2i mousePosition = sf::Mouse::getPosition(*app);
	int xm = mousePosition.x - player->getX();
	int ym = mousePosition.y - player->getY();

	if (abs(xm) >= abs(ym))
	{
	if (xm > 0) player->fire(6);
	else player->fire(4);
	}
	else
	{
	if (ym > 0) player->fire(2);
	else player->fire(8);
	}
	}

	if (player->isDead() && xGameState == xGameStateNone && sf::Keyboard::isKeyPressed(sf::Keyboard::Return))
	{
	xGameState = xGameStateFadeOut;
	xGameTimer = FADE_OUT_DELAY;
	}
	}

	onUpdate();
	EntityManager::getEntityManager()->sortByZ();
	onRender();

	verifyDoorUnlocking();

	if (roomClosed)
	{
	if (getEnnemyCount() == 0)
	{
	currentMap->setCleared(true);
	openDoors();
	}
	}
	}
	quitGame();
	}

	void WitchBlastGame::createFloor()
	{
	// TODO : extracts from createNewGame
	}

	void WitchBlastGame::closeDoors()
	{
	if (!currentMap->isCleared())
	{
	int i;
	for(i = 0; i < MAP_WIDTH; i++)
	{
	if (currentMap->getTile(i, 0) < 4) currentMap->setTile(i, 0, MAP_DOOR);
	if (currentMap->getTile(i, MAP_HEIGHT - 1) < 4) currentMap->setTile(i, MAP_HEIGHT - 1, MAP_DOOR);
	}
	for(i = 0; i < MAP_HEIGHT; i++)
	{
	if (currentMap->getTile(0, i) < 4) currentMap->setTile(0, i, MAP_DOOR);
	if (currentMap->getTile(MAP_WIDTH - 1, i) < 4) currentMap->setTile(MAP_WIDTH - 1, i, MAP_DOOR);
	}
	roomClosed = true;
	}
	}

	void WitchBlastGame::openDoors()
	{
	int i, j;
	for(i = 0; i < MAP_WIDTH; i++)
	for(j = 0; j < MAP_WIDTH; j++)
	if (currentMap->getTile(i, j) == MAP_DOOR) currentMap->setTile(i, j, 0);
	roomClosed = false;
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);

	if (currentMap->hasNeighbourUp() == 2 && !bossRoomOpened)
	currentMap->setTile(MAP_WIDTH/2, 0, MAP_DOOR);
	else
	doorEntity[0]->openDoor();

	if (currentMap->hasNeighbourLeft() == 2 && !bossRoomOpened)
	currentMap->setTile(0, MAP_HEIGHT / 2, MAP_DOOR);
	else
	doorEntity[1]->openDoor();

	if (currentMap->hasNeighbourDown() == 2 && !bossRoomOpened)
	currentMap->setTile(MAP_WIDTH / 2, MAP_HEIGHT - 1, MAP_DOOR);
	else
	doorEntity[2]->openDoor();

	if (currentMap->hasNeighbourRight() == 2 && !bossRoomOpened)
	currentMap->setTile(MAP_WIDTH - 1, MAP_HEIGHT / 2, MAP_DOOR);
	else
	doorEntity[3]->openDoor();
	}

	int WitchBlastGame::getEnnemyCount()
	{
	int n=0;

	EntityManager::EntityList* entityList =EntityManager::getEntityManager()->getList();
	EntityManager::EntityList::iterator it;

	for (it = entityList->begin (); it != entityList->end ();)
	{
	GameEntity e = it;
	it++;

	if (e->getType() >= 20)
	{
	n++;
	} // endif
	} // end for

	return n;
	}

	void WitchBlastGame::refreshMap()
	{
	// clean the sprites from old map
	EntityManager::getEntityManager()->partialClean(10);

	// if new map, it has to be randomized
	bool generateMap = !(currentFloor->getMap(floorX, floorY)->isVisited());
	currentMap = currentFloor->getAndVisitMap(floorX, floorY);

	// load the map
	currentTileMap->setMap(currentMap);
	player->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	refreshMinimap();

	if(generateMap)
	this->generateMap();
	else
	{
	if (currentMap->getRoomType() == roomTypeMerchant)
	new PnjEntity(OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT,
	0);
	}

	// for testing purpose (new stuff)
	if (player->getAge() <2.0f)
	{
	/ItemEntity book = new ItemEntity(ItemEntity::itemHealth, player->getX(), player->getY()- 180);
	book->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	book->setMerchandise(true);*/

	/*int bonusType = getRandomEquipItem(true);
	ItemEntity* boots = new ItemEntity((enumItemType)(itemMagicianHat + bonusType), player->getX(), player->getY()+ 180);
	boots->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);*/

	//ChestEntity* chest = new ChestEntity(player->getX() + 100, player->getY()+ 150, CHEST_FAIRY, false);
	//chest->setMap(currentMap, TILE_WIDTH, TILE_HEIGHT, OFFSET_X, OFFSET_Y);
	}

	// check doors
	doorEntity[0]->setVisible(currentMap->hasNeighbourUp() > 0);
	if (currentMap->hasNeighbourUp() == 1) doorEntity[0]->setDoorType(0);
	if (currentMap->hasNeighbourUp() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[0]->setDoorType(1);
	if (currentMap->hasNeighbourUp() == 2 && !bossRoomOpened)
	{
	doorEntity[0]->setOpen(false);
	currentMap->setTile(MAP_WIDTH/2, 0, MAP_DOOR);
	}
	else
	doorEntity[0]->setOpen(true);

	doorEntity[3]->setVisible(currentMap->hasNeighbourRight() > 0);
	if (currentMap->hasNeighbourRight() == 1) doorEntity[3]->setDoorType(0);
	if (currentMap->hasNeighbourRight() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[3]->setDoorType(1);
	if (currentMap->hasNeighbourRight() == 2 && !bossRoomOpened)
	{
	doorEntity[3]->setOpen(false);
	currentMap->setTile(MAP_WIDTH - 1, MAP_HEIGHT / 2, MAP_DOOR);
	}
	else
	doorEntity[3]->setOpen(true);

	doorEntity[2]->setVisible(currentMap->hasNeighbourDown() > 0);
	if (currentMap->hasNeighbourDown() == 1) doorEntity[2]->setDoorType(0);
	if (currentMap->hasNeighbourDown() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[2]->setDoorType(1);
	if (currentMap->hasNeighbourDown() == 2 && !bossRoomOpened)
	{
	doorEntity[2]->setOpen(false);
	currentMap->setTile(MAP_WIDTH/2, MAP_HEIGHT - 1, MAP_DOOR);
	}
	else
	doorEntity[2]->setOpen(true);

	doorEntity[1]->setVisible(currentMap->hasNeighbourLeft() > 0);
	if (currentMap->hasNeighbourLeft() == 1) doorEntity[1]->setDoorType(0);
	if (currentMap->hasNeighbourLeft() == 2 \|\| currentMap->getRoomType()==roomTypeBoss) doorEntity[1]->setDoorType(1);
	if (currentMap->hasNeighbourLeft() == 2 && !bossRoomOpened)
	{
	doorEntity[1]->setOpen(false);
	currentMap->setTile(0, MAP_HEIGHT / 2, MAP_DOOR);
	}
	else
	doorEntity[1]->setOpen(true);
	}

	void WitchBlastGame::refreshMinimap()
	{
	for (int j=0; j < FLOOR_HEIGHT; j++)
	for (int i=0; i < FLOOR_WIDTH; i++)
	{
	int n = currentFloor->getRoom(i, j);
	if (n > 0 && currentFloor->getMap(i, j)->isVisited())
	{
	if (currentFloor->getRoom(i, j) == roomTypeStarting
	\|\| currentFloor->getRoom(i, j) == roomTypeBonus
	\|\| currentFloor->getRoom(i, j) == roomTypeKey)
	miniMap->setTile(i, j, roomTypeStandard);
	else
	miniMap->setTile(i, j, currentFloor->getRoom(i, j));
	}
	else if (n > 0 && currentFloor->getMap(i, j)->isKnown())
	{
	if (currentFloor->getRoom(i, j) == roomTypeBoss)
	miniMap->setTile(i, j, 7);
	else
	miniMap->setTile(i, j, 9);
	}
	else
	miniMap->setTile(i, j, 0);
	}
	miniMap->setTile(floorX, floorY, 8);
	}

	void WitchBlastGame::checkEntering()
	{
	if (!currentMap->isCleared())
	{
	player->setEntering();
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_CLOSING);
	for (int i=0; i<4; i++)
	doorEntity[i]->closeDoor();
	}
	}

	void WitchBlastGame::saveMapItems()
	{
	EntityManager::EntityList* entityList = EntityManager::getEntityManager()->getList();
	EntityManager::EntityList::iterator it;

	for (it = entityList->begin (); it != entityList->end ();)
	{
	GameEntity* e = *it;
	it++;

	ItemEntity* itemEntity = dynamic_cast<ItemEntity*>(e);
	ChestEntity* chestEntity = dynamic_cast<ChestEntity*>(e);

	if (itemEntity != NULL)
	{
	currentMap->addItem(itemEntity->getItemType(), itemEntity->getX(), itemEntity->getY(), itemEntity->getMerchandise());
	} // endif
	else if (chestEntity != NULL)
	{
	currentMap->addChest(chestEntity->getChestType(), chestEntity->getOpened(), chestEntity->getX(), chestEntity->getY());
	} // endif
	else
	{
	SpriteEntity* spriteEntity = dynamic_cast<SpriteEntity*>(e);
	if (spriteEntity != NULL && (e->getType() == ENTITY_BLOOD \|\| e->getType() == ENTITY_CORPSE ) )
	{
	int spriteFrame = spriteEntity->getFrame();
	if (spriteEntity->getWidth() == 128) spriteFrame += FRAME_CORPSE_KING_RAT;
	currentMap->addSprite(e->getType(), spriteFrame, e->getX(), e->getY(), spriteEntity->getScaleX());
	}

	}
	} // end for
	}

	void WitchBlastGame::moveToOtherMap(int direction)
	{
	saveMapItems();
	switch (direction)
	{
	case (4): floorX--; player->moveTo((OFFSET_X + MAP_WIDTH * TILE_WIDTH), player->getY()); player->move(4); break;
	case (6): floorX++; player->moveTo(OFFSET_X, player->getY()); player->move(6); break;
	case (8): floorY--; player->moveTo(player->getX(), OFFSET_Y + MAP_HEIGHT * TILE_HEIGHT - 10); player->move(8); break;
	case (2): floorY++; player->moveTo(player->getX(), OFFSET_Y); break;
	}
	refreshMap();
	checkEntering();
	currentMap->restoreMapObjects();
	}

	void WitchBlastGame::onRender()
	{
	// clear the view
	app->clear(sf::Color(32, 32, 32));

	// render the game objects
	EntityManager::getEntityManager()->render(app);

	myText.setColor(sf::Color(255, 255, 255, 255));
	myText.setCharacterSize(17);
	myText.setString("WASD or ZQSD to move\nArrows to shoot");
	myText.setPosition(650, 650);
	app->draw(myText);

	myText.setCharacterSize(18);
	std::ostringstream oss;
	oss << player->getGold();
	myText.setString(oss.str());
	myText.setPosition(690, 612);
	app->draw(myText);

	myText.setColor(sf::Color(0, 0, 0, 255));
	myText.setCharacterSize(16);
	myText.setString("Level 1");
	myText.setPosition(410, 692);
	app->draw(myText);

	sf::RectangleShape rectangle(sf::Vector2f(200, 25));
	// life

	if (gameState == gameStatePlaying)
	{
	// life and mana
	rectangle.setFillColor(sf::Color(190, 20, 20));
	rectangle.setPosition(sf::Vector2f(90, 622));
	rectangle.setSize(sf::Vector2f(200.0f * (float)(player->getHpDisplay()) / (float)(player->getHpMax()) , 25));
	app->draw(rectangle);

	rectangle.setFillColor(sf::Color(255, 190, 190));
	rectangle.setPosition(sf::Vector2f(90, 625));
	rectangle.setSize(sf::Vector2f(200.0f * (float)(player->getHpDisplay()) / (float)(player->getHpMax()) , 2));
	app->draw(rectangle);

	rectangle.setFillColor(sf::Color(20, 20, 190));
	rectangle.setPosition(sf::Vector2f(90, 658));
	rectangle.setSize(sf::Vector2f(200.0f * player->getPercentFireDelay() , 25));
	app->draw(rectangle);

	rectangle.setFillColor(sf::Color(190, 190, 255));
	rectangle.setPosition(sf::Vector2f(90, 661));
	rectangle.setSize(sf::Vector2f(200.0f * player->getPercentFireDelay() , 2));
	app->draw(rectangle);

	// drawing the key on the interface
	if (player->isEquiped(EQUIP_BOSS_KEY)) app->draw(keySprite);

	if (isPausing)
	{
	rectangle.setFillColor(sf::Color(0, 0, 0, 160));
	rectangle.setPosition(sf::Vector2f(OFFSET_X, OFFSET_Y));
	rectangle.setSize(sf::Vector2f(MAP_WIDTH * TILE_WIDTH, MAP_HEIGHT * TILE_HEIGHT));
	app->draw(rectangle);

	float x0 = OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2;
	int fade = 50 + 205 * (1.0f + cos(3.0f * getAbsolutTime())) * 0.5f;
	myText.setColor(sf::Color(255, 255, 255, fade));
	myText.setCharacterSize(40);
	myText.setString("PAUSE");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 300);
	app->draw(myText);
	}

	if (player->isDead())
	{
	float x0 = OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2;
	int fade = 255 * (1.0f + cos(2.0f * getAbsolutTime())) * 0.5f;

	myText.setColor(sf::Color(255, 255, 255, 255));
	myText.setCharacterSize(25);
	myText.setString("GAME OVER");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 400);
	app->draw(myText);

	myText.setColor(sf::Color(255, 255, 255, fade));
	myText.setCharacterSize(20);
	myText.setString("Press [ENTER] to play again !");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 440);
	app->draw(myText);
	}
	else if (currentMap->getRoomType() == roomTypeExit)
	{
	float x0 = OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2;
	myText.setColor(sf::Color(255, 255, 255, 255));
	myText.setCharacterSize(25);
	myText.setString("CONGRATULATIONS !\nYou've challenged this demo and\nmanaged to kill the boss !\nSee you soon for new adventures !");
	myText.setPosition(x0 - myText.getLocalBounds().width / 2, 220);
	app->draw(myText);
	}

	if (xGameState == xGameStateFadeIn)
	{
	// fade in
	rectangle.setFillColor(sf::Color(0, 0, 0, 255 - ((FADE_IN_DELAY - xGameTimer) / FADE_IN_DELAY) * 255));
	rectangle.setPosition(sf::Vector2f(OFFSET_X, OFFSET_Y));
	rectangle.setSize(sf::Vector2f(MAP_WIDTH * TILE_WIDTH , MAP_HEIGHT * TILE_HEIGHT));
	app->draw(rectangle);
	}
	else if (xGameState == xGameStateFadeOut)
	{
	// fade out
	rectangle.setFillColor(sf::Color(0, 0, 0, ((FADE_IN_DELAY - xGameTimer) / FADE_IN_DELAY) * 255));
	rectangle.setPosition(sf::Vector2f(OFFSET_X, OFFSET_Y));
	rectangle.setSize(sf::Vector2f(MAP_WIDTH * TILE_WIDTH , MAP_HEIGHT * TILE_HEIGHT));
	app->draw(rectangle);
	}
	}

	app->display();
	}

	void WitchBlastGame::generateBlood(float x, float y, BaseCreatureEntity::enumBloodColor bloodColor)
	{
	+ // double blood if the "Blood Snake3 object is equipped
	int nbIt;
	if (player->isEquiped(EQUIP_BLOOD_SNAKE))
	nbIt = 2;
	else
	nbIt = 1;

	for (int i=0; i < nbIt; i++)
	{
	SpriteEntity* blood = new SpriteEntity(ImageManager::getImageManager()->getImage(IMAGE_BLOOD), x, y, 16, 16, 6);
	blood->setZ(OFFSET_Y - 1);
	int b0 = 0;
	if (bloodColor == BaseCreatureEntity::bloodGreen) b0 += 6;
	blood->setFrame(b0 + rand()%6);
	blood->setType(ENTITY_BLOOD);
	blood->setVelocity(Vector2D(rand()%250));
	blood->setViscosity(0.95f);

	float bloodScale = 1.0f + (rand() % 10) * 0.1f;
	blood->setScale(bloodScale, bloodScale);
	}
	}

	void WitchBlastGame::showArtefactDescription(enumItemType itemType)
	{
	new ArtefactDescriptionEntity(itemType); //, &font);
	}

	void WitchBlastGame::generateMap()
	{
	if (currentMap->getRoomType() == roomTypeStandard)
	generateStandardMap();
	else if (currentMap->getRoomType() == roomTypeBonus)
	{
	currentMap->setCleared(true);
	Vector2D v = currentMap->generateBonusRoom();
	int bonusType = getRandomEquipItem(false);
	if (bonusType == EQUIP_FAIRY)
	{
	new ChestEntity(v.x, v.y, CHEST_FAIRY, false);
	}
	else
	{
	- new ItemEntity( (enumItemType)(itemMagicianHat + bonusType), v.x ,v.y);
	+ new ItemEntity( (enumItemType)(FirstEquipItem + bonusType), v.x ,v.y);
	}
	}
	else if (currentMap->getRoomType() == roomTypeKey)
	{
	Vector2D v = currentMap->generateKeyRoom();
	- new ItemEntity( (enumItemType)(itemBossKey), v.x ,v.y);
	+ new ItemEntity( (enumItemType)(ItemBossKey), v.x ,v.y);
	initMonsterArray();
	int x0 = MAP_WIDTH / 2;
	int y0 = MAP_HEIGHT / 2;
	monsterArray[x0][y0] = true;
	findPlaceMonsters(MONSTER_RAT, 5);
	findPlaceMonsters(MONSTER_BAT, 5);
	}
	else if (currentMap->getRoomType() == roomTypeMerchant)
	{
	currentMap->generateMerchantRoom();

	ItemEntity* item1 = new ItemEntity(
	itemHealth,
	OFFSET_X + (MAP_WIDTH / 2 - 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2) * TILE_HEIGHT);
	item1->setMerchandise(true);

	int bonusType = getRandomEquipItem(true);
	ItemEntity* item2 = new ItemEntity(
	- (enumItemType)(itemMagicianHat + bonusType),
	+ (enumItemType)(FirstEquipItem + bonusType),
	OFFSET_X + (MAP_WIDTH / 2 + 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2) * TILE_HEIGHT);
	item2->setMerchandise(true);

	new PnjEntity(OFFSET_X + (MAP_WIDTH / 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT,
	0);

	currentMap->setCleared(true);
	}
	else if (currentMap->getRoomType() == roomTypeBoss)
	{
	currentMap->generateRoom(0);

	new KingRatEntity(OFFSET_X + (MAP_WIDTH / 2 - 2) * TILE_WIDTH + TILE_WIDTH / 2,
	OFFSET_Y + (MAP_HEIGHT / 2 - 2) * TILE_HEIGHT + TILE_HEIGHT / 2);
	}
	else if (currentMap->getRoomType() == roomTypeStarting)
	{
	currentMap->generateRoom(0);
	currentMap->setCleared(true);
	int bonusType = getRandomEquipItem(false);
	if (bonusType == EQUIP_FAIRY)
	{
	new ChestEntity(OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + 120.0f + (TILE_HEIGHT * MAP_HEIGHT * 0.5f),
	CHEST_FAIRY, false);
	}
	else
	{
	- new ItemEntity( (enumItemType)(itemMagicianHat + bonusType),
	+ new ItemEntity( (enumItemType)(FirstEquipItem + bonusType),
	OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + 120.0f + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));
	}
	}
	else if (currentMap->getRoomType() == roomTypeExit)
	{
	currentMap->generateRoom(0);
	currentMap->setCleared(true);
	}
	else
	currentMap->randomize(currentMap->getRoomType());
	}

	void WitchBlastGame::Write(std::string str, int size, float x, float y, int align, sf::Color color)
	{
	myText.setString(str);
	myText.setCharacterSize(size);
	myText.setColor(color);

	if (align == ALIGN_CENTER)
	myText.setPosition(x - myText.getLocalBounds().width / 2, y);
	else
	myText.setPosition(x, y);

	app->draw(myText);
	}

	void WitchBlastGame::initMonsterArray()
	{
	for (int i = 0; i < MAP_WIDTH; i++)
	for (int j = 0; j < MAP_HEIGHT; j++)
	monsterArray[i][j] = false;
	}

	void WitchBlastGame::addMonster(monster_type_enum monsterType, float xm, float ym)
	{
	switch (monsterType)
	{
	case MONSTER_RAT: new RatEntity(xm, ym - 2); break;
	case MONSTER_BAT: new BatEntity(xm, ym); break;
	case MONSTER_EVIL_FLOWER: new EvilFlowerEntity(xm, ym); break;
	case MONSTER_SLIME: new SlimeEntity(xm, ym); break;

	case MONSTER_KING_RAT: new KingRatEntity(xm, ym); break;
	}
	}

	void WitchBlastGame::findPlaceMonsters(monster_type_enum monsterType, int amount)
	{
	// find a suitable place
	bool isMonsterFlying = monsterType == MONSTER_BAT;

	bool bOk;
	int xm, ym;
	float xMonster, yMonster;

	for (int index = 0; index < amount; index++)
	{
	bOk = false;

	while (!bOk)
	{
	bOk = true;
	xm = 1 +rand() % (MAP_WIDTH - 3);
	ym = 1 +rand() % (MAP_HEIGHT - 3);
	if (monsterArray[xm][ym])
	{
	bOk = false;
	}
	if (bOk && !isMonsterFlying && !currentMap->isWalkable(xm, ym))
	{
	bOk = false;
	}
	if (bOk)
	{
	xMonster = OFFSET_X + xm * TILE_WIDTH + TILE_WIDTH * 0.5f;
	yMonster = OFFSET_Y + ym * TILE_HEIGHT+ TILE_HEIGHT * 0.5f;

	float dist2 = (xMonster - player->getX())(xMonster - player->getX()) + (yMonster - player->getY())(yMonster - player->getY());
	if ( dist2 < 75000.0f)
	{
	bOk = false;
	}
	else
	{
	addMonster(monsterType, xMonster, yMonster);
	monsterArray[xm][ym] = true;
	}
	}
	}
	}
	}

	void WitchBlastGame::generateStandardMap()
	{
	initMonsterArray();

	int random = rand() % 100;

	if (random < 16)
	{
	currentMap->generateRoom(rand()%3);
	findPlaceMonsters(MONSTER_RAT,4);
	}
	else if (random < 32)
	{
	currentMap->generateRoom(rand()%4);
	findPlaceMonsters(MONSTER_BAT,4);
	}
	else if (random < 48)
	{
	currentMap->generateRoom(rand()%4);
	findPlaceMonsters(MONSTER_EVIL_FLOWER,4);
	}
	else if (random < 64)
	{
	Vector2D v = currentMap->generateBonusRoom();
	new ChestEntity(v.x, v.y, CHEST_BASIC, false);
	currentMap->setCleared(true);
	}
	else if (random < 80)
	{
	currentMap->generateRoom(rand()%3);
	findPlaceMonsters(MONSTER_RAT,3);
	findPlaceMonsters(MONSTER_BAT,3);
	}
	else
	{
	currentMap->generateRoom(rand()%3);
	findPlaceMonsters(MONSTER_SLIME,8 + rand() % 5);
	}
	}

	item_equip_enum WitchBlastGame::getRandomEquipItem(bool toSale = false)
	{
	std::vector<int> bonusSet;
	int setSize = 0;
	for (int i = 0; i < NUMBER_EQUIP_ITEMS; i++)
	{
	if (!player->isEquiped(i) && i != EQUIP_BOSS_KEY)
	{
	if (!toSale \|\| i!= EQUIP_FAIRY)
	{
	bonusSet.push_back(i);
	setSize++;
	}
	}
	}
	int bonusType = 0;
	if (setSize > 0) bonusType = bonusSet[rand() % setSize];

	return (item_equip_enum) bonusType;
	}

	void WitchBlastGame::verifyDoorUnlocking()
	{
	- int colliding = (player->getColliding());
	+ int collidingDirection = (player->getCollidingDirection());

	- if (colliding > 0 && currentMap->isCleared() && !bossRoomOpened && player->isEquiped(EQUIP_BOSS_KEY))
	+ if (collidingDirection > 0 && currentMap->isCleared() && !bossRoomOpened && player->isEquiped(EQUIP_BOSS_KEY))
	{
	int xt = (player->getX() - OFFSET_X) / TILE_WIDTH;
	int yt = (player->getY() - OFFSET_Y) / TILE_HEIGHT;

	if (yt <= 1 && xt >= MAP_WIDTH / 2 - 1 && xt <= MAP_WIDTH / 2 + 1 && currentMap->hasNeighbourUp() == 2)
	{
	doorEntity[0]->openDoor();
	currentMap->setTile(MAP_WIDTH / 2, 0, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	if (yt >= MAP_HEIGHT - 2 && xt >= MAP_WIDTH / 2 - 1 &&xt <= MAP_WIDTH / 2 + 1 && currentMap->hasNeighbourDown() == 2)
	{
	doorEntity[2]->openDoor();
	currentMap->setTile(MAP_WIDTH / 2, MAP_HEIGHT - 1, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	if (xt <= 1 && yt >= MAP_HEIGHT / 2 - 1 && yt <= MAP_HEIGHT / 2 + 1 && currentMap->hasNeighbourLeft() == 2)
	{

	doorEntity[1]->openDoor();
	currentMap->setTile(0, MAP_HEIGHT / 2, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	if (xt >= MAP_WIDTH - 2 && yt >= MAP_HEIGHT / 2 - 1 && yt <= MAP_HEIGHT / 2 + 1 && currentMap->hasNeighbourRight() == 2)
	{
	doorEntity[3]->openDoor();
	currentMap->setTile(MAP_WIDTH - 1, MAP_HEIGHT / 2, 0);
	SoundManager::getSoundManager()->playSound(SOUND_DOOR_OPENING);
	player->useBossKey();
	bossRoomOpened = true;
	}
	}
	}

	void WitchBlastGame::playMusic(musicEnum musicChoice)
	{
	music.stop();
	music.setLoop(true);
	bool ok = false;
	switch (musicChoice)
	{
	case MusicDungeon:
	ok = music.openFromFile("media/sound/track00.ogg");
	music.setVolume(75);
	break;

	case MusicEnding:
	ok = music.openFromFile("media/sound/track_ending.ogg");
	music.setVolume(35);
	break;
	}

	if (ok)
	music.play();
	}

	void WitchBlastGame::saveGame()
	{
	ofstream file("game.sav", ios::out \| ios::trunc);

	int i, j, k, l;

	if (file)
	{
	// floor
	int nbRooms = 0;
	for (j = 0; j < FLOOR_HEIGHT; j++)
	{
	for (i = 0; i < FLOOR_WIDTH; i++)
	{
	file << currentFloor->getRoom(i,j) << " ";
	if (currentFloor->getRoom(i,j) > 0) nbRooms++;
	}
	file << std::endl;
	}

	// maps
	saveMapItems();

	file << nbRooms << std::endl;
	for (j = 0; j < FLOOR_HEIGHT; j++)
	{
	for (i = 0; i < FLOOR_WIDTH; i++)
	{
	if (currentFloor->getRoom(i,j) > 0)
	{
	file << i << " " << j << " "
	<< currentFloor->getMap(i, j)->getRoomType() << " "
	<< currentFloor->getMap(i, j)->isKnown() << " "
	<< currentFloor->getMap(i, j)->isVisited() << " "
	<< currentFloor->getMap(i, j)->isCleared() << std::endl;
	if (currentFloor->getMap(i, j)->isVisited())
	{
	for (l = 0; l < MAP_HEIGHT; l++)
	{
	for (k = 0; k < MAP_WIDTH; k++)
	{
	file << currentFloor->getMap(i, j)->getTile(k, l) << " ";
	}
	file << std::endl;
	}
	// items, etc...
	std::list<DungeonMap::itemListElement> itemList = currentFloor->getMap(i, j)->getItemList();
	file << itemList.size() << std::endl;
	std::list<DungeonMap::itemListElement>::iterator it;
	for (it = itemList.begin (); it != itemList.end ();)
	{
	DungeonMap::itemListElement ilm = *it;
	it++;

	file << ilm.type << " " << ilm.x << " " << ilm.y << " " << ilm.merch << std::endl;
	}

	// chests
	std::list<DungeonMap::chestListElement> chestList = currentFloor->getMap(i, j)->getChestList();
	file << chestList.size() << std::endl;
	std::list<DungeonMap::chestListElement>::iterator itc;
	for (itc = chestList.begin (); itc != chestList.end ();)
	{
	DungeonMap::chestListElement ilm = *itc;
	itc++;

	file << ilm.type << " " << ilm.x << " " << ilm.y << " " << ilm.state << std::endl;
	}

	// sprites
	std::list<DungeonMap::spriteListElement> spriteList = currentFloor->getMap(i, j)->getSpriteList();
	file << spriteList.size() << std::endl;
	std::list<DungeonMap::spriteListElement>::iterator its;
	for (its = spriteList.begin (); its != spriteList.end ();)
	{
	DungeonMap::spriteListElement ilm = *its;
	its++;

	file << ilm.type << " " << ilm.frame << " " << ilm.x << " " << ilm.y << " " << ilm.scale << std::endl;
	}
	}
	}
	}
	file << std::endl;
	}

	// game
	file << floorX << " " << floorY << std::endl;
	file << bossRoomOpened << std::endl;
	// boss door !

	// player
	file << player->getHp() << " " << player->getHpMax() << " " << player->getGold() << std::endl;
	for (i = 0; i < NUMBER_EQUIP_ITEMS; i++) file << player->isEquiped(i) << " ";
	file << std::endl;
	file << player->getX() << " " << player->getY() << std::endl;

	file.close();
	}
	else
	{
	cerr << "[ERROR] Saving the game..." << endl;
	}
	}

	bool WitchBlastGame::loadGame()
	{
	ifstream file("game.sav", ios::in);

	if (file)
	{
	int i, j, k, n;

	// floor
	currentFloor = new GameFloor();
	for (j = 0; j < FLOOR_HEIGHT; j++)
	{
	for (i = 0; i < FLOOR_WIDTH; i++)
	{
	int n;
	file >> n;
	currentFloor->setRoom(i, j, n);
	}
	}

	// maps
	int nbRooms;
	file >> nbRooms;

	for (k = 0; k < nbRooms; k++)
	{
	file >> i;
	file >> j;
	file >> n;
	DungeonMap* iMap = new DungeonMap(currentFloor, i, j);
	currentFloor->setMap(i, j, iMap);
	iMap->setRoomType((roomTypeEnum)n);
	bool flag;
	file >> flag;
	iMap->setKnown(flag);
	file >> flag;
	iMap->setVisited(flag);
	file >> flag;
	iMap->setCleared(flag);

	if (iMap->isVisited())
	{
	for (j = 0; j < MAP_HEIGHT; j++)
	{
	for (i = 0; i < MAP_WIDTH; i++)
	{
	file >> n;
	iMap->setTile(i, j, n);
	}
	}
	// items int the map
	file >> n;
	for (i = 0; i < n; i++)
	{
	int t;
	float x, y;
	bool merc;
	file >> t >> x >> y >> merc;
	iMap->addItem(t, x, y, merc);
	}
	// chests in the map
	file >> n;
	for (i = 0; i < n; i++)
	{
	int t;
	float x, y;
	bool state;
	file >> t >> x >> y >> state;
	iMap->addChest(t, state, x, y);
	}
	// sprites in the map
	file >> n;
	for (i = 0; i < n; i++)
	{
	int t, f;
	float x, y, scale;
	file >> t >> f >> x >> y >> scale;
	iMap->addSprite(t, f, x, y, scale);
	}
	}
	}

	- //currentFloor->displayToConsole();
	-
	// game
	file >> floorX >> floorY;
	currentMap = currentFloor->getMap(floorX, floorY);
	file >> bossRoomOpened;

	// player
	int hp, hpMax, gold;
	file >> hp >> hpMax >> gold;
	- player = new PlayerEntity(ImageManager::getImageManager()->getImage(0),
	- OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	+ player = new PlayerEntity(OFFSET_X + (TILE_WIDTH * MAP_WIDTH * 0.5f),
	OFFSET_Y + (TILE_HEIGHT * MAP_HEIGHT * 0.5f));
	player->setHp(hp);
	player->setHpMax(hpMax);
	player->setGold(gold);
	for (i = 0; i < NUMBER_EQUIP_ITEMS; i++)
	{
	bool eq;
	file >> eq;
	player->setEquiped(i, eq);
	}
	float x, y;
	file >> x >> y;

	player->moveTo(x, y);

	file.close();
	remove("game.sav");
	}
	else
	{
	return false;
	}

	return true;
	}

	WitchBlastGame &game()
	{
	return *gameptr;
	}
	diff --git a/src/WitchBlastGame.h b/src/WitchBlastGame.h
	index 296838a..46a7975 100644
	--- a/src/WitchBlastGame.h
	+++ b/src/WitchBlastGame.h
	@@ -1,345 +1,345 @@
	#ifndef WITCH_BLAST_GAME_H
	#define WITCH_BLAST_GAME_H

	#include "sfml_game/Game.h"
	#include "sfml_game/TileMapEntity.h"
	#include "PlayerEntity.h"
	#include "EnnemyEntity.h"
	#include "DoorEntity.h"
	#include "GameFloor.h"

	-const int ALIGN_LEFT = 0;
	-const int ALIGN_RIGHT = 1;
	-const int ALIGN_CENTER = 2;
	+const int ALIGN_LEFT = 0; /!< Text alignment left /
	+const int ALIGN_RIGHT = 1; /!< Text alignment right /
	+const int ALIGN_CENTER = 2; /!< Text alignment centered /

	/*! \class WitchBlastGame
	* \brief Main class of the game
	*
	* WitchBlastGame load the game ressources and do a large part of the game logic (game loop...),
	* watches the input, manages the game states, ...
	*/
	class WitchBlastGame : public Game
	{
	public:
	/*!
	* \brief Constructor
	*
	- * Constructor of the WitchBlastGame class
	+ * Constructor of the WitchBlastGame class.
	*/
	WitchBlastGame();

	/*!
	* \brief Destructor
	*
	- * Destructor of the WitchBlastGame class
	+ * Destructor of the WitchBlastGame class.
	*/
	virtual ~WitchBlastGame();

	/*!
	* \brief Accessor on the current dungeon map
	*
	* Accessor on the current dungeon map (room).
	*
	* \return a pointer to the current dungeon map
	*/
	DungeonMap* getCurrentMap();

	/*!
	* \brief Accessor on the player
	*
	* Accessor on the player.
	*
	* \return a pointer to the player
	*/
	PlayerEntity* getPlayer();

	/*!
	* \brief Start the game and the game loop
	*
	* This method starts the game and the game loop.
	* The game loop watches the events, the inputs, update and draw the game elements.
	*/
	virtual void startGame();

	/*!
	* \brief Move the player to another map (room)
	*
	* Moves the player to another room of the dungeon.
	* It's called when a player walk through an opened door.
	*
	* \param direction : direction of the new map. 4 = left, 8 = north, 6 = right, 2 = south
	*/
	void moveToOtherMap(int direction);

	/*!
	* \brief Closes the doors of the room
	*
	* Closes the doors of the room.
	* It's called when the player enter in an area with monsters.
	*/
	void closeDoors();

	/*!
	* \brief Opens the doors of the room
	*
	* Opens the doors of the room.
	* It's called when the player destroy the last monster of a room.
	*/
	void openDoors();

	/*!
	* \brief Count the enemies in the room
	*
	* Count the enemies in the room.
	* It's called when the room is closed : 0 enemy = room is cleared and doors shall open.
	*
	* \return amount of enemies
	*/
	int getEnnemyCount();

	/*!
	* \brief Generates blood
	*
	* Generates blood, it's called when someone is hurt or dies.
	*
	* \param x : x position of the blood
	* \param y : y position of the blood
	* \param bloodColor : color of the blood (red; green, ...)
	*/
	void generateBlood(float x, float y, BaseCreatureEntity::enumBloodColor bloodColor);

	/*!
	* \brief Show a "popup" with artefact's description
	*
	* Show a "popup" with artefact's description.
	* Artefact's description consists of zoomed picture of the item, name and description.
	* It's called when a player get an equipment item.
	*
	* \param itemType : item identifier
	*/
	void showArtefactDescription(enumItemType itemType);

	void Write(std::string str, int size, float x, float y, int align, sf::Color color);

	/*!
	* \brief Save the game
	*
	* Save the game to file : complete floor and maps, items and blood position, player current equipment and stats....
	*/
	void saveGame();

	/*!
	* \brief Load the game
	*
	* Load the game from file. After restoring the game, the file is destroy.
	*
	* \return true if succeeded
	*/
	bool loadGame();

	protected:
	/*!
	* \brief Rendering method
	*
	* Render all the game objects to the screen.
	* Called in the game loop.
	*/
	virtual void onRender();

	/*!
	* \brief Update method
	*
	* Update all the game objects to the screen.
	* Called in the game loop.
	*/
	virtual void onUpdate();

	private:
	// game logic / data
	GameMap* miniMap; /!< Pointer to the logical minimap /
	DungeonMap* currentMap; /!< Pointer to the logical current map /
	GameFloor* currentFloor; /!< Pointer to the logical floor (level) /

	// game play
	int floorX; /!< X position of the room in the level /
	int floorY; /!< Y position of the room in the level /
	bool roomClosed; /!< True if the room is closed /
	bool bossRoomOpened; /!< True if the boss gate has been opened in this level /
	bool isPausing; /!< True if the game is currently pausing /
	int firingDirection; /!< Save the firing direction - for the "one button" gameplay /
	bool isPlayerAlive; /!< Dying sets this bool to false (trigger the ending music) /
	bool monsterArray[MAP_WIDTH][MAP_HEIGHT]; /!< use to remember if a case has a monster in monster spawn /

	// game objects
	PlayerEntity* player; /!< Pointer to the player entity /
	TileMapEntity* currentTileMap; /!< TileMap of the room (main game board) /

	// displaying objects
	DoorEntity* doorEntity[4]; /!< Pointers to the door graphical entity /
	sf::Sprite keySprite; /!< A simple sprite with the boss key (displayed on the HUD) /
	sf::Font font; /!< The font used for displaying text /
	sf::Text myText; /!< The text to be displayed /

	sf::Music music; /!< Current game music /

	/** Music enum
	* Identify the various music tracks of the game.
	*/
	enum musicEnum
	{
	MusicDungeon, /*< Main game music - played when playing the game /
	MusicEnding /*< Ending music - played when the player has died /
	};

	/** Game states enum
	* Used for the different game states
	*/
	enum gameStateEnum
	{
	gameStateInit, /*< Game initialization /
	gameStatePlaying /*< Playing /
	};
	gameStateEnum gameState; /!< Store the game state /

	/** Special game states enum
	* Used for effects such as fade in...
	*/
	enum xGameStateEnum
	{
	xGameStateNone, /*< No effect /
	xGameStateFadeIn, /*< Fade in effect - usually when starting a level /
	xGameStateFadeOut /*< Fade out effect - usually when leaving a level /
	};
	xGameStateEnum xGameState; /!< Store the effect game state /
	float xGameTimer; /!< Effect game timer /

	/*!
	* \brief Starts the game
	*
	* Start a new game or load it from file.
	*
	* \param fromSaveFile : true if we want to try to load the game from a file
	*/
	void startNewGame(bool fromSaveFile);

	/*!
	* \brief Creates a level
	*
	* Creates a random level (a level is a floor that consists of rooms).
	*/
	void createFloor();

	/*!
	* \brief Create or refresh the room
	*
	* Create a room (if this is a new one) or refresh it.
	* Called when the player changes room.
	* Checks the visibility of the doors and close it if there are monsters.
	* Loads the mas items and sprites.
	*/
	void refreshMap();

	/*!
	* \brief Refreshes the minimap
	*
	* Refresh the minimap.
	* Called when the player changes room.
	*/
	void refreshMinimap();

	/*!
	* \brief Generates a room
	*
	* Generates a room.
	* Called when the player moves to a room for the first time.
	*/
	void generateMap();

	/*!
	* \brief Generates a standard room
	*
	* Generates a standard room with monsters.
	* Called during the generation when the map has no particular type.
	*/
	void generateStandardMap();

	/*!
	* \brief Checks if the room will be closed
	*
	* Checks if the room will be closed.
	* Called when entering a room. If the room is not clear, closes the doors.
	*/
	void checkEntering();

	/*!
	* \brief Saves the map items
	*
	* Saves the map objects such as items, corpses, blood, chest.
	* Called when leaving the door.
	*/
	void saveMapItems();

	/*!
	* \brief Initializes the monster array
	*
	* Initializes the monster array (to empty).
	*/
	void initMonsterArray();

	/*!
	* \brief Adds a monster
	*
	* Adds a monster to the room.
	* \param monsterType : monster type
	* \param xm : x position of the monster
	* \param ym : y position of the monster
	*/
	void addMonster(monster_type_enum monsterType, float xm, float ym);

	/*!
	* \brief Adds monsters
	*
	* Adds monsters to the room in suitable places.
	* \param monsterType : monster type
	* \param amount : amount of monsters
	*/
	void findPlaceMonsters(monster_type_enum monsterType, int amount);

	/*!
	* \brief Returns a random equip object
	*
	* Returns a random equip object (not an object the player already possesses) .
	* \param toSale : true if it's an item for sale
	*
	* \return the equipment item ID
	*/
	item_equip_enum getRandomEquipItem(bool toSale);

	/*!
	* \brief Checks if player opens a door
	*
	* Checks if player opens a door (collide with the door and gets the key).
	* If positive, opens the door.
	*/
	void verifyDoorUnlocking();

	/*!
	* \brief Plays a music
	*
	* Plays a music.
	*
	* \param musicChoice : music track ID
	*/
	void playMusic(musicEnum musicChoice);
	};

	/*!
	* \brief Returns the game reference
	*
	* Returns the game reference.
	*
	* \return a reference to the game
	*/
	WitchBlastGame& game();

	#endif // WITCH_BLAST_GAME_H

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jun 11, 11:34 AM (3 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 68792
Default Alt Text: (104 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions