mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Fixes (by The_Bob):
- Fixed random freeze on win8/10 - Fixed crash on mercs entering sector - Fixed crash when using cover display (del/end) - Fixed attachment popup showing incompatible attachments (crash/freeze/confusion on clicking the option) - Fixed attachment popup positioning - Fixed LBE contents corruption/deletion - Fixed access violation (out of array bounds) in interrupt code - Fixed a bunch of random old stuff - Got the project to build on VS2015 - Improved popup class handling of grayed out options - Improved performance of get item assignment check (added by Flugente) - Added Ctrl+Space bind for testing/fixing broken LBE contents git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1036,7 +1036,10 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
|
||||
char tauntFileNamePattern[MAX_PATH];
|
||||
strcpy(tauntFileNamePattern, directoryName);
|
||||
strcat(tauntFileNamePattern, TAUNTSFOLDERNAME);
|
||||
strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING"*"TAUNTSFILENAMEENDING);
|
||||
strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING);
|
||||
strcat(tauntFileNamePattern, "*");
|
||||
strcat(tauntFileNamePattern, TAUNTSFILENAMEENDING);
|
||||
|
||||
if( GetFileFirst(tauntFileNamePattern, &FileInfo) )
|
||||
{
|
||||
strcpy(fileName, directoryName);
|
||||
@@ -1650,7 +1653,6 @@ UINT32 InitializeJA2(void)
|
||||
|
||||
//Lua
|
||||
IniLuaGlobal();
|
||||
|
||||
return( INIT_SCREEN );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user