From b2fe38441995e5c6edb7faf6fb3391decf904d08 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 22 Oct 2011 07:51:05 +0000 Subject: [PATCH] - Some code cleanup git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4732 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/BobbyRGuns.cpp | 6 ------ Laptop/BobbyRGuns.h | 2 -- Laptop/BobbyRMailOrder.cpp | 2 -- Utils/Text.h | 1 - 4 files changed, 11 deletions(-) diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index 631b9e7b..482bedd7 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -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); } diff --git a/Laptop/BobbyRGuns.h b/Laptop/BobbyRGuns.h index 4126012e..c968bf34 100644 --- a/Laptop/BobbyRGuns.h +++ b/Laptop/BobbyRGuns.h @@ -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 diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp index 6297dd39..7a77ac68 100644 --- a/Laptop/BobbyRMailOrder.cpp +++ b/Laptop/BobbyRMailOrder.cpp @@ -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 ) diff --git a/Utils/Text.h b/Utils/Text.h index 772e41f2..2b7a9dc6 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -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