aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2012_08_09_00_world_creature_template.sql6
-rw-r--r--src/server/shared/Logging/Appender.h2
-rw-r--r--src/server/shared/Logging/AppenderFile.cpp7
3 files changed, 12 insertions, 3 deletions
diff --git a/sql/updates/world/2012_08_09_00_world_creature_template.sql b/sql/updates/world/2012_08_09_00_world_creature_template.sql
new file mode 100644
index 00000000000..8d04c13dc87
--- /dev/null
+++ b/sql/updates/world/2012_08_09_00_world_creature_template.sql
@@ -0,0 +1,6 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag` |2 WHERE `entry` IN (25918,25929,25931,25933,25936,25938,25946,32811,32812,32813,32816);
+
+DELETE FROM `creature_loot_template` WHERE `entry` IN(17465,20583) AND `item`=22554;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(17465,22554,15,1,0,1,1), -- Formula: Enchant 2H Weapon - Savagery
+(20583,22554,15,1,0,1,1); -- Formula: Enchant 2H Weapon - Savagery
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 956776c500b..4b5b4edb0ac 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -140,7 +140,7 @@ class Appender
static const char* getLogFilterTypeString(LogFilterType type);
private:
- virtual void _write(LogMessage& /*message*/) {};
+ virtual void _write(LogMessage& /*message*/) = 0;
uint8 id;
std::string name;
diff --git a/src/server/shared/Logging/AppenderFile.cpp b/src/server/shared/Logging/AppenderFile.cpp
index d66771b9055..01a2f34baa7 100644
--- a/src/server/shared/Logging/AppenderFile.cpp
+++ b/src/server/shared/Logging/AppenderFile.cpp
@@ -26,8 +26,8 @@ AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, co
{
dynamicName = std::string::npos != filename.find("%u");
backup = _flags & APPENDER_FLAGS_MAKE_FILE_BACKUP;
- if (!dynamicName)
- logfile = OpenFile(_filename, _mode, backup);
+
+ logfile = !dynamicName ? OpenFile(_filename, _mode, backup) : NULL;
}
AppenderFile::~AppenderFile()
@@ -54,7 +54,10 @@ void AppenderFile::_write(LogMessage& message)
fflush(logfile);
if (dynamicName)
+ {
fclose(logfile);
+ logfile = NULL;
+ }
}
}