mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
- Some code cleanup
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4732 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2096,10 +2096,6 @@ void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex,
|
||||
|
||||
UINT8 ubPurchaseNumber;
|
||||
|
||||
//Display Items Name
|
||||
//uiStartLoc = BOBBYR_ITEM_DESC_FILE_SIZE * usIndex;
|
||||
//LoadEncryptedDataFromFile(BOBBYRDESCFILE, sText, uiStartLoc, BOBBYR_ITEM_DESC_NAME_SIZE);
|
||||
|
||||
LoadBRName(usIndex,sText);
|
||||
|
||||
if( StringPixLength( sText, BOBBYR_ITEM_NAME_TEXT_FONT ) > ( BOBBYR_GRID_PIC_WIDTH - 6 ) )
|
||||
@@ -2137,8 +2133,6 @@ void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex,
|
||||
}
|
||||
|
||||
//Display Items description
|
||||
//uiStartLoc = (BOBBYR_ITEM_DESC_FILE_SIZE * usIndex) + BOBBYR_ITEM_DESC_NAME_SIZE;
|
||||
//LoadEncryptedDataFromFile(BOBBYRDESCFILE, sText, uiStartLoc, BOBBYR_ITEM_DESC_INFO_SIZE);
|
||||
LoadBRDesc(usIndex,sText);
|
||||
DisplayWrappedString(BOBBYR_ITEM_DESC_START_X, usPosY, BOBBYR_ITEM_DESC_START_WIDTH, 2, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ITEM_DESC_TEXT_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef __BOBBYRGUNS_H
|
||||
#define __BOBBYRGUNS_H
|
||||
|
||||
#define BOBBYRDESCFILE "BINARYDATA\\BrayDesc.edt"
|
||||
|
||||
#define BOBBYR_ITEM_DESC_NAME_SIZE 160
|
||||
#define BOBBYR_ITEM_DESC_INFO_SIZE 640
|
||||
#define BOBBYR_ITEM_DESC_FILE_SIZE 800
|
||||
|
||||
@@ -1049,13 +1049,11 @@ void DisplayPurchasedItems( BOOLEAN fCalledFromOrderPage, UINT16 usGridX, UINT16
|
||||
|
||||
if( pBobbyRayPurchase[i].fUsed )
|
||||
{
|
||||
// LoadEncryptedDataFromFile(BOBBYRDESCFILE, sBack, uiStartLoc, BOBBYR_ITEM_DESC_NAME_SIZE);
|
||||
LoadBRName(pBobbyRayPurchase[i].usItemIndex,sBack);
|
||||
swprintf(sText, L"%s %s", "*", sBack);
|
||||
}
|
||||
else
|
||||
LoadBRName(pBobbyRayPurchase[i].usItemIndex,sText);
|
||||
// LoadEncryptedDataFromFile(BOBBYRDESCFILE, sText, uiStartLoc, BOBBYR_ITEM_DESC_NAME_SIZE);
|
||||
|
||||
//if the name is bigger then can fit into the slot, reduce the size
|
||||
if( StringPixLength(sText, BOBBYR_ORDER_DYNAMIC_TEXT_FONT) > BOBBYR_GRID_THIRD_COLUMN_WIDTH-4 )
|
||||
|
||||
@@ -1319,7 +1319,6 @@ extern STR16 zMarksMapScreenText[];
|
||||
|
||||
|
||||
//Weapon Name and Description size
|
||||
#define ITEMSTRINGFILENAME "BINARYDATA\\ITEMDESC.EDT"
|
||||
#define SIZE_ITEM_NAME 160
|
||||
#define SIZE_SHORT_ITEM_NAME 160
|
||||
#define SIZE_ITEM_INFO 480
|
||||
|
||||
Reference in New Issue
Block a user