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

-fixed BR's not restocking

Browse Source 
-fixed 90210 not working
-fixed 8 character IMP names not working

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-07-18 04:29:26 +00:00
parent da13c44578
commit c4c5ddeec1
3 changed files with 9 additions and 9 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.348" }; INT16 zVersionLabel[256] = { L"Release v1.13.353" };
#endif #endif
Laptop/BobbyR.cpp
+2 -2
View File
@@ -669,7 +669,7 @@ void DailyUpdateOfBobbyRaysNewInventory()
if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnOrder == 0) if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnOrder == 0)
{ {
//if the qty on hand is half the desired amount or fewer //if the qty on hand is half the desired amount or fewer
if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnHand <= (StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] / 2 ) ) if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnHand <= (StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] / 2 * gGameOptions.ubBobbyRay ) )
{ {
// remember value of the "previously eligible" flag // remember value of the "previously eligible" flag
fPrevElig = LaptopSaveInfo.BobbyRayInventory[ i ].fPreviouslyEligible; fPrevElig = LaptopSaveInfo.BobbyRayInventory[ i ].fPreviouslyEligible;
@@ -766,7 +766,7 @@ UINT8 HowManyBRItemsToOrder(UINT16 usItemIndex, UINT8 ubCurrentlyOnHand, UINT8 u
Assert(usItemIndex < MAXITEMS); Assert(usItemIndex < MAXITEMS);
// formulas below will fail if there are more items already in stock than optimal // formulas below will fail if there are more items already in stock than optimal
Assert(ubCurrentlyOnHand <= StoreInventory[ usItemIndex ][ ubBobbyRayNewUsed ]); Assert(ubCurrentlyOnHand <= StoreInventory[ usItemIndex ][ ubBobbyRayNewUsed ] * gGameOptions.ubBobbyRay) ;
Assert(ubBobbyRayNewUsed < BOBBY_RAY_LISTS); Assert(ubBobbyRayNewUsed < BOBBY_RAY_LISTS);
Laptop/IMP Confirm.cpp
+6 -6
View File
@@ -653,18 +653,18 @@ INT32 FirstFreeBigEnoughPocket(MERCPROFILESTRUCT *pProfile, UINT16 usItem)
void WriteOutCurrentImpCharacter( INT32 iProfileId ) void WriteOutCurrentImpCharacter( INT32 iProfileId )
{ {
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("WriteOutCurrentImpCharacter: IMP.dat")); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("WriteOutCurrentImpCharacter: IMP.dat"));
char zImpFileName[12]; char zImpFileName[13];
strcat(zImpFileName,IMP_MERC_FILENAME); strcpy(zImpFileName,IMP_MERC_FILENAME);
strcat(zImpFileName,IMP_FILENAME_SUFFIX); strcat(zImpFileName,IMP_FILENAME_SUFFIX);
WriteOutCurrentImpCharacter ( iProfileId, zImpFileName); WriteOutCurrentImpCharacter ( iProfileId, zImpFileName);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("WriteOutCurrentImpCharacter: Nickname.dat")); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("WriteOutCurrentImpCharacter: Nickname.dat"));
char zFileName[12]; char zFileName[13];
char temp; char temp;
for(int i=0;i < 8;i++) // Madd: I couldn't get strcpy or anything to work here... weird... if s/o wants to fix it, go ahead for(int i=0;i < 9;i++) // Madd: I couldn't get strcpy or anything to work here... weird... if s/o wants to fix it, go ahead
{ {
temp = (char) gMercProfiles[iProfileId].zNickname[i]; temp = (char) gMercProfiles[iProfileId].zNickname[i];
zFileName[i] = temp; zFileName[i] = temp;
@@ -712,7 +712,7 @@ void WriteOutCurrentImpCharacter( INT32 iProfileId, STR fileName )
BOOLEAN ImpExists ( STR nickName ) BOOLEAN ImpExists ( STR nickName )
{ {
char zFileName[12]; char zFileName[13];
strcpy(zFileName,nickName); strcpy(zFileName,nickName);
strcat(zFileName,IMP_FILENAME_SUFFIX); strcat(zFileName,IMP_FILENAME_SUFFIX);
@@ -729,7 +729,7 @@ void LoadImpCharacter( STR nickName )
HWFILE hFile; HWFILE hFile;
UINT32 uiBytesRead = 0; UINT32 uiBytesRead = 0;
char zFileName[12]; char zFileName[13];
strcpy(zFileName,nickName); strcpy(zFileName,nickName);
strcat(zFileName,IMP_FILENAME_SUFFIX); strcat(zFileName,IMP_FILENAME_SUFFIX);