pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to changelog conflict in merge.

Browse Source
This commit is contained in:
KimLS 2013-11-07 12:44:13 -08:00
commit e00c57bc47
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelog.txt
View File

@ -1,11 +1,15 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 11/07/2013 == == 11/07/2013 ==
KLS: Added a system to use the BaseData system in the client. KLS: Added a system to use the BaseData system in the client.
KLS: Added an optional utility to import spells, skill caps and base data (will import from ./import and export to ./export). KLS: Added an optional utility to import spells, skill caps and base data (will import from ./import and export to ./export).
Be sure to source the SQL and run shared_memory. Be sure to source the SQL and run shared_memory.
== 11/06/2013 ==
JJ: (Kingly_Krab) Fix for #npcedit qglobal command.
== 11/01/2013 == == 11/01/2013 ==
JJ: Added in-game commands to enable/disable tradeskill recipes JJ: Added in-game commands to enable/disable tradeskill recipes
-Commands: #enablerecipe recipe_id, #disablerecipe recipe_id -Commands: #enablerecipe recipe_id, #disablerecipe recipe_id
@ -25,7 +29,7 @@ Notes:
- A per-client method will still need to be observed when coding for the new skill uses - A per-client method will still need to be observed when coding for the new skill uses
== 10/27/2013 == == 10/27/2013 ==
Uleat: Attempted fix for high level (12) debug compile failiures Uleat: Attempted fix for high level (12) debug compile failures
Notes: Notes:
- Explicit Windows vs. Linux code was not changed due to my inability to compile Linux code - Explicit Windows vs. Linux code was not changed due to my inability to compile Linux code
- Only CMake accessible flags were corrected if adding the 'std' namespace did not correct the issue - Only CMake accessible flags were corrected if adding the 'std' namespace did not correct the issue

4
zone/command.cpp
View File

@ -6983,8 +6983,8 @@ void command_npcedit(Client *c, const Seperator *sep)
{ {
char errbuf[MYSQL_ERRMSG_SIZE]; char errbuf[MYSQL_ERRMSG_SIZE];
char *query = 0; char *query = 0;
c->Message(15,"Quest globals have been %d for NPCID %u",c->GetTarget()->CastToNPC()->GetNPCTypeID(),atoi(sep->arg[2])==0?"disabled":"enabled"); c->Message(15, "Quest globals have been %s for NPCID %u", atoi(sep->arg[2]) == 0 ? "disabled" : "enabled", c->GetTarget()->CastToNPC()->GetNPCTypeID());
database.RunQuery(query, MakeAnyLenString(&query, "update npc_types set qglobal=%i where id=%i",atoi(sep->argplus[2])==0?0:1,c->GetTarget()->CastToNPC()->GetNPCTypeID()), errbuf); database.RunQuery(query, MakeAnyLenString(&query, "UPDATE npc_types SET qglobal=%i WHERE id=%i", atoi(sep->argplus[2]) == 0 ? 0 : 1, c->GetTarget()->CastToNPC()->GetNPCTypeID()), errbuf);
c->LogSQL(query); c->LogSQL(query);
safe_delete_array(query); safe_delete_array(query);
} }