Merge pull request #458 from NQNStudios:credits-overhaul
Auto-generated credits / Update the credits from IndieGOGO
This commit is contained in:
@@ -245,6 +245,7 @@ void show_dialog_action(std::string xml_file) {
|
||||
if(recording){
|
||||
record_action("show_dialog_action", xml_file);
|
||||
}
|
||||
|
||||
cChoiceDlog(xml_file).show();
|
||||
}
|
||||
|
||||
|
@@ -266,10 +266,11 @@ void draw_startup_anim(bool advance) {
|
||||
|
||||
anim_from = anim_to;
|
||||
anim_from.offset(-1,-4 + startup_anim_pos);
|
||||
if(advance) startup_anim_pos = (startup_anim_pos + 1) % 542;
|
||||
auto scroll_sprite = *ResMgr::graphics.get("startanim",true);
|
||||
if(advance) startup_anim_pos = (startup_anim_pos + 1) % scroll_sprite.getSize().y;
|
||||
rect_draw_some_item(*ResMgr::graphics.get("startbut",true),anim_size,mainPtr,startup_button[STARTBTN_SCROLL]);
|
||||
anim_to.offset(startup_button[STARTBTN_SCROLL].left, startup_button[STARTBTN_SCROLL].top);
|
||||
rect_draw_some_item(*ResMgr::graphics.get("startanim",true),anim_from,mainPtr,anim_to,sf::BlendAlpha);
|
||||
rect_draw_some_item(scroll_sprite,anim_from,mainPtr,anim_to,sf::BlendAlpha);
|
||||
}
|
||||
|
||||
void draw_startup_stats() {
|
||||
|
@@ -689,15 +689,7 @@ void init_boe(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
void showWelcome() {
|
||||
if(recording){
|
||||
record_action("showWelcome", "");
|
||||
}
|
||||
cChoiceDlog welcome("welcome");
|
||||
welcome->attachClickHandlers([](cDialog& self, std::string clicked, eKeyMod) {
|
||||
launchURL(self[clicked].getText());
|
||||
return false;
|
||||
}, {"spidweb", "scen", "forum", "home", "src"});
|
||||
welcome.show();
|
||||
show_dialog_action("welcome");
|
||||
}
|
||||
|
||||
using Key = sf::Keyboard::Key;
|
||||
@@ -975,10 +967,10 @@ void update_terrain_animation() {
|
||||
}
|
||||
|
||||
void update_startup_animation() {
|
||||
static const long twentyTicks = time_in_ticks(20).asMilliseconds();
|
||||
static const long interval = time_in_ticks(10).asMilliseconds();
|
||||
|
||||
if(overall_mode != MODE_STARTUP) return;
|
||||
if(animTimer.getElapsedTime().asMilliseconds() < twentyTicks) return;
|
||||
if(animTimer.getElapsedTime().asMilliseconds() < interval) return;
|
||||
|
||||
draw_startup_anim(true);
|
||||
animTimer.restart();
|
||||
|
Reference in New Issue
Block a user