for (i = 0; i < s->count; i++)
{
l = &level_v[i];
- put_score(fout, &l->time_score);
- put_score(fout, &l->goal_score);
- put_score(fout, &l->coin_score);
+ put_score(fout, &l->score.best_times);
+ put_score(fout, &l->score.unlock_goal);
+ put_score(fout, &l->score.most_coins);
}
fclose(fout);
(strlen(states) == s->count));
for (i = 0; i < s->count && res; i++)
{
- if (states[i] == 'L')
+ switch (states[i])
{
+ case 'L':
level_v[i].is_locked = 1;
level_v[i].is_completed = 0;
- }
- else if (states[i] == 'C')
- {
+ break;
+
+ case 'C':
level_v[i].is_locked = 0;
level_v[i].is_completed = 1;
- }
- else if (states[i] == 'O')
- {
+ break;
+
+ case 'O':
level_v[i].is_locked = 0;
level_v[i].is_completed = 0;
- }
- else
+ break;
+
+ default:
res = 0;
+ }
}
res = res &&
for (i = 0; i < s->count && res; i++)
{
l = &level_v[i];
- res = get_score(fin, &l->time_score) &&
- get_score(fin, &l->goal_score) &&
- get_score(fin, &l->coin_score);
+ res = get_score(fin, &l->score.best_times) &&
+ get_score(fin, &l->score.unlock_goal) &&
+ get_score(fin, &l->score.most_coins);
}
fclose(fin);
if (!res && errno != ENOENT)
{
- fprintf(stderr, _("Error while loading user high-score file '%s': "),
- fn);
- if (errno)
- perror(NULL);
- else
- fprintf(stderr, _("Incorrect format\n"));
+ fprintf(stderr,
+ _("Error while loading user high-score file '%s': %s\n"),
+ fn, errno ? strerror(errno) : _("Incorrect format"));
}
}
-static char *chomp(char *str)
/* Remove trailing \n if any */
+
+static char *chomp(char *str)
{
char *p = str + strlen(str) - 1;
- if (p >= str && *p == '\n') *p = 0;
+ if (p >= str && *p == '\n')
+ *p = 0;
return str;
}
static int set_load(struct set *s, const char *filename)
{
FILE *fin;
-
char buf[MAXSTR];
int res;
fin = fopen(config_data(filename), "r");
+
if (!fin)
{
- fprintf(stderr, _("Cannot load the set file '%s':"), filename);
- perror(NULL);
+ fprintf(stderr, _("Cannot load the set file '%s': %s\n"),
+ filename, strerror(errno));
return 0;
}
/* Load set metadata. */
- strcpy(s->file, config_data(filename));
+ strcpy(s->file, filename);
if ((res = fgets(buf, MAXSTR, fin) != NULL))
strcpy(s->name, chomp(buf));
void set_init()
{
- struct set *set;
FILE *fin;
-
+ struct set *set;
char filename[MAXSTR];
- int res;
current_set = NULL;
-
count = 0;
if ((fin = fopen(config_data(SET_FILE), "r")))
{
- res = 1;
- while (count < MAXSET && res)
+ while (count < MAXSET && fgets(filename, MAXSTR, fin))
{
+ chomp(filename);
set = &(set_v[count]);
- res = (fgets(filename, MAXSTR, fin) != NULL);
- if (res)
+ if (set_load(set, filename))
{
- chomp(filename);
-
- res = set_load(set, filename);
- if (res)
- {
- set->number = count;
- count++;
- }
+ set->number = count;
+ count++;
}
}
-
fclose(fin);
}
}
int i = 0, res;
int nb = 1, bnb = 1;
- if ((fin = fopen(current_set->file, "r")))
+ if ((fin = fopen(config_data(current_set->file), "r")))
{
res = 1;
res = (fscanf(fin, "%s", name) == 1);
assert(res);
- level_load(config_data(name), l);
+ level_load(name, l);
/* Initialize set related info */
l->set = current_set;
l->number = i;
if (l->is_bonus)
- sprintf(l->numbername, _("B%d"), bnb++);
+ sprintf(l->repr, _("B%d"), bnb++);
else
- sprintf(l->numbername, "%02d", nb++);
+ sprintf(l->repr, "%02d", nb++);
l->is_locked = 1;
l->is_completed = 0;
}
int coins = lg->coins;
struct level *l = &level_v[lg->level->number];
- lg->time_rank = score_time_insert(&l->time_score, player, timer, coins);
+ lg->time_rank = score_time_insert(&l->score.best_times,
+ player, timer, coins);
if (lg->mode == MODE_CHALLENGE || lg->mode == MODE_NORMAL)
- lg->goal_rank = score_time_insert(&l->goal_score, player, timer, coins);
+ lg->goal_rank = score_time_insert(&l->score.unlock_goal,
+ player, timer, coins);
else
lg->goal_rank = 3;
- lg->coin_rank = score_coin_insert(&l->coin_score, player, timer, coins);
+ lg->coin_rank = score_coin_insert(&l->score.most_coins,
+ player, timer, coins);
return (lg->time_rank < 3 || lg->goal_rank < 3 || lg->coin_rank < 3);
}
#define UPDATE(i, x) (strncpy((x).player[(i)], player, MAXNAM))
struct set *s = current_set;
struct level *l = &level_v[lg->level->number];
- UPDATE(lg->time_rank, l->time_score);
- UPDATE(lg->goal_rank, l->goal_score);
- UPDATE(lg->coin_rank, l->coin_score);
+ UPDATE(lg->time_rank, l->score.best_times);
+ UPDATE(lg->goal_rank, l->score.unlock_goal);
+ UPDATE(lg->coin_rank, l->score.most_coins);
UPDATE(lg->score_rank, s->coin_score);
UPDATE(lg->times_rank, s->time_score);
set_store_hs();