Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace-Server

src/engine/server/server.cpp

@@ -884,7 +884,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 						m_aClients[ClientId].m_Addr.ip[1],
 						m_aClients[ClientId].m_Addr.ip[2],
 						m_aClients[ClientId].m_Addr.ip[3]);
-						//BanAdd(m_aClients[ClientId].m_Addr, g_Config.m_SvRconTriesBantime); // bye  
+						//BanAdd(m_aClients[ClientId].m_Addr, g_Config.m_SvRconTriesBantime,"Trying Rcon commands withou permission"); // bye
 					}
 
 
@@ -1371,11 +1371,11 @@ void CServer::ConBan(IConsole::IResult *pResult, void *pUser, int ClientId1)
 	NETADDR Addr;
 	char aAddrStr[128], Bufz[100];
 	const char *pStr = pResult->GetString(0);
-	int Minutes = 30, jkl;//????
+	int Seconds = 30, jkl;//????
 	str_format(Bufz, sizeof(Bufz), "");
 
 	if(pResult->NumArguments() > 1)
-		Minutes = pResult->GetInteger(1);
+		Seconds = pResult->GetInteger(1);
 
 	if(pResult->NumArguments() > 2)
 	{
@@ -1390,7 +1390,7 @@ void CServer::ConBan(IConsole::IResult *pResult, void *pUser, int ClientId1)
 
 
 	if(net_addr_from_str(&Addr, pStr) == 0)
-		((CServer *)pUser)->BanAdd(Addr, Minutes*60, Bufz);
+		((CServer *)pUser)->BanAdd(Addr, Seconds, Bufz);
 	else if(StrAllnum(pStr))
 	{
 		int ClientId = str_toint(pStr);
@@ -1404,14 +1404,14 @@ void CServer::ConBan(IConsole::IResult *pResult, void *pUser, int ClientId1)
 		}
 
 		Addr = ((CServer *)pUser)->m_NetServer.ClientAddr(ClientId);
-		((CServer *)pUser)->BanAdd(Addr, Minutes*60, Bufz);
+		((CServer *)pUser)->BanAdd(Addr, Seconds, Bufz);
 	}
 
 	Addr.port = 0;
 	net_addr_str(&Addr, aAddrStr, sizeof(aAddrStr));
 
-	if(Minutes)
+	if(Seconds)
-		dbg_msg("server", "banned %s for %d Minutes", aAddrStr, Minutes);
+		dbg_msg("server", "banned %s for %d Second(s)", aAddrStr, Seconds);
 	else
 		dbg_msg("server", "banned %s for life", aAddrStr);
 }
@@ -1534,7 +1534,7 @@ void CServer::RegisterCommands()
 	m_pConsole = Kernel()->RequestInterface<IConsole>();
 
 	Console()->Register("kick", "i", CFGFLAG_SERVER, ConKick, this, "", 2);
-	Console()->Register("ban", "s?i?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s?s", CFGFLAG_SERVER, ConBan, this, "Ban player",2); //horrible long string
+	Console()->Register("ban", "s?i?r", CFGFLAG_SERVER, ConBan, this, "Ban player",2); //horrible long string
 	Console()->Register("unban", "s", CFGFLAG_SERVER, ConUnban, this, "", 3);
 	Console()->Register("bans", "", CFGFLAG_SERVER, ConBans, this, "", 2);
 	Console()->Register("status", "", CFGFLAG_SERVER, ConStatus, this, "", 1);

src/engine/shared/config_variables.h

@@ -8,6 +8,7 @@
 //===============================  	
 /* DDRace */
 //MACRO_CONFIG_STR(SvEntities, sv_entities, 64, "Latest", CFGFLAG_SERVER, "The type of entities used") still need to think of a way
+MACRO_CONFIG_INT(SvEndlessSuperHook, sv_endless_super_hook, 0, 0, 1, CFGFLAG_SERVER, "Endless hook for super players on/off")
 MACRO_CONFIG_INT(SvEmotionalTees, sv_emotional_tees, 1, 0, 1, CFGFLAG_SERVER, "Emotional Tees on/off")
 MACRO_CONFIG_INT(SvOldShotgun, sv_old_shotgun, 0, 0, 1, CFGFLAG_SERVER, "Makes Shotgun laser pull towards the shooter, rather than the last bounce origin")
 MACRO_CONFIG_INT(SvReconnectTime,sv_reconnect_time,5,0,9999,CFGFLAG_SERVER,"how much time between leaves and joins")
@@ -16,7 +17,7 @@ MACRO_CONFIG_INT(SvVoteKickBanTime,sv_vote_kick_bantime, 300, 0, 9999, CFGFLAG_S
 MACRO_CONFIG_INT(SvVoteMapTimeDelay,sv_vote_map_delay,0,0,9999,CFGFLAG_SERVER,"how much time between map votes")
 //MACRO_CONFIG_INT(SvMaxConnections,sv_max_connections, 2, 1, 16, CFGFLAG_SERVER, "Maximum count of connection from one IP server can accept") not needed
 MACRO_CONFIG_INT(SvMaxAfkTime,sv_max_afk_time, 0, 0, 9999, CFGFLAG_SERVER, "How many seconds a player is allowed to be afk, 0=disabled")	  
-MACRO_CONFIG_INT(SvPauseable, sv_pauseable, 0, 0, 1, CFGFLAG_SERVER, "players can pause their char or not")  		  
+MACRO_CONFIG_INT(SvPauseable, sv_pauseable, 1, 0, 1, CFGFLAG_SERVER, "players can pause their char or not")
 MACRO_CONFIG_INT(SvCheatTime, sv_cheattime, 0, 0, 1, CFGFLAG_SERVER, "players can cheat with time or not")
 MACRO_CONFIG_INT(SvHit, sv_hit, 1, 0, 1, CFGFLAG_SERVER, "players can hammer/grenade/laser one another")  		 
 MACRO_CONFIG_INT(SvTunes, sv_tunes, 1, 0, 1, CFGFLAG_SERVER, "Turns Tuning On/Off")  		 

src/engine/shared/network.h

@@ -218,6 +218,7 @@ public:
 		NETADDR m_Addr;
 		int m_Expires;
 		char m_Reason[100];
+		bool m_Soon;
 	};
 	
 private:
@@ -277,7 +278,7 @@ public:
 
 	// banning
 	int BanAdd(NETADDR Addr, int Seconds, const char *Reason);
-	int BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason);
+	int BanAddNoDrop(NETADDR Addr, int Seconds);
 	int BanRemove(NETADDR Addr);
 	int BanNum(); // caution, slow
 	int BanGet(int Index, CBanInfo *pInfo); // caution, slow

src/engine/shared/network_server.cpp

@@ -80,8 +80,6 @@ int CNetServer::Drop(int ClientID, const char *pReason)
 {
 	// TODO: insert lots of checks here
 	NETADDR Addr = ClientAddr(ClientID);
-	char Bufz[100];
-	str_format( Bufz, sizeof(Bufz),"trying to connect so soon");
 	dbg_msg("net_server", "client dropped. cid=%d ip=%d.%d.%d.%d reason=\"%s\"",
 		ClientID,
 		Addr.ip[0], Addr.ip[1], Addr.ip[2], Addr.ip[3],
@@ -92,7 +90,7 @@ int CNetServer::Drop(int ClientID, const char *pReason)
 	if(m_pfnDelClient)
 		m_pfnDelClient(ClientID, m_UserPtr);
 	m_aSlots[ClientID].m_Connection.Disconnect(pReason);
-	BanAddNoDrop(Addr, g_Config.m_SvReconnectTime, Bufz);
+	BanAddNoDrop(Addr, g_Config.m_SvReconnectTime);
 	return 0;
 }
 
@@ -151,7 +149,6 @@ int CNetServer::BanAdd(NETADDR Addr, int Seconds, const char * Reason)
 
 	// remove the port
 	Addr.port = 0;
-	
 	if(Seconds)
 		Stamp = time_timestamp() + Seconds;
 
@@ -160,11 +157,11 @@ int CNetServer::BanAdd(NETADDR Addr, int Seconds, const char * Reason)
 	MACRO_LIST_FIND(pBan, m_pHashNext, net_addr_comp(&pBan->m_Info.m_Addr, &Addr) == 0);
 	if(pBan)
 	{
-		// adjust the ban
+		if(pBan->m_Info.m_Expires==-1 || pBan->m_Info.m_Expires>Stamp)
-		if (pBan->m_Info.m_Expires > Seconds || pBan->m_Info.m_Expires == 0xffffffff)
 			return 0;
-		
+		// adjust the ban
 		pBan->m_Info.m_Expires = Stamp;
+		pBan->m_Info.m_Soon	= false;
 		strcpy(pBan->m_Info.m_Reason, Reason);
 		return 0;
 	}
@@ -179,6 +176,8 @@ int CNetServer::BanAdd(NETADDR Addr, int Seconds, const char * Reason)
 	// setup the ban info
 	pBan->m_Info.m_Expires = Stamp;
 	pBan->m_Info.m_Addr = Addr;
+	pBan->m_Info.m_Soon	= false;
+	strcpy(pBan->m_Info.m_Reason, Reason);
 
 	// add it to the ban hash
 	MACRO_LIST_LINK_FIRST(pBan, m_aBans[IpHash], m_pHashPrev, m_pHashNext);
@@ -214,20 +213,15 @@ int CNetServer::BanAdd(NETADDR Addr, int Seconds, const char * Reason)
 			MACRO_LIST_LINK_FIRST(pBan, m_BanPool_FirstUsed, m_pPrev, m_pNext);
 		}
 	}
-
 	// drop banned clients
 	{
 		char Buf[128];
 		NETADDR BanAddr;
 
-		if(Seconds) {
+		if(Seconds)
-			str_format(Buf, sizeof(Buf), "you have been banned for %d minutes", Seconds/60);
+			str_format(Buf, sizeof(Buf), "You have been banned for %d second(s) for %s", Seconds,Reason);
-			strcat(Buf, Reason);
+		else
-		} else {
+			str_format(Buf, sizeof(Buf), "You have been banned for life for %s",Reason);
-			str_format(Buf, sizeof(Buf), "you have been banned for life");
-			strcat(Buf, Reason);
-		}
-		
 		for(int i = 0; i < MaxClients(); i++)
 		{
 			BanAddr = m_aSlots[i].m_Connection.PeerAddress();
@@ -240,9 +234,7 @@ int CNetServer::BanAdd(NETADDR Addr, int Seconds, const char * Reason)
 	return 0;
 }
 
-
+int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds)
-
-int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason)
 {
 	int IpHash = (Addr.ip[0]+Addr.ip[1]+Addr.ip[2]+Addr.ip[3])&0xff;
 	int Stamp = -1;
@@ -250,7 +242,6 @@ int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason)
 
 	// remove the port
 	Addr.port = 0;
-	
 	if(Seconds)
 		Stamp = time_timestamp() + Seconds;
 
@@ -259,12 +250,11 @@ int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason)
 	MACRO_LIST_FIND(pBan, m_pHashNext, net_addr_comp(&pBan->m_Info.m_Addr, &Addr) == 0);
 	if(pBan)
 	{
-		// adjust the ban
+		if(pBan->m_Info.m_Expires==-1 || pBan->m_Info.m_Expires>Stamp)
-		if (pBan->m_Info.m_Expires > Seconds || pBan->m_Info.m_Expires == 0xffffffff)
 			return 0;
-		
+		// adjust the ban
 		pBan->m_Info.m_Expires = Stamp;
-		strcpy(pBan->m_Info.m_Reason, Reason);
+		pBan->m_Info.m_Soon	= true;
 		return 0;
 	}
 
@@ -278,7 +268,7 @@ int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason)
 	// setup the ban info
 	pBan->m_Info.m_Expires = Stamp;
 	pBan->m_Info.m_Addr = Addr;
-	strcpy(pBan->m_Info.m_Reason, Reason);
+	pBan->m_Info.m_Soon	= true;
 	// add it to the ban hash
 	MACRO_LIST_LINK_FIRST(pBan, m_aBans[IpHash], m_pHashPrev, m_pHashNext);
 
@@ -316,7 +306,6 @@ int CNetServer::BanAddNoDrop(NETADDR Addr, int Seconds, const char *Reason)
 	return 0;
 }
 
-
 int CNetServer::Update()
 {
 	int Now = time_timestamp();
@@ -328,7 +317,7 @@ int CNetServer::Update()
 	}
 
 	// remove expired bans
-	while(m_BanPool_FirstUsed && m_BanPool_FirstUsed->m_Info.m_Expires < Now)
+	while(m_BanPool_FirstUsed && m_BanPool_FirstUsed->m_Info.m_Expires < Now && m_BanPool_FirstUsed->m_Info.m_Expires != -1)
 	{
 		CBan *pBan = m_BanPool_FirstUsed;
 		BanRemoveByObject(pBan);
@@ -379,16 +368,17 @@ int CNetServer::Recv(CNetChunk *pChunk)
 			{
 				// banned, reply with a message
 				char BanStr[128];
-				if(pBan->m_Info.m_Expires && (pBan->m_Info.m_Expires!=0xffffffff))
+				if(pBan->m_Info.m_Expires && (pBan->m_Info.m_Expires!=-1))
 				{
 					int Mins = ((pBan->m_Info.m_Expires - Now))/60;
 					if(Mins > 1)
 						str_format(BanStr, sizeof(BanStr), "Banned for %d minute(s) for %s", Mins, pBan->m_Info.m_Reason);
 					else
-						str_format(BanStr, sizeof(BanStr), "Banned for %d minute(s) for %s", (pBan->m_Info.m_Expires - Now), pBan->m_Info.m_Reason);
+						str_format(BanStr, sizeof(BanStr), "Banned for %d second(s) for %s", (pBan->m_Info.m_Expires - Now), pBan->m_Info.m_Reason);
 				}
 				else
 					str_format(BanStr, sizeof(BanStr), "Banned for life for %s", pBan->m_Info.m_Reason);
+				if(!pBan->m_Info.m_Soon)
 					CNetBase::SendControlMsg(m_Socket, &Addr, 0, NET_CTRLMSG_CLOSE, BanStr, str_length(BanStr)+1);
 				continue;
 			}

src/game/server/entities/character.cpp

@@ -292,7 +292,7 @@ void CCharacter::FireWeapon()
 			m_NumObjectsHit = 0;
 			GameServer()->CreateSound(m_Pos, SOUND_HAMMER_FIRE);
 			
-			if (!g_Config.m_SvHit || m_RaceState == RACE_PAUSE) break;
+			if (!g_Config.m_SvHit) break;
 			
 			CCharacter *aEnts[64];
 			int Hits = 0;
@@ -357,10 +357,8 @@ void CCharacter::FireWeapon()
 		
 		case WEAPON_SHOTGUN:
 		{
-			if(m_RaceState != RACE_PAUSE) {
 				new CLaser(&GameServer()->m_World, m_Pos, Direction, GameServer()->Tuning()->m_LaserReach, m_pPlayer->GetCID(), 1);
 				GameServer()->CreateSound(m_Pos, SOUND_SHOTGUN_FIRE);
-			}
 			/*int ShotSpread = 2;
 
 			CMsgPacker Msg(NETMSGTYPE_SV_EXTRAPROJECTILE);
@@ -395,8 +393,6 @@ void CCharacter::FireWeapon()
 
 		case WEAPON_GRENADE:
 		{
-			if (m_RaceState != RACE_PAUSE) {
-				
 				CProjectile *Proj = new CProjectile(GameWorld(), WEAPON_GRENADE,
 					m_pPlayer->GetCID(),
 					ProjStartPos,
@@ -418,20 +414,16 @@ void CCharacter::FireWeapon()
 				Server()->SendMsg(&Msg, 0, m_pPlayer->GetCID());
 				
 				GameServer()->CreateSound(m_Pos, SOUND_GRENADE_FIRE);
-			}
 		} break;
 		
 		case WEAPON_RIFLE:
 		{
-			if (m_RaceState != RACE_PAUSE) {
 				new CLaser(GameWorld(), m_Pos, Direction, GameServer()->Tuning()->m_LaserReach, m_pPlayer->GetCID(), 0);
 				//GameServer()->CreateSound(m_Pos, SOUND_RIFLE_FIRE);
-			}
 		} break;
 		
 		case WEAPON_NINJA:
 		{
-			if (m_RaceState != RACE_PAUSE) {
 				// reset Hit objects
 				m_NumObjectsHit = 0;
 				
@@ -440,7 +432,6 @@ void CCharacter::FireWeapon()
 				//m_Ninja.m_CurrentMoveTime = g_pData->m_Weapons.m_Ninja.m_Movetime * Server()->TickSpeed() / 1000;
 				m_Ninja.m_CurrentMoveTime = 10;
 				//GameServer()->CreateSound(m_Pos, SOUND_NINJA_FIRE);
-			}
 		} break;
 		
 	}
@@ -510,13 +501,13 @@ bool CCharacter::GiveWeapon(int Weapon, int Ammo)
 
 void CCharacter::GiveNinja()
 {
+	if(!m_aWeapons[WEAPON_NINJA].m_Got)
+		GameServer()->CreateSound(m_Pos, SOUND_PICKUP_NINJA);
 	m_Ninja.m_ActivationTick = Server()->Tick();
 	m_aWeapons[WEAPON_NINJA].m_Got = true;
 	m_aWeapons[WEAPON_NINJA].m_Ammo = -1;
 	m_LastWeapon = m_ActiveWeapon;
 	m_ActiveWeapon = WEAPON_NINJA;
-	
-	GameServer()->CreateSound(m_Pos, SOUND_PICKUP_NINJA);
 }
 
 void CCharacter::SetEmote(int Emote, int Tick)
@@ -559,14 +550,6 @@ void CCharacter::Tick()
 	int MapIndex = GameServer()->Collision()->GetMapIndex(m_PrevPos, m_Pos);
 	int TileIndex1 = GameServer()->Collision()->GetCollisionDDRace(MapIndex);
 	int TileIndex2 = GameServer()->Collision()->GetFCollisionDDRace(MapIndex);
-	if(m_RaceState == RACE_PAUSE) {
-		m_Input.m_Direction = 0;
-		m_Input.m_Jump = 0;
-		m_Input.m_Hook = 0;
-		m_Input.m_Fire = 0;
-		m_Core.m_Jumped = 0;
-		ResetPos();
-	}
 
 	if(m_pPlayer->m_ForceBalanced)
 	{
@@ -602,6 +585,8 @@ void CCharacter::Tick()
 		m_Core.m_HookTick = 0;
 	if (m_Super && m_Core.m_Jumped > 1)
 		m_Core.m_Jumped = 1; 
+	if (m_Super && g_Config.m_SvEndlessSuperHook)
+		m_Core.m_HookTick = 0;
 	/*dbg_msg("character","TileIndex1=%d , TileIndex2=%d",TileIndex1,TileIndex2); //REMOVE*/
 	//DDRace  		 
 	char aBuftime[128];
@@ -719,8 +704,8 @@ void CCharacter::Tick()
 		{
 			if((int)GameServer()->Collision()->GetPos(TileIndex1).y < (int)m_Core.m_Pos.y)
 				m_Core.m_Pos.y = m_PrevPos.y;
-			if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump
+			m_Core.m_Jumped = 0;
-				m_Core.m_Jumped = m_Jumped;
+			//m_Jumped = 1;
 			m_Core.m_Vel.y = 0;
 		}
 	}
@@ -730,8 +715,7 @@ void CCharacter::Tick()
 		{
 			if((int)GameServer()->Collision()->GetPos(TileIndex2).y < (int)m_Core.m_Pos.y)
 				m_Core.m_Pos.y = m_PrevPos.y;
-			if(m_Jumped&3 && m_Core.m_Jumped != m_Jumped) // check double jump
+			m_Core.m_Jumped = 0;
-				m_Core.m_Jumped = m_Jumped;
 			m_Core.m_Vel.y = 0;
 		}
 	}
@@ -1012,7 +996,13 @@ bool CCharacter::UnFreeze()
 		m_Ninja.m_ActivationDir=vec2(0,0);
 		m_Ninja.m_ActivationTick=0;
 		m_Ninja.m_CurrentMoveTime=0;
-
+		for(int i=0;i<WEAPON_NINJA;i++)
+		{
+			if (m_aWeapons[i].m_Got)
+			{
+				m_aWeapons[i].m_Ammo = -1;
+			}
+		}
 		return true;
 	}
 	return false;  		 
@@ -1147,7 +1137,7 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 		GameServer()->CreateSound(m_Pos, SOUND_PLAYER_PAIN_SHORT);
 */
 	// set attacker's face to happy (taunt!)
-	if(g_Config.m_SvEmotionalTees)
+	/*if(g_Config.m_SvEmotionalTees)
 	{
 	if (From >= 0 && From != m_pPlayer->GetCID() && GameServer()->m_apPlayers[From])
 	{
@@ -1157,15 +1147,13 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 			pChr->m_EmoteType = EMOTE_HAPPY;
 			pChr->m_EmoteStop = Server()->Tick() + Server()->TickSpeed();
 		}
-	}
+	}*///Removed you can set your emote via /emoteEMOTENAME
 	//set the attacked face to pain
 	m_EmoteType = EMOTE_PAIN;
 	m_EmoteStop = Server()->Tick() + 500 * Server()->TickSpeed() / 1000;
 
 	return true;
 }
-	else return true;
-}
 
 void CCharacter::Snap(int SnappingClient)
 {

src/game/server/entities/character.h

@@ -18,8 +18,7 @@ enum
 {
 	RACE_NONE = 0,
 	RACE_STARTED,
-	RACE_CHEAT, // no time and won't start again unless oredered by a mod or death
+	RACE_CHEAT // no time and won't start again unless ordered by a mod or death
-	RACE_PAUSE//No time nor movement
 };
 
 class CCharacter : public CEntity

src/game/server/entities/pickup.cpp

@@ -76,6 +76,14 @@ void CPickup::Tick()
 						pChr->m_aWeapons[i].m_Ammo = 0;
 						sound = true;
 					}
+					if(pChr->m_FreezeTime)
+					{
+						pChr->m_aWeapons[WEAPON_GUN].m_Ammo = 0;
+						pChr->m_aWeapons[WEAPON_HAMMER].m_Ammo =0;
+					}
+					pChr->m_Ninja.m_ActivationDir=vec2(0,0);
+					pChr->m_Ninja.m_ActivationTick=0;
+					pChr->m_Ninja.m_CurrentMoveTime=0;
 				}
 				if (sound)
 				{
@@ -87,7 +95,7 @@ void CPickup::Tick()
 
 			case POWERUP_WEAPON:
 				
-				if(m_Subtype >= 0 && m_Subtype < NUM_WEAPONS)
+				if(m_Subtype >= 0 && m_Subtype < NUM_WEAPONS && (!pChr->m_aWeapons[m_Subtype].m_Got || pChr->m_aWeapons[m_Subtype].m_Ammo != -1))
 				{
 					if(pChr->GiveWeapon(m_Subtype, -1))
 					{

src/game/server/gamecontext.cpp

@@ -652,7 +652,7 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
 					{
 						CCharacter* chr = p->GetCharacter();
 
-							if(!p->GetTeam())
+							if(!p->GetTeam() && (!chr->m_aWeapons[WEAPON_NINJA].m_Got || chr->m_FreezeTime) && chr->IsGrounded() && chr->m_Pos==chr->m_PrevPos)
 							{
 								p->SaveCharacter();
 								p->SetTeam(-1);
@@ -663,13 +663,18 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
 								p->SetTeam(0);
 								//p->LoadCharacter();//TODO:Check if this system Works
 							}
+							else
+								SendChatTarget(ClientId, (chr->m_aWeapons[WEAPON_NINJA].m_Got)?"You can't use /pause while you are a ninja":(!chr->IsGrounded())?"You can't use /pause while you are a in air":"You can't use /pause while you are moving");
 
 							//if(chr->m_RaceState==RACE_STARTED)
 							//	chr->m_RaceState = RACE_PAUSE;
 							//else if(chr->m_RaceState==RACE_PAUSE)
 							//	chr->m_RaceState = RACE_STARTED;*/
 					}
-			} else if(!str_comp_nocase(pMsg->m_pMessage, "/info"))
+					else
+						SendChatTarget(ClientId, "The admin didn't activate /pause");
+			}
+			else if(!str_comp_nocase(pMsg->m_pMessage, "/info"))
 			{
 					SendChatTarget(ClientId, "DDRace Mod. Version: " DDRACE_VERSION);
 					SendChatTarget(ClientId, "Official site: DDRace.info");
@@ -1113,6 +1118,7 @@ void CGameContext::OnMessage(int MsgId, CUnpacker *pUnpacker, int ClientId)
 					pChr->m_EmoteType = EMOTE_HAPPY;
 					break;
 				case EMOTICON_1:
+				case EMOTICON_4:
 				case EMOTICON_9:
 				case EMOTICON_15:
 					pChr->m_EmoteType = EMOTE_PAIN;

src/game/server/player.cpp

@@ -228,24 +228,61 @@ void CPlayer::TryRespawn()
 
 void CPlayer::LoadCharacter() {
 	Character->m_Core = m_PauseInfo.m_Core;
-	Character->m_StartTime = m_PauseInfo.m_StartTime;
+	Character->m_StartTime = Server()->Tick() - (m_PauseInfo.m_PauseTime - m_PauseInfo.m_StartTime);
 	Character->m_RaceState = m_PauseInfo.m_RaceState;
 	Character->m_RefreshTime = Server()->Tick();
 	for(int i = 0; i < NUM_WEAPONS; ++i) {
-		if(m_PauseInfo.m_aHasWeapon[i]) {
+		if(m_PauseInfo.m_aHasWeapon[i])
+		 if(!m_PauseInfo.m_FreezeTime)
 			Character->GiveWeapon(i, -1);
+		 else
+			 Character->GiveWeapon(i, 0);
 	}
-	}
+	Character->m_FreezeTime = m_PauseInfo.m_FreezeTime;
+	Character->m_Doored = m_PauseInfo.m_Doored;
+	Character->m_OldPos = m_PauseInfo.m_OldPos;
+	Character->m_OlderPos = m_PauseInfo.m_OlderPos;
+	Character->m_LastAction = m_PauseInfo.m_LastAction;
+	Character->m_Jumped = m_PauseInfo.m_Jumped;
+	Character->m_Health = m_PauseInfo.m_Health;
+	Character->m_Armor = m_PauseInfo.m_Armor;
+	Character->m_PlayerState = m_PauseInfo.m_PlayerState;
+	Character->m_LastMove = m_PauseInfo.m_LastMove;
+	Character->m_LastSpeedup = m_PauseInfo.m_LastSpeedup;
+	Character->m_PrevPos = m_PauseInfo.m_PrevPos;
+	Character->m_ActiveWeapon = m_PauseInfo.m_ActiveWeapon;
+	Character->m_LastWeapon = m_PauseInfo.m_LastWeapon;
+	Character->m_HammerType = m_PauseInfo.m_HammerType;
+	Character->m_Super = m_PauseInfo.m_Super;
 	m_PauseInfo.m_Respawn = false;
 }
 
-void CPlayer::SaveCharacter() {
+void CPlayer::SaveCharacter()
+{
 	m_PauseInfo.m_Core = Character->m_Core;
 	m_PauseInfo.m_StartTime = Character->m_StartTime;
 	m_PauseInfo.m_RaceState = Character->m_RaceState;
-	for(int i = 0; i < NUM_WEAPONS; ++i) {
+	for(int i = 0; i < WEAPON_NINJA; ++i)
+	{
 		m_PauseInfo.m_aHasWeapon[i] = Character->m_aWeapons[i].m_Got;
 	}
+	m_PauseInfo.m_FreezeTime=Character->m_FreezeTime;
+	m_PauseInfo.m_Doored = Character->m_Doored;
+	m_PauseInfo.m_OldPos = Character->m_OldPos;
+	m_PauseInfo.m_OlderPos = Character->m_OlderPos;
+	m_PauseInfo.m_LastAction = Character->m_LastAction;
+	m_PauseInfo.m_Jumped = Character->m_Jumped;
+	m_PauseInfo.m_Health = Character->m_Health;
+	m_PauseInfo.m_Armor = Character->m_Armor;
+	m_PauseInfo.m_PlayerState = Character->m_PlayerState;
+	m_PauseInfo.m_LastMove = Character->m_LastMove;
+	m_PauseInfo.m_LastSpeedup = Character->m_LastSpeedup;
+	m_PauseInfo.m_PrevPos = Character->m_PrevPos;
+	m_PauseInfo.m_ActiveWeapon = Character->m_ActiveWeapon;
+	m_PauseInfo.m_LastWeapon = Character->m_LastWeapon;
+	m_PauseInfo.m_HammerType = Character->m_HammerType;
+	m_PauseInfo.m_Super = Character->m_Super;
+	m_PauseInfo.m_PauseTime = Server()->Tick();
 	//m_PauseInfo.m_RefreshTime = Character->m_RefreshTime;
 }
 

src/game/server/player.h

@@ -38,8 +38,25 @@ public:
 		int m_StartTime;
 		int m_RaceState;
 		//int m_RefreshTime;
+		int m_FreezeTime;
+		bool m_Doored;
+		vec2 m_OldPos;
+		vec2 m_OlderPos;
+		int m_LastAction;
+		int m_Jumped;
+		int m_Health;
+		int m_Armor;
+		int m_PlayerState;
+		int m_LastMove;
+		int m_LastSpeedup;
+		vec2 m_PrevPos;
+		int m_ActiveWeapon;
+		int m_LastWeapon;
 		bool m_Respawn;
 		bool m_aHasWeapon[NUM_WEAPONS];
+		int m_HammerType;
+		bool m_Super;
+		int m_PauseTime;
 	} m_PauseInfo;
 	void LoadCharacter();
 	void SaveCharacter();