Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

used clang-format to format the code

Browse Source
This commit is contained in:
Chris Cromer
2022-10-10 21:54:12 -03:00
parent 57cc75c249
commit 3b533fb03d
33 changed files with 145 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/game_over/GameOverScreen.cpp
View File

@@ -1,6 +1,5 @@
#include "gui/game_over/GameOverScreen.h"
#include "Event.h"
#include "gui/game_over/GameOverScreen.h"
#include <AudioStreamPlayer.hpp>
#include <PackedScene.hpp>
@@ -16,7 +15,7 @@ void alai::GameOverScreen::_register_methods()
godot::register_method("restart_game", &GameOverScreen::restart_game);
godot::register_method("connect_signal", &GameOverScreen::connect_signal);
godot::register_method("_on_player_died", &GameOverScreen::_on_player_died);
godot::register_method("_on_visibility_changed", &GameOverScreen::_on_visibility_changed);
godot::register_method("_on_visibility_changed", &GameOverScreen::_on_visibility_changed);
}
alai::GameOverScreen::GameOverScreen()
@@ -42,8 +41,8 @@ void alai::GameOverScreen::_on_restart_button_pressed()
if (_resource_loader->exists("res://levels/PrototypeR.tscn"))
{
godot::Ref<godot::PackedScene> level_scene = _resource_loader->load("res://levels/PrototypeR.tscn");
auto level = level_scene->instance();
auto level_node = get_tree()->get_root()->get_node("Main")->find_node("Level");
auto level = level_scene->instance();
auto level_node = get_tree()->get_root()->get_node("Main")->find_node("Level");
if (level_node != nullptr)
{
@@ -66,7 +65,7 @@ void alai::GameOverScreen::_on_player_died()
auto level_node = get_tree()->get_root()->get_node("Main")->find_node("Level");
if (level_node != nullptr)
{
auto child = level_node->get_child(0);
auto child = level_node->get_child(0);
if (child != nullptr)
{
// Delete the currently active level from the tree.
@@ -99,8 +98,8 @@ void alai::GameOverScreen::connect_signal()
void alai::GameOverScreen::_on_visibility_changed()
{
auto gameoversound = get_node<godot::AudioStreamPlayer>("GameOverMusic");
if (is_visible())
{
if (is_visible())
{
gameoversound->play();
}
else

5
src/gui/game_over/GameOverScreen.h
View File

@@ -5,7 +5,6 @@
#include <Godot.hpp>
#include <ResourceLoader.hpp>
namespace alai
{
/**
@@ -14,7 +13,7 @@ namespace alai
*/
class GameOverScreen : public godot::CanvasLayer
{
GODOT_CLASS(GameOverScreen, godot::CanvasLayer)
GODOT_CLASS(GameOverScreen, godot::CanvasLayer)
private:
godot::ResourceLoader *_resource_loader;
@@ -57,6 +56,6 @@ namespace alai
void connect_signal();
void _on_visibility_changed();
};
}
} // namespace alai
#endif

11
src/gui/game_won/GameWonScreen.cpp
View File

@@ -1,13 +1,12 @@
#include "gui/game_won/GameWonScreen.h"
#include "Event.h"
#include "gui/game_won/GameWonScreen.h"
#include <AudioStreamPlayer.hpp>
#include <SceneTree.hpp>
#include <Viewport.hpp>
void alai::GameWonScreen::_register_methods()
{
{
godot::register_method("_ready", &GameWonScreen::_ready);
godot::register_method("connect_signal", &GameWonScreen::connect_signal);
godot::register_method("_on_player_won", &GameWonScreen::_on_player_won);
@@ -45,7 +44,7 @@ void alai::GameWonScreen::_on_player_won()
auto level_node = get_tree()->get_root()->get_node("Main")->find_node("Level");
if (level_node != nullptr)
{
auto child = level_node->get_child(0);
auto child = level_node->get_child(0);
if (child != nullptr)
{
child->queue_free();
@@ -70,8 +69,8 @@ void alai::GameWonScreen::connect_signal()
void alai::GameWonScreen::_on_visibility_changed()
{
auto victorysound = get_node<godot::AudioStreamPlayer>("VictorySound");
if (is_visible())
{
if (is_visible())
{
victorysound->play();
}
else

4
src/gui/game_won/GameWonScreen.h
View File

@@ -12,7 +12,7 @@ namespace alai
*/
class GameWonScreen : public godot::CanvasLayer
{
GODOT_CLASS(GameWonScreen, godot::CanvasLayer)
GODOT_CLASS(GameWonScreen, godot::CanvasLayer)
public:
/**
@@ -47,6 +47,6 @@ namespace alai
void connect_signal();
void _on_visibility_changed();
};
}
} // namespace alai
#endif