Merge pull request #21 from TibiaDev/feature/0.2.9

[Feature] 0.2.9

Author: MUN1Z

Makefile

@@ -1,20 +1,21 @@
+# Makefile for Linux (tested under Debian and Ubuntu)
 TFS = forgottenserver
 
 INCLUDEDIRS = -I. -I/usr/include/libxml2 \
 		-I /usr/include/lua5.1
 
 LIBDIRS =
 
-FLAGS = -D_THREAD_SAFE -D_REENTRANT -D__NO_HOMEDIR_CONF__  -D__ENABLE_SERVER_DIAGNOSTIC__ -D__USE_SQLITE__ -D__USE_MYSQL__
+FLAGS = -D_THREAD_SAFE -D_REENTRANT -D__NO_HOMEDIR_CONF__ -D__ENABLE_SERVER_DIAGNOSTIC__ -D__USE_SQLITE__ -D__USE_MYSQL__
 
-CXXFLAGS = $(INCLUDEDIRS) $(FLAGS) -Werror -Wall -O0 -ggdb
+CXXFLAGS = $(INCLUDEDIRS) $(FLAGS) -Werror -Wall -O2
 CXX = g++
 
-LIBS = -lxml2 -lpthread -llua5.1 -lgmp -lmysqlclient -lsqlite3 -lboost_regex -llua5.1-sql-mysql -llua5.1-sql-sqlite -ldl -lboost_system -lboost_thread
+LIBS = -lxml2 -lpthread -llua5.1 -lgmp -lmysqlclient -lsqlite3 -lboost_regex -llua5.1-sql-mysql -ldl -lboost_system -lboost_thread
 
 LDFLAGS = $(LIBDIRS) $(LIBS)
 
-CXXSOURCES = account.cpp actions.cpp admin.cpp allocator.cpp ban.cpp baseevents.cpp beds.cpp creature.cpp creatureevent.cpp chat.cpp combat.cpp commands.cpp condition.cpp configmanager.cpp connection.cpp container.cpp cylinder.cpp database.cpp databasemysql.cpp databasesqlite.cpp depot.cpp exception.cpp fileloader.cpp game.cpp gui.cpp house.cpp housetile.cpp ioguild.cpp iologindata.cpp iomap.cpp iomapserialize.cpp inputbox.cpp item.cpp items.cpp logger.cpp luascript.cpp mailbox.cpp map.cpp md5.cpp monster.cpp monsters.cpp movement.cpp networkmessage.cpp npc.cpp otserv.cpp outfit.cpp outputmessage.cpp party.cpp player.cpp playerbox.cpp position.cpp protocol.cpp protocolgame.cpp protocollogin.cpp protocolold.cpp quests.cpp raids.cpp rsa.cpp scheduler.cpp scriptmanager.cpp server.cpp sha1.cpp spawn.cpp spells.cpp status.cpp talkaction.cpp tasks.cpp teleport.cpp textlogger.cpp thing.cpp tile.cpp tools.cpp trashholder.cpp vocation.cpp waitlist.cpp weapons.cpp
+CXXSOURCES = account.cpp actions.cpp admin.cpp allocator.cpp ban.cpp baseevents.cpp beds.cpp creature.cpp creatureevent.cpp chat.cpp combat.cpp commands.cpp condition.cpp configmanager.cpp connection.cpp container.cpp cylinder.cpp database.cpp databasemysql.cpp databasesqlite.cpp depot.cpp exception.cpp fileloader.cpp game.cpp globalevent.cpp gui.cpp house.cpp housetile.cpp ioguild.cpp iologindata.cpp iomap.cpp iomapserialize.cpp inputbox.cpp item.cpp items.cpp logger.cpp luascript.cpp mailbox.cpp map.cpp md5.cpp monster.cpp monsters.cpp mounts.cpp movement.cpp networkmessage.cpp npc.cpp otserv.cpp outfit.cpp outputmessage.cpp party.cpp player.cpp playerbox.cpp position.cpp protocol.cpp protocolgame.cpp protocollogin.cpp protocolold.cpp quests.cpp raids.cpp rsa.cpp scheduler.cpp scriptmanager.cpp server.cpp sha1.cpp spawn.cpp spells.cpp status.cpp talkaction.cpp tasks.cpp teleport.cpp textlogger.cpp thing.cpp tile.cpp tools.cpp trashholder.cpp vocation.cpp waitlist.cpp weapons.cpp
 
 CXXOBJECTS = $(CXXSOURCES:.cpp=.o)
 

actions.cpp

@@ -619,9 +619,9 @@ bool Action::executeUse(Player* player, Item* item, const PositionEx& fromPos, c
 			LuaScriptInterface::pushPosition(L, posEx, 0);
 		}
 
-		int32_t result = m_scriptInterface->callFunction(5);
+		bool result = m_scriptInterface->callFunction(5);
 		m_scriptInterface->releaseScriptEnv();
-		return (result != LUA_FALSE);
+		return result;
 	}
 	else
 	{

beds.cpp

@@ -96,15 +96,15 @@ BedItem* BedItem::getNextBedItem()
 	Position targetPos = getNextPosition(dir, getPosition());
 
 	Tile* tile = g_game.getMap()->getTile(targetPos);
-	if(tile != NULL)
+	if(tile)
 		return tile->getBedItem();
 
 	return NULL;
 }
 
 bool BedItem::canUse(Player* player)
 {
-	if(player == NULL || house == NULL || !player->isPremium())
+	if(!player || !house || !player->isPremium())
 		return false;
 	else if(player->hasCondition(CONDITION_INFIGHT))
 		return false;
@@ -142,7 +142,7 @@ bool BedItem::canUse(Player* player)
 void BedItem::sleep(Player* player)
 {
 	// avoid crashes
-	if((house == NULL) || (player == NULL) || player->isRemoved())
+	if((!house) || (!player) || player->isRemoved())
 		return;
 
 	if(sleeperGUID != 0)
@@ -183,12 +183,12 @@ void BedItem::sleep(Player* player)
 void BedItem::wakeUp(Player* player)
 {
 	// avoid crashes
-	if(house == NULL)
+	if(!house)
 		return;
 
 	if(sleeperGUID != 0)
 	{
-		if(player == NULL)
+		if(!player)
 		{
 			std::string name;
 			if(IOLoginData::getInstance()->getNameByGuid(sleeperGUID, name))

chat.cpp

@@ -147,7 +147,7 @@ void ChatChannel::sendToAll(std::string message, SpeakClasses type)
 		it->second->sendChannelMessage("", message, type, m_id);
 }
 
-bool ChatChannel::talk(Player* fromPlayer, SpeakClasses type, const std::string& text, uint32_t time /*= 0*/)
+bool ChatChannel::talk(Player* fromPlayer, SpeakClasses type, const std::string& text)
 {
 	if(m_users.find(fromPlayer->getID()) == m_users.end())
 		return false;
@@ -159,7 +159,7 @@ bool ChatChannel::talk(Player* fromPlayer, SpeakClasses type, const std::string&
 	}
 
 	for(UsersMap::iterator it = m_users.begin(); it != m_users.end(); ++it)
-		it->second->sendToChannel(fromPlayer, type, text, getId(), time);
+		it->second->sendToChannel(fromPlayer, type, text, getId());
 
 	return true;
 }

chat.h

@@ -42,7 +42,7 @@ class ChatChannel
 		bool addUser(Player* player);
 		bool removeUser(Player* player);
 
-		bool talk(Player* fromPlayer, SpeakClasses type, const std::string& text, uint32_t time = 0);
+		bool talk(Player* fromPlayer, SpeakClasses type, const std::string& text);
 		void sendToAll(std::string message, SpeakClasses type);
 
 		const std::string& getName() {return m_name;}

codeblocks/The Forgotten Server.cbp

@@ -100,6 +100,8 @@
 		<Unit filename="..\fileloader.h" />
 		<Unit filename="..\game.cpp" />
 		<Unit filename="..\game.h" />
+		<Unit filename="..\globalevent.cpp" />
+		<Unit filename="..\globalevent.h" />
 		<Unit filename="..\gui.cpp" />
 		<Unit filename="..\gui.h" />
 		<Unit filename="..\house.cpp" />
@@ -135,6 +137,8 @@
 		<Unit filename="..\monster.h" />
 		<Unit filename="..\monsters.cpp" />
 		<Unit filename="..\monsters.h" />
+		<Unit filename="..\mounts.cpp" />
+		<Unit filename="..\mounts.h" />
 		<Unit filename="..\movement.cpp" />
 		<Unit filename="..\movement.h" />
 		<Unit filename="..\networkmessage.cpp" />

combat.cpp

@@ -1015,7 +1015,7 @@ void ValueCallback::getMinMaxValues(Player* player, int32_t& min, int32_t& max,
 			min = LuaScriptInterface::popNumber(L);
 		}
 
-		if((lua_gettop(L) + parameters /*nParams*/  + 1) != size0)
+		if((lua_gettop(L) + parameters /*nParams*/ + 1) != size0)
 			LuaScriptInterface::reportError(NULL, "Stack size changed!");
 
 		env->resetCallback();
@@ -1088,7 +1088,7 @@ void TargetCallback::onTargetCombat(Creature* creature, Creature* target) const
 		if(lua_pcall(L, 2, 0 /*nReturnValues*/, 0) != 0)
 			LuaScriptInterface::reportError(NULL, LuaScriptInterface::popString(L));
 
-		if((lua_gettop(L) + 2 /*nParams*/  + 1) != size0)
+		if((lua_gettop(L) + 2 /*nParams*/ + 1) != size0)
 			LuaScriptInterface::reportError(NULL, "Stack size changed!");
 
 		env->resetCallback();
@@ -1146,7 +1146,7 @@ bool AreaCombat::getList(const Position& centerPos, const Position& targetPos, s
 			{
 				if(tmpPosX >= 0 && tmpPosX < 0xFFFF &&
 					tmpPosY >= 0 && tmpPosY < 0xFFFF &&
-					tmpPosZ  >= 0 && tmpPosZ < MAP_MAX_LAYERS)
+					tmpPosZ >= 0 && tmpPosZ < MAP_MAX_LAYERS)
 				{
 					if(g_game.isSightClear(targetPos, Position(tmpPosX, tmpPosY, tmpPosZ), true))
 					{

commands.cpp

@@ -43,6 +43,7 @@
 #include "raids.h"
 #include "chat.h"
 #include "quests.h"
+#include "mounts.h"
 #ifdef __ENABLE_SERVER_DIAGNOSTIC__
 #include "outputmessage.h"
 #include "connection.h"
@@ -186,7 +187,11 @@ bool Commands::loadFromXml()
 						else
 							std::cout << "missing acctype tag for " << strCmd << std::endl;
 					}
+					#ifdef __ENABLE_SERVER_DIAGNOSTIC__
 					else
+					#else
+					else if(strCmd != "/serverdiag")
+					#endif
 						std::cout << "Unknown command " << strCmd << std::endl;
 				}
 				else
@@ -580,11 +585,15 @@ void Commands::reloadInfo(Player* player, const std::string& cmd, const std::str
 		Quests::getInstance()->reload();
 		player->sendTextMessage(MSG_STATUS_CONSOLE_BLUE, "Reloaded quests.");
 	}
+	else if(tmpParam == "mount" || tmpParam == "mounts")
+	{
+		Mounts::getInstance()->reload();
+		player->sendTextMessage(MSG_STATUS_CONSOLE_BLUE, "Reloaded mounts.");
+	}
 	else
 		player->sendTextMessage(MSG_STATUS_CONSOLE_BLUE, "Reload type not found.");
 }
 
-
 void Commands::teleportToTown(Player* player, const std::string& cmd, const std::string& param)
 {
 	std::string tmp = param;
@@ -1019,8 +1028,12 @@ void Commands::removeThing(Player* player, const std::string& cmd, const std::st
 void Commands::newType(Player* player, const std::string& cmd, const std::string& param)
 {
 	int32_t lookType = atoi(param.c_str());
-	if(lookType >= 0 && lookType != 1 && lookType != 135 && (lookType <= 160 || lookType >= 192) && lookType <= 367)
-		g_game.internalCreatureChangeOutfit(player, (const Outfit_t&)lookType);
+	if(lookType >= 0 && lookType != 1 && lookType != 135 && (lookType <= 160 || lookType >= 192) && lookType <= 386)
+	{
+		Outfit_t newOutfit = player->getDefaultOutfit();
+		newOutfit.lookType = lookType;
+		g_game.internalCreatureChangeOutfit(player, newOutfit);
+	}
 	else
 		player->sendTextMessage(MSG_STATUS_SMALL, "This looktype does not exist.");
 }
@@ -1283,10 +1296,10 @@ void Commands::playerKills(Player* player, const std::string& cmd, const std::st
 	int32_t fragTime = g_config.getNumber(ConfigManager::FRAG_TIME);
 	if(player->redSkullTicks && fragTime > 0)
 	{
-		int32_t frags = ceil(player->redSkullTicks / (double)fragTime);
+		int32_t frags = (int32_t)ceil(player->redSkullTicks / (double)fragTime);
 		int32_t remainingTime = (player->redSkullTicks % fragTime) / 1000;
-		int32_t hours = floor(remainingTime / 3600);
-		int32_t minutes = floor((remainingTime % 3600) / 60);
+		int32_t hours = (int32_t)floor(remainingTime / 3600);
+		int32_t minutes = (int32_t)floor((remainingTime % 3600) / 60);
 
 		std::stringstream ss;
 		ss << "You have " << frags << " unjustified kill" << (frags > 1 ? "s" : "") << ". The amount of unjustified kills will decrease after: " << hours << " hour" << (hours != 1 ? "s" : "") << " and " << minutes << " minute" << (minutes != 1 ? "s" : "") << ".";