Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor SPEC512 bug fix, fixes Alpha Waves 2-players mode with freq scaling #2

Closed
wants to merge 11 commits into from
Closed

Minor SPEC512 bug fix, fixes Alpha Waves 2-players mode with freq scaling #2

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8169d4b
Enable blitter in EmuTOS autostart INF file
Feb 24, 2019
a761797
Update spec file description + more accurate license
Feb 24, 2019
37f4053
Enable debug logging for frame skip changes
Feb 24, 2019
9c7531a
Improve --fast-forward / --benchmark options descriptions
Feb 24, 2019
4b57212
Update release notes
Feb 24, 2019
1506908
Update EmuTOS related information
Feb 24, 2019
49ca660
HG -> Git link
Feb 24, 2019
0ad895e
Separate web items from local info in Help menu
Feb 24, 2019
66ef70d
Update Python UI documentation / links
Feb 24, 2019
137ed28
Support for showing installed Hatari UI docs from Hatari UI
Feb 24, 2019
c7711fb
Use frequency-shift adjusted end of scan-line for spec512
c3d Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use frequency-shift adjusted end of scan-line for spec512 
For SPEC512 emulation, cycles are always counted in "real" ST cycles,
and are shifted at other places, e.g. Spec512_EndScanLine.

This fixes Alpha-Waves two-players mode with frequency scaling.
  • Loading branch information
@c3d
c3d committed Feb 28, 2019
commit c7711fbae26295ddd288e962c37d9852c907359e
4 changes: 3 additions & 1 deletion src/spec512.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,14 @@ void Spec512_StoreCyclePalette(Uint16 col, Uint32 addr)
/* Do we have a previous entry at the same cycles? If so, 68000 have used a 'move.l' instruction so stagger writes */
if (nCyclePalettes[ScanLine] > 0)
{
int CycleEnd = nCyclesPerLine >> nCpuFreqShift;

/* In case the ST uses a move.l or a movem.l to update colors, we need
* to add at least 4 cycles between each color: */
if ((pTmpCyclePalette-1)->LineCycles >= nHorPos)
nHorPos = (pTmpCyclePalette-1)->LineCycles + 4;

if ( nHorPos >= nCyclesPerLine ) /* end of line reached, continue on the next line */
if ( nHorPos >= CycleEnd ) /* end of line reached, continue on the next line */
{
ScanLine++;
pTmpCyclePalette = &CyclePalettes[ (ScanLine*MAX_CYCLEPALETTES_PERLINE) + nCyclePalettes[ScanLine] ];
Expand Down