From 72ad53d95ea7e191ef08aeeb3308452f0b371ab3 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Wed, 14 Jun 2006 02:24:57 +0000 Subject: [PATCH] -removed disk space check because it was pissing me off and coming up with a warning despite the fact that I have 12 GB space free -changed weapon ranges in tooltips to tiles to match the ranges in the item description screen git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@231 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 2 +- Laptop/BobbyRGuns.cpp | 4 ++-- Tactical/Interface Items.cpp | 8 ++++---- gameloop.cpp | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 629d015a..45d0a80e 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.225" }; + INT16 zVersionLabel[256] = { L"Release v1.13.231" }; #endif diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index ee047d9a..eae1c66b 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -1375,7 +1375,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum gWeaponStatsDesc[ 11 ], //Damage String gunDamage, //Gun damage gWeaponStatsDesc[ 10 ], //Range String - Weapon[ pItemNumbers[ i ] ].usRange, //Gun Range + Weapon[ pItemNumbers[ i ] ].usRange/10, //Gun Range gWeaponStatsDesc[ 5 ], //AP String //apStr, //AP's L"- / - / -", @@ -1436,7 +1436,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum gWeaponStatsDesc[ 11 ], //Damage String gunDamage, //Gun damage gWeaponStatsDesc[ 10 ], //Range String - Weapon[ pItemNumbers[ i ] ].usRange, //Gun Range + Weapon[ pItemNumbers[ i ] ].usRange/10, //Gun Range gWeaponStatsDesc[ 5 ], //AP String //apStr, //AP's L"- / - / -", diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index a1d227b5..1a4bb457 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -7361,8 +7361,8 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi gWeaponStatsDesc[ 11 ], //Damage String GetDamage(pObject), gWeaponStatsDesc[ 10 ], //Range String - GunRange( pObject ), //Modified Range - Weapon[ usItem ].usRange, //Gun Range + GunRange( pObject )/10, //Modified Range + Weapon[ usItem ].usRange/10, //Gun Range gWeaponStatsDesc[ 5 ], //AP String apStr, //AP's gWeaponStatsDesc[ 12 ], //Weight String @@ -7410,8 +7410,8 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi gWeaponStatsDesc[ 11 ], //Damage String GetDamage(pObject), gWeaponStatsDesc[ 10 ], //Range String - GunRange( pObject ), //Modified Range - Weapon[ usItem ].usRange, //Gun Range + GunRange( pObject )/10, //Modified Range + Weapon[ usItem ].usRange/10, //Gun Range gWeaponStatsDesc[ 5 ], //AP String apStr, //AP's gWeaponStatsDesc[ 12 ], //Weight String diff --git a/gameloop.cpp b/gameloop.cpp index 8cb0bb5f..7d501bb2 100644 --- a/gameloop.cpp +++ b/gameloop.cpp @@ -225,7 +225,8 @@ void GameLoop(void) guiCurrentScreen = ERROR_SCREEN; } - +/* + // Madd: removed check because it kept coming up for me, even on new games, even though I have 12GB free!! I think the "DoesUserHaveEnoughHardDriveSpace" function is busted. //if we are to check for free space on the hard drive //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"GameLoop: check hard drive"); if( gubCheckForFreeSpaceOnHardDriveCount < DONT_CHECK_FOR_FREE_SPACE ) @@ -266,7 +267,7 @@ void GameLoop(void) } } } - +*/ // ATE: Force to be in message box screen! if ( gfInMsgBox ) {