small refactor with raw keys

git-svn-id: https://subversion.assembla.com/svn/d2bs@1848 080cfd25-d5d9-4c59-82ea-70d02a200d8b
ds-hwang · Nov 25, 2014 · 1c05599 · 1c05599
1 parent c9a19e3
commit 1c05599
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/branches/bob-18/D2BS.h b/branches/bob-18/D2BS.h
@@ -5,7 +5,7 @@
 
 #define XP_WIN
 
-#define D2BS_VERSION "1.5.1847" //uptodate with d branch 1765 ff 20b
+#define D2BS_VERSION "1.5.1848" //uptodate with d branch 1765 ff 20b
 
 #include <windows.h>
 #include <vector>

diff --git a/branches/bob-18/D2Handlers.cpp b/branches/bob-18/D2Handlers.cpp
@@ -600,8 +600,3 @@ void GameLeave(void)
 //	EnterCriticalSection(&Vars.cGameLoopSection);
 }
 
-void SetKeys()
-{
-	*p_BNCLIENT_XPacKey = Vars.szLod;
-	*p_BNCLIENT_ClassicKey = Vars.szClassic;
-}
diff --git a/branches/bob-18/D2Handlers.h b/branches/bob-18/D2Handlers.h
@@ -25,4 +25,4 @@ void GameLeave(void);
 void CALLBACK TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);
 VOID __fastcall ClassicSTUB();
 VOID __fastcall LodSTUB();
-void SetKeys(void);
+
diff --git a/branches/bob-18/D2Intercepts.cpp b/branches/bob-18/D2Intercepts.cpp
@@ -317,17 +317,19 @@ void __declspec(naked) RemoveUnit_Intercept(UnitAny* lpUnit)
 
 VOID __declspec(naked) __fastcall ClassicSTUB()
 {
+	*p_BNCLIENT_ClassicKey = Vars.szClassic;
 	__asm{
-		call SetKeys
+
 		jmp BNCLIENT_DClass;
 	}
 
 }
 
 VOID __declspec(naked) __fastcall LodSTUB()
 { 
+	*p_BNCLIENT_XPacKey = Vars.szLod;
 	__asm{
-		call SetKeys		
+
 		jmp BNCLIENT_DLod;
 	}