Fixed more critical hit crashes when compiled on msvc8.

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402358

extensions/tf2/CDetour/detourhelpers.h

@@ -1,7 +1,7 @@
 /**
  * vim: set ts=4 :
  * =============================================================================
- * SourceMod SDKTools Extension
+ * SourceMod
  * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *

extensions/tf2/CDetour/detours.cpp

@@ -1,3 +1,34 @@
+/**
+* vim: set ts=4 :
+* =============================================================================
+* SourceMod
+* Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+* =============================================================================
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License, version 3.0, as published by the
+* Free Software Foundation.
+* 
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License along with
+* this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* As a special exception, AlliedModders LLC gives you permission to link the
+* code of this program (as well as its derivative works) to "Half-Life 2," the
+* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+* by the Valve Corporation.  You must obey the GNU General Public License in
+* all respects for all other code used.  Additionally, AlliedModders LLC grants
+* this exception to all derivative works.  AlliedModders LLC defines further
+* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+* or <http://www.sourcemod.net/license.php>.
+*
+* Version: $Id$
+*/
+
 #include "detours.h"
 #include <asm/asm.h>
 
@@ -105,11 +136,11 @@ bool CDetour::CreateDetour()
 
 	if (!detour_address)
 	{
-		g_pSM->LogError(myself, "Sigscan for %s failed - Disabling detour", signame);
+		g_pSM->LogError(myself, "Sigscan for %s failed - Disabling detour to prevent crashes", signame);
 		return false;
 	}
 
-	detour_restore.bytes = copy_bytes((unsigned char *)detour_address, NULL, OP_JMP_SIZE);
+	detour_restore.bytes = copy_bytes((unsigned char *)detour_address, NULL, OP_JMP_SIZE+1);
 
 	/* First, save restore bits */
 	for (size_t i=0; i<detour_restore.bytes; i++)

extensions/tf2/CDetour/detours.h

@@ -1,3 +1,33 @@
+/**
+* vim: set ts=4 :
+* =============================================================================
+* SourceMod
+* Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+* =============================================================================
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License, version 3.0, as published by the
+* Free Software Foundation.
+* 
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License along with
+* this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* As a special exception, AlliedModders LLC gives you permission to link the
+* code of this program (as well as its derivative works) to "Half-Life 2," the
+* "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+* by the Valve Corporation.  You must obey the GNU General Public License in
+* all respects for all other code used.  Additionally, AlliedModders LLC grants
+* this exception to all derivative works.  AlliedModders LLC defines further
+* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+* or <http://www.sourcemod.net/license.php>.
+*
+* Version: $Id$
+*/
 
 #ifndef _INCLUDE_SOURCEMOD_DETOURS_H_
 #define _INCLUDE_SOURCEMOD_DETOURS_H_

extensions/tf2/msvc9/tf2.vcproj

@@ -258,15 +258,15 @@
 			Name="CDetour"
 			>
 			<File
-				RelativePath="..\..\..\public\CBaseServer and friends\CDetour\detourhelpers.h"
+				RelativePath="..\CDetour\detourhelpers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\public\CBaseServer and friends\CDetour\detours.cpp"
+				RelativePath="..\CDetour\detours.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\public\CBaseServer and friends\CDetour\detours.h"
+				RelativePath="..\CDetour\detours.h"
 				>
 			</File>
 		</Filter>