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

Merge commit 'origin/master' into 320

Browse source 
Conflicts:
	sql/updates/8098_01_characters_character_action.sql
	sql/updates/8098_02_mangos_playercreateinfo_action.sql
	src/game/Player.cpp
	src/game/Player.h
	src/game/SpellEffects.cpp
	src/shared/revision_nr.h
This commit is contained in:
tomrus88 2009-07-02 09:38:10 +04:00
commit 62327e7af0
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/updates/8098_01_characters_character_action.sql
View file

@ -4,7 +4,7 @@ ALTER TABLE character_action
CHANGE COLUMN action action int(11) unsigned NOT NULL default '0'; CHANGE COLUMN action action int(11) unsigned NOT NULL default '0';
UPDATE character_action UPDATE character_action
SET action = action | ( misc < 16 ); SET action = action | ( misc << 16 );
ALTER TABLE character_action ALTER TABLE character_action
DROP COLUMN misc; DROP COLUMN misc;

2
sql/updates/8098_02_mangos_playercreateinfo_action.sql
View file

@ -4,7 +4,7 @@ ALTER TABLE playercreateinfo_action
CHANGE COLUMN action action int(11) unsigned NOT NULL default '0'; CHANGE COLUMN action action int(11) unsigned NOT NULL default '0';
UPDATE playercreateinfo_action UPDATE playercreateinfo_action
SET action = action | ( misc < 16 ); SET action = action | ( misc << 16 );
ALTER TABLE playercreateinfo_action ALTER TABLE playercreateinfo_action
DROP COLUMN misc; DROP COLUMN misc;

4
src/game/Player.cpp
View file

@ -5564,7 +5564,6 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type)
// set data and update to CHANGED if not NEW // set data and update to CHANGED if not NEW
ab.SetActionAndType(action,ActionButtonType(type)); ab.SetActionAndType(action,ActionButtonType(type));
}
sLog.outDetail( "Player '%u' Added Action '%u' (type %u) to Button '%u'", GetGUIDLow(), action, uint32(type), button ); sLog.outDetail( "Player '%u' Added Action '%u' (type %u) to Button '%u'", GetGUIDLow(), action, uint32(type), button );
return &ab; return &ab;
@ -20481,5 +20480,4 @@ void Player::SendDuelCountdown(uint32 counter)
{ {
WorldPacket data(SMSG_DUEL_COUNTDOWN, 4); WorldPacket data(SMSG_DUEL_COUNTDOWN, 4);
data << uint32(counter); // seconds data << uint32(counter); // seconds
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
}

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8106" #define REVISION_NR "8107"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__