Detailed build.sh, improved main.c (thanks Lephe')

This commit is contained in:
KikooDX 2020-02-12 12:30:56 +01:00
parent cb0ced9977
commit 7488170b9d
3 changed files with 16 additions and 11 deletions

View File

@ -1,4 +1,7 @@
#/bin/#!/usr/bin/env bash
echo "making levels.c"
rm src/levels.c
lua5.3 levels.lua >> src/levels.c
echo "building for cg"
fxsdk build-cg
echo "done"

Binary file not shown.

View File

@ -5,8 +5,13 @@
#include "collide.h"
#include "levels.h"
#define WALK_SPD 1
#define MIN_VSPD -8
#define JUMP_SPD -4
#define GRAV 0.2
void jump_test(char *jump_pressed, char *jump_buffer, unsigned int *jump_hold); //test if jump pressed
char sgn(int number); //return the sign of input double
int sgn(int number); //return the sign of input double
int callback(volatile void *arg)
{
@ -29,9 +34,6 @@ int main(void)
int player_x = 0;
int player_y = 0;
int old_x, old_y;
const double jump_spd = -4; //default jump speed
const double grav = 0.2;
const double min_vspd = -8;
dclear(0); //0 -> black
set_level(level_id, level);
draw_level(level, &player_x, &player_y);
@ -47,11 +49,11 @@ int main(void)
dupdate();
old_x = player_x;
old_y = player_y;
pollevent();
clearevents();
//horizontal movement
hspd = 0;
if (keydown(KEY_LEFT)) hspd--;
if (keydown(KEY_RIGHT)) hspd++;
if (keydown(KEY_LEFT)) hspd -= WALK_SPD;
if (keydown(KEY_RIGHT)) hspd += WALK_SPD;
if (!collide(player_x + hspd, player_y, level, '0'))
{
player_x += hspd;
@ -60,14 +62,14 @@ int main(void)
if (collide(player_x, player_y + 1, level, '0')) on_ground = 6;
else
{
if (vspd > min_vspd) vspd += grav;
if (vspd > MIN_VSPD) vspd += GRAV;
if (on_ground) on_ground--;
}
//vertical movement
jump_test(&jump_pressed, &jump_buffer, &jump_hold);
//if jump is pressed and on ground
if (jump_buffer && on_ground) {
vspd = jump_spd;
vspd = JUMP_SPD;
on_ground = 0;
}
//vertical collision
@ -79,7 +81,7 @@ int main(void)
}
else
{
char sign_vspd = sgn(trunc_vspd);
int sign_vspd = sgn(trunc_vspd);
while (!collide(player_x, player_y + sign_vspd, level, '0'))
{
player_y += sign_vspd;
@ -110,7 +112,7 @@ void jump_test(char *jump_pressed, char *jump_buffer, unsigned int *jump_hold)
if (*jump_buffer) *jump_buffer -= 1;
}
char sgn(int number)
int sgn(int number)
{
if (number < 0) return -1;
else return 1;