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

Merge pull request #657 from sebholt/display

Browse Source 
Add new command line option: -display
This commit is contained in:
Louis Gombert 2024-12-20 23:39:52 +01:00 committed by GitHub
commit 4ff0665dc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
USAGE.md
View File

@ -87,6 +87,7 @@ Here brief usage of command line options, supported by game.
| Option | Type | Default | Platform | Description |
|----------------------|---------|-------------------------------------|----------|-------------------------------------------------------------------|
| `-dedicated`, `-d` | boolean | Off | all | Run game in dedicated mode |
| `-display` | integer | 0 | all | Run game on the selected display |
| `-fullscreen`, `-f` | boolean | On | all | Run game in fullscreen mode |
| `-logfile` | boolean | Off | all | Enable file logging to Descent3.log |
| `-loglevel <LEVEL>` | string | INFO (on Release), DEBUG (on Debug) | all | Set log level (NONE, VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL) |

16
renderer/HardwareOpenGL.cpp
View File

@ -424,7 +424,21 @@ int opengl_Setup(oeApplication *app, const int *width, const int *height) {
}
if (!GSDLWindow) {
GSDLWindow = SDL_CreateWindow("Descent 3", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, winw, winh, flags);
int display = 0;
if (int display_arg = FindArg("-display"); display_arg != 0) {
if (const char * arg_index_str = GetArg (display_arg + 1); arg_index_str == nullptr) {
LOG_WARNING << "No parameter for -display given";
} else {
int arg_index = atoi(arg_index_str);
int display_count = SDL_GetNumVideoDisplays();
if ((arg_index < 0) || (arg_index >= display_count)) {
LOG_WARNING.printf( "Parameter for -display must be in the range 0..%i", display_count-1 );
} else {
display = arg_index;
}
}
}
GSDLWindow = SDL_CreateWindow("Descent 3", SDL_WINDOWPOS_UNDEFINED_DISPLAY(display), SDL_WINDOWPOS_UNDEFINED_DISPLAY(display), winw, winh, flags);
if (!GSDLWindow) {
LOG_ERROR.printf("OpenGL: SDL window creation failed: %s", SDL_GetError());
return 0;