diff --git a/LICENSES b/LICENSES index d50dce4..b2e5a84 100644 --- a/LICENSES +++ b/LICENSES @@ -598,11 +598,10 @@ Details: Tuned down 5 half-notes. ------------------------------------------------------------------------ -music/walking_among_androids.ogg +music/android_oppression.ogg -Author: Zander Noriega -License: CC BY 3.0 -Source: http://opengameart.org/content/walking-among-androids-20 +Author: The Diligent Circle +License: CC0 ------------------------------------------------------------------------ diff --git a/data/credits.txt b/data/credits.txt index b31f1fc..8fde31e 100644 --- a/data/credits.txt +++ b/data/credits.txt @@ -45,7 +45,6 @@ 020 p0ss 020 Berklee 050 +++ MUSIC +++ -030 Zander Noriega 020 maxstack 020 Deceased Superior Technician 020 matthew.pablo diff --git a/music/Makefile.am b/music/Makefile.am index f8ca2e2..146810f 100644 --- a/music/Makefile.am +++ b/music/Makefile.am @@ -6,6 +6,7 @@ musicdir = $(pkgdatadir)/music nobase_dist_music_DATA = \ + android_oppression.ogg \ first_cyber_dance.ogg \ frozen_jam.ogg \ last_cyber_dance.ogg \ @@ -16,8 +17,7 @@ nobase_dist_music_DATA = \ rise_of_spirit.ogg \ sound_and_silence.ogg \ space_dimensions.ogg \ - through_space.ogg \ - walking_among_androids.ogg + through_space.ogg EXTRA_DIST = sources diff --git a/music/android_oppression.ogg b/music/android_oppression.ogg new file mode 100644 index 0000000..0d05b91 Binary files /dev/null and b/music/android_oppression.ogg differ diff --git a/music/sources/android_oppression.mmpz b/music/sources/android_oppression.mmpz new file mode 100644 index 0000000..3b08f80 Binary files /dev/null and b/music/sources/android_oppression.mmpz differ diff --git a/music/walking_among_androids.ogg b/music/walking_among_androids.ogg deleted file mode 100644 index 67ccfd7..0000000 Binary files a/music/walking_among_androids.ogg and /dev/null differ diff --git a/src/defs.h b/src/defs.h index 8335f7b..171609a 100644 --- a/src/defs.h +++ b/src/defs.h @@ -555,8 +555,10 @@ enum { // Text sprites enum { // Main menu - TS_PRESENTS = MAX_INFOLINES, + TS_DILIGENTCIRCLE = MAX_INFOLINES, + TS_PRESENTS, TS_AN_SDL_GAME, + TS_ORIGINALLY_BY, TS_START_NEW_GAME, TS_LOAD_GAME, TS_CONTINUE_CURRENT_GAME, diff --git a/src/title.c b/src/title.c index 877ff4a..a3dcdbb 100644 --- a/src/title.c +++ b/src/title.c @@ -245,8 +245,10 @@ int title_show() prlogo = gfx_loadImage("gfx/prlogo.png"); sflogo = gfx_loadImage("gfx/sflogo.png"); + gfx_createTextObject(TS_DILIGENTCIRCLE, "THE DILIGENT CIRCLE", 0, 0, FONT_WHITE); gfx_createTextObject(TS_PRESENTS, "PRESENTS", 0, 0, FONT_WHITE); gfx_createTextObject(TS_AN_SDL_GAME, "AN SDL GAME", 0, 0, FONT_WHITE); + gfx_createTextObject(TS_ORIGINALLY_BY, "ORIGINALLY BY", 0, 0, FONT_WHITE); gfx_createTextObject(TS_START_NEW_GAME, _("START NEW GAME"), 0, 0, FONT_WHITE); gfx_createTextObject(TS_LOAD_GAME, _("LOAD GAME"), 0, 0, FONT_WHITE); gfx_createTextObject(TS_CONTINUE_CURRENT_GAME, _("CONTINUE CURRENT GAME"), 0, 0, FONT_WHITE); @@ -316,7 +318,7 @@ int title_show() #ifdef OLD_MUSIC audio_playMusic("music/Platinum.mod", 1, 0); #else - audio_playMusic("music/walking_among_androids.ogg", 1, 0); + audio_playMusic("music/android_oppression.ogg", 1, 1); #endif while (!engine.done) @@ -342,23 +344,28 @@ int title_show() } } - if ((now - then > 2000) && (now - then < 8000) && (!skip)) + if ((now - then > 2000) && (now - then < 7000) && (!skip)) { - screen_blit(prlogo, ((screen->w - prlogo->w) / 2), ((screen->h - prlogo->h) / 2)); + screen_blitText(TS_DILIGENTCIRCLE, -1, screen->h / 2); } - else if ((now - then > 9000) && (now - then < 15000) && (!skip)) + else if ((now - then > 7500) && (now - then < 14250) && (!skip)) { screen_blitText(TS_PRESENTS, -1, screen->h / 2); } - else if ((now - then > 16000) && (now - then < 21000) && (!skip)) + else if ((now - then > 14750) && (now - then < 21500) && (!skip)) { screen_blitText(TS_AN_SDL_GAME, -1, screen->h / 2); } - else if ((now - then > 25500) || (skip)) + else if ((now - then > 22000) && (now - then < 29000) && (!skip)) + { + screen_blitText(TS_ORIGINALLY_BY, -1, screen->h / 2 - MENU_SPACING); + screen_blit(prlogo, ((screen->w - prlogo->w) / 2), screen->h / 2); + } + else if ((now - then > 29500) || (skip)) { screen_blit(sflogo, ((screen->w - sflogo->w) / 2), ((screen->h - sflogo->h) / 3)); - if ((now - then >= 27500) || (skip)) + if ((now - then >= 33250) || (skip)) { optionRec.x = screen->w / 2 - optionRec.w / 2; optionRec.y = (MENU_Y - 4 - MENU_SPACING) + MENU_SPACING * selectedOption; @@ -517,7 +524,7 @@ int title_show() #ifdef OLD_MUSIC audio_playMusic("music/Platinum.mod", 1, 0); #else - audio_playMusic("music/walking_among_androids.ogg", 1, 0); + audio_playMusic("music/android_oppression.ogg", 1, 1); #endif } else