Start moving game data into a fatty struct
This commit is contained in:
@@ -20,13 +20,13 @@ ErrorContext *load_start_bgm(char *fname)
|
||||
|
||||
SDL_snprintf((char *)&tmpstr->data, MAX_STRING_LENGTH, "%s%s", SDL_GetBasePath(), fname);
|
||||
SDL_Log("Loading music asset from %s", (char *)&tmpstr->data);
|
||||
bgm = MIX_LoadAudio(GAME_mixer, (char *)&tmpstr->data, true);
|
||||
bgm = MIX_LoadAudio(game.mixer, (char *)&tmpstr->data, true);
|
||||
FAIL_ZERO_BREAK(errctx, bgm, ERR_NULLPOINTER, "Failed to load music asset %s : %s", (char *)&tmpstr->data, SDL_GetError());
|
||||
|
||||
bgmtrack = MIX_CreateTrack(GAME_mixer);
|
||||
bgmtrack = MIX_CreateTrack(game.mixer);
|
||||
FAIL_ZERO_BREAK(errctx, bgmtrack, ERR_NULLPOINTER, "Failed to create audio track for background music: %s", SDL_GetError());
|
||||
|
||||
GAME_tracks[GAME_AUDIO_TRACK_BGM] = bgmtrack;
|
||||
game.tracks[GAME_AUDIO_TRACK_BGM] = bgmtrack;
|
||||
|
||||
FAIL_ZERO_BREAK(
|
||||
errctx,
|
||||
|
||||
Reference in New Issue
Block a user