Fix crash when editing character (fixes #184)

Change config default to scale 2x, hqx Fix not loading new config
cxong · Nov 18, 2013 · fdd4ee0 · fdd4ee0
1 parent baa181a
commit fdd4ee0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/cdogs/config.c b/src/cdogs/config.c
@@ -257,6 +257,7 @@ void ConfigLoad(Config *config, const char *filename)
 	case 1:
 	case 2:
 	case 3:
+	case 4:
 		ConfigLoadJSON(config, filename);
 		break;
 	default:
@@ -292,9 +293,9 @@ void ConfigLoadDefault(Config *config)
 	config->Graphics.Fullscreen = 0;
 	config->Graphics.ResolutionHeight = 240;
 	config->Graphics.ResolutionWidth = 320;
-	config->Graphics.ScaleFactor = 1;
+	config->Graphics.ScaleFactor = 2;
 	config->Graphics.ShakeMultiplier = 1;
-	config->Graphics.ScaleMode = SCALE_MODE_NN;
+	config->Graphics.ScaleMode = SCALE_MODE_HQX;
 	config->Input.PlayerKeys[0].Keys.left = SDLK_LEFT;
 	config->Input.PlayerKeys[0].Keys.right = SDLK_RIGHT;
 	config->Input.PlayerKeys[0].Keys.up = SDLK_UP;

diff --git a/src/player_select_menus.c b/src/player_select_menus.c
@@ -503,7 +503,7 @@ void PlayerSelectMenusCreate(
 {
 	MenuSystem *ms = &menu->ms;
 	PlayerSelectMenuData *data = &menu->data;
-	struct PlayerData *p = data->display.pData;
+	struct PlayerData *p = pData;
 	Vec2i pos = Vec2iZero();
 	Vec2i size = Vec2iZero();
 	int w = graphics->cachedConfig.ResolutionWidth;