Skip to content

Commit ec9eb6f

Browse files
LTVA1LTVA1
committed
for some reason one of the symbols broke breaking the unite commands thing display; such a hassle...
1 parent 0873966 commit ec9eb6f

File tree

22 files changed

+33
-24
lines changed

22 files changed

+33
-24
lines changed

‎Fonts/src/build-font-file.bat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@echo off
2+
echo Building font...
3+
bin\makebundle.exe Font.fnt MyFont
4+
echo ---
5+
echo Your new font is now packed in the file called "Font"!
6+
pause

‎Fonts/src/font16x16/charmap.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc\fd\fe\ff\c

‎Fonts/src/font16x16/font.png

2.55 KB
Loading

‎Fonts/src/font16x16/res.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16 16

‎Fonts/src/font24x24/charmap.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc\fd\fe\ff\c

‎Fonts/src/font24x24/font.png

3.15 KB
Loading

‎Fonts/src/font24x24/res.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24 24

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ res/$(1): themes/$(1)/* #themes/$(1)/font/* themes/$(1)/font7x6/* themes/$(1)/ti
133133
$(Q)rm -rf themetemp.$(1)
134134

135135
$(Q)mkdir -p res/Fonts
136-
$(Q)cp -f Fonts/* res/Fonts
136+
$(Q)cp -f Fonts/font16x16.* res/Fonts
137+
$(Q)cp -f Fonts/font24x24.* res/Fonts
137138

138139
endef
139140

‎src/view.c

+9-11
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ void program_view(GfxDomain *dest_surface, const SDL_Rect *dest, const SDL_Event
15501550
{
15511551
if (mused.channel[c].instrument == inst && ((mused.cyd.channel[c].flags & CYD_CHN_ENABLE_GATE) || ((mused.cyd.channel[c].flags & CYD_CHN_ENABLE_FM) && (mused.cyd.channel[c].fm.adsr.envelope != 0) && !(mused.cyd.channel[c].flags & CYD_CHN_ENABLE_GATE))) && (mused.channel[c].program_flags & (1 << mused.current_instrument_program)) && mused.channel[c].program_tick[mused.current_instrument_program] == i)
15521552
{
1553-
cur = '�'; //where arrow pointing at current instrument program step is drawn
1553+
cur = '½'; //where arrow pointing at current instrument program step is drawn
15541554
pointing_at_command = true;
15551555
}
15561556
}
@@ -1622,20 +1622,18 @@ void program_view(GfxDomain *dest_surface, const SDL_Rect *dest, const SDL_Event
16221622
{
16231623
if(mused.jump_in_program)
16241624
{
1625-
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->program_unite_bits[mused.current_instrument_program][i / 8] & (1 << (i & 7)))) ? '�' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
1626-
select_program_step, MAKEPTR(i), 0, 0);
1625+
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->program_unite_bits[mused.current_instrument_program][i / 8] & (1 << (i & 7)))) ? '\xd' : '|'), select_program_step, MAKEPTR(i), 0, 0);
16271626
}
16281627

16291628
else
16301629
{
1631-
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->program_unite_bits[mused.current_instrument_program][i / 8] & (1 << (i & 7)))) ? '�' : '|'), NULL, NULL, NULL, NULL);
1630+
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->program_unite_bits[mused.current_instrument_program][i / 8] & (1 << (i & 7)))) ? '\xd' : '|'), NULL, NULL, NULL, NULL);
16321631
}
16331632
}
16341633

16351634
else
16361635
{
1637-
check_event(event, console_write_args(mused.console, "%c ", (!(inst->program_unite_bits[mused.current_instrument_program][i / 8] & (1 << (i & 7)))) ? '�' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
1638-
select_program_step, MAKEPTR(i), 0, 0);
1636+
check_event(event, console_write_args(mused.console, "%c ", (!(inst->program_unite_bits[mused.current_instrument_program][i / 8] & (1 << (i & 7)))) ? '\xd' : '|'), select_program_step, MAKEPTR(i), 0, 0);
16391637
}
16401638
}
16411639

@@ -1931,7 +1929,7 @@ void inst_field(const SDL_Event *e, const SDL_Rect *area, int p, int length, cha
19311929

19321930
for (; text[i] && c < my_min(length, field.w / mused.console->font.w); ++i, ++c)
19331931
{
1934-
const SDL_Rect *r = console_write_args(mused.console, "%c", mused.editpos == i ? '�' : text[i]);
1932+
const SDL_Rect *r = console_write_args(mused.console, "%c", mused.editpos == i ? '½' : text[i]);
19351933

19361934
if (check_event(e, r, NULL, NULL, NULL, NULL))
19371935
{
@@ -3405,7 +3403,7 @@ void four_op_program_view(GfxDomain *dest_surface, const SDL_Rect *dest, const S
34053403
if (mused.channel[c].instrument == inst && ((mused.cyd.channel[c].fm.ops[mused.selected_operator - 1].adsr.envelope > 0 || (mused.cyd.channel[c].fm.ops[mused.selected_operator - 1].flags & CYD_FM_OP_ENABLE_GATE) /* so arrow does not blink when CSM timer is used */) && (mused.channel[c].ops[mused.selected_operator - 1].program_flags & (1 << (mused.current_fourop_program[mused.selected_operator - 1]))) && mused.channel[c].ops[mused.selected_operator - 1].program_tick[mused.current_fourop_program[mused.selected_operator - 1]] == i))
34063404
//if (mused.channel[c].instrument == inst && ((mused.cyd.channel[c].fm.ops[mused.selected_operator - 1].flags & CYD_FM_OP_ENABLE_GATE) && (mused.channel[c].ops[mused.selected_operator - 1].flags & MUS_FM_OP_PROGRAM_RUNNING) && mused.channel[c].ops[mused.selected_operator - 1].program_tick == i) && !(inst->fm_flags & CYD_FM_FOUROP_USE_MAIN_INST_PROG))
34073405
{
3408-
cur = '�'; //where arrow pointing at current instrument (operator) program step is drawn
3406+
cur = '½'; //where arrow pointing at current instrument (operator) program step is drawn
34093407
pointing_at_command = true;
34103408
}
34113409
}
@@ -3477,20 +3475,20 @@ void four_op_program_view(GfxDomain *dest_surface, const SDL_Rect *dest, const S
34773475
{
34783476
if(mused.jump_in_program_4op)
34793477
{
3480-
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->ops[mused.selected_operator - 1].program_unite_bits[mused.current_fourop_program[mused.selected_operator - 1]][i / 8] & (1 << (i & 7)))) ? '�' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
3478+
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->ops[mused.selected_operator - 1].program_unite_bits[mused.current_fourop_program[mused.selected_operator - 1]][i / 8] & (1 << (i & 7)))) ? '\xd' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
34813479
select_program_step, MAKEPTR(i), 0, 0);
34823480
}
34833481

34843482
else
34853483
{
3486-
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->ops[mused.selected_operator - 1].program_unite_bits[mused.current_fourop_program[mused.selected_operator - 1]][i / 8] & (1 << (i & 7)))) ? '�' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
3484+
check_event_mousebuttonup(event, console_write_args(mused.console, "%c ", (!(inst->ops[mused.selected_operator - 1].program_unite_bits[mused.current_fourop_program[mused.selected_operator - 1]][i / 8] & (1 << (i & 7)))) ? '\xd' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
34873485
NULL, 0, 0, 0);
34883486
}
34893487
}
34903488

34913489
else
34923490
{
3493-
check_event(event, console_write_args(mused.console, "%c ", (!(inst->ops[mused.selected_operator - 1].program_unite_bits[mused.current_fourop_program[mused.selected_operator - 1]][i / 8] & (1 << (i & 7)))) ? '�' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
3491+
check_event(event, console_write_args(mused.console, "%c ", (!(inst->ops[mused.selected_operator - 1].program_unite_bits[mused.current_fourop_program[mused.selected_operator - 1]][i / 8] & (1 << (i & 7)))) ? '\xd' : '|'), //old command check_event(event, console_write_args(mused.console, "%c ", (!(inst->program[i] & 0x8000) || (inst->program[i] & 0xf000) == 0xf000) ? '�' : '|'),
34943492
select_program_step, MAKEPTR(i), 0, 0);
34953493
}
34963494
}

‎themes/AHX/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Blacklyst/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/C64/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Classic/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Gameboy/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Golden_Brown/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Ravancore/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Ravancore/font8x8/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Rust_Camo/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc\fd\fe\ff

‎themes/Rust_Camo/font/font.png

1.07 KB
Loading

‎themes/Rust_Camo/font8x8/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc\fd\fe\ff
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc\fd\fe\ff

‎themes/Rust_Red/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f8\f5\f6\f7\f9\fa\fb\fc

‎themes/Ultimate_Proctamed/font/charmap.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`���~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f5\f6\f7\f8\f9\fa\fb\fc
1+
ABCDEFGHIJKLMNOPQRSTUVWXYZ.:�-abcdefghijklmnopqrstuvwxyz0123456789(),;#_|+?�/`\d��~\[]{}"'%!@$=<>\1\2\3\4\5\6\7\8\9\b\f0\f1\f2\f3\f4\f5\f6\f7\f8\f9\fa\fb\fc

0 commit comments

Comments
 (0)