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

provide movie-free frame count display

This commit is contained in:
gocha 2012-08-04 08:01:19 +09:00
parent c2a78a5388
commit 40c12d0890
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx.cpp
View File

@ -2043,7 +2043,7 @@ static void DisplayPressedKeys (void)
static int KeyOrder[] = { 8, 10, 7, 9, 0, 6, 14, 13, 5, 1, 4, 3, 2, 11, 12 }; // < ^ > v A B Y X L R S s
enum controllers controller;
int line = Settings.DisplayMovieFrame && S9xMovieActive() ? 2 : 1;
int line = Settings.DisplayMovieFrame ? 2 : 1;
int8 ids[4];
char string[255];
@ -2193,7 +2193,7 @@ void S9xDisplayMessages (uint16 *screen, int ppl, int width, int height, int sca
if (Settings.DisplayPressedKeys)
DisplayPressedKeys();
if (Settings.DisplayMovieFrame && S9xMovieActive())
if (Settings.DisplayMovieFrame)
S9xDisplayString(GFX.FrameDisplayString, 1, 1, false);
if (GFX.InfoString && *GFX.InfoString)

10
movie.cpp
View File

@ -178,6 +178,7 @@
// Input recording/playback code
// (c) Copyright 2004 blip
#include <math.h>
#ifndef __WIN32__
#include <unistd.h>
#endif
@ -1199,4 +1200,13 @@ void S9xUpdateFrameCounter (int offset)
sprintf(GFX.FrameDisplayString, "%s frame: %d", Settings.NetPlayServer ? "Server" : "Client",
max(0, (int) (NetPlay.FrameCount + offset)));
#endif
else
{
int frame = max(0, (int) (IPPU.TotalEmulatedFrames + offset));
double totalseconds = frame / 60.0;
int hour = (int)(totalseconds / 3600);
int minute = (int)(totalseconds / 60);
double second = fmod(totalseconds, 60.0);
sprintf(GFX.FrameDisplayString, "Frame: %d (%d:%02d:%05.2f)", frame, hour, minute, second);
}
}

1
win32/wlanguage.h
View File

@ -498,7 +498,6 @@ Nintendo is a trade mark.")
#define MOVIE_ERR_WRONG_FORMAT TEXT("The movie file is corrupt or in the wrong format.")
#define MOVIE_ERR_WRONG_VERSION_SHORT TEXT("Unsupported movie version.")
#define MOVIE_ERR_WRONG_VERSION MOVIE_ERR_WRONG_VERSION_SHORT TEXT(" You need a different version of Snes9x to play this movie.")
#define MOVIE_ERR_NOFRAMETOGGLE "No movie; can't toggle frame count"
#define MOVIE_ERR_NOREADONLYTOGGLE "No movie; can't toggle read-only"
#define MOVIE_LABEL_AUTHORINFO TEXT("Author Info:")
#define MOVIE_LABEL_ERRORINFO TEXT("Error Info:")

9
win32/wsnes9x.cpp
View File

@ -1024,14 +1024,7 @@ int HandleKeyMessage(WPARAM wParam, LPARAM lParam)
if(wParam == CustomKeys.FrameCount.key
&& modifiers == CustomKeys.FrameCount.modifiers)
{
if (S9xMovieActive()
#ifdef NETPLAY_SUPPORT
|| Settings.NetPlay
#endif
)
S9xMovieToggleFrameDisplay ();
else
S9xMessage(S9X_INFO, S9X_MOVIE_INFO, MOVIE_ERR_NOFRAMETOGGLE);
S9xMovieToggleFrameDisplay ();
hitHotKey = true;
}
if(wParam == CustomKeys.Pause.key