1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bug fix: CTD when clicking on buttons

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-06-07 15:49:36 +00:00
parent 21d454688b
commit f937772476
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.181" }; INT16 zVersionLabel[256] = { L"Release v1.13.187" };
#endif #endif
JA2.vcproj
+2 -2
View File
@@ -43,7 +43,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.181_2006_06_07.exe" OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.187_2006_06_07.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.181_2006_06_07.exe" OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.187_2006_06_07.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Standard Gaming Platform/Button System.cpp
+2 -4
View File
@@ -4128,15 +4128,13 @@ void MSYS_SetBtnUserData(INT32 iButtonNum,INT32 index,INT32 userdata)
{ {
GUI_BUTTON *b; GUI_BUTTON *b;
b=ButtonList[iButtonNum]; b=ButtonList[iButtonNum];
if(index < 0 || index > 3) if((index < 0) || (index > 3))
return; return;
b->UserData[index]=userdata; if(b != NULL) b->UserData[index]=userdata;
} }
INT32 MSYS_GetBtnUserData(GUI_BUTTON *b,INT32 index) INT32 MSYS_GetBtnUserData(GUI_BUTTON *b,INT32 index)
{ {
if(index < 0 || index > 3) if(index < 0 || index > 3)
return(0); return(0);
Tactical/Weapons.cpp
+1
View File
@@ -5555,3 +5555,4 @@ INT8 GetAPsToReload( OBJECTTYPE *pObj )
( 100 - GetPercentReloadTimeAPReduction(pObj) ) ) / 100; ( 100 - GetPercentReloadTimeAPReduction(pObj) ) ) / 100;
} }