zoriya/ForecastingVillage
1
0
Fork 0
mirror of https://github.com/zoriya/ForecastingVillage.git synced 2025-12-06 05:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the music

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-05-03 20:06:29 +02:00
parent 5b0cd85922
commit e2573af9e2
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gamacon

Submodule lib/gamacon updated: 873f0cef56...b034b325b6

2
src/game_loader.c
View File

@@ -173,7 +173,7 @@ int create_game_scene(gc_engine *engine, bool map_editor)
scene = scene_create(engine, "prefabs/mainmenu.gcprefab"); scene = scene_create(engine, "prefabs/mainmenu.gcprefab");
if (!scene) if (!scene)
return (-1); return (-1);
engine->change_scene(engine, scene); engine->change_scene(engine, scene, true);
return (0); return (0);
} }

7
src/main_menu.c
View File

@@ -32,7 +32,7 @@ enum gc_mousekeys __)
my_printf("The game scene couldn't be loaded.\n"); my_printf("The game scene couldn't be loaded.\n");
return (true); return (true);
} }
engine->change_scene(engine, scene); engine->change_scene(engine, scene, true);
if (prefab_load(engine, "prefabs/player.gcprefab") < 0 if (prefab_load(engine, "prefabs/player.gcprefab") < 0
|| prefab_load(engine, "prefabs/map_entities.gcprefab") < 0) || prefab_load(engine, "prefabs/map_entities.gcprefab") < 0)
my_printf("Could not load entites.\n"); my_printf("Could not load entites.\n");
@@ -56,8 +56,7 @@ enum gc_mousekeys __)
return (true); return (true);
} }
GETSYS(engine, game_manager_system)->game_scene = engine->scene; GETSYS(engine, game_manager_system)->game_scene = engine->scene;
engine->scene = NULL; engine->change_scene(engine, scene, false);
engine->change_scene(engine, scene);
entity = engine->scene->get_entity(engine->scene, 50); entity = engine->scene->get_entity(engine->scene, 50);
if (rend) if (rend)
checkbox_update(engine->scene, entity, rend->is_fullscreen); checkbox_update(engine->scene, entity, rend->is_fullscreen);
@@ -83,7 +82,7 @@ enum gc_mousekeys __)
my_printf("The option scene couldn't be loaded.\n"); my_printf("The option scene couldn't be loaded.\n");
return (true); return (true);
} }
engine->change_scene(engine, scene); engine->change_scene(engine, scene, true);
return (true); return (true);
} }

2
src/systems/combat_manager.c
View File

@@ -39,7 +39,7 @@ void combat_end(gc_engine *engine, bool has_won)
struct dialog_manager *dialog = GETSYS(engine, dialog_manager); struct dialog_manager *dialog = GETSYS(engine, dialog_manager);
set_combat_player(engine, player_combat, player); set_combat_player(engine, player_combat, player);
engine->change_scene(engine, this->game_scene); engine->change_scene(engine, this->game_scene, true);
this->game_scene = NULL; this->game_scene = NULL;
this->state = ATTACK; this->state = ATTACK;
dialog->dialog_id = -1; dialog->dialog_id = -1;

3
src/systems/combat_methods.c
View File

@@ -36,8 +36,7 @@ void combat_start(gc_engine *engine, char *enemy_name)
this->state = ATTACK; this->state = ATTACK;
this->game_scene = engine->scene; this->game_scene = engine->scene;
set_combat_player(engine, player, player_combat); set_combat_player(engine, player, player_combat);
engine->scene = NULL; engine->change_scene(engine, scene, false);
engine->change_scene(engine, scene);
load_attacks(scene); load_attacks(scene);
dialog_next(engine); dialog_next(engine);
combat_create_enemy(this, engine, enemy_name); combat_create_enemy(this, engine, enemy_name);