Merge pull request #9115 from Kyep/sql_version_fix

Fixes SQL version (3->4), plus a runtime
This commit is contained in:
tigercat2000
2018-06-15 22:33:25 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -346,7 +346,7 @@
#define INVESTIGATE_BOMB "bombs"
// The SQL version required by this version of the code
#define SQL_VERSION 3
#define SQL_VERSION 4
// Vending machine stuff
#define CAT_NORMAL 1
+2 -2
View File
@@ -266,12 +266,12 @@ This is always put in the attack log.
var/loglevel = ATKLOG_MOST
if(custom_level)
if(!isnull(custom_level))
loglevel = custom_level
else if(istype(target))
if(isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE
loglevel = ATKLOG_FEW
else if(!user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL
else if(istype(user) && !user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL
loglevel = ATKLOG_ALL
else if(!target.ckey) // Attacks by players on NPCs are only shown to admins with ATKLOG_ALL or ATKLOG_ALMOSTALL
loglevel = ATKLOG_ALMOSTALL