Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly declare ShowStaticScreen()

Browse Source
This commit is contained in:
Azamat H. Hackimov 2024-10-28 03:06:29 +03:00
parent f79e02c638
commit b07f2353ae
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Descent3/credits.cpp
View File

@ -299,8 +299,6 @@ static bool Credits_LoadCredits(const char *filename) {
return true;
}
extern void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
#define CREDIT_PIXELS_PER_SECOND 22
void Credits_Display() {

13
Descent3/descent.cpp
View File

@ -381,7 +381,6 @@
* $NoKeywords: $
*/
#include <algorithm>
#include <cstdlib>
#include <filesystem>
#include <vector>
@ -408,6 +407,7 @@
#include "args.h"
#include "multi_dll_mgr.h"
#include "localization.h"
#include "uisys.h"
// ---------------------------------------------------------------------------
// Variables
@ -434,10 +434,6 @@ std::filesystem::path Descent3_temp_directory; // temp directory to put temp fil
// ---------------------------------------------------------------------------
// #define BETA
#if (defined(OEM) || defined(DEMO))
void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
#endif
char Proxy_server[200] = "";
int16_t Proxy_port = 80;
@ -597,10 +593,8 @@ void MainLoop() {
SetScreenMode(SM_NULL);
}
#if (defined(OEM) || defined(DEMO) || defined(RELEASE))
// Shows a fullscreen static bitmap
void ShowStaticScreen(char *bitmap_filename, bool timed, float delay_time) {
extern void ui_SetScreenMode(int w, int h);
void ShowStaticScreen(const char *bitmap_filename, bool timed, float delay_time) {
chunked_bitmap splash_bm;
// do splash screen on release
@ -615,7 +609,7 @@ void ShowStaticScreen(char *bitmap_filename, bool timed, float delay_time) {
bm_FreeBitmap(bm_handle);
float start_time = timer_GetTime();
while (1) {
while (true) {
StartFrame();
rend_DrawChunkedBitmap(&splash_bm, 0, 0, 255);
@ -646,7 +640,6 @@ void ShowStaticScreen(char *bitmap_filename, bool timed, float delay_time) {
ui_SetScreenMode(Max_window_w, Max_window_h);
}
#endif
// ---------------------------------------------------------------------------
// Accessor functions

3
Descent3/descent.h
View File

@ -212,6 +212,9 @@ void D3DeferHandler(bool is_active);
void SetFunctionMode(function_mode mode);
function_mode GetFunctionMode();
// Shows a fullscreen static bitmap
void ShowStaticScreen(const char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
#ifndef RELEASE
// this is called when you hit a debug break!
void D3DebugStopHandler();

3
Descent3/init.cpp
View File

@ -1722,9 +1722,6 @@ void InitMessage(const char *c, float progress) {
}
//////////////////////////////////////////////////////////////////////////////
#if (defined(OEM) || defined(DEMO) || defined(RELEASE))
void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
#endif
void IntroScreen() {
// #if (defined(OEM) || defined(DEMO) )