From 5c726f96449eeb5a192b5e068de9c98947c0cb80 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sat, 1 Jan 2011 17:59:59 +0100 Subject: [PATCH] Move default config location --- README.md | 2 +- hqflt/cg/crt.cg | 2 +- settings.c | 4 ++-- ssnes.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 446165946e..a6ce0b1d0c 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ The default configuration is defined in config.def.h. These can later be tweaked by using the ssnes config file. A sample configuration file is installed to /etc/ssnes.cfg. This is the system-wide config file. -Each user should create a config file in $XDG\_CONFIG\_HOME/ssnes. +Each user should create a config file in $XDG\_CONFIG\_HOME/ssnes/ssnes.cfg. The users only need to configure a certain option if the desired value deviates from the value defined in config.def.h. To configure joypads, start up jstest /dev/input/js0 to determine which joypad buttons (and axis) to use. diff --git a/hqflt/cg/crt.cg b/hqflt/cg/crt.cg index ab89abc478..bee618ad38 100644 --- a/hqflt/cg/crt.cg +++ b/hqflt/cg/crt.cg @@ -52,7 +52,7 @@ output main_fragment(float2 texCoord : TEXCOORD0, uniform sampler2D decal : TEXU float2 rubyTextureSize = IN.texture_size; float2 xy = barrelDistortion(texCoord.xy); - float2 one = 0.999/rubyTextureSize; + float2 one = 1.0/rubyTextureSize; xy = xy + float2(0.0 , -0.5 * (phase + (1-phase) * rubyInputSize.y/rubyOutputSize.y) * one.y); float4 texels[8]; texels[0] = TEX2D(xy + float2(-one.x,0.0)); diff --git a/settings.c b/settings.c index 015e885a51..0288dd3dd6 100644 --- a/settings.c +++ b/settings.c @@ -120,9 +120,9 @@ void parse_config(void) const char *home = getenv("HOME"); if (xdg) { - char conf_path[strlen(xdg) + strlen("/ssnes ")]; + char conf_path[strlen(xdg) + strlen("/ssnes/ssnes.cfg ")]; strcpy(conf_path, xdg); - strcat(conf_path, "/ssnes"); + strcat(conf_path, "/ssnes/ssnes.cfg"); conf = config_file_new(conf_path); } else if (home) diff --git a/ssnes.c b/ssnes.c index 8cbac9190e..cc0c518b10 100644 --- a/ssnes.c +++ b/ssnes.c @@ -195,7 +195,7 @@ static void print_help(void) puts("Usage: ssnes [rom file] [-h/--help | -s/--save]"); puts("\t-h/--help: Show this help message"); puts("\t-s/--save: Path for save file (*.srm). Required when rom is input from stdin"); - puts("\t-c/--config: Path for config file. Defaults to $XDG_CONFIG_HOME/ssnes"); + puts("\t-c/--config: Path for config file. Defaults to $XDG_CONFIG_HOME/ssnes/ssnes.cfg"); puts("\t-v/--verbose: Verbose logging"); }