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

GTK : Removed 2 global vars 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@852 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2009-01-23 14:40:18 +00:00
parent 72ccee1bb2
commit 55a905fd3e
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/system.cpp
View File

@ -39,11 +39,6 @@ u16 systemGbPalette[24];
int emulating; int emulating;
int RGB_LOW_BITS_MASK; int RGB_LOW_BITS_MASK;
// Extra vars, only used for the GUI
//
int systemRenderedFrames;
int systemFPS;
inline VBA::Window * GUI() inline VBA::Window * GUI()
{ {
return VBA::Window::poGetInstance(); return VBA::Window::poGetInstance();
@ -62,7 +57,6 @@ void systemMessage(int _iId, const char * _csFormat, ...)
void systemDrawScreen() void systemDrawScreen()
{ {
GUI()->vDrawScreen(); GUI()->vDrawScreen();
systemRenderedFrames++;
} }
bool systemReadJoypads() bool systemReadJoypads()
@ -77,9 +71,6 @@ u32 systemReadJoypad(int joy)
void systemShowSpeed(int _iSpeed) void systemShowSpeed(int _iSpeed)
{ {
systemFPS = systemRenderedFrames;
systemRenderedFrames = 0;
GUI()->vShowSpeed(_iSpeed); GUI()->vShowSpeed(_iSpeed);
} }

12
src/gtk/window.cpp
View File

@ -43,8 +43,6 @@
#include "screenarea-opengl.h" #include "screenarea-opengl.h"
#endif // USE_OPENGL #endif // USE_OPENGL
extern int systemRenderedFrames;
extern int systemFPS;
extern int RGB_LOW_BITS_MASK; extern int RGB_LOW_BITS_MASK;
@ -556,13 +554,12 @@ void Window::vInitSystem()
systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
systemFrameSkip = 2; systemFrameSkip = 2;
systemRenderedFrames = 0;
systemFPS = 0;
emulating = 0; emulating = 0;
gbFrameSkip = 0; gbFrameSkip = 0;
m_iFrameCount = 0;
soundInit(); soundInit();
} }
@ -1149,6 +1146,7 @@ void Window::vPopupErrorV(const char * _csFormat, va_list _args)
void Window::vDrawScreen() void Window::vDrawScreen()
{ {
m_poScreenArea->vDrawPixels(pix); m_poScreenArea->vDrawPixels(pix);
m_iFrameCount++;
} }
void Window::vDrawDefaultScreen() void Window::vDrawDefaultScreen()
@ -1173,9 +1171,11 @@ void Window::vShowSpeed(int _iSpeed)
else if (m_eShowSpeed == ShowDetailed) else if (m_eShowSpeed == ShowDetailed)
{ {
snprintf(csTitle, 50, "VBA-M - %d%% (%d, %d fps)", snprintf(csTitle, 50, "VBA-M - %d%% (%d, %d fps)",
_iSpeed, systemFrameSkip, systemFPS); _iSpeed, systemFrameSkip, m_iFrameCount);
set_title(csTitle); set_title(csTitle);
} }
m_iFrameCount = 0;
} }
void Window::vComputeFrameskip(int _iRate) void Window::vComputeFrameskip(int _iRate)

1
src/gtk/window.h
View File

@ -245,6 +245,7 @@ private:
int m_bFullscreen; int m_bFullscreen;
int m_iScreenWidth; int m_iScreenWidth;
int m_iScreenHeight; int m_iScreenHeight;
int m_iFrameCount;
std::string m_sRomFile; std::string m_sRomFile;
ECartridge m_eCartridge; ECartridge m_eCartridge;