Merge fix

This commit is contained in:
KimLS
2017-02-21 21:20:33 -08:00
50 changed files with 4486 additions and 1384 deletions
+3
View File
@@ -234,6 +234,9 @@ enum { //some random constants
#define ZONE_CONTROLLER_NPC_ID 10
// Timer to update aggrometer
#define AGGRO_METER_UPDATE_MS 1000
//Some hard coded statuses from commands and other places:
enum {
minStatusToBeGM = 40,