Merge branch 'master' into lets_move

common/database.cpp

@@ -2185,8 +2185,7 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 	std::string query = StringFormat("SELECT minute,hour,day,month,year,realtime FROM eqtime limit 1");
 	auto results = QueryDatabase(query);
 
-	if (!results.Success() || results.RowCount() == 0)
-	{
+	if (!results.Success() || results.RowCount() == 0){
 		Log.Out(Logs::Detail, Logs::World_Server, "Loading EQ time of day failed. Using defaults.");
 		eqTime.minute = 0;
 		eqTime.hour = 9;
@@ -2195,15 +2194,16 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 		eqTime.year = 3100;
 		realtime = time(0);
 	}
+	else{
+		auto row = results.begin();
 
-	auto row = results.begin();
-
-	eqTime.minute = atoi(row[0]);
-	eqTime.hour = atoi(row[1]);
-	eqTime.day = atoi(row[2]);
-	eqTime.month = atoi(row[3]);
-	eqTime.year = atoi(row[4]);
-	realtime = atoi(row[5]);
+		eqTime.minute = atoi(row[0]);
+		eqTime.hour = atoi(row[1]);
+		eqTime.day = atoi(row[2]);
+		eqTime.month = atoi(row[3]);
+		eqTime.year = atoi(row[4]);
+		realtime = atoi(row[5]);
+	}
 
 	return eqTime;
 }
@@ -2215,4 +2215,4 @@ bool Database::SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year
 
 	return results.Success();
 
-}
+}

common/features.h

@@ -273,6 +273,9 @@ enum {
 #define NPC_DEFAULT_LOGGING_ENABLED false
 
 
+// This is the item ID we use for say links, we use the max that fits in 5 ASCII chars
+#define SAYLINK_ITEM_ID 0xFFFFF
+
 
 /*
 

common/shareddb.cpp

@@ -1920,6 +1920,7 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
                             "ON lootdrop.id = lootdrop_entries.lootdrop_id ORDER BY lootdrop_id";
     auto results = QueryDatabase(query);
     if (!results.Success()) {
+		return;
     }
 
     uint32 current_id = 0;