OpenTyrian: allow to configure screen joystick in settings

This commit is contained in:
pelya
2014-06-15 22:01:46 +03:00
parent 9801410f17
commit 0829eaa3e4
8 changed files with 65 additions and 112 deletions

View File

@@ -212,8 +212,7 @@ JE_SaveFilesType saveFiles; /*array[1..saveLevelnum] of savefiletype;*/
JE_SaveGameTemp saveTemp;
JE_word editorLevel; /*Initial value 800*/
AutoFireMode_t autoFireMode = AUTOFIRE_TOUCHSCREEN;
TouchscreenMode_t touchscreenMode = TOUCHSCREEN_SHIP_ABOVE_FINGER;
TouchscreenControlMode_t touchscreenControlMode = TOUCHSCREEN_CONTROL_FINGER;
cJSON *load_json( const char *filename )
{
@@ -274,11 +273,8 @@ bool load_opentyrian_config( void )
if ((setting = cJSON_GetObjectItem(section, "scaler")))
set_scaler_by_name(setting->valuestring);
if ((setting = cJSON_GetObjectItem(section, "autofire")))
autoFireMode = (AutoFireMode_t)setting->valueint;
if ((setting = cJSON_GetObjectItem(section, "touchscreen")))
touchscreenMode = (TouchscreenMode_t)setting->valueint;
if ((setting = cJSON_GetObjectItem(section, "touchscreenmode")))
touchscreenControlMode = setting->valueint;
}
cJSON_Delete(root);
@@ -306,11 +302,8 @@ bool save_opentyrian_config( void )
setting = cJSON_CreateOrGetObjectItem(section, "scaler");
cJSON_SetString(setting, scalers[scaler].name);
setting = cJSON_CreateOrGetObjectItem(section, "autofire");
cJSON_SetNumber(setting, autoFireMode);
setting = cJSON_CreateOrGetObjectItem(section, "touchscreen");
cJSON_SetNumber(setting, touchscreenMode);
setting = cJSON_CreateOrGetObjectItem(section, "touchscreenmode");
cJSON_SetNumber(setting, touchscreenControlMode);
}
save_json(root, "opentyrian.conf");