convert all name function from oldName to new_name

1 files changed, 181 insertions, 181 deletions

diff --git a/src/screen/setting.c b/src/screen/setting.c
index 1895ec2..d5c5c1a 100644
--- a/src/screen/setting.c
+++ b/src/screen/setting.c
@@ -81,107 +81,107 @@ static textFile_t *configFile;
 
 static void hotkey_escape()
 {
-	setScreen("mainMenu");
+	screen_set("mainMenu");
 }
 
-void startScreenSetting()
+void screen_startSetting()
 {
 #ifndef NO_SOUND
-	playMusic("menu", MUSIC_GROUP_BASE);
+	music_play("menu", MUSIC_GROUP_BASE);
 #endif
 
-	registerHotKey(SDLK_ESCAPE, hotkey_escape);
+	hotKey_register(SDLK_ESCAPE, hotkey_escape);
 }
 
-void drawScreenSetting()
+void setting_draw()
 {
 	int i;
 
-	drawWidgetImage(image_backgorund);
+	wid_image_draw(image_backgorund);
 
-	drawWidgetLabel(label_count_round);
-	drawWidgetLabel(label_name_player1);
-	drawWidgetLabel(label_ai);
+	label_draw(label_count_round);
+	label_draw(label_name_player1);
+	label_draw(label_ai);
 
 #ifndef NO_SOUND
-	drawWidgetLabel(label_music);
-	drawWidgetLabel(label_sound);
+	label_draw(label_music);
+	label_draw(label_sound);
 #endif
 
-	drawWidgetTextfield(textfield_count_cound);
-	drawWidgetTextfield(textfield_name_player1);
+	textField_draw(textfield_count_cound);
+	textField_draw(textfield_name_player1);
 
-	if (getWidgetCheckStatus(check_ai) == FALSE) {
-		drawWidgetLabel(label_name_player2);
-		drawWidgetTextfield(textfield_name_player2);
+	if (check_get_status(check_ai) == FALSE) {
+		label_draw(label_name_player2);
+		textField_draw(textfield_name_player2);
 	}
 
-	drawWidgetImage(image_gun_dual_revolver);
-	drawWidgetImage(image_gun_scatter);
-	drawWidgetImage(image_gun_tommy);
-	drawWidgetImage(image_gun_lasser);
-	drawWidgetImage(image_gun_mine);
-	drawWidgetImage(image_gun_bombball);
+	wid_image_draw(image_gun_dual_revolver);
+	wid_image_draw(image_gun_scatter);
+	wid_image_draw(image_gun_tommy);
+	wid_image_draw(image_gun_lasser);
+	wid_image_draw(image_gun_mine);
+	wid_image_draw(image_gun_bombball);
 
-	drawWidgetImage(image_bonus_speed);
-	drawWidgetImage(image_bonus_shot);
-	drawWidgetImage(image_bonus_teleport);
-	drawWidgetImage(image_bonus_ghost);
-	drawWidgetImage(image_bonus_4x);
-	drawWidgetImage(image_bonus_hidden);
+	wid_image_draw(image_bonus_speed);
+	wid_image_draw(image_bonus_shot);
+	wid_image_draw(image_bonus_teleport);
+	wid_image_draw(image_bonus_ghost);
+	wid_image_draw(image_bonus_4x);
+	wid_image_draw(image_bonus_hidden);
 
 #ifndef NO_SOUND
-	drawWidgetCheck(check_music);
-	drawWidgetCheck(check_sound);
+	check_draw(check_music);
+	check_draw(check_sound);
 #endif
 
 	for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) {
-		drawWidgetCheck(check[i]);
+		check_draw(check[i]);
 	}
 
 	for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) {
-		drawWidgetCheck(check[i]);
+		check_draw(check[i]);
 	}
 
-	drawWidgetCheck(check_ai);
+	check_draw(check_ai);
 
-	drawWidgetButton(button_back);
-	drawWidgetButton(button_keys);
+	button_draw(button_back);
+	button_draw(button_keys);
 }
 
-void eventScreenSetting()
+void setting_event()
 {
 	int i;
 
-	eventWidgetTextfield(textfield_count_cound);
-	eventWidgetTextfield(textfield_name_player1);
+	textField_event(textfield_count_cound);
+	textField_event(textfield_name_player1);
 
-	if (getWidgetCheckStatus(check_ai) == FALSE) {
-		eventWidgetTextfield(textfield_name_player2);
+	if (check_get_status(check_ai) == FALSE) {
+		textField_event(textfield_name_player2);
 	}
 
 #ifndef NO_SOUND
-	eventWidgetCheck(check_music);
-	eventWidgetCheck(check_sound);
+	check_event(check_music);
+	check_event(check_sound);
 #endif
 
 	for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) {
-		eventWidgetCheck(check[i]);
+		check_event(check[i]);
 	}
 
 	for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) {
-		eventWidgetCheck(check[i]);
+		check_event(check[i]);
 	}
 
-	eventWidgetCheck(check_ai);
+	check_event(check_ai);
 
-	eventWidgetButton(button_back);
-	eventWidgetButton(button_keys);
+	button_event(button_back);
+	button_event(button_keys);
 }
 
 void stopScreenSetting()
 {
-	unregisterHotKey(SDLK_ESCAPE);
+	unhotKey_register(SDLK_ESCAPE);
 }
 
 static void eventWidget(void *p)
@@ -193,20 +193,20 @@ static void eventWidget(void *p)
 	my_check = (widget_t *) (p);
 
 	if (my_button == button_back) {
-		setScreen("mainMenu");
+		screen_set("mainMenu");
 	}
 
 	if (my_button == button_keys) {
-		setScreen("settingKeys");
+		screen_set("settingKeys");
 	}
 
 #ifndef NO_SOUND
 	if (my_check == check_music) {
-		setMusicActive(getWidgetCheckStatus(check_music));
+		music_set_active(check_get_status(check_music));
 	}
 
 	if (my_check == check_sound) {
-		setSoundActive(getWidgetCheckStatus(check_sound));
+		sound_set_active(check_get_status(check_sound));
 	}
 #endif
 }
@@ -216,15 +216,15 @@ static void initSettingFile()
 	char path[STR_PATH_SIZE];
 	char val[STR_SIZE];
 
-	sprintf(path, "%s/tuxanci.conf", getHomeDirector());
+	sprintf(path, "%s/tuxanci.conf", homeDirector_get());
 
-	configFile = loadTextFile(path);
+	configFile = textFile_load(path);
 
 	if (configFile == NULL) {
 		fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path);
 		fprintf(stderr, _("Creating: \"%s\"\n"), path);
 
-		configFile = newTextFile(path);
+		configFile = textFile_new(path);
 	}
 
 	if (configFile == NULL) {
@@ -233,59 +233,59 @@ static void initSettingFile()
 	}
 
 	loadValueFromConfigFile(configFile, "COUNT_ROUND", val, STR_SIZE, "15");
-	setWidgetTextFiledText(textfield_count_cound, val);
+	textField_set_text(textfield_count_cound, val);
 
 	loadValueFromConfigFile(configFile, "NAME_PLAYER_RIGHT", val, STR_SIZE,
 							NAME_PLAYER_RIGHT);
-	setWidgetTextFiledText(textfield_name_player1, val);
+	textField_set_text(textfield_name_player1, val);
 
 	loadValueFromConfigFile(configFile, "NAME_PLAYER_LEFT", val, STR_SIZE,
 							NAME_PLAYER_LEFT);
-	setWidgetTextFiledText(textfield_name_player2, val);
+	textField_set_text(textfield_name_player2, val);
 
 	loadValueFromConfigFile(configFile, "GUN_DUAL_SIMPLE", val, STR_SIZE,
 							"YES");
-	setWidgetCheckStatus(check[GUN_DUAL_SIMPLE], isYesOrNO(val));
+	check_set_status(check[GUN_DUAL_SIMPLE], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "GUN_SCATTER", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[GUN_SCATTER], isYesOrNO(val));
+	check_set_status(check[GUN_SCATTER], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "GUN_TOMMY", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[GUN_TOMMY], isYesOrNO(val));
+	check_set_status(check[GUN_TOMMY], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "GUN_LASSER", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[GUN_LASSER], isYesOrNO(val));
+	check_set_status(check[GUN_LASSER], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "GUN_MINE", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[GUN_MINE], isYesOrNO(val));
+	check_set_status(check[GUN_MINE], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "GUN_BOMBBALL", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[GUN_BOMBBALL], isYesOrNO(val));
+	check_set_status(check[GUN_BOMBBALL], isYesOrNO(val));
 
 	loadValueFromConfigFile(configFile, "BONUS_SPEED", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[BONUS_SPEED], isYesOrNO(val));
+	check_set_status(check[BONUS_SPEED], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "BONUS_SHOT", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[BONUS_SHOT], isYesOrNO(val));
+	check_set_status(check[BONUS_SHOT], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "BONUS_TELEPORT", val, STR_SIZE,
 							"YES");
-	setWidgetCheckStatus(check[BONUS_TELEPORT], isYesOrNO(val));
+	check_set_status(check[BONUS_TELEPORT], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "BONUS_GHOST", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[BONUS_GHOST], isYesOrNO(val));
+	check_set_status(check[BONUS_GHOST], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "BONUS_4X", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[BONUS_4X], isYesOrNO(val));
+	check_set_status(check[BONUS_4X], isYesOrNO(val));
 	loadValueFromConfigFile(configFile, "BONUS_HIDDEN", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check[BONUS_HIDDEN], isYesOrNO(val));
+	check_set_status(check[BONUS_HIDDEN], isYesOrNO(val));
 
 	loadValueFromConfigFile(configFile, "AI", val, STR_SIZE, "NO");
-	setWidgetCheckStatus(check_ai, isYesOrNO(val));
+	check_set_status(check_ai, isYesOrNO(val));
 
 #ifndef NO_SOUND
 	loadValueFromConfigFile(configFile, "MUSIC", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check_music, isYesOrNO(val));
+	check_set_status(check_music, isYesOrNO(val));
 
 	loadValueFromConfigFile(configFile, "SOUND", val, STR_SIZE, "YES");
-	setWidgetCheckStatus(check_sound, isYesOrNO(val));
+	check_set_status(check_sound, isYesOrNO(val));
 #endif
 
 	loadValueFromConfigFile(configFile, "ARENA", val, STR_SIZE, "FAGN");
-	setChoiceArena(getArenaFileFormNetName(val));
+	choiceArena_set(arenaFile_get_file_format_net_name(val));
 
-	saveTextFile(configFile);
+	textFile_save(configFile);
 }
 
 static void saveAndDestroyConfigFile()
@@ -295,84 +295,84 @@ static void saveAndDestroyConfigFile()
 		return;
 	}
 
-	setValueInConfigFile(configFile, "COUNT_ROUND",  getTextFromWidgetTextfield(textfield_count_cound));
-	setValueInConfigFile(configFile, "NAME_PLAYER_RIGHT", getTextFromWidgetTextfield(textfield_name_player1));
-	setValueInConfigFile(configFile, "NAME_PLAYER_LEFT", getTextFromWidgetTextfield(textfield_name_player2));
-	setValueInConfigFile(configFile, "GUN_DUAL_SIMPLE", getYesOrNo(getWidgetCheckStatus(check[GUN_DUAL_SIMPLE])));
-	setValueInConfigFile(configFile, "GUN_SCATTER", getYesOrNo(getWidgetCheckStatus(check[GUN_SCATTER])));
-	setValueInConfigFile(configFile, "GUN_TOMMY", getYesOrNo(getWidgetCheckStatus(check[GUN_TOMMY])));
-	setValueInConfigFile(configFile, "GUN_LASSER", getYesOrNo(getWidgetCheckStatus(check[GUN_LASSER])));
-	setValueInConfigFile(configFile, "GUN_MINE", getYesOrNo(getWidgetCheckStatus(check[GUN_MINE])));
-	setValueInConfigFile(configFile, "GUN_BOMBBALL", getYesOrNo(getWidgetCheckStatus(check[GUN_BOMBBALL])));
-	setValueInConfigFile(configFile, "BONUS_SPEED", getYesOrNo(getWidgetCheckStatus(check[BONUS_SPEED])));
-	setValueInConfigFile(configFile, "BONUS_SHOT", getYesOrNo(getWidgetCheckStatus(check[BONUS_SHOT])));
-	setValueInConfigFile(configFile, "BONUS_TELEPORT", getYesOrNo(getWidgetCheckStatus (check[BONUS_TELEPORT])));
-	setValueInConfigFile(configFile, "BONUS_GHOST", getYesOrNo(getWidgetCheckStatus(check[BONUS_GHOST])));
-	setValueInConfigFile(configFile, "BONUS_4X", getYesOrNo(getWidgetCheckStatus(check[BONUS_4X])));
-	setValueInConfigFile(configFile, "BONUS_HIDDEN", getYesOrNo(getWidgetCheckStatus(check[BONUS_HIDDEN])));
-	setValueInConfigFile(configFile, "AI", getYesOrNo(getWidgetCheckStatus(check_ai)));
+	setValueInConfigFile(configFile, "COUNT_ROUND",  textField_get_text(textfield_count_cound));
+	setValueInConfigFile(configFile, "NAME_PLAYER_RIGHT", textField_get_text(textfield_name_player1));
+	setValueInConfigFile(configFile, "NAME_PLAYER_LEFT", textField_get_text(textfield_name_player2));
+	setValueInConfigFile(configFile, "GUN_DUAL_SIMPLE", getYesOrNo(check_get_status(check[GUN_DUAL_SIMPLE])));
+	setValueInConfigFile(configFile, "GUN_SCATTER", getYesOrNo(check_get_status(check[GUN_SCATTER])));
+	setValueInConfigFile(configFile, "GUN_TOMMY", getYesOrNo(check_get_status(check[GUN_TOMMY])));
+	setValueInConfigFile(configFile, "GUN_LASSER", getYesOrNo(check_get_status(check[GUN_LASSER])));
+	setValueInConfigFile(configFile, "GUN_MINE", getYesOrNo(check_get_status(check[GUN_MINE])));
+	setValueInConfigFile(configFile, "GUN_BOMBBALL", getYesOrNo(check_get_status(check[GUN_BOMBBALL])));
+	setValueInConfigFile(configFile, "BONUS_SPEED", getYesOrNo(check_get_status(check[BONUS_SPEED])));
+	setValueInConfigFile(configFile, "BONUS_SHOT", getYesOrNo(check_get_status(check[BONUS_SHOT])));
+	setValueInConfigFile(configFile, "BONUS_TELEPORT", getYesOrNo(check_get_status (check[BONUS_TELEPORT])));
+	setValueInConfigFile(configFile, "BONUS_GHOST", getYesOrNo(check_get_status(check[BONUS_GHOST])));
+	setValueInConfigFile(configFile, "BONUS_4X", getYesOrNo(check_get_status(check[BONUS_4X])));
+	setValueInConfigFile(configFile, "BONUS_HIDDEN", getYesOrNo(check_get_status(check[BONUS_HIDDEN])));
+	setValueInConfigFile(configFile, "AI", getYesOrNo(check_get_status(check_ai)));
 
 #ifndef NO_SOUND
-	setValueInConfigFile(configFile, "MUSIC", getYesOrNo(getWidgetCheckStatus(check_music)));
-	setValueInConfigFile(configFile, "SOUND", getYesOrNo(getWidgetCheckStatus(check_sound)));
+	setValueInConfigFile(configFile, "MUSIC", getYesOrNo(check_get_status(check_music)));
+	setValueInConfigFile(configFile, "SOUND", getYesOrNo(check_get_status(check_sound)));
 #endif
 
-	if( getChoiceArena() != NULL )
+	if( choiceArena_get() != NULL )
 	{
-		setValueInConfigFile(configFile, "ARENA", getArenaNetName(getChoiceArena()));
+		setValueInConfigFile(configFile, "ARENA", arenaFile_get_net_name(choiceArena_get()));
 	}
 	//TODO
 
-	saveTextFile(configFile);
-	destroyTextFile(configFile);
+	textFile_save(configFile);
+	textFile_destroy(configFile);
 }
 
-void initScreenSetting()
+void setting_init()
 {
 	image_t *image;
 	int i;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
-	image_backgorund = newWidgetImage(0, 0, image);
+	image = image_get(IMAGE_GROUP_BASE, "screen_main");
+	image_backgorund = wid_image_new(0, 0, image);
 
-	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget);
+	button_back = button_new(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget);
 
-	button_keys = newWidgetButton(_("controls"), WINDOW_SIZE_X - 200,
+	button_keys = button_new(_("controls"), WINDOW_SIZE_X - 200,
 				      button_back->y - WIDGET_BUTTON_HEIGHT - 10, eventWidget);
 
 #ifndef NO_SOUND
-	label_music = newWidgetLabel(_("Music:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT);
+	label_music = label_new(_("Music:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT);
 
-	check_music = newWidgetCheck(label_music->x + label_music->w + 10,
-				     WINDOW_SIZE_Y - 80, isMusicActive(), eventWidget);
-	label_sound = newWidgetLabel(_("Sound:"), check_music->x + WIDGET_CHECK_WIDTH + 10,
+	check_music = check_new(label_music->x + label_music->w + 10,
+				     WINDOW_SIZE_Y - 80, music_is_active(), eventWidget);
+	label_sound = label_new(_("Sound:"), check_music->x + WIDGET_CHECK_WIDTH + 10,
 				     WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT);
 
-	check_sound = newWidgetCheck(label_sound->x + label_sound->w + 10,
-				     WINDOW_SIZE_Y - 80, isSoundActive(), eventWidget);
+	check_sound = check_new(label_sound->x + label_sound->w + 10,
+				     WINDOW_SIZE_Y - 80, sound_is_active(), eventWidget);
 
-	label_ai = newWidgetLabel(_("AI:"), check_sound->x + WIDGET_CHECK_WIDTH + 10,
+	label_ai = label_new(_("AI:"), check_sound->x + WIDGET_CHECK_WIDTH + 10,
 			 	  WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT);
 #else
-	label_ai = newWidgetLabel(_("AI:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT);
+	label_ai = label_new(_("AI:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT);
 #endif
 
-	check_ai = newWidgetCheck(label_ai->x + label_ai->w + 10, WINDOW_SIZE_Y - 80, FALSE, eventWidget);
+	check_ai = check_new(label_ai->x + label_ai->w + 10, WINDOW_SIZE_Y - 80, FALSE, eventWidget);
 
-	label_count_round = newWidgetLabel(_("No. of rounds:"), 100, WINDOW_SIZE_Y - 200, WIDGET_LABEL_LEFT);
-	label_name_player1 = newWidgetLabel(_("Player 1:"), 100, WINDOW_SIZE_Y - 160, WIDGET_LABEL_LEFT);
-	label_name_player2 = newWidgetLabel(_("Player 2:"), 100, WINDOW_SIZE_Y - 120, WIDGET_LABEL_LEFT);
+	label_count_round = label_new(_("No. of rounds:"), 100, WINDOW_SIZE_Y - 200, WIDGET_LABEL_LEFT);
+	label_name_player1 = label_new(_("Player 1:"), 100, WINDOW_SIZE_Y - 160, WIDGET_LABEL_LEFT);
+	label_name_player2 = label_new(_("Player 2:"), 100, WINDOW_SIZE_Y - 120, WIDGET_LABEL_LEFT);
 
-	textfield_count_cound = newWidgetTextfield(getParamElse("--count", "15"),
+	textfield_count_cound = textField_new(getParamElse("--count", "15"),
 				WIDGET_TEXTFIELD_FILTER_NUM,
 				110 + label_count_round->w,
 				 WINDOW_SIZE_Y - 200);
 
-	textfield_name_player1 = newWidgetTextfield(getParamElse("--name1", NAME_PLAYER_RIGHT),
+	textfield_name_player1 = textField_new(getParamElse("--name1", NAME_PLAYER_RIGHT),
 				WIDGET_TEXTFIELD_FILTER_ALPHANUM,
 				110 + label_count_round->w, WINDOW_SIZE_Y - 160);
 
-	textfield_name_player2 = newWidgetTextfield(getParamElse("--name2", NAME_PLAYER_LEFT),
+	textfield_name_player2 = textField_new(getParamElse("--name2", NAME_PLAYER_LEFT),
 				WIDGET_TEXTFIELD_FILTER_ALPHANUM,
 				110 + label_count_round->w, WINDOW_SIZE_Y - 120);
 
@@ -390,7 +390,7 @@ void initScreenSetting()
 			y = 200 + (i - GUN_LASSER) * 50;
 		}
 
-		check[i] = newWidgetCheck(x, y, TRUE, NULL);
+		check[i] = check_new(x, y, TRUE, NULL);
 	}
 
 	for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) {
@@ -407,24 +407,24 @@ void initScreenSetting()
 			y = 200 + (i - BONUS_GHOST) * 50;
 		}
 
-		check[i] = newWidgetCheck(x, y, TRUE, NULL);
+		check[i] = check_new(x, y, TRUE, NULL);
 	}
 
-	image_gun_dual_revolver = newWidgetImage(110 + WIDGET_CHECK_WIDTH, 200, getImage(IMAGE_GROUP_BASE, "panel_dual"));
-	image_gun_scatter = newWidgetImage(110 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_scatter"));
-	image_gun_tommy = newWidgetImage(110 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_tommy"));
-	image_gun_lasser = newWidgetImage(260 + WIDGET_CHECK_WIDTH, 200,getImage(IMAGE_GROUP_BASE, "panel_lasser"));
-	image_gun_mine = newWidgetImage(260 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_mine"));
-	image_gun_bombball = newWidgetImage(260 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_bombball"));
-	image_bonus_speed = newWidgetImage(430 + WIDGET_CHECK_WIDTH, 200, getImage(IMAGE_GROUP_BASE, "panel_speed"));;
-	image_bonus_shot = newWidgetImage(430 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_shot"));;
-	image_bonus_teleport = newWidgetImage(430 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_teleport"));;
-	image_bonus_ghost = newWidgetImage(580 + WIDGET_CHECK_WIDTH, 200, getImage(IMAGE_GROUP_BASE, "panel_ghost"));;
-	image_bonus_4x = newWidgetImage(580 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_4x"));;
-	image_bonus_hidden = newWidgetImage(580 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_hidden"));;
-
-	registerScreen( newScreen("setting", startScreenSetting, eventScreenSetting,
-			drawScreenSetting, stopScreenSetting));
+	image_gun_dual_revolver = wid_image_new(110 + WIDGET_CHECK_WIDTH, 200, image_get(IMAGE_GROUP_BASE, "panel_dual"));
+	image_gun_scatter = wid_image_new(110 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_scatter"));
+	image_gun_tommy = wid_image_new(110 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_tommy"));
+	image_gun_lasser = wid_image_new(260 + WIDGET_CHECK_WIDTH, 200,image_get(IMAGE_GROUP_BASE, "panel_lasser"));
+	image_gun_mine = wid_image_new(260 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_mine"));
+	image_gun_bombball = wid_image_new(260 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_bombball"));
+	image_bonus_speed = wid_image_new(430 + WIDGET_CHECK_WIDTH, 200, image_get(IMAGE_GROUP_BASE, "panel_speed"));;
+	image_bonus_shot = wid_image_new(430 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_shot"));;
+	image_bonus_teleport = wid_image_new(430 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_teleport"));;
+	image_bonus_ghost = wid_image_new(580 + WIDGET_CHECK_WIDTH, 200, image_get(IMAGE_GROUP_BASE, "panel_ghost"));;
+	image_bonus_4x = wid_image_new(580 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_4x"));;
+	image_bonus_hidden = wid_image_new(580 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_hidden"));;
+
+	screen_register( screen_new("setting", screen_startSetting, setting_event,
+			setting_draw, stopScreenSetting));
 
 	initSettingFile();
 
@@ -434,42 +434,42 @@ void initScreenSetting()
 #endif
 }
 
-void getSettingNameRight(char *s)
+void publicServer_get_settingNameRight(char *s)
 {
-	strcpy(s, getTextFromWidgetTextfield(textfield_name_player1));
+	strcpy(s, textField_get_text(textfield_name_player1));
 }
 
-void getSettingNameLeft(char *s)
+void publicServer_get_settingNameLeft(char *s)
 {
-	if (getWidgetCheckStatus(check_ai)) {
+	if (check_get_status(check_ai)) {
 		strcpy(s, NAME_AI);
 	} else {
-		strcpy(s, getTextFromWidgetTextfield(textfield_name_player2));
+		strcpy(s, textField_get_text(textfield_name_player2));
 	}
 }
 
-void getSettingCountRound(int *n)
+void publicServer_get_settingCountRound(int *n)
 {
-	*n = atoi(getTextFromWidgetTextfield(textfield_count_cound));
+	*n = atoi(textField_get_text(textfield_count_cound));
 }
 
-bool_t isSettingAI()
+bool_t setting_is_ai()
 {
-	return getWidgetCheckStatus(check_ai);
+	return check_get_status(check_ai);
 }
 
-bool_t isSettingAnyItem()
+bool_t setting_is_any_item()
 {
 	int i;
 
 	for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) {
-		if (getWidgetCheckStatus(check[i]) == TRUE) {
+		if (check_get_status(check[i]) == TRUE) {
 			return TRUE;
 		}
 	}
 
 	for (i = BONUS_SPEED; i < BONUS_HIDDEN; i++) {
-		if (getWidgetCheckStatus(check[i]) == TRUE) {
+		if (check_get_status(check[i]) == TRUE) {
 			return TRUE;
 		}
 	}
@@ -477,62 +477,62 @@ bool_t isSettingAnyItem()
 	return FALSE;
 }
 
-bool_t isSettingItem(int item)
+bool_t setting_is_item(int item)
 {
-	return getWidgetCheckStatus(check[item]);
+	return check_get_status(check[item]);
 }
 
-void quitScreenSetting()
+void setting_quit()
 {
 	int i;
 
 	saveAndDestroyConfigFile();
 
-	destroyWidgetImage(image_backgorund);
+	wid_image_destroy(image_backgorund);
 
-	destroyWidgetLabel(label_count_round);
-	destroyWidgetLabel(label_name_player1);
-	destroyWidgetLabel(label_ai);
+	label_destroy(label_count_round);
+	label_destroy(label_name_player1);
+	label_destroy(label_ai);
 
 #ifndef NO_SOUND
-	destroyWidgetLabel(label_music);
-	destroyWidgetLabel(label_sound);
+	label_destroy(label_music);
+	label_destroy(label_sound);
 #endif
-	destroyWidgetLabel(label_name_player2);
-	destroyWidgetTextfield(textfield_name_player2);
-
-	destroyWidgetTextfield(textfield_name_player1);
-	destroyWidgetTextfield(textfield_count_cound);
-
-	destroyWidgetImage(image_gun_dual_revolver);
-	destroyWidgetImage(image_gun_scatter);
-	destroyWidgetImage(image_gun_tommy);
-	destroyWidgetImage(image_gun_lasser);
-	destroyWidgetImage(image_gun_mine);
-	destroyWidgetImage(image_gun_bombball);
-
-	destroyWidgetImage(image_bonus_speed);
-	destroyWidgetImage(image_bonus_shot);
-	destroyWidgetImage(image_bonus_teleport);
-	destroyWidgetImage(image_bonus_ghost);
-	destroyWidgetImage(image_bonus_4x);
-	destroyWidgetImage(image_bonus_hidden);
+	label_destroy(label_name_player2);
+	textField_destroy(textfield_name_player2);
+
+	textField_destroy(textfield_name_player1);
+	textField_destroy(textfield_count_cound);
+
+	wid_image_destroy(image_gun_dual_revolver);
+	wid_image_destroy(image_gun_scatter);
+	wid_image_destroy(image_gun_tommy);
+	wid_image_destroy(image_gun_lasser);
+	wid_image_destroy(image_gun_mine);
+	wid_image_destroy(image_gun_bombball);
+
+	wid_image_destroy(image_bonus_speed);
+	wid_image_destroy(image_bonus_shot);
+	wid_image_destroy(image_bonus_teleport);
+	wid_image_destroy(image_bonus_ghost);
+	wid_image_destroy(image_bonus_4x);
+	wid_image_destroy(image_bonus_hidden);
 
 #ifndef NO_SOUND
-	destroyWidgetCheck(check_music);
-	destroyWidgetCheck(check_sound);
+	check_destroy(check_music);
+	check_destroy(check_sound);
 #endif
 
-	destroyWidgetCheck(check_ai);
+	check_destroy(check_ai);
 
 	for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) {
-		destroyWidgetCheck(check[i]);
+		check_destroy(check[i]);
 	}
 
 	for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) {
-		destroyWidgetCheck(check[i]);
+		check_destroy(check[i]);
 	}
 
-	destroyWidgetButton(button_back);
-	destroyWidgetButton(button_keys);
+	button_destroy(button_back);
+	button_destroy(button_keys);
 }