Skip to content

Commit

Permalink
add belek666 & jolek to about page, code clean ups
Browse files Browse the repository at this point in the history
  • Loading branch information
Tupakaveli committed Jan 22, 2020
1 parent f5ab840 commit f7024b9
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion lng/lang_English.lng
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Auto start in %i s...
Auto Start
Value in second(s), 0 to disable auto start.
PS2 Logo
Only displayed for a valid disc logo which matches the console's region.
Displayed for a valid disc logo matching the console's region.
Configure PADEMU
Pad Emulator Settings
Enable Pad Emulator
Expand Down
1 change: 0 additions & 1 deletion src/dia.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ static void diaDrawHint(int text_id)
int x, y;
char *text = _l(text_id);

// the width of the hint text string will be scaled by the Vmode, we need to unscale it.
x = screenWidth - rmUnScaleX(fntCalcDimensions(gTheme->fonts[0], text)) - 10;
y = gTheme->usedHeight - 62;

Expand Down
10 changes: 5 additions & 5 deletions src/dialogs.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,15 +781,15 @@ struct UIItem diaAbout[] = {
{UI_BREAK},

{UI_SPACER},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"BatRastard - crazyc - dlanor - doctorxyz - hominem.te.esse", -1}}},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"BatRastard - belek666 - crazyc - dlanor - doctorxyz", -1}}},
{UI_BREAK},

{UI_SPACER},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"ifcaro - izdubar - jimmikaelkael - Maximus32 - misfire", -1}}},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"hominem.te.esse - ifcaro - izdubar - jimmikaelkael", -1}}},
{UI_BREAK},

{UI_SPACER},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"Polo35 - reprep - SP193 - volca", -1}}},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"Maximus32 - misfire - Polo35 - reprep - SP193 - volca", -1}}},
{UI_BREAK},

{UI_SPACER},
Expand All @@ -803,11 +803,11 @@ struct UIItem diaAbout[] = {
{UI_BREAK},

{UI_SPACER},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"algol - Berion - danielB - El_Patas - EP - gledson999 - lee4", -1}}},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"algol - Berion - danielB - El_Patas - EP - gledson999 - jolek", -1}}},
{UI_BREAK},

{UI_SPACER},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"LocalH - RandQalan - ShaolinAssassin - yoshi314 - zero35", -1}}},
{UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"lee4 - LocalH - RandQalan - ShaolinAssassin - yoshi314 - zero35", -1}}},
{UI_BREAK},

{UI_BREAK},
Expand Down
8 changes: 4 additions & 4 deletions src/gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static void guiResetNotifications(void)

static void guiRenderNotifications(char *type, char *path, int y)
{
char notification[32];
char notification[128];
char *col_pos;
int x;

Expand Down Expand Up @@ -1272,12 +1272,12 @@ static void guiDrawOverlays()

if (!pending) {
if (bfadeout > 0x0)
bfadeout -= 0x04;
bfadeout -= 0x02;
else
bfadeout = 0x0;
} else {
if (bfadeout < 0x80)
bfadeout += 0x04;
bfadeout += 0x02;
}

if (bfadeout > 0 && !toggleSfx)
Expand Down Expand Up @@ -1402,7 +1402,7 @@ void guiIntroLoop(void)
guiShow();

if (gInitComplete)
wfadeout -= 2;
wfadeout -= 0x02;

if (wfadeout > 0)
guiRenderGreeting();
Expand Down
2 changes: 1 addition & 1 deletion src/lang.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static char *internalEnglish[LANG_STR_COUNT] = {
"Auto Start",
"Value in second(s), 0 to disable auto start.",
"PS2 Logo",
"Only displayed for a valid disc logo which matches the console's region.",
"Displayed for a valid disc logo matching the console's region.",
"Configure PADEMU",
"Pad Emulator Settings",
"Enable Pad Emulator",
Expand Down
24 changes: 12 additions & 12 deletions src/opl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1386,21 +1386,21 @@ void deinit(int exception, int modeSelected)

void setDefaultColors(void)
{
gDefaultBgColor[0] = 0x028;
gDefaultBgColor[1] = 0x0c5;
gDefaultBgColor[2] = 0x0f9;
gDefaultBgColor[0] = 0x28;
gDefaultBgColor[1] = 0xC5;
gDefaultBgColor[2] = 0xF9;

gDefaultTextColor[0] = 0x0ff;
gDefaultTextColor[1] = 0x0ff;
gDefaultTextColor[2] = 0x0ff;
gDefaultTextColor[0] = 0xFF;
gDefaultTextColor[1] = 0xFF;
gDefaultTextColor[2] = 0xFF;

gDefaultSelTextColor[0] = 0x000;
gDefaultSelTextColor[1] = 0x0ae;
gDefaultSelTextColor[2] = 0x0ff;
gDefaultSelTextColor[0] = 0x00;
gDefaultSelTextColor[1] = 0xAE;
gDefaultSelTextColor[2] = 0xFF;

gDefaultUITextColor[0] = 0x058;
gDefaultUITextColor[1] = 0x068;
gDefaultUITextColor[2] = 0x0b4;
gDefaultUITextColor[0] = 0x58;
gDefaultUITextColor[1] = 0x68;
gDefaultUITextColor[2] = 0xB4;
}

static void setDefaults(void)
Expand Down

0 comments on commit f7024b9

Please sign in to comment.