Merge pull request #17 from GabrielRavier/armsItemImprove
Improve ArmsItem.cpp
This commit is contained in:
Clownacy
GitHub
commit
243942c016
1 changed files with 67 additions and 65 deletions
|
|
@ -37,7 +37,7 @@ void ClearItemData()
|
|||
BOOL AddArmsData(long code, long max_num)
|
||||
{
|
||||
int i = 0;
|
||||
for (;i < ARMS_MAX;)
|
||||
for (; i < ARMS_MAX;)
|
||||
{
|
||||
if (gArmsData[i].code == code)
|
||||
break;
|
||||
|
|
@ -57,6 +57,7 @@ BOOL AddArmsData(long code, long max_num)
|
|||
gArmsData[i].level = 1;
|
||||
}
|
||||
|
||||
// Set weapon and ammo
|
||||
gArmsData[i].code = code;
|
||||
gArmsData[i].max_num += max_num;
|
||||
gArmsData[i].num += max_num;
|
||||
|
|
@ -70,7 +71,7 @@ BOOL AddArmsData(long code, long max_num)
|
|||
BOOL SubArmsData(long code)
|
||||
{
|
||||
int i = 0;
|
||||
for (;i < ARMS_MAX; ++i)
|
||||
for (; i < ARMS_MAX; ++i)
|
||||
if (gArmsData[i].code == code)
|
||||
break;
|
||||
|
||||
|
|
@ -81,10 +82,11 @@ BOOL SubArmsData(long code)
|
|||
#endif
|
||||
return FALSE;
|
||||
|
||||
//Shift all arms from the right to the left
|
||||
// Shift all arms from the right to the left
|
||||
for (i += 1; i < ARMS_MAX; ++i)
|
||||
gArmsData[i - 1] = gArmsData[i];
|
||||
|
||||
// Clear farthest weapon and select first
|
||||
gArmsData[i - 1].code = 0;
|
||||
gSelectedArms = 0;
|
||||
return TRUE;
|
||||
|
|
@ -93,7 +95,7 @@ BOOL SubArmsData(long code)
|
|||
BOOL TradeArms(long code1, long code2, long max_num)
|
||||
{
|
||||
int i = 0;
|
||||
for (;i < ARMS_MAX;)
|
||||
for (; i < ARMS_MAX;)
|
||||
{
|
||||
if (gArmsData[i].code == code1)
|
||||
break;
|
||||
|
|
@ -115,7 +117,7 @@ BOOL TradeArms(long code1, long code2, long max_num)
|
|||
BOOL AddItemData(long code)
|
||||
{
|
||||
int i = 0;
|
||||
for (;i < ITEM_MAX;)
|
||||
for (; i < ITEM_MAX;)
|
||||
{
|
||||
if (gItemData[i].code == code)
|
||||
break;
|
||||
|
|
@ -136,14 +138,14 @@ BOOL AddItemData(long code)
|
|||
BOOL SubItemData(long code)
|
||||
{
|
||||
int i = 0;
|
||||
for (;i < ITEM_MAX; ++i)
|
||||
for (; i < ITEM_MAX; ++i)
|
||||
if (gItemData[i].code == code)
|
||||
break;
|
||||
|
||||
if (i == ITEM_MAX)
|
||||
return FALSE;
|
||||
|
||||
//Shift all items from the right to the left
|
||||
// Shift all items from the right to the left
|
||||
for (i += 1; i < ITEM_MAX; ++i)
|
||||
gItemData[i - 1] = gItemData[i];
|
||||
|
||||
|
|
@ -268,7 +270,7 @@ void MoveCampCursor()
|
|||
|
||||
void PutCampObject()
|
||||
{
|
||||
//Get rects
|
||||
// Get rects
|
||||
RECT rcPer = {72, 48, 80, 56};
|
||||
RECT rcNone = {80, 48, 96, 56};
|
||||
RECT rcLv = {80, 80, 96, 88};
|
||||
|
|
@ -281,22 +283,22 @@ void PutCampObject()
|
|||
RECT rcBoxBody = {0, 8, 244, 16};
|
||||
RECT rcBoxBottom = {0, 16, 244, 24};
|
||||
|
||||
//Draw box
|
||||
// Draw box
|
||||
int y;
|
||||
PutBitmap3(&rcView, (WINDOW_WIDTH - 244) / 2, (WINDOW_HEIGHT - 224) / 2, &rcBoxTop, SURFACE_ID_TEXT_BOX);
|
||||
for (y = 1; y < 18; y++)
|
||||
PutBitmap3(&rcView, (WINDOW_WIDTH - 244) / 2, ((WINDOW_HEIGHT - 240) / 2) + (8 * (y + 1)), &rcBoxBody, SURFACE_ID_TEXT_BOX);
|
||||
PutBitmap3(&rcView, (WINDOW_WIDTH - 244) / 2, ((WINDOW_HEIGHT - 240) / 2) + (8 * (y + 1)), &rcBoxBottom, SURFACE_ID_TEXT_BOX);
|
||||
|
||||
//Move titles
|
||||
// Move titles
|
||||
if (gCampTitleY > (WINDOW_HEIGHT - 208) / 2)
|
||||
--gCampTitleY;
|
||||
|
||||
//Draw titles
|
||||
// Draw titles
|
||||
PutBitmap3(&rcView, (WINDOW_WIDTH - 224) / 2, gCampTitleY, &rcTitle1, SURFACE_ID_TEXT_BOX);
|
||||
PutBitmap3(&rcView, (WINDOW_WIDTH - 224) / 2, gCampTitleY + 52, &rcTitle2, SURFACE_ID_TEXT_BOX);
|
||||
|
||||
//Draw arms cursor
|
||||
// Draw arms cursor
|
||||
static unsigned int flash;
|
||||
++flash;
|
||||
|
||||
|
|
@ -305,7 +307,7 @@ void PutCampObject()
|
|||
else
|
||||
PutBitmap3(&rcView, 40 * gSelectedArms + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT / 2) - 96, &rcCur1[1], SURFACE_ID_TEXT_BOX);
|
||||
|
||||
//Draw arms
|
||||
// Draw arms
|
||||
for (int i = 0; i < ARMS_MAX; i++)
|
||||
{
|
||||
if (gArmsData[i].code == 0)
|
||||
|
|
@ -322,7 +324,7 @@ void PutCampObject()
|
|||
PutBitmap3(&rcView, 40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 160) / 2, &rcLv, SURFACE_ID_TEXT_BOX);
|
||||
PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 160) / 2, gArmsData[i].level, 0);
|
||||
|
||||
//Draw ammo
|
||||
// Draw ammo
|
||||
if ( gArmsData[i].max_num )
|
||||
{
|
||||
PutNumber4(40 * i + (WINDOW_WIDTH - 224) / 2, (WINDOW_HEIGHT - 144) / 2, gArmsData[i].num, 0);
|
||||
|
|
@ -335,7 +337,7 @@ void PutCampObject()
|
|||
}
|
||||
}
|
||||
|
||||
//Draw items cursor
|
||||
// Draw items cursor
|
||||
if (gCampActive == TRUE)
|
||||
PutBitmap3(&rcView, 32 * (gSelectedItem % 6) + (WINDOW_WIDTH - 224) / 2, 16 * (gSelectedItem / 6) + (WINDOW_HEIGHT - 88) / 2, &rcCur2[(flash / 2) % 2], SURFACE_ID_TEXT_BOX);
|
||||
else
|
||||
|
|
@ -360,7 +362,7 @@ int CampLoop()
|
|||
{
|
||||
RECT rcView = {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT};
|
||||
|
||||
//Load the inventory script
|
||||
// Load the inventory script
|
||||
char old_script_path[PATH_LENGTH];
|
||||
GetTextScriptPath(old_script_path);
|
||||
|
||||
|
|
@ -370,9 +372,9 @@ int CampLoop()
|
|||
gCampActive = FALSE;
|
||||
gSelectedItem = 0;
|
||||
|
||||
//Run script
|
||||
// Run script
|
||||
int arms_num = 0;
|
||||
for (;gArmsData[arms_num].code != 0;)
|
||||
for (; gArmsData[arms_num].code != 0;)
|
||||
++arms_num;
|
||||
|
||||
if (arms_num)
|
||||
|
|
@ -432,7 +434,7 @@ int CampLoop()
|
|||
return 0;
|
||||
}
|
||||
|
||||
//Resume original script
|
||||
// Resume original script
|
||||
LoadTextScript_Stage(old_script_path);
|
||||
gArmsEnergyX = 32;
|
||||
return 1;
|
||||
|
|
@ -494,7 +496,7 @@ void FullArmsEnergy()
|
|||
int RotationArms()
|
||||
{
|
||||
int arms_num = 0;
|
||||
for (;gArmsData[arms_num].code != 0;)
|
||||
for (; gArmsData[arms_num].code != 0;)
|
||||
++arms_num;
|
||||
|
||||
if (arms_num == 0)
|
||||
|
|
@ -523,7 +525,7 @@ int RotationArms()
|
|||
int RotationArmsRev()
|
||||
{
|
||||
int arms_num = 0;
|
||||
for (;gArmsData[arms_num].code != 0;)
|
||||
for (; gArmsData[arms_num].code != 0;)
|
||||
++arms_num;
|
||||
|
||||
if (arms_num == 0)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue