mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed windows build, account data should be saved server side now

Browse source
This commit is contained in:
tomrus88 2008-10-27 20:00:56 +03:00
parent f7657a0fe3
commit 97bf2e7d68
11 changed files with 138 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/wotlk_updates/5_character_account_data.sql Normal file
View file

@ -0,0 +1,7 @@
CREATE TABLE `account_data` (
`guid` int(11) unsigned NOT NULL default '0',
`type` int(11) unsigned NOT NULL default '0',
`time` bigint(11) unsigned NOT NULL default '0',
`data` longtext NOT NULL default '',
PRIMARY KEY (`guid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

9
src/game/CharacterHandler.cpp
View file

@ -79,6 +79,7 @@ bool LoginQueryHolder::Initialize()
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES, "SELECT genitive, dative, accusative, instrumental, prepositional FROM character_declinedname WHERE guid = '%u'",GUID_LOPART(m_guid));
// in other case still be dummy query
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGUILD, "SELECT guildid,rank FROM guild_member WHERE guid = '%u'", GUID_LOPART(m_guid));
res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA, "SELECT type,time,data FROM account_data WHERE guid = '%u'", GUID_LOPART(m_guid));
return res;
}
@ -497,11 +498,11 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
data << pCurrChar->GetOrientation();
SendPacket(&data);
data.Initialize( SMSG_ACCOUNT_DATA_TIMES, 128 ); // changed in WotLK
data << uint32(0); // unix time of something
data.Initialize( SMSG_ACCOUNT_DATA_TIMES, 4+1+8*4 ); // changed in WotLK
data << uint32(time(NULL)); // unix time of something
data << uint8(1);
for(int i = 0; i < 8; i++)
data << uint32(0); // also unix time
for(int i = 0; i < NUM_ACCOUNT_DATA_TYPES; i++)
data << uint32(pCurrChar->GetAccountData(i)->Time); // also unix time
SendPacket(&data);
data.Initialize(SMSG_FEATURE_SYSTEM_STATUS, 2); // added in 2.2.0

66
src/game/MiscHandler.cpp
View file

@ -311,7 +311,7 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ )
data.append(GetPlayer()->GetPackGUID());
data << (uint32)2;
SendPacket( &data );
GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
}
WorldPacket data( SMSG_LOGOUT_RESPONSE, 5 );
@ -348,7 +348,7 @@ void WorldSession::HandleLogoutCancelOpcode( WorldPacket & /*recv_data*/ )
GetPlayer()->SetStandState(PLAYER_STATE_NONE);
//! DISABLE_ROTATE
GetPlayer()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
GetPlayer()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
}
sLog.outDebug( "WORLD: sent SMSG_LOGOUT_CANCEL_ACK Message" );
@ -1073,27 +1073,37 @@ void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
sLog.outDetail("WORLD: Received CMSG_UPDATE_ACCOUNT_DATA");
recv_data.hexlike();
uint32 id1, timestamp, decompressedSize;
recv_data >> id1 >> timestamp >> decompressedSize;
uint32 type, timestamp, decompressedSize;
recv_data >> type >> timestamp >> decompressedSize;
if(decompressedSize == 0)
if(type > NUM_ACCOUNT_DATA_TYPES)
return;
if(decompressedSize == 0) // erase
{
_player->SetAccountData(type, timestamp, "");
_player->SaveAccountData(type);
return;
}
ByteBuffer dest;
dest.resize(decompressedSize);
uLongf realSize = decompressedSize;
if(uncompress(const_cast<uint8*>(dest.contents()), &realSize, const_cast<uint8*>(recv_data.contents() + recv_data.rpos()), recv_data.size() - recv_data.rpos()) == Z_OK)
{
dest.hexlike();
}
else
if(uncompress(const_cast<uint8*>(dest.contents()), &realSize, const_cast<uint8*>(recv_data.contents() + recv_data.rpos()), recv_data.size() - recv_data.rpos()) != Z_OK)
{
sLog.outError("UAD: Failed to decompress packet");
return;
}
std::string adata;
dest >> adata;
_player->SetAccountData(type, timestamp, adata);
_player->SaveAccountData(type);
WorldPacket data(SMSG_UPDATE_ACCOUNT_DATA_COMPLETE, 4+4);
data << uint32(id1);
data << uint32(type);
data << uint32(0);
SendPacket(&data);
}
@ -1105,15 +1115,33 @@ void WorldSession::HandleRequestAccountData(WorldPacket& recv_data)
CHECK_PACKET_SIZE(recv_data, 4);
uint32 id;
recv_data >> id;
uint32 type;
recv_data >> type;
WorldPacket data (SMSG_UPDATE_ACCOUNT_DATA, 8+4+4+4);
data << uint64(_player->GetGUID());
data << uint32(id);
data << uint32(time(NULL));
data << uint32(0); // decompressed length
// data << account_data(data_len);
if(type > NUM_ACCOUNT_DATA_TYPES)
return;
AccountData *adata = _player->GetAccountData(type);
uint32 size = adata->Data.size();
uLongf destSize = compressBound(size);
ByteBuffer dest;
//if(compress(const_cast<uint8*>(dest.contents()), &destSize, const_cast<uint8*>(adata->Data.c_str()), size) != Z_OK)
if(compress(const_cast<uint8*>(dest.contents()), &destSize, (uint8*)adata->Data.c_str(), size) != Z_OK)
{
sLog.outDebug("RAD: Failed to compress account data, error");
return;
}
dest.resize(destSize);
WorldPacket data (SMSG_UPDATE_ACCOUNT_DATA, 8+4+4+4+destSize);
data << uint64(_player->GetGUID()); // player guid
data << uint32(type); // type (0-7)
data << uint32(adata->Time); // unix time
data << uint32(size); // decompressed length
data.append(dest); // compressed data
SendPacket(&data);
}
void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)

4
src/game/Pet.cpp
View file

@ -481,12 +481,12 @@ void Pet::setDeathState(DeathState s) // overwrite virtual
if(!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND))
ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE);
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
}
}
else if(getDeathState()==ALIVE)
{
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
CastPetAuras(true);
}
}

29
src/game/Player.cpp
View file

@ -2298,7 +2298,7 @@ void Player::InitStatsForLevel(bool reapplyMods)
RemoveFlag( UNIT_FIELD_FLAGS,
UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_ATTACKABLE_1 |
UNIT_FLAG_PET_IN_COMBAT | UNIT_FLAG_SILENCED | UNIT_FLAG_PACIFIED |
UNIT_FLAG_DISABLE_ROTATE | UNIT_FLAG_IN_COMBAT | UNIT_FLAG_DISARMED |
UNIT_FLAG_STUNNED | UNIT_FLAG_IN_COMBAT | UNIT_FLAG_DISARMED |
UNIT_FLAG_CONFUSED | UNIT_FLAG_FLEEING | UNIT_FLAG_NOT_SELECTABLE |
UNIT_FLAG_SKINNABLE | UNIT_FLAG_MOUNT | UNIT_FLAG_TAXI_FLIGHT );
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE ); // must be set
@ -15050,7 +15050,7 @@ void Player::SaveToDB()
SetByteValue(UNIT_FIELD_BYTES_1, 0, 0); // stand state
SetByteValue(UNIT_FIELD_BYTES_2, 3, 0); // shapeshift
SetByteValue(UNIT_FIELD_BYTES_1, 3, 0); // stand flags?
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
SetDisplayId(GetNativeDisplayId());
bool inworld = IsInWorld();
@ -18568,3 +18568,28 @@ void Player::InitGlyphsForLevel()
SetUInt32Value(PLAYER_GLYPHS_ENABLED, value);
}
void Player::LoadAccountData(QueryResult *result)
{
do
{
Field *fields = result->Fetch();
AccountData data;
uint32 type = fields[0].GetUInt32();
data.Time = fields[1].GetUInt32();
data.Data = fields[2].GetCppString();
if(type < NUM_ACCOUNT_DATA_TYPES)
m_accountData[type] = data;
} while (result->NextRow());
delete result;
}
void Player::SaveAccountData(uint32 type)
{
uint32 lowguid = GetGUIDLow();
CharacterDatabase.PExecute("DELETE FROM account_data WHERE guid=%u AND type=%u", lowguid, type);
CharacterDatabase.PExecute("INSERT INTO account_data VALUES (%u,%u,%u,%s)", lowguid, type, (uint32)m_accountData[type].Time, m_accountData[type].Data.c_str());
}

23
src/game/Player.h
View file

@ -221,6 +221,12 @@ struct Areas
float y2;
};
struct AccountData
{
time_t Time;
std::string Data;
};
enum FactionFlags
{
FACTION_FLAG_VISIBLE = 0x01, // makes visible in client (set or can be set at interaction with target of this faction)
@ -835,9 +841,10 @@ enum PlayerLoginQueryIndex
PLAYER_LOGIN_QUERY_LOADSPELLCOOLDOWNS = 15,
PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES = 16,
PLAYER_LOGIN_QUERY_LOADGUILD = 17,
PLAYER_LOGIN_QUERY_LOADACCOUNTDATA = 18,
};
#define MAX_PLAYER_LOGIN_QUERY 18
#define MAX_PLAYER_LOGIN_QUERY 19
// Player summoning auto-decline time (in secs)
#define MAX_PLAYER_SUMMON_DELAY (2*MINUTE)
@ -1345,6 +1352,18 @@ class MANGOS_DLL_SPEC Player : public Unit
}
}
AccountData *GetAccountData(uint32 type)
{
return &m_accountData[type];
}
void SetAccountData(uint32 type, time_t time_, std::string data)
{
m_accountData[type].Time = time_;
m_accountData[type].Data = data;
}
void LoadAccountData(QueryResult *result);
void SaveAccountData(uint32 type);
QuestStatusMap& getQuestStatusMap() { return mQuestStatus; };
const uint64& GetSelection( ) const { return m_curSelection; }
@ -2217,6 +2236,8 @@ class MANGOS_DLL_SPEC Player : public Unit
uint32 m_Tutorials[8];
bool m_TutorialsChanged;
AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES];
bool m_DailyQuestChanged;
time_t m_lastDailyQuestTime;

1
src/game/SharedDefines.h
View file

@ -82,6 +82,7 @@ enum Classes
#define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1)))
#define PLAYER_MAX_BATTLEGROUND_QUEUES 3
#define NUM_ACCOUNT_DATA_TYPES 8
enum ReputationRank
{

4
src/game/SpellAuras.cpp
View file

@ -3162,7 +3162,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
m_target->addUnitState(UNIT_STAT_STUNNED);
m_target->SetUInt64Value(UNIT_FIELD_TARGET, 0);
m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
m_target->CastStop(m_target->GetGUID() == GetCasterGUID() ? GetId() : 0);
// Creature specific
@ -3184,7 +3184,7 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
return;
m_target->clearUnitState(UNIT_STAT_STUNNED);
m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_ROTATE);
m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
if(!m_target->hasUnitState(UNIT_STAT_ROOT)) // prevent allow move if have also root effect
{

8
win/VC71/game.vcproj
View file

@ -135,6 +135,14 @@
<File
RelativePath="..\..\src\game\AccountMgr.h">
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.cpp">
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.h">
</File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp">
</File>

8
win/VC80/game.vcproj
View file

@ -354,6 +354,14 @@
RelativePath="..\..\src\game\AccountMgr.h"
>
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.cpp"
>
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.h"
>
</File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp"
>

9
win/VC90/game.vcproj
View file

@ -6,6 +6,7 @@
ProjectGUID="{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
RootNamespace="game"
Keyword="Win32Proj"
TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@ -355,6 +356,14 @@
RelativePath="..\..\src\game\AccountMgr.h"
>
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.cpp"
>
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.h"
>
</File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp"
>