Skip to content

Commit 03489e2

Browse files
committed
[Nokia N-Gage] Re-enable FPS counter, fix link in README.
- Re-enable FPS counter, which is hidden by default anyway - but essential while working on an actual project. - Fix link in the platform's README. - Re-order list of supported platforms (alphabetical order to maintain consistency).
1 parent 530639a commit 03489e2

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

docs/README-ngage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ a state-of-the-art C23 compiler. The irony writes itself.
4444
## Existing Issues and Limitations
4545

4646
- For now, the new
47-
[SDL3 main callbacks](https://wiki.libsdl.org/SDL3/README/main-functions#how-to-use-main-callbacks-in-sdl3)
47+
[SDL3 main callbacks](https://wiki.libsdl.org/SDL3/README-main-functions#main-callbacks-in-sdl3)
4848
are not optional and must be used. This is important as the callbacks
4949
are optional on other platforms.
5050

docs/README-platforms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- [NetBSD](README-bsd.md)
1313
- [Nintendo Switch](README-switch.md)
1414
- [Nintendo 3DS](README-n3ds.md)
15+
- [Nokia N-Gage](README-ngage.md)]
1516
- [OpenBSD](README-bsd.md)
1617
- [PlayStation 2](README-ps2.md)
1718
- [PlayStation 4](README-ps4.md)
@@ -24,7 +25,6 @@
2425
- [Windows](README-windows.md)
2526
- [Windows GDK](README-gdk.md)
2627
- [Xbox](README-gdk.md)
27-
- [Nokia N-Gage](README-ngage.md)
2828

2929
## Unsupported Platforms
3030

src/render/ngage/SDL_render_ngage.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@ void CRenderer::Flip()
512512
return;
513513
}
514514

515-
#ifdef SDL_VIDEO_RENDER_NGAGE_FPS
516515
iRenderer->Gc()->UseFont(iFont);
517516

518517
if (iShowFPS && iRenderer->Gc()) {
@@ -537,7 +536,6 @@ void CRenderer::Flip()
537536
iRenderer->Gc()->DrawText(_L(""), TPoint(0, 0));
538537
}
539538
iRenderer->Gc()->DiscardFont();
540-
#endif // SDL_VIDEO_RENDER_NGAGE_FPS
541539
iRenderer->Flip(iDirectScreen);
542540

543541
// Keep the backlight on.
@@ -571,7 +569,6 @@ void CRenderer::SetClipRect(TInt aX, TInt aY, TInt aWidth, TInt aHeight)
571569
}
572570
}
573571

574-
#ifdef SDL_VIDEO_RENDER_NGAGE_FPS
575572
void CRenderer::UpdateFPS()
576573
{
577574
static TTime lastTime;
@@ -593,7 +590,6 @@ void CRenderer::UpdateFPS()
593590
lastTime = currentTime;
594591
}
595592
}
596-
#endif
597593

598594
void CRenderer::SuspendScreenSaver(TBool aSuspend)
599595
{
@@ -688,15 +684,13 @@ void CRenderer::HandleEvent(const TWsEvent &aWsEvent)
688684
timestamp = SDL_GetPerformanceCounter();
689685
SDL_SendKeyboardKey(timestamp, 1, aWsEvent.Key()->iCode, ConvertScancode(aWsEvent.Key()->iScanCode), true);
690686

691-
#ifdef SDL_VIDEO_RENDER_NGAGE_FPS
692687
if (aWsEvent.Key()->iScanCode == EStdKeyHash) {
693688
if (iShowFPS) {
694689
iShowFPS = EFalse;
695690
} else {
696691
iShowFPS = ETrue;
697692
}
698693
}
699-
#endif
700694

701695
break;
702696
case EEventKeyUp: /* Key events */

0 commit comments

Comments
 (0)