mirror of
https://github.com/OpenDriver2/REDRIVER2.git
synced 2024-11-22 10:22:48 +01:00
- fix PSX frontend, reduce/reuse code
This commit is contained in:
Ilya Shurumov
InspirationByte
parent
839e4ec26f
commit
1c7be3b8ca
@ -277,8 +277,8 @@ void State_InitFrontEnd(void* param)
|
||||
{
|
||||
if ((int)param == 2)
|
||||
{
|
||||
InitFrontendDisplay();
|
||||
InitFrontend();
|
||||
InitFrontendDisplay();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -728,96 +728,14 @@ void DisplayOnScreenText(void)
|
||||
}
|
||||
}
|
||||
|
||||
// [D] [T]
|
||||
void DrawScreen(PSXSCREEN *pScr)
|
||||
void DrawButton(PSXBUTTON* pBtn, int i)
|
||||
{
|
||||
char version_info[32];
|
||||
int numBtnsToDraw;
|
||||
int i;
|
||||
#ifndef PSX
|
||||
if (bRedrawFrontend)
|
||||
{
|
||||
// flush the old screen
|
||||
//EndFrame();
|
||||
int status = pBtn->action >> 8;
|
||||
|
||||
bRedrawFrontend = 0;
|
||||
}
|
||||
#endif
|
||||
for (i = 0; i < 6; i++)
|
||||
addPrim(current->ot + 11, &BackgroundPolys[i]);
|
||||
|
||||
if (pScr)
|
||||
{
|
||||
GetTimeStamp(version_info);
|
||||
|
||||
if (iScreenSelect == SCREEN_CUTCITY && (gFurthestMission < 39))
|
||||
{
|
||||
// hide the Director's Cut button
|
||||
numBtnsToDraw = pScr->numButtons - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
numBtnsToDraw = pScr->numButtons;
|
||||
}
|
||||
int draw = (status != BTN_HIDDEN);
|
||||
|
||||
#ifndef PSX
|
||||
NewSelection(0);
|
||||
if (!bQuitToSystem)
|
||||
#endif
|
||||
{
|
||||
for (i = 0; i < numBtnsToDraw; i++)
|
||||
{
|
||||
PSXBUTTON* button = &pScr->buttons[i];
|
||||
int status = button->action >> 8;
|
||||
|
||||
#ifdef PSX
|
||||
if (status != 5)
|
||||
{
|
||||
if (button == pCurrButton)
|
||||
{
|
||||
if (status == 3)
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 32, 32, 32);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (iScreenSelect == SCREEN_MISSION && (i == 0 || i == 5) ||
|
||||
iScreenSelect == SCREEN_CAR && (i == 0 || i == 2) ||
|
||||
iScreenSelect == SCREEN_CUTSCENE && (i == 0 || i == 2))
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 124, 108, 40);
|
||||
}
|
||||
else
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 128, 128, 128);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (status == 3)
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 32, 32, 32);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (iScreenSelect == SCREEN_MISSION && (i == 0 || i == 5) ||
|
||||
iScreenSelect == SCREEN_CAR && (i == 0 || i == 2) ||
|
||||
iScreenSelect == SCREEN_CUTSCENE && (i == 0 || i == 2))
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 124, 108, 40);
|
||||
}
|
||||
else
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 128, 128, 128);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
int draw = (status != 5);
|
||||
|
||||
if (button == pCurrButton)
|
||||
if (pBtn == pCurrButton)
|
||||
{
|
||||
SPRT* hghltSprt;
|
||||
POLY_FT4* hghltDummy;
|
||||
@ -841,12 +759,13 @@ void DrawScreen(PSXSCREEN *pScr)
|
||||
|
||||
draw = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (draw)
|
||||
{
|
||||
if (status == 3)
|
||||
if (status == BTN_DISABLED)
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 32, 32, 32);
|
||||
FEPrintString(pBtn->Name, pBtn->x * 2 + pBtn->w, pBtn->y, 4, 32, 32, 32);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -855,19 +774,44 @@ void DrawScreen(PSXSCREEN *pScr)
|
||||
iScreenSelect == SCREEN_CUTSCENE && (i == 0 || i == 2) ||
|
||||
iScreenSelect == SCREEN_TIMEOFDAY && i == 2) // [A]
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 124, 108, 40);
|
||||
FEPrintString(pBtn->Name, pBtn->x * 2 + pBtn->w, pBtn->y, 4, 124, 108, 40);
|
||||
}
|
||||
else
|
||||
{
|
||||
FEPrintString(button->Name, button->x * 2 + button->w, button->y, 4, 128, 128, 128);
|
||||
FEPrintString(pBtn->Name, pBtn->x * 2 + pBtn->w, pBtn->y, 4, 128, 128, 128);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// [D] [T]
|
||||
void DrawScreen(PSXSCREEN *pScr)
|
||||
{
|
||||
char version_info[32];
|
||||
int numBtnsToDraw;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 6; i++)
|
||||
addPrim(current->ot + 11, &BackgroundPolys[i]);
|
||||
|
||||
if (pScr)
|
||||
{
|
||||
GetTimeStamp(version_info);
|
||||
|
||||
if (iScreenSelect == SCREEN_CUTCITY && (gFurthestMission < 39))
|
||||
{
|
||||
// hide the Director's Cut button
|
||||
numBtnsToDraw = pScr->numButtons - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
numBtnsToDraw = pScr->numButtons;
|
||||
}
|
||||
|
||||
#ifndef PSX
|
||||
#ifdef PSX
|
||||
for (i = 0; i < numBtnsToDraw; i++)
|
||||
DrawButton(&pScr->buttons[i], i);
|
||||
#else
|
||||
if(bQuitToSystem)
|
||||
{
|
||||
int len;
|
||||
@ -885,8 +829,16 @@ void DrawScreen(PSXSCREEN *pScr)
|
||||
len = FEStringWidth(G_LTXT(GTXT_NO));
|
||||
FEPrintString(G_LTXT(GTXT_NO), 320 + quitLen / 4 - len/2, 288, 0, 128, 128, bQuitToSystemSel ? 128 : 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
NewSelection(0);
|
||||
|
||||
for (i = 0; i < numBtnsToDraw; i++)
|
||||
DrawButton(&pScr->buttons[i], i);
|
||||
}
|
||||
#endif
|
||||
|
||||
// debug version text
|
||||
#if defined(_DEBUG) || defined(DEBUG_OPTIONS)
|
||||
FEPrintString(version_info, 40, 16, 0, 128, 128, 0);
|
||||
FEPrintString("--- " GAME_VERSION " ---", 320, 16, 0, 128, 128, 0);
|
||||
@ -918,13 +870,16 @@ void DrawScreen(PSXSCREEN *pScr)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef PSX
|
||||
else
|
||||
{
|
||||
EndFrame();
|
||||
}
|
||||
#else
|
||||
|
||||
EndFrame();
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1055,7 +1010,7 @@ void LoadBackgroundFile(char* name)
|
||||
FEDrawCDicon();
|
||||
}
|
||||
|
||||
LoadfileSeg(name, (char*)_other_buffer, iTpage * 0x8000, 0x800);
|
||||
LoadfileSeg(name, (char*)_other_buffer, iTpage * 0x8000, 512);
|
||||
FEDrawCDicon();
|
||||
|
||||
rect.h = 1;
|
||||
@ -1211,6 +1166,7 @@ void ReInitScreens(int returnToMain)
|
||||
SwitchMappings(1);
|
||||
#endif // !PSX
|
||||
|
||||
bCdIconSetup = 0;
|
||||
InitCdIcon();
|
||||
|
||||
if (bReturnToMain)
|
||||
@ -1297,6 +1253,10 @@ void NewSelection(short dir)
|
||||
|
||||
pCurrButton = pNewB;
|
||||
|
||||
// show who has control
|
||||
if (NumPlayers == 2 && currPlayer != 1)
|
||||
FEPrintStringSized(G_LTXT(GTXT_Player2), 400, 260, 3072, 0, 128, 128, 128);
|
||||
|
||||
#ifdef PSX
|
||||
rect.x = pCurrButton->s_x;
|
||||
rect.y = pCurrButton->s_y;
|
||||
@ -1311,23 +1271,8 @@ void NewSelection(short dir)
|
||||
addPrim(current->ot + 6, &HighlightSprt);
|
||||
addPrim(current->ot + 6, &HighlightDummy);
|
||||
|
||||
if ((pNewB->action >> 8) == 3) {
|
||||
FEPrintString(pNewB->Name, pNewB->x * 2 + pNewB->w, pNewB->y, 4, 32, 32, 32);
|
||||
}
|
||||
else {
|
||||
if ((iScreenSelect == SCREEN_MISSION && ((pNewB == &pCurrScreen->buttons[0]) || (pNewB == &pCurrScreen->buttons[5]))) ||
|
||||
((iScreenSelect == SCREEN_CAR && ((pNewB == &pCurrScreen->buttons[0]) || (pNewB == &pCurrScreen->buttons[2])))) ||
|
||||
((iScreenSelect == SCREEN_CUTSCENE && ((pNewB == &pCurrScreen->buttons[0]) || (pNewB == &pCurrScreen->buttons[2])))))
|
||||
{
|
||||
FEPrintString(pNewB->Name, pNewB->x * 2 + pNewB->w, pNewB->y, 4, 124, 108, 40);
|
||||
}
|
||||
else {
|
||||
FEPrintString(pNewB->Name, pNewB->x * 2 + pNewB->w, pNewB->y, 4, 128, 128, 128);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
DrawButton(pNewB, pNewB - pCurrScreen->buttons);
|
||||
|
||||
#ifdef PSX
|
||||
EndFrame();
|
||||
#endif
|
||||
}
|
||||
@ -1684,7 +1629,11 @@ void State_FrontEnd(void* param)
|
||||
#else
|
||||
if (bRedrawFrontend)
|
||||
{
|
||||
DrawSync(0);
|
||||
EndFrame();
|
||||
|
||||
DrawScreen(pCurrScreen);
|
||||
|
||||
EndFrame();
|
||||
|
||||
NewSelection(0);
|
||||
@ -1954,7 +1903,7 @@ int CentreScreen(int bSetup)
|
||||
|
||||
if (feNewPad & 0x1000)
|
||||
{
|
||||
if (current->disp.screen.y > screen_limits[0].miny)
|
||||
if (current->disp.screen.y >= screen_limits[video_mode].miny)
|
||||
{
|
||||
current->disp.screen.y--;
|
||||
last->disp.screen.y--;
|
||||
@ -1963,7 +1912,7 @@ int CentreScreen(int bSetup)
|
||||
}
|
||||
else if (feNewPad & 0x4000)
|
||||
{
|
||||
if (current->disp.screen.y < screen_limits[0].maxy)
|
||||
if (current->disp.screen.y <= screen_limits[video_mode].maxy)
|
||||
{
|
||||
current->disp.screen.y++;
|
||||
last->disp.screen.y++;
|
||||
@ -1972,7 +1921,7 @@ int CentreScreen(int bSetup)
|
||||
}
|
||||
else if (feNewPad & 0x8000)
|
||||
{
|
||||
if (current->disp.screen.x > screen_limits[0].minx)
|
||||
if (current->disp.screen.x >= screen_limits[video_mode].minx)
|
||||
{
|
||||
current->disp.screen.x--;
|
||||
last->disp.screen.x--;
|
||||
@ -1981,7 +1930,7 @@ int CentreScreen(int bSetup)
|
||||
}
|
||||
else if (feNewPad & 0x2000)
|
||||
{
|
||||
if (current->disp.screen.x < screen_limits[0].maxx)
|
||||
if (current->disp.screen.x <= screen_limits[video_mode].maxx)
|
||||
{
|
||||
current->disp.screen.x++;
|
||||
last->disp.screen.x++;
|
||||
@ -2059,12 +2008,7 @@ int CarSelectScreen(int bSetup)
|
||||
|
||||
#ifdef PSX
|
||||
if (currPlayer != 1)
|
||||
{
|
||||
if (NumPlayers == 2)
|
||||
FEPrintStringSized(G_LTXT(GTXT_Player2), 400, 260, 0xc00, 0, 128, 128, 128);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
LoadBackgroundFile("DATA\\CARS\\CARBACK.RAW");
|
||||
@ -2105,14 +2049,6 @@ int CarSelectScreen(int bSetup)
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifndef PSX
|
||||
if (currPlayer != 1)
|
||||
{
|
||||
if (NumPlayers == 2)
|
||||
FEPrintStringSized(G_LTXT(GTXT_Player2), 400, 260, 0xc00, 0, 128, 128, 128);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (feNewPad & 0x10)
|
||||
{
|
||||
FESound(0);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user