Merge.
This commit is contained in:
		
						commit
						0c463b1f86
					
				| @ -199,6 +199,11 @@ void EntityOutputManager::ShutdownFireEventDetour() | |||||||
| 
 | 
 | ||||||
| void EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator, CBaseEntity *pCaller, float fDelay) | void EntityOutputManager::FireEventDetour(void *pOutput, CBaseEntity *pActivator, CBaseEntity *pCaller, float fDelay) | ||||||
| { | { | ||||||
|  | 	if (!pCaller) | ||||||
|  | 	{ | ||||||
|  | 		return; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
| 	char sOutput[20]; | 	char sOutput[20]; | ||||||
| 	Q_snprintf(sOutput, sizeof(sOutput), "%x", pOutput); | 	Q_snprintf(sOutput, sizeof(sOutput), "%x", pOutput); | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -163,6 +163,7 @@ | |||||||
| 			"game"					"FortressForever" | 			"game"					"FortressForever" | ||||||
| 			"game"					"zps" | 			"game"					"zps" | ||||||
| 			"game"					"gesource" | 			"game"					"gesource" | ||||||
|  | 			"game"					"obsidian" | ||||||
| 		} | 		} | ||||||
| 		 | 		 | ||||||
| 		"Keys" | 		"Keys" | ||||||
|  | |||||||
| @ -72,7 +72,6 @@ | |||||||
| 		{ | 		{ | ||||||
| 			"game"		"ageofchivalry" | 			"game"		"ageofchivalry" | ||||||
| 			"game"		"zps" | 			"game"		"zps" | ||||||
| 			"game"		"empires" |  | ||||||
| 			"game"		"pvkii" | 			"game"		"pvkii" | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| @ -100,7 +99,6 @@ | |||||||
| 		{ | 		{ | ||||||
| 			"game"		"ageofchivalry" | 			"game"		"ageofchivalry" | ||||||
| 			"game"		"zps" | 			"game"		"zps" | ||||||
| 			"game"		"empires" |  | ||||||
| 			"game"		"pvkii" | 			"game"		"pvkii" | ||||||
| 		} | 		} | ||||||
| 		 | 		 | ||||||
|  | |||||||
| @ -95,6 +95,10 @@ | |||||||
| 				"windows"	"6" | 				"windows"	"6" | ||||||
| 				"linux"		"6" | 				"linux"		"6" | ||||||
| 			} | 			} | ||||||
|  | 			"g_pGameRules" | ||||||
|  | 			{ | ||||||
|  | 				"windows"	"2" | ||||||
|  | 			} | ||||||
| 		} | 		} | ||||||
| 		"Signatures" | 		"Signatures" | ||||||
| 		{ | 		{ | ||||||
| @ -122,6 +126,16 @@ | |||||||
| 				"windows"	"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x2A\x85\xC9\x57\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x2A\x2A\x2A\x83\xC0\x2A\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x2A\x2A\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x2A\x8D\x2A\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x2A\xEB\x11\x39" | 				"windows"	"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x2A\x85\xC9\x57\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\xFF\x2A\x2A\x2A\x83\xC0\x2A\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x2A\x2A\x8B\x2D\x2A\x2A\x2A\x2A\xEB\x2A\x8D\x2A\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x2A\xEB\x11\x39" | ||||||
| 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" | 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" | ||||||
| 			} | 			} | ||||||
|  | 			"CreateGameRulesObject" | ||||||
|  | 			{ | ||||||
|  | 				"library"	"server" | ||||||
|  | 				"windows"	"\x8B\x0D\x2A\x2A\x2A\x2A\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\x6A\x01\xFF\xD2" | ||||||
|  | 			} | ||||||
|  | 			"g_pGameRules" | ||||||
|  | 			{ | ||||||
|  | 				"library"	"server" | ||||||
|  | 				"linux"		"@g_pGameRules" | ||||||
|  | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | |||||||
| @ -11,7 +11,7 @@ | |||||||
| 
 | 
 | ||||||
| "Games" | "Games" | ||||||
| { | { | ||||||
| 	/* Empires 2.24 */ | 	/* Empires 2.25 */ | ||||||
| 	"empires" | 	"empires" | ||||||
| 	{ | 	{ | ||||||
| 
 | 
 | ||||||
| @ -102,6 +102,43 @@ | |||||||
| 				"windows"	"23" | 				"windows"	"23" | ||||||
| 				"linux"		"24" | 				"linux"		"24" | ||||||
| 			} | 			} | ||||||
|  | 			"PlayerRunCmd" | ||||||
|  | 			{ | ||||||
|  | 				"windows"	"373" | ||||||
|  | 				"linux"		"374" | ||||||
|  | 			} | ||||||
|  | 			"FireOutputBackup" | ||||||
|  | 			{ | ||||||
|  | 				"windows"	"6" | ||||||
|  | 				"linux"		"10" | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 		"Signatures" | ||||||
|  | 		{ | ||||||
|  | 			"DispatchSpawn" | ||||||
|  | 			{ | ||||||
|  | 				"library"	"server" | ||||||
|  | 				"windows"	"\x53\x55\x56\x8B\x74\x24\x10\x57\x85\xF6\x0F\x84\x2A\x2A\x2A\x2A\x8B\x1D\x2A\x2A\x2A\x2A\x8B\x03\x8B\x50\x64\x8B\xCB" | ||||||
|  | 				"linux"		"@_Z13DispatchSpawnP11CBaseEntity" | ||||||
|  | 			} | ||||||
|  | 			"CreateEntityByName" | ||||||
|  | 			{ | ||||||
|  | 				"library"	"server" | ||||||
|  | 				"windows"	"\x56\x8B\x74\x24\x0C\x57\x8B\x7C\x24\x0C\x83\xFE\xFF\x74\x27\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01\x8B\x50\x54\x56\xFF\xD2" | ||||||
|  | 				"linux"		"@_Z18CreateEntityByNamePKci" | ||||||
|  | 			} | ||||||
|  | 			"FindEntityByClassname" | ||||||
|  | 			{ | ||||||
|  | 				"library"	"server" | ||||||
|  | 				"windows"	"\x53\x55\x56\x8B\xF1\x8B\x4C\x24\x10\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x08\xFF\xD2\x8B\x00\x25\xFF\x0F\x00\x00\x40\xC1\xE0\x04\x8B\x3C\x30\xEB\x06\x8B\xBE\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5C\x24\x18\x8B\x2D\x2A\x2A\x2A\x2A\x8D\xA4\x24\x00\x00\x00\x00\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x83\xC4\x04\xEB\x2A\x39\x2A\x2A\x74\x2A\x53" | ||||||
|  | 				"linux"		"@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" | ||||||
|  | 			} | ||||||
|  | 			"FireOutput" | ||||||
|  | 			{ | ||||||
|  | 				"library"	"server" | ||||||
|  | 				"windows"	"\x55\x8B\xEC\x83\x2A\x2A\x81\xEC\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x57\x89" | ||||||
|  | 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" | ||||||
|  | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user