jmv/gtkballs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gtkballs.c: consistent indentation

Browse Source
This commit is contained in:
wdlkmpx 2021-01-14 21:15:59 +08:00
parent efce62f435
commit 751e9cf82e
1 changed files with 127 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/gtkballs.c
View File

@ -25,7 +25,7 @@
gint destroy_lines(gboolean count_score) {
gint i = game_destroy_lines(count_score);
if(count_score && i) {
if (count_score && i) {
gint ml = rules_get_destroy();
gint sc = game_get_score();
gint nsc = sc + ml * 2 + (i - ml) * (i - ml) * 2 + (1 - pref_get_show_next_colors());
@ -53,7 +53,8 @@ gint random_cell(void) {
return (gint)(((gfloat)rules_get_width() * rules_get_height()) * rand() / (RAND_MAX + 1.0));
}
void new_turn(gint number, gboolean first) {
void new_turn(gint number, gboolean first)
{
gint i, k = 0, free_cells_number, c;
struct score_board scoreboard[10];
@ -61,12 +62,12 @@ void new_turn(gint number, gboolean first) {
timer_start();
k = 0;
if(number < rules_get_next()) {
if (number < rules_get_next()) {
number = rules_get_next();
}
if((free_cells_number = game_count_free_cells()) <= number) {
if(!read_score(scoreboard, NULL, NULL) ||
if ((free_cells_number = game_count_free_cells()) <= number) {
if (!read_score(scoreboard, NULL, NULL) ||
game_get_score() > scoreboard[9].score) {
input_name_dialog();
}
@ -76,8 +77,8 @@ void new_turn(gint number, gboolean first) {
do {
i = random_cell();
if(board_get_at_node(i) < 1) {
if(first) {
if (board_get_at_node(i) < 1) {
if (first) {
c = 1 + random_color();
board_set_at_node(i, c);
} else {
@ -88,20 +89,21 @@ void new_turn(gint number, gboolean first) {
continue;
}
/* I hope that k!=0 */
if(k <= rules_get_next()) {
if (k <= rules_get_next()) {
next_set(k - 1, 1 + random_color());
}
} while(k < ((number < free_cells_number) ? number : free_cells_number));
} while (k < ((number < free_cells_number) ? number : free_cells_number));
if(!first) {
if (!first) {
draw_next_balls();
/* if line complete, don't increase user's score--it's not his merit */
destroy_lines(FALSE);
}
} while((free_cells_number = game_count_free_cells()) == rules_get_width() * rules_get_height());
} while ((free_cells_number = game_count_free_cells()) == rules_get_width() * rules_get_height());
}
void new_game(void){
void new_game(void)
{
stop_jumping_animation();
game_init_game(NULL, NULL);
menu_set_sensitive_undo(FALSE);
@ -111,7 +113,9 @@ void new_game(void){
draw_board();
}
int main(int argc, char **argv) {
int main(int argc, char **argv)
{
gint i;
struct timeval tv;
struct timezone tz;
@ -126,7 +130,8 @@ int main(int argc, char **argv) {
#endif /* ENABLE_NLS */
/* drop privileges after spawning child with extra privs */
if(score_setup() == -1) return 1;
if (score_setup() == -1)
return 1;
setregid(getgid(), getgid());
/* initialize random seed */
@ -137,18 +142,18 @@ int main(int argc, char **argv) {
load_preferences();
/* initialize gtk */
gtk_init(&argc, &argv);
gtk_init (&argc, &argv);
/* load theme, fallback to default if specifed theme cannot be loaded */
if(!(i = load_theme(pref_get_theme_name()))) {
if(strcmp(pref_get_theme_name(), pref_get_default_theme_name()) != 0) {
if (!(i = load_theme(pref_get_theme_name()))) {
if (strcmp(pref_get_theme_name(), pref_get_default_theme_name()) != 0) {
err = g_strdup_printf(_("Failed loading theme \"%s\"! Trying \"%s\"\n"), pref_get_theme_name(), pref_get_default_theme_name());
ut_simple_message_box(err);
g_free(err);
pref_set_theme_name(pref_get_default_theme_name());
i = load_theme(pref_get_theme_name());
}
if(!i) {
if (!i) {
err = g_strdup_printf(_("Failed loading theme \"%s\"! Exiting.\n"), pref_get_theme_name());
ut_simple_message_box(err);
g_free(err);
@ -165,7 +170,7 @@ int main(int argc, char **argv) {
remake_board(-1, 1);
/* read and set scores */
if(!read_score(scoreboard, NULL, NULL)) {
if (!read_score(scoreboard, NULL, NULL)) {
ut_simple_message_box(_("Unable to read score.\n"));
}
mw_set_hi_score(scoreboard[0].score);
@ -173,12 +178,12 @@ int main(int argc, char **argv) {
mapfile = g_strconcat(getenv("HOME"), G_DIR_SEPARATOR_S, ".gtkballs",
G_DIR_SEPARATOR_S, "accel.map", NULL);
gtk_accel_map_load(mapfile);
gtk_accel_map_load (mapfile);
/* enter main application loop */
gtk_main();
gtk_accel_map_save(mapfile);
gtk_accel_map_save (mapfile);
return 0;
}