Menu
▾
▴
vba-commit — CVS commits for VBA
You can subscribe to this list here.
| 2004 |
Jan
(17) |
Feb
(38) |
Mar
(24) |
Apr
(18) |
May
(75) |
Jun
(2) |
Jul
|
Aug
|
Sep
(21) |
Oct
(3) |
Nov
(19) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(15) |
Jul
(2) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
|
Mar
|
Apr
(6) |
May
(73) |
Jun
(57) |
Jul
(12) |
Aug
(68) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
|
From: <for...@us...> - 2004-02-24 10:46:43
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12266 Modified Files: Cheats.cpp Log Message: Improve CodeBreaker code 0xDxxxxxxx support Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Cheats.cpp 21 Jan 2004 01:01:34 -0000 1.17 --- Cheats.cpp 24 Feb 2004 10:40:23 -0000 1.18 *************** *** 274,283 **** break; case CBA_IF_KEYS_PRESSED: ! if(cheatsList[i].address == 0x20) { ! if((keys & cheatsList[i].value) != cheatsList[i].value) { ! i++; } - } else if(cheatsList[i].value != keys) { - i++; } break; --- 274,289 ---- break; case CBA_IF_KEYS_PRESSED: ! { ! u16 value = cheatsList[i].value; ! u32 addr = cheatsList[i].address; ! if((addr & 0x30) == 0x20) { ! if((keys & value) != value) { ! i++; ! } ! } else if((addr & 0x30) == 0x10) { ! if((keys & value) == value) { ! i++; ! } } } break; |
|
From: <for...@us...> - 2004-02-17 11:36:28
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052 Modified Files: BitmapControl.cpp MemoryViewer.cpp PaletteViewControl.cpp skinButton.cpp ZoomControl.cpp Log Message: Fix GDI problems on Win98 Index: BitmapControl.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/BitmapControl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BitmapControl.cpp 4 Nov 2003 14:09:52 -0000 1.1 --- BitmapControl.cpp 17 Feb 2004 11:27:36 -0000 1.2 *************** *** 87,93 **** h1 = h; } ! CBitmap bitmap; bitmap.CreateCompatibleBitmap(dc, w1, h1); ! memDC.SelectObject(&bitmap); if(stretch) { bmpInfo->bmiHeader.biWidth = w; --- 87,93 ---- h1 = h; } ! CBitmap bitmap, *pOldBitmap; bitmap.CreateCompatibleBitmap(dc, w1, h1); ! pOldBitmap = memDC.SelectObject(&bitmap); if(stretch) { bmpInfo->bmiHeader.biWidth = w; *************** *** 128,131 **** --- 128,132 ---- dc->BitBlt(0,0,w1,h1, &memDC,0,0,SRCCOPY); + memDC.SelectObject(pOldBitmap); bitmap.DeleteObject(); Index: MemoryViewer.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MemoryViewer.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MemoryViewer.cpp 4 Nov 2003 14:09:52 -0000 1.4 --- MemoryViewer.cpp 17 Feb 2004 11:27:36 -0000 1.5 *************** *** 158,164 **** CDC memDC; memDC.CreateCompatibleDC(&dc); ! CBitmap bitmap; bitmap.CreateCompatibleBitmap(&dc, w, rect.bottom - rect.top); ! memDC.SelectObject(&bitmap); memDC.FillRect(&rect, CBrush::FromHandle((HBRUSH)GetStockObject(WHITE_BRUSH))); --- 158,164 ---- CDC memDC; memDC.CreateCompatibleDC(&dc); ! CBitmap bitmap, *pOldBitmap; bitmap.CreateCompatibleBitmap(&dc, w, rect.bottom - rect.top); ! pOldBitmap = memDC.SelectObject(&bitmap); memDC.FillRect(&rect, CBrush::FromHandle((HBRUSH)GetStockObject(WHITE_BRUSH))); *************** *** 263,266 **** --- 263,267 ---- dc.BitBlt(0, 0, w, rect.bottom - rect.top, &memDC, 0, 0, SRCCOPY); + memDC.SelectObject(pOldBitmap); memDC.DeleteDC(); bitmap.DeleteObject(); Index: PaletteViewControl.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/PaletteViewControl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PaletteViewControl.cpp 4 Nov 2003 14:09:52 -0000 1.1 --- PaletteViewControl.cpp 17 Feb 2004 11:27:36 -0000 1.2 *************** *** 328,334 **** CDC memDC; memDC.CreateCompatibleDC(&dc); ! CBitmap bitmap; bitmap.CreateCompatibleBitmap(&dc, w, h); ! memDC.SelectObject(bitmap); StretchDIBits(memDC.GetSafeHdc(), --- 328,334 ---- CDC memDC; memDC.CreateCompatibleDC(&dc); ! CBitmap bitmap, *pOldBitmap; bitmap.CreateCompatibleBitmap(&dc, w, h); ! pOldBitmap = memDC.SelectObject(&bitmap); StretchDIBits(memDC.GetSafeHdc(), *************** *** 387,390 **** --- 387,391 ---- &memDC,0,0,SRCCOPY); + memDC.SelectObject(pOldBitmap); bitmap.DeleteObject(); memDC.DeleteDC(); Index: skinButton.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skinButton.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** skinButton.cpp 4 Nov 2003 14:09:53 -0000 1.4 --- skinButton.cpp 17 Feb 2004 11:27:36 -0000 1.5 *************** *** 99,113 **** HDC memDC = ::CreateCompatibleDC(hDC); UINT state = ::SendMessage(m_hWnd, BM_GETSTATE, 0, 0); ! if(state & BST_PUSHED) ! SelectObject(memDC, downBmp); else if(mouseOver && overBmp != NULL) ! SelectObject(memDC, overBmp); else ! SelectObject(memDC, normalBmp); SelectClipRgn(hDC, region); BitBlt(hDC, 0, 0, theApp.rect.right - theApp.rect.left, theApp.rect.bottom - theApp.rect.top, memDC, 0, 0, SRCCOPY); SelectClipRgn(hDC, NULL); DeleteDC(memDC); --- 99,114 ---- HDC memDC = ::CreateCompatibleDC(hDC); UINT state = ::SendMessage(m_hWnd, BM_GETSTATE, 0, 0); ! HBITMAP oldBitmap; if(state & BST_PUSHED) ! oldBitmap = (HBITMAP)SelectObject(memDC, downBmp); else if(mouseOver && overBmp != NULL) ! oldBitmap = (HBITMAP)SelectObject(memDC, overBmp); else ! oldBitmap = (HBITMAP)SelectObject(memDC, normalBmp); SelectClipRgn(hDC, region); BitBlt(hDC, 0, 0, theApp.rect.right - theApp.rect.left, theApp.rect.bottom - theApp.rect.top, memDC, 0, 0, SRCCOPY); SelectClipRgn(hDC, NULL); + SelectObject(memDC, oldBitmap); DeleteDC(memDC); Index: ZoomControl.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/ZoomControl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ZoomControl.cpp 18 Jan 2004 14:54:22 -0000 1.2 --- ZoomControl.cpp 17 Feb 2004 11:27:36 -0000 1.3 *************** *** 89,96 **** CDC memDC ; memDC.CreateCompatibleDC(&dc); ! CBitmap bitmap; bitmap.CreateCompatibleBitmap(&dc, w, h); ! memDC.SelectObject(&bitmap); int multX = w / 8; --- 89,96 ---- CDC memDC ; memDC.CreateCompatibleDC(&dc); ! CBitmap bitmap, *pOldBitmap; bitmap.CreateCompatibleBitmap(&dc, w, h); ! pOldBitmap = memDC.SelectObject(&bitmap); int multX = w / 8; *************** *** 148,151 **** --- 148,152 ---- &memDC,0,0, SRCCOPY); + memDC.SelectObject(pOldBitmap); bitmap.DeleteObject(); memDC.DeleteDC(); |
|
From: <for...@us...> - 2004-02-17 11:20:22
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26226 Modified Files: VBA.cpp Log Message: Patch to allow base language to be searched when selecting system language Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** VBA.cpp 7 Feb 2004 13:55:16 -0000 1.9 --- VBA.cpp 17 Feb 2004 11:11:34 -0000 1.10 *************** *** 1883,1890 **** HINSTANCE l = winLoadLanguage(lbuffer); if(l == NULL) { ! systemMessage(IDS_FAILED_TO_LOAD_LIBRARY, ! "Failed to load library %s", ! lbuffer); ! return; } AfxSetResourceHandle(l); --- 1883,1897 ---- HINSTANCE l = winLoadLanguage(lbuffer); if(l == NULL) { ! LCID locIdBase = MAKELCID( MAKELANGID( PRIMARYLANGID( GetSystemDefaultLangID() ), SUBLANG_NEUTRAL ), SORT_DEFAULT ); ! if(GetLocaleInfo(locIdBase, LOCALE_SABBREVLANGNAME, ! lbuffer, 10)) { ! l = winLoadLanguage(lbuffer); ! if(l == NULL) { ! systemMessage(IDS_FAILED_TO_LOAD_LIBRARY, ! "Failed to load library %s", ! lbuffer); ! return; ! } ! } } AfxSetResourceHandle(l); |
|
From: <for...@us...> - 2004-02-17 11:19:41
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26093 Modified Files: elf.cpp Log Message: Fix warnings... Index: elf.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** elf.cpp 17 Feb 2004 11:03:50 -0000 1.13 --- elf.cpp 17 Feb 2004 11:10:53 -0000 1.14 *************** *** 244,248 **** char *elfSectionHeadersStringTable = NULL; int elfSectionHeadersCount = 0; ! char *elfFileData = NULL; CompileUnit *elfCompileUnits = NULL; --- 244,248 ---- char *elfSectionHeadersStringTable = NULL; int elfSectionHeadersCount = 0; ! u8 *elfFileData = NULL; CompileUnit *elfCompileUnits = NULL; |
|
From: <for...@us...> - 2004-02-17 11:12:37
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25053 Modified Files: elf.cpp Log Message: Fix problems caused by memory leak fix Index: elf.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** elf.cpp 20 Jan 2004 00:46:11 -0000 1.12 --- elf.cpp 17 Feb 2004 11:03:50 -0000 1.13 *************** *** 244,247 **** --- 244,248 ---- char *elfSectionHeadersStringTable = NULL; int elfSectionHeadersCount = 0; + char *elfFileData = NULL; CompileUnit *elfCompileUnits = NULL; *************** *** 2801,2810 **** fseek(f, 0, SEEK_END); long size = ftell(f); ! u8 *filedata = (u8 *)malloc(size); fseek(f, 0, SEEK_SET); ! fread(filedata, 1, size, f); fclose(f); ! ELFHeader *header = (ELFHeader *)filedata; if(READ32LE(&header->magic) != 0x464C457F || --- 2802,2811 ---- fseek(f, 0, SEEK_END); long size = ftell(f); ! elfFileData = (u8 *)malloc(size); fseek(f, 0, SEEK_SET); ! fread(elfFileData, 1, size, f); fclose(f); ! ELFHeader *header = (ELFHeader *)elfFileData; if(READ32LE(&header->magic) != 0x464C457F || *************** *** 2812,2825 **** header->clazz != 1) { systemMessage(0, "Not a valid ELF file %s", name); ! free(filedata); return false; } ! if(!elfReadProgram(header, filedata, siz, parseDebug)) { ! free(filedata); return false; } - free(filedata); - // systemMessage(0, "Done"); return true; --- 2813,2826 ---- header->clazz != 1) { systemMessage(0, "Not a valid ELF file %s", name); ! free(elfFileData); ! elfFileData = NULL; return false; } ! if(!elfReadProgram(header, elfFileData, siz, parseDebug)) { ! free(elfFileData); ! elfFileData = NULL; return false; } return true; *************** *** 2989,2991 **** --- 2990,2997 ---- cie = next; } + + if(elfFileData) { + free(elfFileData); + elfFileData = NULL; + } } |
|
From: <fl...@us...> - 2004-02-16 03:16:24
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27454/src Modified Files: Gfx.h Log Message: Mosaic fix Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Gfx.h 16 Feb 2004 00:46:42 -0000 1.9 --- Gfx.h 16 Feb 2004 03:08:40 -0000 1.10 *************** *** 251,255 **** if(mosaicOn) { for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { line[i] = line[i-1]; i++; } --- 251,255 ---- if(mosaicOn) { for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { line[i] = line[i-1]; i++; } *************** *** 411,415 **** int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { line[i] = line[i-1]; i++; } --- 411,415 ---- int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { line[i] = line[i-1]; i++; } *************** *** 502,506 **** int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { line[i] = line[i-1]; i++; } --- 502,506 ---- int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { line[i] = line[i-1]; i++; } *************** *** 597,601 **** int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { line[i] = line[i-1]; i++; } --- 597,601 ---- int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { line[i] = line[i-1]; i++; } *************** *** 690,694 **** int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { line[i] = line[i-1]; i++; } --- 690,694 ---- int mosaicX = (MOSAIC & 0xF) + 1; for(int i = 0; i < 240; i+=2) { ! for(int m = 1; m < mosaicX; m++) { line[i] = line[i-1]; i++; } |
|
From: <fl...@us...> - 2004-02-16 00:54:21
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4010/src Modified Files: Gfx.h Log Message: More graphics optimizations Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Gfx.h 16 Feb 2004 00:23:47 -0000 1.8 --- Gfx.h 16 Feb 2004 00:46:42 -0000 1.9 *************** *** 167,172 **** } if((control) & 0x80) { ! u16 *screenSource = screenBase + 0x400 * (xxx>>8) + ((xxx & 255)>>3) + ((yyy>>3)*32); for(int x = 0; x < 240; x++) { u16 data = READ16LE(screenSource); --- 167,173 ---- } + int yshift = ((yyy>>3)<<5); if((control) & 0x80) { ! u16 *screenSource = screenBase + 0x400 * (xxx>>8) + ((xxx & 255)>>3) + yshift; for(int x = 0; x < 240; x++) { u16 data = READ16LE(screenSource); *************** *** 193,209 **** if(xxx == 256) { if(sizeX > 256) ! screenSource = screenBase + 0x400 + ((yyy>>3)*32); else { ! screenSource = screenBase + ((yyy>>3)*32); xxx = 0; } } else if(xxx >= sizeX) { xxx = 0; ! screenSource = screenBase + ((yyy>>3)*32); } } } else { u16 *screenSource = screenBase + 0x400*(xxx>>8)+((xxx&255)>>3) + ! ((yyy>>3)*32); for(int x = 0; x < 240; x++) { u16 data = READ16LE(screenSource); --- 194,210 ---- if(xxx == 256) { if(sizeX > 256) ! screenSource = screenBase + 0x400 + yshift; else { ! screenSource = screenBase + yshift; xxx = 0; } } else if(xxx >= sizeX) { xxx = 0; ! screenSource = screenBase + yshift; } } } else { u16 *screenSource = screenBase + 0x400*(xxx>>8)+((xxx&255)>>3) + ! yshift; for(int x = 0; x < 240; x++) { u16 data = READ16LE(screenSource); *************** *** 218,222 **** tileY = 7 - tileY; ! u8 color = charBase[tile * 32 + tileY * 4 + (tileX>>1)]; if(tileX & 1) { --- 219,223 ---- tileY = 7 - tileY; ! u8 color = charBase[(tile<<5) + (tileY<<2) + (tileX>>1)]; if(tileX & 1) { *************** *** 237,248 **** if(xxx == 256) { if(sizeX > 256) ! screenSource = screenBase + 0x400 + (yyy>>3)*32; else { ! screenSource = screenBase + (yyy>>3)*32; xxx = 0; } } else if(xxx >= sizeX) { xxx = 0; ! screenSource = screenBase + ((yyy>>3)*32); } } --- 238,249 ---- if(xxx == 256) { if(sizeX > 256) ! screenSource = screenBase + 0x400 + yshift; else { ! screenSource = screenBase + yshift; xxx = 0; } } else if(xxx >= sizeX) { xxx = 0; ! screenSource = screenBase + yshift; } } *************** *** 354,358 **** int tileY = yyy & 7; ! u8 color = charBase[tile * 64 + tileY * 8 + tileX]; line[x] = color ? (READ16LE(&palette[color])|prio): 0x80000000; --- 355,359 ---- int tileY = yyy & 7; ! u8 color = charBase[(tile<<6) + (tileY<<3) + tileX]; line[x] = color ? (READ16LE(&palette[color])|prio): 0x80000000; *************** *** 386,390 **** int tileY = yyy & 7; ! u8 color = charBase[tile * 64 + tileY * 8 + tileX]; line[x] = color ? (READ16LE(&palette[color])|prio): 0x80000000; --- 387,391 ---- int tileY = yyy & 7; ! u8 color = charBase[(tile<<6) + (tileY<<3) + tileX]; line[x] = color ? (READ16LE(&palette[color])|prio): 0x80000000; *************** *** 823,828 **** sx >= 240); else { ! u32 color = vram[0x10000 + (((c + (yyy>>3) * inc)* ! 32 + (yyy & 7) * 8 + (xxx >> 3) * 64 + (xxx & 7))&0x7FFF)]; if ((color==0) && (((prio >> 25)&3) < --- 824,829 ---- sx >= 240); else { ! u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) ! + ((yyy & 7)<<3) + ((xxx >> 3)<<6) + (xxx & 7))&0x7FFF)]; if ((color==0) && (((prio >> 25)&3) < *************** *** 861,866 **** sx >= 240); else { ! u32 color = vram[0x10000 + (((c + (yyy>>3) * inc)* ! 32 + (yyy & 7) * 4 + (xxx >> 3) * 32 + ((xxx & 7)>>1))&0x7FFF)]; if(xxx & 1) --- 862,867 ---- sx >= 240); else { ! u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) ! + ((yyy & 7)<<2) + ((xxx >> 3)<<5) + ((xxx & 7)>>1))&0x7FFF)]; if(xxx & 1) *************** *** 982,987 **** } ! int address = 0x10000 + (((c + (t>>3) * inc) * 32 ! + (t & 7) * 4 + (xxx>>3) * 32 + ((xxx & 7) >> 1))&0x7FFF); u32 prio = (((a2 >> 10) & 3) << 25) | ((a0 & 0x0c00)<<6); int palette = (a2 >> 8) & 0xF0; --- 983,988 ---- } ! int address = 0x10000 + ((((c + (t>>3) * inc)<<5) ! + ((t & 7)<<2) + ((xxx>>3)<<5) + ((xxx & 7) >> 1))&0x7FFF); u32 prio = (((a2 >> 10) & 3) << 25) | ((a0 & 0x0c00)<<6); int palette = (a2 >> 8) & 0xF0; *************** *** 1183,1188 **** yyy < 0 || yyy >= sizeY) { } else { ! u32 color = vram[0x10000 + (((c + (yyy>>3) * inc)* ! 32 + (yyy & 7) * 8 + (xxx >> 3) * 64 + (xxx & 7))&0x7fff)]; if(color) { --- 1184,1189 ---- yyy < 0 || yyy >= sizeY) { } else { ! u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) ! + ((yyy & 7)<<3) + ((xxx >> 3)<<6) + (xxx & 7))&0x7fff)]; if(color) { *************** *** 1214,1219 **** yyy < 0 || yyy >= sizeY){ } else { ! u32 color = vram[0x10000 + (((c + (yyy>>3) * inc)* ! 32 + (yyy & 7) * 4 + (xxx >> 3) * 32 + ((xxx & 7)>>1))&0x7fff)]; if(xxx & 1) --- 1215,1220 ---- yyy < 0 || yyy >= sizeY){ } else { ! u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) ! + ((yyy & 7)<<2) + ((xxx >> 3)<<5) + ((xxx & 7)>>1))&0x7fff)]; if(xxx & 1) *************** *** 1303,1308 **** if(a1 & 0x1000) xxx = sizeX - 1; ! int address = 0x10000 + (((c + (t>>3) * inc) * 32 ! + (t & 7) * 4 + (xxx>>3) * 32 + ((xxx & 7) >> 1))&0x7fff); // u32 prio = (((a2 >> 10) & 3) << 25) | ((a0 & 0x0c00)<<6); // int palette = (a2 >> 8) & 0xF0; --- 1304,1309 ---- if(a1 & 0x1000) xxx = sizeX - 1; ! int address = 0x10000 + ((((c + (t>>3) * inc)<<5) ! + ((t & 7)<<2) + ((xxx>>3)<<5) + ((xxx & 7) >> 1))&0x7fff); // u32 prio = (((a2 >> 10) & 3) << 25) | ((a0 & 0x0c00)<<6); // int palette = (a2 >> 8) & 0xF0; |
|
From: <fl...@us...> - 2004-02-16 00:31:26
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv350/src Modified Files: Gfx.h Log Message: Optimize mosaic logic. Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Gfx.h 15 Jun 2003 12:11:44 -0000 1.7 --- Gfx.h 16 Feb 2004 00:23:47 -0000 1.8 *************** *** 249,259 **** } if(mosaicOn) { ! int m = 0; ! for(int i = 0; i < 240; i++) { ! if(m) ! line[i] = line[i-1]; ! m++; ! if(m == mosaicX) ! m = 0; } } --- 249,256 ---- } if(mosaicOn) { ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { ! line[i] = line[i-1]; i++; ! } } } *************** *** 412,422 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! int m = 0; ! for(int i = 0; i < 240; i++) { ! if(m) ! line[i] = line[i-1]; ! m++; ! if(m == mosaicX) ! m = 0; } } --- 409,416 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { ! line[i] = line[i-1]; i++; ! } } } *************** *** 506,516 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! int m = 0; ! for(int i = 0; i < 240; i++) { ! if(m) ! line[i] = line[i-1]; ! m++; ! if(m == mosaicX) ! m = 0; } } --- 500,507 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { ! line[i] = line[i-1]; i++; ! } } } *************** *** 604,614 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! int m = 0; ! for(int i = 0; i < 240; i++) { ! if(m) ! line[i] = line[i-1]; ! m++; ! if(m == mosaicX) ! m = 0; } } --- 595,602 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { ! line[i] = line[i-1]; i++; ! } } } *************** *** 700,710 **** if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! int m = 0; ! for(int i = 0; i < 240; i++) { ! if(m) ! line[i] = line[i-1]; ! m++; ! if(m == mosaicX) ! m = 0; } } --- 688,695 ---- if(control & 0x40) { int mosaicX = (MOSAIC & 0xF) + 1; ! for(int i = 0; i < 240; i+=2) { ! for(int m = 1; i < mosaicX; m++) { ! line[i] = line[i-1]; i++; ! } } } |
|
From: <for...@us...> - 2004-02-07 15:44:19
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25448 Modified Files: MainWnd.cpp MainWnd.h MainWndFile.cpp VBA.cpp VBA.h Log Message: Fixed screensaver/power management code Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MainWnd.cpp 5 Feb 2004 11:38:43 -0000 1.9 --- MainWnd.cpp 7 Feb 2004 13:55:16 -0000 1.10 *************** *** 414,417 **** --- 414,418 ---- ON_UPDATE_COMMAND_UI_RANGE(ID_OPTIONS_JOYPAD_AUTOFIRE_A, ID_OPTIONS_JOYPAD_AUTOFIRE_R, OnUpdateOptionsJoypadAutofire) ON_MESSAGE(VBA_CONFIRM_MODE, OnConfirmMode) + ON_MESSAGE(WM_SYSCOMMAND, OnMySysCommand) END_MESSAGE_MAP() *************** *** 422,427 **** void MainWnd::OnClose() { - theApp.enablePowerManagement(); - CWnd::OnClose(); --- 423,426 ---- *************** *** 593,598 **** theApp.rewindSaveNeeded = false; - theApp.disablePowerManagement(); - return true; } --- 592,595 ---- *************** *** 1084,1088 **** if(!theApp.paused) { if(emulating) { - theApp.disablePowerManagement(); soundResume(); } --- 1081,1084 ---- *************** *** 1092,1096 **** if(theApp.pauseWhenInactive) { if(emulating) { - theApp.enablePowerManagement(); soundPause(); } --- 1088,1091 ---- *************** *** 1140,1141 **** --- 1135,1145 ---- DragFinish(hDropInfo); } + + LRESULT MainWnd::OnMySysCommand(WPARAM wParam, LPARAM lParam) + { + if(emulating && !theApp.paused) { + if((wParam&0xFFF0) == SC_SCREENSAVE || (wParam&0xFFF0) == SC_MONITORPOWER) + return 0; + } + return Default(); + } Index: MainWnd.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainWnd.h 19 Jan 2004 23:52:56 -0000 1.4 --- MainWnd.h 7 Feb 2004 13:55:16 -0000 1.5 *************** *** 57,60 **** --- 57,61 ---- bool fileOpenSelect(); afx_msg LRESULT OnConfirmMode(WPARAM, LPARAM); + afx_msg LRESULT OnMySysCommand(WPARAM, LPARAM); afx_msg void OnUpdateFileLoadGameSlot(CCmdUI *pCmdUI); afx_msg void OnUpdateFileSaveGameSlot(CCmdUI *pCmdUI); Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MainWndFile.cpp 28 Jan 2004 17:45:37 -0000 1.3 --- MainWndFile.cpp 7 Feb 2004 13:55:16 -0000 1.4 *************** *** 54,61 **** theApp.wasPaused = true; soundPause(); - theApp.enablePowerManagement(); } else { soundResume(); - theApp.disablePowerManagement(); } } --- 54,59 ---- *************** *** 153,158 **** RedrawWindow(NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); systemSetTitle("VisualBoyAdvance"); - - theApp.enablePowerManagement(); } --- 151,154 ---- Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VBA.cpp 5 Feb 2004 11:38:43 -0000 1.8 --- VBA.cpp 7 Feb 2004 13:55:16 -0000 1.9 *************** *** 2170,2213 **** } - static UINT power_get[3] = { - SPI_GETSCREENSAVETIMEOUT, - SPI_GETLOWPOWERTIMEOUT, - SPI_GETPOWEROFFTIMEOUT - }; - - static UINT power_set[3] = { - SPI_SETSCREENSAVETIMEOUT, - SPI_SETLOWPOWERTIMEOUT, - SPI_SETPOWEROFFTIMEOUT - }; - - static int power[3]; - - void VBA::enablePowerManagement() - { - for(int i = 0;i < 3; i++) { - if(power[i] != -1) - SystemParametersInfo(power_set[i], - power[i], - NULL, - 0); - } - } - - void VBA::disablePowerManagement() - { - for(int i = 0;i < 3; i++) { - power[i] = -1; - if(SystemParametersInfo(power_get[i], - 0, - &power[i], - 0)) - SystemParametersInfo(power_set[i], - 0, - NULL, - 0); - } - } - void winSignal(int, int) { --- 2170,2173 ---- Index: VBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VBA.h 28 Jan 2004 17:45:37 -0000 1.4 --- VBA.h 7 Feb 2004 13:55:16 -0000 1.5 *************** *** 222,227 **** public: - void disablePowerManagement(); - void enablePowerManagement(); void saveSettings(); void movieReadNext(); --- 222,225 ---- |
|
From: <for...@us...> - 2004-02-07 15:36:41
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695 Modified Files: ChangeLog NEWS Log Message: Disable remove intros option (too many problems with it) Index: ChangeLog =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/ChangeLog,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** ChangeLog 7 Feb 2004 13:59:56 -0000 1.67 --- ChangeLog 7 Feb 2004 14:07:28 -0000 1.68 *************** *** 1,4 **** --- 1,7 ---- 2004-02-07 Forgotten <for...@us...> + * src/SDL.cpp (main): disable remove intros option + * src/win32/MainWndOptions.cpp (OnUpdateOptionsEmulatorRemoveintrosgba): disable remove intros option + * src/win32/MainWnd.cpp: disable remove intros option * src/win32/VBA.cpp: fix power management code * src/win32/MainWnd.cpp (OnMySysCommand): fix power management code Index: NEWS =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/NEWS,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** NEWS 7 Feb 2004 13:59:56 -0000 1.55 --- NEWS 7 Feb 2004 14:07:28 -0000 1.56 *************** *** 4,7 **** --- 4,8 ---- - avoid crash when loading an invalid ELF file - avoid turning sound on if soundOffFlag is true + - disabled remove intros option - fixed memory leak in ELF support code - fixed memory corruption if loading a bigger file than the memory to hold it |
|
From: <for...@us...> - 2004-02-07 15:36:23
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695/src Modified Files: SDL.cpp VisualBoyAdvance.cfg Log Message: Disable remove intros option (too many problems with it) Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/SDL.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** SDL.cpp 5 Feb 2004 11:38:30 -0000 1.52 --- SDL.cpp 7 Feb 2004 14:07:28 -0000 1.53 *************** *** 2229,2235 **** --- 2229,2237 ---- emulator = GBASystem; + /* disabled due to problems if(removeIntros && rom != NULL) { WRITE32LE(&rom[0], 0xea00002e); } + */ CPUInit(biosFileName, useBios); Index: VisualBoyAdvance.cfg =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/VisualBoyAdvance.cfg,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** VisualBoyAdvance.cfg 20 Nov 2003 11:34:44 -0000 1.22 --- VisualBoyAdvance.cfg 7 Feb 2004 14:07:28 -0000 1.23 *************** *** 132,138 **** soundReverse=0 ! # Remove GBA intros # 0=false, anything else for true ! removeIntros=0 # Save Type --- 132,138 ---- soundReverse=0 ! # Remove GBA intros (not supported anymore) # 0=false, anything else for true ! # removeIntros=0 # Save Type |
|
From: <for...@us...> - 2004-02-07 15:19:18
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695/src/win32 Modified Files: MainWnd.cpp MainWndOptions.cpp Log Message: Disable remove intros option (too many problems with it) Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MainWnd.cpp 7 Feb 2004 13:55:16 -0000 1.10 --- MainWnd.cpp 7 Feb 2004 14:07:28 -0000 1.11 *************** *** 535,541 **** --- 535,543 ---- theApp.emulator = GBASystem; + /* disabled due to problems if(theApp.removeIntros && rom != NULL) { *((u32 *)rom)= 0xea00002e; } + */ if(theApp.autoIPS) { Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainWndOptions.cpp 20 Nov 2003 02:47:10 -0000 1.2 --- MainWndOptions.cpp 7 Feb 2004 14:07:28 -0000 1.3 *************** *** 640,649 **** void MainWnd::OnOptionsEmulatorRemoveintrosgba() { ! theApp.removeIntros = !theApp.removeIntros; } void MainWnd::OnUpdateOptionsEmulatorRemoveintrosgba(CCmdUI* pCmdUI) { ! pCmdUI->SetCheck(theApp.removeIntros); } --- 640,650 ---- void MainWnd::OnOptionsEmulatorRemoveintrosgba() { ! // theApp.removeIntros = !theApp.removeIntros; } void MainWnd::OnUpdateOptionsEmulatorRemoveintrosgba(CCmdUI* pCmdUI) { ! pCmdUI->Enable(false); ! // pCmdUI->SetCheck(theApp.removeIntros); } |
|
From: <kx...@us...> - 2004-02-07 15:10:12
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5443 Modified Files: gba_sdl.vcproj Log Message: Remove GP dependencies Index: gba_sdl.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/gba_sdl.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gba_sdl.vcproj 20 Jan 2004 02:16:02 -0000 1.1 --- gba_sdl.vcproj 7 Feb 2004 15:07:18 -0000 1.2 *************** *** 252,265 **** </Filter> <Filter - Name="GP" - Filter=""> - <File - RelativePath="..\src\gp\GP.cpp"> - </File> - <File - RelativePath="..\src\gp\gpGfxRender.cpp"> - </File> - </Filter> - <Filter Name="SDL" Filter=""> --- 252,255 ---- |
|
From: <for...@us...> - 2004-02-07 14:12:28
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26417 Modified Files: ChangeLog NEWS Log Message: Update news/changelog for version 1.7.1 Index: ChangeLog =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/ChangeLog,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** ChangeLog 4 Nov 2003 14:13:57 -0000 1.66 --- ChangeLog 7 Feb 2004 13:59:56 -0000 1.67 *************** *** 1,157 **** ! 2003-09-03 Forgotten <for...@us...> ! ! * src/armdis.cpp: fixed thumb disassembly bug with ldsb and ldrh opcodes ! ! 2003-08-23 Forgotten <for...@us...> ! ! * src/win32/Win32.cpp (updateRenderMethod0): return true if render type did not change ! * src/bios.cpp (BIOS_CpuSet): fixed bug introduced in previous fix ! * src/GBA.cpp (CPULoop): fixed slowdown problem introduced in version 1.6 ! ! 2003-08-09 Forgotten <for...@us...> ! ! * src/GBA.cpp (CPUCheckDMA): fix minor DMA problem introduced with previous fixes ! * src/GBA.cpp: fix DMA timings and add DMA hack fix ! * src/Util.cpp (utilGBAFindSave): change search slightly ! * src/agbprint.cpp (agbPrintWrite): return true to avoid warning message ! * src/win32/TileViewer.cpp (OnMapInfo): fixed tile information when in 256 color mode ! * src/win32/Win32.cpp (initApp): fix bug when initially switching to INI ! ! 2003-08-02 Forgotten <for...@us...> ! ! * src/win32/TileViewer.cpp (render): fixed TileViewer for 256 color display (incorrect tile and address) ! ! 2003-08-01 Forgotten <for...@us...> ! ! * src/win32/Win32.cpp (initApp): changed default rewind interval to 0 (disabled) ! * src/bios.cpp (BIOS_CpuFastSet): fixed ! * src/bios.cpp (BIOS_CpuSet): fixed ! ! 2003-07-21 Forgotten <for...@us...> ! ! * src/win32/Win32.cpp (fileMoviePlay): added message when playing movie ! * src/Sound.cpp (soundTick): produce mute sound while in sleep state ! * src/GBA.cpp (CPULoop): improve stop state/sleep support ! ! 2003-07-19 Forgotten <for...@us...> ! ! * src/win32/Win32.cpp (updateFileMenu): allow customize in fullscreen (not at 320x240 though) ! ! 2003-07-18 Forgotten <for...@us...> ! ! * src/win32/MapView.cpp (renderTextScreen): fixed rendering when 512x512 ! * src/win32/MapView.cpp (GetTextClickAddress): fixed click address for text screens when size > 256 ! ! 2003-07-16 Forgotten <for...@us...> ! ! * src/Sound.cpp (soundEvent): fix sound envelope bug when set to 0 ! ! 2003-07-15 Forgotten <for...@us...> ! ! * src/TestEmu.cpp (systemGbBorderOn): fixed TestEmu compilation ! * src/SDL.cpp: added save type NONE support ! * src/win32/Win32.cpp (helpBugReport): fixed bug with bug report when emulating GB/GBC program ! ! 2003-07-13 Forgotten <for...@us...> ! ! * src/Util.cpp (utilGBAFindSave): added enhanced save type detection ! ! 2003-07-09 Forgotten <for...@us...> ! * src/SDL.cpp: rewind default to disabled ! * src/win32/Win32.cpp: rewind default to disabled ! * src/win32/RewindInterval.cpp (OnOk): allow a rewind interval between 0 and 600 seconds - 0 to disable it ! * src/win32/Win32.cpp (fileMoviePlay): put a warning when playing a movie ! * src/GBA.cpp (CPUReadState): fix sound problem loading old save states ! ! 2003-07-08 Forgotten <for...@us...> ! ! * src/armdis.cpp: fixed thumb disassembly bug ! * src/win32/Win32.cpp: fix rewind enable and reset when loading a game ! * src/win32/Reg.cpp (regQueryBinaryValue): fix problem saving binary settings into INI ! ! 2003-07-05 Forgotten <for...@us...> ! ! * src/Mode0.cpp (mode0RenderLineAll): fixed priority between OBJ Win and Windows ! * src/Mode1.cpp (mode0RenderLineAll): fixed priority between OBJ Win and Windows ! * src/Mode2.cpp (mode0RenderLineAll): fixed priority between OBJ Win and Windows ! * src/Mode3.cpp (mode0RenderLineAll): fixed priority between OBJ Win and Windows ! * src/Mode4.cpp (mode0RenderLineAll): fixed priority between OBJ Win and Windows ! * src/Mode5.cpp (mode0RenderLineAll): fixed priority between OBJ Win and Windows ! ! 2003-07-04 Forgotten <for...@us...> ! ! * src/win32/Win32.cpp: menu toggle can have a customizable accelerator ! * src/win32/Commands.cpp: added file toggle menu ! ! 2003-07-02 Forgotten <for...@us...> ! ! * src/SDL.cpp: fixed type on pause-when-inactive option ! ! 2003-06-29 Forgotten <for...@us...> ! * src/win32/Reg.cpp (regExportSettingsToINI): also exporting settings for viewers ! 2003-06-28 Forgotten <for...@us...> ! * src/win32/Win32.cpp (WindowProc): added rewind interval configuration ! * src/bios.cpp (BIOS_SndDriverJmpTableCopy): simple emulation of function 0x2a ! 2003-06-26 Forgotten <for...@us...> ! * src/win32/Win32.cpp: added movie version for future updates ! 2003-06-25 Forgotten <for...@us...> ! * src/win32/Win32.cpp (helpFAQ): added FAQ menu to take to website ! 2003-06-24 Forgotten <for...@us...> ! * src/win32/Win32.cpp (helpBugReport): added bug report option ! * src/SDL.cpp: added rewind support ! 2003-06-21 Forgotten <for...@us...> ! * src/GBA.cpp (CPULoadRom): speed up loading ! 2003-06-20 Forgotten <for...@us...> ! * src/gb/GB.cpp: added rewind support ! 2003-06-19 Forgotten <for...@us...> ! * src/Cheats.cpp (cheatsCheckKeys): added support for slowdown codes ! * src/elf.cpp (elfGetAddressSymbol): fix crash debugging the initialization code ! 2003-06-17 Forgotten <for...@us...> ! * src/GBA.cpp: added rewind support ! * src/Win32.cpp: added rewind support ! * src/Util.cpp: added memory gzip support for rewind ! 2003-06-15 Forgotten <for...@us...> ! * src/Gfx.h (gfxDrawSprites): emulate sprite priority bug ! * src/GBA.cpp: fix for DMA emulation problems ! 2003-06-13 Forgotten <for...@us...> ! * src/SDL.cpp: support for automatic SGB border ! * src/win32/Win32.cpp (systemGbBorderOn): support for automatic SGB border ! * src/gb/gbSGB.cpp: added support for automatic SGB border ! * src/GBA.cpp: fixed bug with enable/disable layers introduced in version 1.5.1 ! 2003-06-12 Forgotten <for...@us...> ! * src/SDL.cpp: added sound off/enable support ! * src/VisualBoyAdvance.cfg: added sound off/enable flags ! * src/win32/Win32.cpp: added auto hide menu support ! * src/GBA.cpp, src/gb/GB.cpp: code cleanup ! 2003-06-11 Forgotten <for...@us...> ! * src/win32/Win32.cpp: added movie support ! 2003-06-10 Forgotten <for...@us...> ! * GBACheats.cpp: fixed bug with enable/disable cheats --- 1,94 ---- ! 2004-02-07 Forgotten <for...@us...> ! * src/win32/VBA.cpp: fix power management code ! * src/win32/MainWnd.cpp (OnMySysCommand): fix power management code ! * src/win32/MainWndFile.cpp: fix power management code ! 2004-02-06 Forgotten <for...@us...> ! * src/Sound.cpp (soundSetQuality): avoid turning sound on if sound off is checked ! * src/gb/gbSound.cpp (gbSoundSetQuality): avoid turning sound on if sound off is checked ! * src/GBA.cpp (CPUSoftwareInterrupt): added SWI call to exit emulator ! 2004-02-05 Forgotten <for...@us...> ! * src/win32/MainWnd.cpp (FileRun): update battery file more often ! * src/win32/VBA.cpp (system10Frames): update battery file more often ! * src/gb/gbMemory.cpp: update battery file more often ! * src/gb/GB.cpp: update battery file more often ! * src/System.h: update battery file more often ! * src/Sram.cpp (sramWrite): update battery file more often ! * src/SDL.cpp (main): update battery file more often ! * src/GBA.cpp: update battery file more often ! * src/Flash.cpp (flashWrite): update battery file more often ! * src/EEprom.cpp (eepromWrite): update battery file more often ! 2004-01-30 Forgotten <for...@us...> ! * src/win32/OpenGL.cpp (render): fix memory leak in OpenGL rendering ! 2004-01-29 Forgotten <for...@us...> ! * src/gb/gbCodes.h: fix HALT when no matching in IE and IF ! 2004-01-28 Forgotten <for...@us...> ! * src/prof/prof.cpp: fix compile warnings ! * src/win32/MainWndTools.cpp: switch to use structure functions ! * src/win32/MainWndFile.cpp: switch to use structure functions ! * src/win32/VBA.cpp (VBA): use structure instead of individual functions for emulation ! * src/win32/VBA.h (class VBA): use structure instead of individual functions for emulation ! * src/win32/MainWnd.cpp: switch to use structure functions ! * src/System.h: structure for emulator functions ! * src/win32/MainWnd.cpp (FileRun): save rom size for later use ! * src/win32/BugReport.cpp (createReport): include cart save strings to bug report ! 2004-01-25 Forgotten <for...@us...> ! * src/win32/AboutDialog.cpp (OnInitDialog): fix problem with translator URLs not working correctly and force URL to new site ! * src/win32/MainWndHelp.cpp (OnHelpFaq): update FAQ URL to new site ! 2004-01-21 Forgotten <for...@us...> ! * src/Util.cpp (utilLoad): fix possible memory corruption when loading files with a passed in memory location ! 2004-01-20 Forgotten <for...@us...> ! * src/Port.h (READ32LE): big endian updates from flea ! * src/GBA.cpp: big endian updates from flea ! * src/Cheats.cpp: big endian updates from flea ! * src/win32/VBA.cpp (VBA): initialize default GB color palette ! * src/win32/Direct3D.cpp (initialize): avoid resetting GB colors set by user ! * src/win32/OpenGL.cpp (initialize): avoid resetting GB colors set by user ! * src/win32/GDIDisplay.cpp (initialize): avoid resetting GB colors set by user ! * src/win32/DirectDraw.cpp (initializeOffscreen): avoid resetting GB colors set by user ! 2004-01-19 Forgotten <for...@us...> ! * src/gb/GB.cpp (gbEmulate): reset the window line before starting a new frame ! * src/elf.cpp (elfRead): fix memory leak ! * src/GBA.cpp (CPULoadRom): avoid crash with invalid ELF file ! 2004-01-18 Forgotten <for...@us...> ! * src/win32/FileDlg.cpp (FileDlg): fix problem on 320x240 mode ! * src/win32/ZoomControl.cpp (OnPaint): fix crash on map/oam/tile viewer ! 2004-01-16 Forgotten <for...@us...> ! * win32/GBMemoryViewerDlg.cpp (OnLoad): fixed bug loading memory dump ! * win32/MemoryViewerDlg.cpp (OnLoad): fixed bug loading memory dump ! 2004-01-15 Forgotten <for...@us...> ! * win32/VBA.cpp: store throttle value ! 2004-01-14 Forgotten <for...@us...> ! * win32/VBA.cpp (adjustDestRect): fix multi-mon support ! * win32/FileDlg.cpp (FileDlg): fix problem on VC 7.1 ! * win32/MainWnd.cpp (OnActivateApp): fix compile errors on VC 7.1 ! * win32/GBCheatsDlg.cpp: fix compile errors on VC 7.1 ! * win32/GBACheats.cpp: fix compile errors on VC 7.1 ! * bios.cpp: fix compile errors on VC 7.1 Index: NEWS =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/NEWS,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** NEWS 9 Dec 2003 21:53:40 -0000 1.54 --- NEWS 7 Feb 2004 13:59:56 -0000 1.55 *************** *** 1,2 **** --- 1,32 ---- + Version 1.7.1: + Core changes: + - added SWI call (0xf9 in thumb mode) to exit emulator in SDL version + - avoid crash when loading an invalid ELF file + - avoid turning sound on if soundOffFlag is true + - fixed memory leak in ELF support code + - fixed memory corruption if loading a bigger file than the memory to hold it + - fixed some compile warnings in the profiling code + - merged some big endian fixes into the code + - update battery files more often (a bit after the save memory is last updated) + + Gameboy: + - fixed bug with window support introduced in version 1.7 + - fixed HALT bug when no matching bits for interrupt + + Windows: + - added cartridge save strings to bug report + - changed default button on disassembly views to Go instead of Close + - changed power management/screen saver disabling code again to avoid problems + - fixed compilation problems on VC 7 + - fixed multi-monitor support + - fixed bug loading memory dumps + - fixed crash onb map/oam/tile viewers + - fixed problem 320x240 mode open/save dialogs + - fixed bug where user selected Gameboy colors were reset and not stored + - fixed bug rendering the translator URL + - fixed memory leak in OpenGL code which caused nasty problems + - store throttle value between restarts of the emulator + - updated FAQ and URL links to the new site + Version 1.7: Core changes: |
|
From: <for...@us...> - 2004-02-07 00:20:56
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20964 Modified Files: Sound.cpp Log Message: Avoid turning sound on when changing sound quality if soundOffFlag is true. Index: Sound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Sound.cpp 4 Nov 2003 14:11:52 -0000 1.12 --- Sound.cpp 7 Feb 2004 00:18:07 -0000 1.13 *************** *** 1285,1292 **** { if(soundQuality != quality && systemCanChangeSoundQuality()) { ! soundShutdown(); soundQuality = quality; soundNextPosition = 0; ! soundInit(); SOUND_CLOCK_TICKS = USE_TICKS_AS * soundQuality; soundIndex = 0; --- 1285,1294 ---- { if(soundQuality != quality && systemCanChangeSoundQuality()) { ! if(!soundOffFlag) ! soundShutdown(); soundQuality = quality; soundNextPosition = 0; ! if(!soundOffFlag) ! soundInit(); SOUND_CLOCK_TICKS = USE_TICKS_AS * soundQuality; soundIndex = 0; |
|
From: <for...@us...> - 2004-02-07 00:20:56
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20964/gb Modified Files: gbSound.cpp Log Message: Avoid turning sound on when changing sound quality if soundOffFlag is true. Index: gbSound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbSound.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gbSound.cpp 4 Nov 2003 14:08:07 -0000 1.5 --- gbSound.cpp 7 Feb 2004 00:18:07 -0000 1.6 *************** *** 119,122 **** --- 119,123 ---- extern bool soundLowPass; extern bool soundReverse; + extern bool soundOffFlag; bool gbDigitalSound = false; *************** *** 854,861 **** { if(soundQuality != quality && systemCanChangeSoundQuality()) { ! soundShutdown(); soundQuality = quality; soundNextPosition = 0; ! soundInit(); SOUND_CLOCK_TICKS = (gbSpeed ? 2 : 1) * 24 * soundQuality; soundIndex = 0; --- 855,864 ---- { if(soundQuality != quality && systemCanChangeSoundQuality()) { ! if(!soundOffFlag) ! soundShutdown(); soundQuality = quality; soundNextPosition = 0; ! if(!soundOffFlag) ! soundInit(); SOUND_CLOCK_TICKS = (gbSpeed ? 2 : 1) * 24 * soundQuality; soundIndex = 0; |
|
From: <for...@us...> - 2004-02-06 11:29:40
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4797 Modified Files: GBA.cpp Log Message: Added BIOS call to exit the emulator in SDL version (SWI #0xf9 in thumb mode) Tracker #880413 Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** GBA.cpp 5 Feb 2004 11:38:30 -0000 1.51 --- GBA.cpp 6 Feb 2004 11:26:58 -0000 1.52 *************** *** 1675,1678 **** --- 1675,1685 ---- return; } + #ifdef SDL + if(comment == 0xf9) { + emulating = 0; + CPU_BREAK_LOOP_2; + return; + } + #endif if(useBios) { #ifdef DEV_VERSION |
|
From: <for...@us...> - 2004-02-06 11:13:10
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2135 Modified Files: vba.rc Log Message: Change default button on disassembly view to Go instead of Close Tracker #891315 Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** vba.rc 25 Jan 2004 13:49:29 -0000 1.44 --- vba.rc 6 Feb 2004 11:10:27 -0000 1.45 *************** *** 725,729 **** EDITTEXT IDC_ADDRESS,158,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP ! PUSHBUTTON "Go",IDC_GO,232,7,50,14 LISTBOX IDC_DISASSEMBLE,7,25,276,161,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_TABSTOP --- 725,729 ---- EDITTEXT IDC_ADDRESS,158,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP ! DEFPUSHBUTTON "Go",IDC_GO,232,7,50,14 LISTBOX IDC_DISASSEMBLE,7,25,276,161,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_TABSTOP *************** *** 732,736 **** PUSHBUTTON "Refresh",IDC_REFRESH,120,204,50,14 PUSHBUTTON "Next",IDC_NEXT,233,204,50,14 ! DEFPUSHBUTTON "Close",IDC_CLOSE,346,204,50,14 LTEXT "R0:",IDC_STATIC,309,7,18,8 LTEXT "R1:",IDC_STATIC,309,15,18,8 --- 732,736 ---- PUSHBUTTON "Refresh",IDC_REFRESH,120,204,50,14 PUSHBUTTON "Next",IDC_NEXT,233,204,50,14 ! PUSHBUTTON "Close",IDC_CLOSE,346,204,50,14 LTEXT "R0:",IDC_STATIC,309,7,18,8 LTEXT "R1:",IDC_STATIC,309,15,18,8 *************** *** 913,917 **** EDITTEXT IDC_ADDRESS,7,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP ! PUSHBUTTON "Go",IDC_GO,81,7,50,14 LISTBOX IDC_DISASSEMBLE,7,25,222,161,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_TABSTOP --- 913,917 ---- EDITTEXT IDC_ADDRESS,7,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP ! DEFPUSHBUTTON "Go",IDC_GO,81,7,50,14 LISTBOX IDC_DISASSEMBLE,7,25,222,161,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_TABSTOP *************** *** 920,924 **** PUSHBUTTON "Refresh",IDC_REFRESH,100,204,50,14 PUSHBUTTON "Next",IDC_NEXT,193,204,50,14 ! DEFPUSHBUTTON "Close",IDC_CLOSE,287,204,50,14 LTEXT "AF:",IDC_STATIC,250,25,18,8 LTEXT "BC:",IDC_STATIC,250,35,18,8 --- 920,924 ---- PUSHBUTTON "Refresh",IDC_REFRESH,100,204,50,14 PUSHBUTTON "Next",IDC_NEXT,193,204,50,14 ! PUSHBUTTON "Close",IDC_CLOSE,287,204,50,14 LTEXT "AF:",IDC_STATIC,250,25,18,8 LTEXT "BC:",IDC_STATIC,250,35,18,8 |
|
From: <kx...@us...> - 2004-02-05 22:00:58
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12371 Modified Files: TestEmu.cpp Log Message: Update battery file more often, a while after the game stops writing to it (RFE #882246) Index: TestEmu.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/TestEmu.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestEmu.cpp 31 Jan 2004 01:14:36 -0000 1.9 --- TestEmu.cpp 5 Feb 2004 21:58:16 -0000 1.10 *************** *** 74,77 **** --- 74,78 ---- int systemDebug = 0; int systemVerbose = 0; + int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; int cartridgeType = 3; |
|
From: <for...@us...> - 2004-02-05 11:45:10
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19561 Modified Files: gba_sdl.dsp Log Message: Remove GP dependencies Index: gba_sdl.dsp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/gba_sdl.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gba_sdl.dsp 20 Nov 2003 11:34:45 -0000 1.10 --- gba_sdl.dsp 5 Feb 2004 11:42:36 -0000 1.11 *************** *** 257,272 **** # End Source File # End Group - # Begin Group "GP" - - # PROP Default_Filter "" - # Begin Source File - - SOURCE=..\src\gp\GP.cpp - # End Source File - # Begin Source File - - SOURCE=..\src\gp\gpGfxRender.cpp - # End Source File - # End Group # Begin Group "SDL" --- 257,260 ---- |
|
From: <for...@us...> - 2004-02-05 11:41:34
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18627 Modified Files: EEprom.cpp Flash.cpp GBA.cpp SDL.cpp Sram.cpp System.h Log Message: Update battery file more often, a while after the game stops writing to it (RFE #882246) Index: EEprom.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/EEprom.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EEprom.cpp 17 Jun 2003 15:34:20 -0000 1.4 --- EEprom.cpp 5 Feb 2004 11:38:30 -0000 1.5 *************** *** 180,183 **** --- 180,184 ---- eepromData[(eepromAddress << 3) + i] = eepromBuffer[i]; } + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } else if(eepromBits == 0x41) { eepromMode = EEPROM_IDLE; Index: Flash.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Flash.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Flash.cpp 12 Jun 2003 10:45:09 -0000 1.5 --- Flash.cpp 5 Feb 2004 11:38:30 -0000 1.6 *************** *** 208,215 **** --- 208,217 ---- 0, 0x1000); + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; flashReadState = FLASH_ERASE_COMPLETE; } else if(byte == 0x10) { // CHIP ERASE memset(flashSaveMemory, 0, flashSize); + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; flashReadState = FLASH_ERASE_COMPLETE; } else { *************** *** 231,234 **** --- 233,237 ---- case FLASH_PROGRAM: flashSaveMemory[(flashBank<<16)+address] = byte; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; flashState = FLASH_READ_ARRAY; flashReadState = FLASH_READ_ARRAY; Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** GBA.cpp 28 Jan 2004 17:59:29 -0000 1.50 --- GBA.cpp 5 Feb 2004 11:38:30 -0000 1.51 *************** *** 809,812 **** --- 809,814 ---- if(eepromInUse) gbaSaveType = 3; + + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; return true; *************** *** 1089,1092 **** --- 1091,1096 ---- long size = ftell(file); fseek(file, 0, SEEK_SET); + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + if(size == 512 || size == 0x2000) { if(fread(eepromData, 1, size, file) != (size_t)size) { *************** *** 1250,1253 **** --- 1254,1259 ---- elfCleanUp(); + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + emulating = 0; } *************** *** 1260,1263 **** --- 1266,1271 ---- CPUCleanUp(); } + + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; rom = (u8 *)malloc(0x2000000); *************** *** 3273,3276 **** --- 3281,3286 ---- break; } + + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; lastTime = systemGetClock(); Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/SDL.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** SDL.cpp 31 Jan 2004 01:14:36 -0000 1.51 --- SDL.cpp 5 Feb 2004 11:38:30 -0000 1.52 *************** *** 148,151 **** --- 148,152 ---- int systemVerbose = 0; int systemFrameSkip = 0; + int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; int srcPitch = 0; *************** *** 2176,2179 **** --- 2177,2182 ---- } + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + if(optind < argc) { char *szFile = argv[optind]; *************** *** 2873,2876 **** --- 2876,2887 ---- } } + + if(systemSaveUpdateCounter) { + if(--systemSaveUpdateCounter <= SYSTEM_SAVE_NOT_UPDATED) { + sdlWriteBattery(); + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + } + } + wasPaused = false; autoFrameSkipLastTime = time; Index: Sram.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sram.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Sram.cpp 20 Oct 2002 13:03:12 -0000 1.1 --- Sram.cpp 5 Feb 2004 11:38:30 -0000 1.2 *************** *** 29,31 **** --- 29,32 ---- { flashSaveMemory[address & 0xFFFF] = byte; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } Index: System.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/System.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** System.h 28 Jan 2004 17:59:31 -0000 1.11 --- System.h 5 Feb 2004 11:38:30 -0000 1.12 *************** *** 117,120 **** --- 117,124 ---- extern int systemVerbose; extern int systemFrameSkip; + extern int systemSaveUpdateCounter; + + #define SYSTEM_SAVE_UPDATED 30 + #define SYSTEM_SAVE_NOT_UPDATED 0 #endif //VBA_SYSTEM_H |
|
From: <for...@us...> - 2004-02-05 11:41:16
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18627/win32 Modified Files: MainWnd.cpp VBA.cpp Log Message: Update battery file more often, a while after the game stops writing to it (RFE #882246) Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MainWnd.cpp 28 Jan 2004 17:45:37 -0000 1.8 --- MainWnd.cpp 5 Feb 2004 11:38:43 -0000 1.9 *************** *** 470,474 **** return false; } ! theApp.cartridgeType = (int)type; if(type == IMAGE_GB) { --- 470,474 ---- return false; } ! systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; theApp.cartridgeType = (int)type; if(type == IMAGE_GB) { Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** VBA.cpp 28 Jan 2004 17:45:37 -0000 1.7 --- VBA.cpp 5 Feb 2004 11:38:43 -0000 1.8 *************** *** 119,122 **** --- 119,123 ---- int systemVerbose = 0; int systemDebug = 0; + int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; void winSignal(int,int); *************** *** 269,272 **** --- 270,275 ---- updateCount = 0; + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + ZeroMemory(&emulator, sizeof(emulator)); *************** *** 977,980 **** --- 980,990 ---- } } + if(systemSaveUpdateCounter) { + if(--systemSaveUpdateCounter <= SYSTEM_SAVE_NOT_UPDATED) { + ((MainWnd *)theApp.m_pMainWnd)->writeBatteryFile(); + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + } + } + theApp.wasPaused = false; theApp.autoFrameSkipLastTime = time; |
|
From: <for...@us...> - 2004-02-05 11:41:16
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18627/gb Modified Files: GB.cpp gbMemory.cpp Log Message: Update battery file more often, a while after the game stops writing to it (RFE #882246) Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GB.cpp 28 Jan 2004 17:58:59 -0000 1.16 --- GB.cpp 5 Feb 2004 11:38:31 -0000 1.17 *************** *** 1649,1652 **** --- 1649,1654 ---- gbSoundReset(); + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + gbLastTime = systemGetClock(); gbFrameCount = 0; *************** *** 1924,1927 **** --- 1926,1930 ---- bool gbReadBatteryFile(const char *file) { + bool res = false; if(gbBattery) { int type = gbRom[0x147]; *************** *** 1929,1936 **** switch(type) { case 0x03: ! return gbReadSaveMBC1(file); break; case 0x06: ! return gbReadSaveMBC2(file); break; case 0x0f: --- 1932,1939 ---- switch(type) { case 0x03: ! res = gbReadSaveMBC1(file); break; case 0x06: ! res = gbReadSaveMBC2(file); break; case 0x0f: *************** *** 1947,1966 **** gbDataMBC3.mapperControl = (gbDataMBC3.mapperControl & 0xfe) | (lt->tm_yday > 255 ? 1: 0); ! return false; } ! return true; break; case 0x1b: case 0x1e: ! return gbReadSaveMBC5(file); break; case 0x22: ! return gbReadSaveMBC7(file); case 0xff: ! return gbReadSaveMBC1(file); break; } } ! return false; } --- 1950,1971 ---- gbDataMBC3.mapperControl = (gbDataMBC3.mapperControl & 0xfe) | (lt->tm_yday > 255 ? 1: 0); ! res = false; ! break; } ! res = true; break; case 0x1b: case 0x1e: ! res = gbReadSaveMBC5(file); break; case 0x22: ! res = gbReadSaveMBC7(file); case 0xff: ! res = gbReadSaveMBC1(file); break; } } ! systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; ! return res; } *************** *** 2344,2347 **** --- 2349,2354 ---- gbCheatsReadGame(gzFile, version); + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + return true; } *************** *** 2425,2428 **** --- 2432,2437 ---- gbWram = NULL; } + + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; } *************** *** 2435,2438 **** --- 2444,2449 ---- } + systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + gbRom = utilLoad(szFile, utilIsGBImage, Index: gbMemory.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbMemory.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gbMemory.cpp 20 Oct 2002 13:03:12 -0000 1.1 --- gbMemory.cpp 5 Feb 2004 11:38:43 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- */ #include "../GBA.h" + #include "../Port.h" #include "gbGlobals.h" #include "gbMemory.h" *************** *** 97,100 **** --- 98,102 ---- if(gbRamSize) { gbMemoryMap[address >> 12][address & 0x0fff] = value; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } *************** *** 166,169 **** --- 168,172 ---- if(gbRamSize && address < 0xa200) { gbMemoryMap[address >> 12][address & 0x0fff] = value; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } *************** *** 310,313 **** --- 313,317 ---- if(gbRamSize) { gbMemoryMap[address>>12][address & 0x0fff] = value; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } else { *************** *** 458,461 **** --- 462,466 ---- if(gbRamSize) { gbMemoryMap[address >> 12][address & 0x0fff] = value; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } *************** *** 582,585 **** --- 587,591 ---- gbMemory[0xa000+gbDataMBC7.address*2]=gbDataMBC7.buffer>>8; gbMemory[0xa000+gbDataMBC7.address*2+1]=gbDataMBC7.buffer&0xff; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } gbDataMBC7.state=0; *************** *** 649,652 **** --- 655,659 ---- gbMemory[0xa000+i*2] = gbDataMBC7.buffer >> 8; gbMemory[0xa000+i*2+1] = gbDataMBC7.buffer & 0xff; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } *************** *** 655,659 **** if (gbDataMBC7.writeEnable) { for(int i=0;i<256;i++) ! *((u16 *)&gbMemory[0xa000+i*2]) = 0xffff; } gbDataMBC7.state=5; --- 662,667 ---- if (gbDataMBC7.writeEnable) { for(int i=0;i<256;i++) ! WRITE16LE((u16 *)&gbMemory[0xa000+i*2], 0xffff); ! systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } gbDataMBC7.state=5; *************** *** 789,792 **** --- 797,801 ---- if(gbRamSize) { gbMemoryMap[address >> 12][address & 0x0fff] = value; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } *************** *** 888,891 **** --- 897,901 ---- if(gbRamSize) { gbMemoryMap[address >> 12][address & 0x0fff] = value; + systemSaveUpdateCounter = SYSTEM_SAVE_UPDATED; } } *************** *** 956,962 **** } } - - - - - --- 966,967 ---- |
|
From: <for...@pr...> - 2004-02-01 15:04:32
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064/src Modified Files: Makefile.am Makefile.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 16 Jan 2004 13:41:55 -0000 1.14 --- Makefile.am 1 Feb 2004 15:02:39 -0000 1.15 *************** *** 1,4 **** SUBDIRS = gb @VBA_EXTRA@ ! EXTRA_SUBDIRS = gp i386 prof DIST_SUBDIRS = gb $(EXTRA_SUBDIRS) bin_PROGRAMS = VisualBoyAdvance TestEmu --- 1,4 ---- SUBDIRS = gb @VBA_EXTRA@ ! EXTRA_SUBDIRS = i386 prof DIST_SUBDIRS = gb $(EXTRA_SUBDIRS) bin_PROGRAMS = VisualBoyAdvance TestEmu *************** *** 18,22 **** hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h interp.h ! VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_GP@ @VBA_MMX@ VisualBoyAdvance_LDFLAGS = `sdl-config --libs` --- 18,22 ---- hq2x.cpp hq2x.h lq2x.h Text.cpp Text.h interp.h ! VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ VisualBoyAdvance_LDFLAGS = `sdl-config --libs` *************** *** 35,50 **** interp.h ! TestEmu_LDADD = gb/libgb.a @VBA_PROF@ @VBA_GP@ @VBA_MMX@ TestEmu_LDFLAGS = EXTRA_DIST = \ win32 VisualBoyAdvance.cfg \ ! expr.l expr.y qt \ CheatSearch.cpp CheatSearch.h dist-hook: - rm -rf `find $(distdir)/gp -name CVS` rm -rf `find $(distdir)/i386 -name CVS` rm -rf `find $(distdir)/win32 -name CVS` - rm -rf `find $(distdir)/qt -name CVS` rm -rf `find $(distdir)/prof -name CVS` --- 35,48 ---- interp.h ! TestEmu_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ TestEmu_LDFLAGS = EXTRA_DIST = \ win32 VisualBoyAdvance.cfg \ ! expr.l expr.y \ CheatSearch.cpp CheatSearch.h dist-hook: rm -rf `find $(distdir)/i386 -name CVS` rm -rf `find $(distdir)/win32 -name CVS` rm -rf `find $(distdir)/prof -name CVS` Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 16 Jan 2004 13:41:55 -0000 1.16 --- Makefile.in 1 Feb 2004 15:02:39 -0000 1.17 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- *************** *** 139,143 **** target_vendor = @target_vendor@ SUBDIRS = gb @VBA_EXTRA@ ! EXTRA_SUBDIRS = gp i386 prof DIST_SUBDIRS = gb $(EXTRA_SUBDIRS) bin_PROGRAMS = VisualBoyAdvance TestEmu --- 138,142 ---- target_vendor = @target_vendor@ SUBDIRS = gb @VBA_EXTRA@ ! EXTRA_SUBDIRS = i386 prof DIST_SUBDIRS = gb $(EXTRA_SUBDIRS) bin_PROGRAMS = VisualBoyAdvance TestEmu *************** *** 158,162 **** ! VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_GP@ @VBA_MMX@ VisualBoyAdvance_LDFLAGS = `sdl-config --libs` --- 157,161 ---- ! VisualBoyAdvance_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ VisualBoyAdvance_LDFLAGS = `sdl-config --libs` *************** *** 176,185 **** ! TestEmu_LDADD = gb/libgb.a @VBA_PROF@ @VBA_GP@ @VBA_MMX@ TestEmu_LDFLAGS = EXTRA_DIST = \ win32 VisualBoyAdvance.cfg \ ! expr.l expr.y qt \ CheatSearch.cpp CheatSearch.h --- 175,184 ---- ! TestEmu_LDADD = gb/libgb.a @VBA_PROF@ @VBA_MMX@ TestEmu_LDFLAGS = EXTRA_DIST = \ win32 VisualBoyAdvance.cfg \ ! expr.l expr.y \ CheatSearch.cpp CheatSearch.h *************** *** 666,673 **** dist-hook: - rm -rf `find $(distdir)/gp -name CVS` rm -rf `find $(distdir)/i386 -name CVS` rm -rf `find $(distdir)/win32 -name CVS` - rm -rf `find $(distdir)/qt -name CVS` rm -rf `find $(distdir)/prof -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 665,670 ---- |
|
From: <for...@pr...> - 2004-02-01 15:04:32
|
Update of /cvsroot/vba/VisualBoyAdvance/src/i386 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23064/src/i386 Modified Files: Makefile.in Log Message: Remove qt and gp from autoconf/automake Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/i386/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 21 Nov 2003 21:53:41 -0000 1.5 --- Makefile.in 1 Feb 2004 15:02:39 -0000 1.6 *************** *** 90,94 **** STRIP = @STRIP@ VBA_EXTRA = @VBA_EXTRA@ - VBA_GP = @VBA_GP@ VBA_MMX = @VBA_MMX@ VBA_PROF = @VBA_PROF@ --- 90,93 ---- |
