fix un bug pété alright

This commit is contained in:
Lephenixnoir 2021-08-21 23:12:08 +02:00
parent 7ea9be2c13
commit 4c644a08f1
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
4 changed files with 21 additions and 9 deletions

View File

@ -32,6 +32,10 @@ set(ASSETS
assets-cg/level/level11.txt
assets-cg/level/level12.txt
assets-cg/level/level13.txt
assets-cg/level/level14.txt
assets-cg/level/level15.txt
assets-cg/level/level16.txt
assets-cg/level/level17.txt
)
fxconv_declare_converters(converters.py)

View File

@ -136,10 +136,11 @@ void rect_physics(rect_t *r, rectmeta_t const *meta, float time);
// Levels
//---
extern level_t level1, level2, level3, level4;
extern level_t level5, level6, level7, level8;
extern level_t level9, level10, level11, level12;
extern level_t level13;
extern level_t level1, level2, level3, level4;
extern level_t level5, level6, level7, level8;
extern level_t level9, level10, level11, level12;
extern level_t level13, level14, level15, level16;
extern level_t level17;
//---
// Menu

View File

@ -52,15 +52,18 @@ int main(void)
r61524_set(0x010, 0x0010);
level_t const *story_levels[] = {
&level1, &level2, &level3, &level4, &level5, &level6, &level7,
&level8, &level9, &level10, &level11, &level12, &level13, NULL,
&level1, &level2, &level3, &level4, &level5, &level6, &level7,
&level8, &level9, &level10, &level11, &level12, &level13, &level14,
&level15, &level16, &level17,
NULL,
};
int story_position = main_menu();
story_position = 11;
game_t game;
game.forced_player_rota = 0;
memset(&game, 0x00, sizeof game);
load_level(&game, story_levels[story_position]);
state_t state = State_Playing;
@ -71,7 +74,7 @@ int main(void)
volatile int need_frame = 1;
int timer = timer_configure(TIMER_ANY, 33000, GINT_CALL_SET(&need_frame));
timer_start(timer);
if(timer >= 0) timer_start(timer);
while (1) {
level_t const *lv = game.level;

View File

@ -2,6 +2,7 @@
#include <gint/keyboard.h>
#include <gint/timer.h>
#include <gint/gint.h>
#include <gint/cpu.h>
#include "duet.h"
@ -11,12 +12,15 @@ int main_menu(void)
{
volatile int need_frame = 1;
int timer = timer_configure(TIMER_ANY, 33000, GINT_CALL_SET(&need_frame));
timer_start(timer);
if(timer >= 0) timer_start(timer);
float time = 0;
int selected_level = 0;
while(1) {
while (need_frame == 0) sleep();
need_frame = 0;
time += 1.0 / 30;
/* Keyboard input */