ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into port/psp2

This commit is contained in:
Jeffrey Pfau 2015-08-23 05:08:12 -07:00
parent 59b9dedea3 f4a1a7f7db
commit 1fefc26b91
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -4,6 +4,7 @@ Bugfixes:
- Qt: Fix install path of XDG desktop file with DESTDIR
- Qt: Fix drag and drop on Windows
- Qt: Reenable double buffering, as disabling it broke some Windows configs
- GBA Video: Start on the scanline BIOS finishes on if no BIOS is loaded
Misc:
- Qt: Window size command line options are now supported
- Qt: Increase usability of key mapper

1
CMakeLists.txt
View File

@ -28,6 +28,7 @@ file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
file(GLOB GBA_CHEATS_SRC ${CMAKE_SOURCE_DIR}/src/gba/cheats/*.c)
file(GLOB GBA_RR_SRC ${CMAKE_SOURCE_DIR}/src/gba/rr/*.c)
file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c)
file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/gui/*.c)
file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs])
file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/util/gui/*.c)
file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/*.c)

BIN
res/font.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

8
src/gba/video.c
View File

@ -62,7 +62,13 @@ void GBAVideoInit(struct GBAVideo* video) {
}
void GBAVideoReset(struct GBAVideo* video) {
video->vcount = VIDEO_VERTICAL_TOTAL_PIXELS - 1;
if (video->p->memory.fullBios) {
video->vcount = 0;
} else {
// TODO: Verify exact scanline hardware
video->vcount = 0x7E;
}
video->p->memory.io[REG_VCOUNT >> 1] = video->vcount;
video->lastHblank = 0;
video->nextHblank = VIDEO_HDRAW_LENGTH;