aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Warden/Modules/WardenModuleMac.h2
-rw-r--r--src/server/game/Warden/Modules/WardenModuleWin.h2
-rw-r--r--src/server/game/Warden/Warden.cpp38
-rw-r--r--src/server/game/Warden/Warden.h16
-rw-r--r--src/server/game/Warden/WardenCheckMgr.cpp6
-rw-r--r--src/server/game/Warden/WardenCheckMgr.h6
-rw-r--r--src/server/game/Warden/WardenMac.cpp2
-rw-r--r--src/server/game/Warden/WardenMac.h2
-rw-r--r--src/server/game/Warden/WardenWin.cpp4
-rw-r--r--src/server/game/Warden/WardenWin.h2
-rw-r--r--src/server/shared/Cryptography/WardenKeyGeneration.h2
11 files changed, 23 insertions, 59 deletions
diff --git a/src/server/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h
index 76303b8cb48..46011c5bcd9 100644
--- a/src/server/game/Warden/Modules/WardenModuleMac.h
+++ b/src/server/game/Warden/Modules/WardenModuleMac.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/Modules/WardenModuleWin.h b/src/server/game/Warden/Modules/WardenModuleWin.h
index 1db96b67f17..ca61a270a81 100644
--- a/src/server/game/Warden/Modules/WardenModuleWin.h
+++ b/src/server/game/Warden/Modules/WardenModuleWin.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
index 7ef08d0233e..3d625df63d0 100644
--- a/src/server/game/Warden/Warden.cpp
+++ b/src/server/game/Warden/Warden.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
@@ -42,42 +42,6 @@ Warden::~Warden()
_initialized = false;
}
-void Warden::Init(WorldSession* /*session*/, BigNumber* /*k*/)
-{
- ASSERT(false);
-}
-
-ClientWardenModule* Warden::GetModuleForClient()
-{
- ASSERT(false);
- return NULL;
-}
-
-void Warden::InitializeModule()
-{
- ASSERT(false);
-}
-
-void Warden::RequestHash()
-{
- ASSERT(false);
-}
-
-void Warden::HandleHashResult(ByteBuffer& /*buff*/)
-{
- ASSERT(false);
-}
-
-void Warden::RequestData()
-{
- ASSERT(false);
-}
-
-void Warden::HandleData(ByteBuffer& /*buff*/)
-{
- ASSERT(false);
-}
-
void Warden::SendModuleToClient()
{
sLog->outDebug(LOG_FILTER_WARDEN, "Send module to client");
diff --git a/src/server/game/Warden/Warden.h b/src/server/game/Warden/Warden.h
index 429743cdb60..e06ea7dca25 100644
--- a/src/server/game/Warden/Warden.h
+++ b/src/server/game/Warden/Warden.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
@@ -109,13 +109,13 @@ class Warden
Warden();
~Warden();
- virtual void Init(WorldSession* session, BigNumber* k);
- virtual ClientWardenModule* GetModuleForClient();
- virtual void InitializeModule();
- virtual void RequestHash();
- virtual void HandleHashResult(ByteBuffer &buff);
- virtual void RequestData();
- virtual void HandleData(ByteBuffer &buff);
+ virtual void Init(WorldSession* session, BigNumber* k) = 0;
+ virtual ClientWardenModule* GetModuleForClient() = 0;
+ virtual void InitializeModule() = 0;
+ virtual void RequestHash() = 0;
+ virtual void HandleHashResult(ByteBuffer &buff) = 0;
+ virtual void RequestData() = 0;
+ virtual void HandleData(ByteBuffer &buff) = 0;
void SendModuleToClient();
void RequestModule();
diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp
index a4290a2f07d..77332bd30a8 100644
--- a/src/server/game/Warden/WardenCheckMgr.cpp
+++ b/src/server/game/Warden/WardenCheckMgr.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
@@ -179,7 +179,7 @@ void WardenCheckMgr::LoadWardenChecks()
sLog->outString();
}
-WardenCheck* WardenCheckMgr::GetWardenDataById(uint32 Id)
+WardenCheck* WardenCheckMgr::GetWardenDataById(uint16 Id)
{
if (Id < CheckStore.size())
return CheckStore[Id];
@@ -187,7 +187,7 @@ WardenCheck* WardenCheckMgr::GetWardenDataById(uint32 Id)
return NULL;
}
-WardenCheckResult* WardenCheckMgr::GetWardenResultById(uint32 Id)
+WardenCheckResult* WardenCheckMgr::GetWardenResultById(uint16 Id)
{
CheckResultContainer::const_iterator itr = CheckResultStore.find(Id);
if (itr != CheckResultStore.end())
diff --git a/src/server/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h
index 855cd3c5d6f..cbe8460db3b 100644
--- a/src/server/game/Warden/WardenCheckMgr.h
+++ b/src/server/game/Warden/WardenCheckMgr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
@@ -55,8 +55,8 @@ class WardenCheckMgr
typedef std::vector<WardenCheck*> CheckContainer;
typedef std::map<uint32, WardenCheckResult*> CheckResultContainer;
- WardenCheck* GetWardenDataById(uint32 Id);
- WardenCheckResult* GetWardenResultById(uint32 Id);
+ WardenCheck* GetWardenDataById(uint16 Id);
+ WardenCheckResult* GetWardenResultById(uint16 Id);
uint32 InternalDataID;
std::vector<uint16> MemChecksIdPool;
diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
index 28124eee6a8..f62aa11a339 100644
--- a/src/server/game/Warden/WardenMac.cpp
+++ b/src/server/game/Warden/WardenMac.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h
index c09e3b6e2a2..b2ecc72367d 100644
--- a/src/server/game/Warden/WardenMac.h
+++ b/src/server/game/Warden/WardenMac.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
index 21e3037e317..a77c77a3261 100644
--- a/src/server/game/Warden/WardenWin.cpp
+++ b/src/server/game/Warden/WardenWin.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
@@ -205,7 +205,7 @@ void WardenWin::RequestData()
_serverTicks = getMSTime();
- uint32 id;
+ uint16 id;
uint8 type;
WardenCheck* wd;
_currentChecks.clear();
diff --git a/src/server/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h
index 2f302e8057a..4d859f2b22a 100644
--- a/src/server/game/Warden/WardenWin.h
+++ b/src/server/game/Warden/WardenWin.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it
diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/src/server/shared/Cryptography/WardenKeyGeneration.h
index 1a0ef5c515c..9b44ab1832e 100644
--- a/src/server/shared/Cryptography/WardenKeyGeneration.h
+++ b/src/server/shared/Cryptography/WardenKeyGeneration.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify it