diff --git a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js index b3f7b5d..ad47741 100644 --- a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js +++ b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js @@ -48,6 +48,12 @@ function set_stars(rating) { } function bloonsa_update_html(r) { + + var url_path = `/a/game/${r.level_id}` + if (window.location.pathname != url_path) { + window.history.pushState({}, r.level_title, url_path); + } + document.getElementById("level-info-box").classList.remove("invisible") // Level Infobox diff --git a/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited.swf b/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited.swf index 770ff3c..ff85e3d 100644 Binary files a/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited.swf and b/app/bloonsa_game/static/bloonsa_game/misc/bloons_unlimited.swf differ diff --git a/app/bloonsa_game/templates/bloonsa_game/base.html b/app/bloonsa_game/templates/bloonsa_game/base.html index b89bd20..ddd95a2 100644 --- a/app/bloonsa_game/templates/bloonsa_game/base.html +++ b/app/bloonsa_game/templates/bloonsa_game/base.html @@ -32,7 +32,7 @@
- +
diff --git a/app/bloonsa_game/templates/bloonsa_game/game.html b/app/bloonsa_game/templates/bloonsa_game/game.html index 5bdd7e0..c07570d 100644 --- a/app/bloonsa_game/templates/bloonsa_game/game.html +++ b/app/bloonsa_game/templates/bloonsa_game/game.html @@ -16,6 +16,7 @@ "splashScreen": false, "menu": false, "polyfills": false, + // "logLevel": "debug", }; @@ -31,7 +32,7 @@ const container = document.getElementById("bloonsa-game"); container.appendChild(player); player.load({ - url: "{% static 'bloonsa_game/misc/bloons_unlimited.swf' %}", + url: "{% static 'bloonsa_game/misc/bloons_unlimited.swf' %}?{{ flashVars |safe }}", allowScriptAccess: true, backgroundColor: "#000", }); diff --git a/app/bloonsa_game/views.py b/app/bloonsa_game/views.py index 69e169a..9538ad1 100644 --- a/app/bloonsa_game/views.py +++ b/app/bloonsa_game/views.py @@ -26,17 +26,15 @@ class GameView(TemplateView): total_levels = Level.objects.count() if type(kwargs.get("pk")) is int: - level = Level.objects.get(id=kwargs["pk"]) + level = Level.objects.get(level_id=kwargs["pk"]) if level: bloonsa_util.log(player=player, action=actions.bloonsa_load_level_by_url, note=level) - return render(request, "bloonsa_game/level.html", context={ + return render(request, "bloonsa_game/game.html", context={ "player": player, "total_levels": total_levels, - "flashVars": level.get_flash_vars(seperator="&"), - "levelTitle": level.title, - "levelAuthor": level.author, + "flashVars": level.get_flash_vars(seperator="&"), }) return render(request, "bloonsa_game/game.html", context={"player": player,