diff options
| author | megamage <none@none> | 2009-03-24 17:21:36 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-24 17:21:36 -0600 |
| commit | cda206aacc9cdd3b9038f7cecfb9b0a71558c86f (patch) | |
| tree | 407bb31ca970cb96c5d6dd843153493d23eabc41 | |
| parent | d96b0f5cb6b7ee78a365760e05e7c8ae606415f7 (diff) | |
| parent | df82ebcbfe2e3b4e577d08404ffed8967a7a3c17 (diff) | |
*Merge.
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/2131_world.sql | 2 | ||||
| -rw-r--r-- | sql/updates/2160_world.sql | 6 | ||||
| -rw-r--r-- | sql/updates/2161_world.sql | 4 | ||||
| -rw-r--r-- | src/trinitycore/WorldRunnable.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sql/updates/2131_world.sql b/sql/updates/2131_world.sql index db0f517e61e..76fb0b69c52 100644 --- a/sql/updates/2131_world.sql +++ b/sql/updates/2131_world.sql @@ -1,4 +1,4 @@ -DELETE FROM `command` WHERE `name` IN ('server difftime', 'npc addtemp', 'gobject addtemp', ''); +DELETE FROM `command` WHERE `name` IN ('server difftime', 'npc tempadd', 'gobject tempadd', ''); INSERT INTO `command` VALUES ('gobject tempadd','2','Adds a temporary gameobject that is not saved to DB.'), ('npc tempadd','2','Adds temporary NPC, not saved to database.'); diff --git a/sql/updates/2160_world.sql b/sql/updates/2160_world.sql index a4b308d60cb..40d2c9d1bb6 100644 --- a/sql/updates/2160_world.sql +++ b/sql/updates/2160_world.sql @@ -1,3 +1,3 @@ -DELETE FROM command WHERE name LIKE "ahbotoption %"; -DELETE FROM command WHERE name LIKE "ahbotoptions %"; -DELETE FROM command WHERE name IN ('gobject addtemp','npc addtemp');
\ No newline at end of file +DELETE FROM `command` WHERE `name` LIKE "ahbotoption %"; +DELETE FROM `command` WHERE `name` LIKE "ahbotoptions %"; +DELETE FROM `command` WHERE `name` IN ('gobject addtemp','npc addtemp');
\ No newline at end of file diff --git a/sql/updates/2161_world.sql b/sql/updates/2161_world.sql index 718130ebe38..1e45d6b33ed 100644 --- a/sql/updates/2161_world.sql +++ b/sql/updates/2161_world.sql @@ -1,2 +1,2 @@ -DELETE FROM command WHERE name LIKE "wp mod %"; -DELETE FROM command WHERE name LIKE "wp event %";
\ No newline at end of file +DELETE FROM `command` WHERE `name` LIKE "wp mod %"; +DELETE FROM `command` WHERE `name` LIKE "wp event %";
\ No newline at end of file diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index 607b60684a9..6583fb8a1ba 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -33,7 +33,7 @@ #include "Database/DatabaseEnv.h" -#ifdef WIN32 +#if (defined(WIN32) || defined(SHORT_SLEEP)) #define WORLD_SLEEP_CONST 50 #else #define WORLD_SLEEP_CONST 100 //Is this still needed?? [On linux some time ago not working 50ms] |