Skip to content

OGC: Make Fullscreen the Default #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fancy2209 wants to merge 3 commits into
base: debian-wii
Choose a base branch
from
Open

OGC: Make Fullscreen the Default #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b54d2d4
Fix Build
Fancy2209 Feb 8, 2025
a44b639
Make Fullscreen the default and make windowed res a safe default for …
Fancy2209 Feb 8, 2025
2ee6c35
Remove video modes that won't work on Wii, make ifdef's consistent
Fancy2209 Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ball/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <SDL.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>

#include "version.h"
#include "glext.h"
Expand Down Expand Up @@ -544,7 +546,7 @@ int main(int argc, char *argv[])

#ifdef __WII__
chdir("/apps/neverball");
setenv("SDL_WII_JOYSTICK_SIDEWAYS", "1", 1);
SDL_setenv("SDL_WII_JOYSTICK_SIDEWAYS", "1", 1);
#endif

if (!fs_init(argv[0]))
Expand Down
2 changes: 1 addition & 1 deletion scripts/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ svn_version()

git_version()
{
if git_desc="$(git describe --dirty=+)"; then
if git_desc="$(git describe --tags --dirty=+)"; then
echo "$git_desc" | sed -e 's/^neverball-//' -e 's/-g/-/g'
fi
}
Expand Down
9 changes: 9 additions & 0 deletions share/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,19 @@ static struct
const int def;
int cur;
} option_d[] = {
#ifdef __WII__
{ &CONFIG_FULLSCREEN, "fullscreen", 1 },
#else
{ &CONFIG_FULLSCREEN, "fullscreen", 0 },
#endif
{ &CONFIG_DISPLAY, "display", 0 },
#ifdef __WII__
{ &CONFIG_WIDTH, "width", 640 },
{ &CONFIG_HEIGHT, "height", 480 },
#else
{ &CONFIG_WIDTH, "width", 800 },
{ &CONFIG_HEIGHT, "height", 600 },
#endif
{ &CONFIG_STEREO, "stereo", 0 },
{ &CONFIG_CAMERA, "camera", 0 },
{ &CONFIG_TEXTURES, "textures", 1 },
Expand Down
5 changes: 5 additions & 0 deletions share/st_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ struct mode
};

static const struct mode modes[] = {
#ifndef __WII__
{ 2560, 1440 },
{ 1920, 1200 },
{ 1920, 1080 },
Expand All @@ -491,6 +492,10 @@ static const struct mode modes[] = {
{ 1280, 720 },
{ 1024, 768 },
{ 800, 600 },
#endif
#ifdef __WII__
{ 854, 480},
#endif
{ 640, 480 },
{ 480, 320 },
{ 320, 240 }
Expand Down