aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKudlaty <none@none>2009-07-26 02:00:35 +0200
committerKudlaty <none@none>2009-07-26 02:00:35 +0200
commit3c046356942193756987dc646b30dcf408a1630f (patch)
tree2b2fecd0d40ba8f82584100e7e3aa39e4b4be65c
parent9f1118cf0a3c6b08fc6477c1f009187a4b1270af (diff)
Fix build on windows.
Fix command ticket viewname - thx Deadlyskunk for point this fix setlink command group, add missing commands to db - patch by XTElite1 --HG-- branch : trunk
-rw-r--r--sql/updates/4597_world_command.sql4
-rw-r--r--sql/world.sql2
-rw-r--r--src/game/Chat.cpp2
-rw-r--r--src/game/Level1.cpp5
-rw-r--r--src/game/ReputationMgr.cpp2
-rw-r--r--src/game/ReputationMgr.h1
6 files changed, 12 insertions, 4 deletions
diff --git a/sql/updates/4597_world_command.sql b/sql/updates/4597_world_command.sql
new file mode 100644
index 00000000000..374cbb2c632
--- /dev/null
+++ b/sql/updates/4597_world_command.sql
@@ -0,0 +1,4 @@
+DELETE FROM `command` WHERE `name` IN ('reload creature_linked_respawn', 'npc setlink');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('reload creature_linked_respawn',2,'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
+('npc setlink',2,'Syntax: .npc setlink $creatureGUID\r\n\r\nLinks respawn of selected creature to the condition that $creatureGUID defined is alive.');
diff --git a/sql/world.sql b/sql/world.sql
index 302d36eccdb..9139f18470c 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -490,6 +490,7 @@ INSERT INTO `command` VALUES
('npc info',3,'Syntax: .npc info\r\n\r\nDisplay a list of details for the selected creature.\r\n\r\nThe list includes:\r\n- GUID, Faction, NPC flags, Entry ID, Model ID,\r\n- Level,\r\n- Health (current/maximum),\r\n\r\n- Field flags, dynamic flags, faction template, \r\n- Position information,\r\n- and the creature type, e.g. if the creature is a vendor.'),
('npc move',2,'Syntax: .npc move [#creature_guid]\r\n\r\nMove the targeted creature spawn point to your coordinates.'),
('npc playemote',3,'Syntax: .npc playemote #emoteid\r\n\r\nMake the selected creature emote with an emote of id #emoteid.'),
+('npc setlink',2,'Syntax: .npc setlink $creatureGUID\r\n\r\nLinks respawn of selected creature to the condition that $creatureGUID defined is alive.'),
('npc say',1,'Syntax: .npc say $message\nMake selected creature say specified message.'),
('npc setdeathstate',2,'Syntax: .npc setdeathstate on/off\r\n\r\nSet default death state (dead/alive) for npc at spawn.'),
('npc setmodel',2,'Syntax: .npc setmodel #displayid\r\n\r\nChange the model id of the selected creature to #displayid.'),
@@ -534,6 +535,7 @@ INSERT INTO `command` VALUES
('reload config',3,'Syntax: .reload config\r\n\r\nReload config settings (by default stored in trinityd.conf). Not all settings can be change at reload: some new setting values will be ignored until restart, some values will applied with delay or only to new objects/maps, some values will explicitly rejected to change at reload.'),
('reload creature_involvedrelation',3,'Syntax: .reload creature_involvedrelation\nReload creature_involvedrelation table.'),
('reload creature_loot_template',3,'Syntax: .reload creature_loot_template\nReload creature_loot_template table.'),
+('reload creature_linked_respawn',2,'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
('reload creature_questrelation',3,'Syntax: .reload creature_questrelation\nReload creature_questrelation table.'),
('reload disenchant_loot_template',3,'Syntax: .reload disenchant_loot_template\nReload disenchant_loot_template table.'),
('reload event_scripts',3,'Syntax: .reload event_scripts\nReload event_scripts table.'),
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index b14a7f94e6e..4dcc603afc4 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -373,6 +373,7 @@ ChatCommand * ChatHandler::getCommandTable()
{ "tame", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcTameCommand, "", NULL },
{ "setdeathstate", SEC_GAMEMASTER, false, &ChatHandler::HandleNpcSetDeathStateCommand, "", NULL },
{ "addformation", SEC_MODERATOR, false, &ChatHandler::HandleNpcAddFormationCommand, "", NULL },
+ { "setlink", SEC_MODERATOR, false, &ChatHandler::HandleNpcSetLinkCommand, "", NULL },
//{ TODO: fix or remove this commands
{ "addweapon", SEC_ADMINISTRATOR, false, &ChatHandler::HandleNpcAddWeaponCommand, "", NULL },
@@ -547,7 +548,6 @@ ChatCommand * ChatHandler::getCommandTable()
{
{ "cancel", SEC_ADMINISTRATOR, true, &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
{ "" , SEC_ADMINISTRATOR, true, &ChatHandler::HandleServerShutDownCommand, "", NULL },
- { "setlink", SEC_MODERATOR, false, &ChatHandler::HandleNpcSetLinkCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 8e234057f94..6c344b29903 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -400,7 +400,10 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args)
if(!*args)
return false;
- Player *plr = objmgr.GetPlayer(args);
+ std::string name = (char*)args;
+ normalizePlayerName(name);
+
+ Player *plr = objmgr.GetPlayer(name.c_str());
if(!plr)
{
SendSysMessage(LANG_NO_PLAYERS_FOUND);
diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp
index 8e6aa511d21..7536fb54f03 100644
--- a/src/game/ReputationMgr.cpp
+++ b/src/game/ReputationMgr.cpp
@@ -255,7 +255,7 @@ bool ReputationMgr::SetOneFactionReputation(FactionEntry const* factionEntry, in
if(incremental)
{
// int32 *= float cause one point loss?
- standing = roundf( (float)standing * sWorld.getRate(RATE_REPUTATION_GAIN) );
+ standing = floor( (float)standing * sWorld.getRate(RATE_REPUTATION_GAIN) + 0.5 );
standing += itr->second.Standing + BaseRep;
}
diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h
index 494f675d20a..d63c518eb82 100644
--- a/src/game/ReputationMgr.h
+++ b/src/game/ReputationMgr.h
@@ -24,7 +24,6 @@
#include "Language.h"
#include "DBCStructure.h"
#include <map>
-#include <math.h>
static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
{