Use only one global flag for FPS counter

carstene1ns · Oct 7, 2015 · b00c1ce · b00c1ce
1 parent a1d4fd5
commit b00c1ce
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/builds/android/jni/src/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp b/builds/android/jni/src/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
@@ -33,7 +33,7 @@ extern "C" {
 JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_toggleFps
   (JNIEnv *, jclass)
 {
-	Graphics::show_fps = !Graphics::show_fps;
+	Player::fps_flag = !Player::fps_flag;
 }
 
 JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_endGame

diff --git a/src/graphics.cpp b/src/graphics.cpp
@@ -31,8 +31,6 @@
 #include "player.h"
 
 namespace Graphics {
-	bool show_fps;
-
 	void UpdateTitle();
 	void DrawFrame();
 	void DrawOverlay();
@@ -75,7 +73,6 @@ unsigned SecondToFrame(float const second) {
 }
 
 void Graphics::Init() {
-	show_fps = Player::fps_flag;
 	fps = 0;
 	frozen_screen = BitmapRef();
 	screen_erased = false;
@@ -150,7 +147,7 @@ void Graphics::UpdateTitle() {
 	std::stringstream title;
 	title << Player::game_title;
 
-	if (show_fps) {
+	if (Player::fps_flag) {
 		title << " - FPS " << real_fps;
 	}
 
@@ -204,7 +201,7 @@ void Graphics::DrawFrame() {
 }
 
 void Graphics::DrawOverlay() {
-	if (DisplayUi->IsFullscreen() && Graphics::show_fps) {
+	if (DisplayUi->IsFullscreen() && Player::fps_flag) {
 		std::stringstream text;
 		text << "FPS: " << real_fps;
 		DisplayUi->GetDisplaySurface()->TextDraw(2, 2, Color(255, 255, 255, 255), text.str());

diff --git a/src/graphics.h b/src/graphics.h
@@ -126,8 +126,6 @@ namespace Graphics {
 
 	void UpdateZCallback();
 
-	extern bool show_fps;
-
 	void Push();
 	void Pop();
 

diff --git a/src/player.cpp b/src/player.cpp
@@ -228,7 +228,7 @@ void Player::Update(bool update_scene) {
 
 	// Normal logic update
 	if (Input::IsTriggered(Input::TOGGLE_FPS)) {
-		Graphics::show_fps = !Graphics::show_fps;
+		fps_flag = !fps_flag;
 	}
 	if (Input::IsTriggered(Input::TAKE_SCREENSHOT)) {
 		Output::TakeScreenshot();