zoriya/My3D
1
0
Fork 0
mirror of https://github.com/zoriya/My3D.git synced 2026-06-01 18:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up

Browse Source
This commit is contained in:
AnonymusRaccoon
2020-03-10 15:24:18 +01:00
parent abf8b6d02f
commit 7f22750a04
10 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -234,7 +234,7 @@ add_executable(My3D
src/components/game_display.c
src/systems/game_display_system.c
lib/gamacon/src/components/tile_collision_manager.c
lib/gamacon/include/components/tile_collision_manager.h
lib/gamacon/include/tile_collision_manager.h
lib/gamacon/src/engine/event_manager.c
lib/gamacon/include/event_manager.h
src/teams/absent.c
include/components/teams_component.h
+1 -1
View File
@@ -20,6 +20,6 @@ struct teams_component
const struct teams_component teams_component;
bool teams_move_up(gc_scene *scene, float amount, float y_level);
void pm_clicked(gc_engine *engine, int id);
void pm_clicked(gc_engine *engine, gc_entity *entity);
#endif //_TEAMS_COMPONENT_C_
include/setup.h
+9 -9
View File
@@ -12,16 +12,16 @@
int start_game();
bool start_button(gc_engine *engine, int entity_id, gc_vector2 _);
bool options(gc_engine *engine, int entity_id, gc_vector2 _);
bool goto_main_menu(gc_engine *engine, int entity_id, gc_vector2 _);
bool quit(gc_engine *engine, int entity_id, gc_vector2 _);
bool catch(gc_engine *engine, int entity_id, gc_vector2 _);
bool toggle_pause(gc_engine *engine, int entity_id, gc_vector2 _);
bool start_button(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool options(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool goto_main_menu(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool quit(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool catch(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool toggle_pause(gc_engine *engine, gc_entity *entity, gc_vector2 _);
int checkbox_update(gc_scene *s, gc_entity *entity, bool checked);
void resolution_set_text(gc_entity *entity, gc_engine *engine);
bool fullscreen(gc_engine *engine, int entity_id, gc_vector2 _);
bool resolution_down(gc_engine *engine, int entity_id, gc_vector2 _);
bool resolution_up(gc_engine *engine, int entity_id, gc_vector2 _);
bool fullscreen(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool resolution_down(gc_engine *engine, gc_entity *entity, gc_vector2 _);
bool resolution_up(gc_engine *engine, gc_entity *entity, gc_vector2 _);
lib/gamacon
+1 -1
Submodule lib/gamacon updated: 2521a73936...af57877b65
prefabs/game.gcprefab
+2
View File
@@ -37,6 +37,8 @@
</teams_component>
</gc_entity>
<panel src="panel" x="7%" y="3%" width="30%" height="6%"/>
<panel src="panel" x="100%" y="50%" width="50%" height="120%"/>
<text text="TEAMS" x="88%" y="40"/>
src/main_menu.c
+5 -6
View File
@@ -8,7 +8,7 @@
#include "setup.h"
#include "my.h"
bool start_button(gc_engine *engine, int entity_id, gc_vector2 _)
bool start_button(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
gc_scene *scene = scene_create(engine, "prefabs/game.gcprefab");
if (!scene) {
@@ -20,10 +20,9 @@ bool start_button(gc_engine *engine, int entity_id, gc_vector2 _)
return (true);
}
bool options(gc_engine *engine, int entity_id, gc_vector2 _)
bool options(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
gc_scene *scene = scene_create(engine, "prefabs/options.gcprefab");
gc_entity *entity;
struct sfml_renderer_system *rend = GETSYS(engine, sfml_renderer_system);
if (!scene) {
@@ -40,7 +39,7 @@ bool options(gc_engine *engine, int entity_id, gc_vector2 _)
return (true);
}
bool goto_main_menu(gc_engine *engine, int entity_id, gc_vector2 _)
bool goto_main_menu(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
gc_scene *scene = scene_create(engine, "prefabs/mainmenu.gcprefab");
if (!scene) {
@@ -52,13 +51,13 @@ bool goto_main_menu(gc_engine *engine, int entity_id, gc_vector2 _)
return (true);
}
bool quit(gc_engine *engine, int entity_id, gc_vector2 _)
bool quit(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
engine->should_close = true;
return (true);
}
bool catch(gc_engine *engine, int entity_id, gc_vector2 _)
bool catch(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
return (true);
}
src/options.c
+3 -4
View File
@@ -53,9 +53,8 @@ void resolution_set_text(gc_entity *entity, gc_engine *engine)
((gc_text *)renderer->data)->text = resolution;
}
bool fullscreen(gc_engine *engine, int entity_id, gc_vector2 _)
bool fullscreen(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
gc_entity *entity = engine->scene->get_entity(engine->scene, entity_id);
struct sfml_renderer_system *rend = GETSYS(engine, sfml_renderer_system);
if (!rend)
@@ -74,7 +73,7 @@ rend->resolution.y, 32}, "My3D", sfDefaultStyle, NULL);
return (true);
}
bool resolution_down(gc_engine *engine, int entity_id, gc_vector2 _)
bool resolution_down(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
struct sfml_renderer_system *rend = GETSYS(engine, sfml_renderer_system);
int i = 2;
@@ -92,7 +91,7 @@ bool resolution_down(gc_engine *engine, int entity_id, gc_vector2 _)
return (true);
}
bool resolution_up(gc_engine *engine, int entity_id, gc_vector2 _)
bool resolution_up(gc_engine *engine, gc_entity *entity, gc_vector2 _)
{
struct sfml_renderer_system *rend = GETSYS(engine, sfml_renderer_system);
int i = 0;
src/systems/teams_system.c
+3 -5
View File
@@ -23,14 +23,12 @@ void pm_destroy(gc_scene *scene, int prefab_id)
((gc_entity *)ent->data)->destroy(ent->data, scene);
}
void pm_clicked(gc_engine *engine, int id)
void pm_clicked(gc_engine *engine, gc_entity *entity)
{
gc_scene *scene = engine->scene;
gc_entity *entity = scene->get_entity(scene, id);
float y_pos = GETCMP(entity, fixed_to_cam)->pos.y;
pm_destroy(scene, entity->prefab_id);
teams_move_up(scene, -15, y_pos);
pm_destroy(engine->scene, entity->prefab_id);
teams_move_up(engine->scene, -15, y_pos);
}
bool teams_move_up(gc_scene *scene, float amount, float y_level)
src/teams/absent.c
+4 -4
View File
@@ -8,7 +8,7 @@
#include "components/teams_component.h"
#include "engine.h"
bool absent_check(gc_engine *engine, int id)
bool absent_check(gc_engine *engine, gc_entity *entity)
{
gc_scene *scene = engine->scene;
gc_list *li = scene->get_entity_by_cmp(scene, "game_manager");
@@ -17,11 +17,11 @@ bool absent_check(gc_engine *engine, int id)
return (false);
GETCMP(li->data, game_manager)->happiness += 3;
GETCMP(li->data, game_manager)->stupidity += random() % 5;
pm_clicked(engine, id);
pm_clicked(engine, entity);
return (true);
}
bool absent_cross(gc_engine *engine, int id)
bool absent_cross(gc_engine *engine, gc_entity *entity)
{
gc_scene *scene = engine->scene;
gc_list *li = scene->get_entity_by_cmp(scene, "game_manager");
@@ -30,6 +30,6 @@ bool absent_cross(gc_engine *engine, int id)
return (false);
GETCMP(li->data, game_manager)->happiness -= 3;
GETCMP(li->data, game_manager)->stupidity -= random() % 5;
pm_clicked(engine, id);
pm_clicked(engine, entity);
return (true);
}
src/teams/forgot.c
+4 -4
View File
@@ -7,7 +7,7 @@
#include "components/teams_component.h"
#include "engine.h"
bool forgot_lmfao(gc_engine *engine, int id)
bool forgot_lmfao(gc_engine *engine, gc_entity *entity)
{
gc_scene *scene = engine->scene;
gc_list *li = scene->get_entity_by_cmp(scene, "game_manager");
@@ -16,11 +16,11 @@ bool forgot_lmfao(gc_engine *engine, int id)
return (false);
GETCMP(li->data, game_manager)->happiness -= 5;
GETCMP(li->data, game_manager)->stupidity -= 5;
pm_clicked(engine, id);
pm_clicked(engine, entity);
return (true);
}
bool forgot_ok(gc_engine *engine, int id)
bool forgot_ok(gc_engine *engine, gc_entity *entity)
{
gc_scene *scene = engine->scene;
gc_list *li = scene->get_entity_by_cmp(scene, "game_manager");
@@ -29,6 +29,6 @@ bool forgot_ok(gc_engine *engine, int id)
return (false);
GETCMP(li->data, game_manager)->happiness += 2;
GETCMP(li->data, game_manager)->stupidity += 6;
pm_clicked(engine, id);
pm_clicked(engine, entity);
return (true);
}