ZennDev1337/Rust-for-Arduboy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed an error with types in screen with

Browse source
This commit is contained in:
ZennDev1337 2023-10-06 09:52:08 +02:00
parent 54bf01cfea
commit 9ad03927de
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/Arduboy-Tutorials/demo7/src/lib.rs
View file

@ -223,8 +223,8 @@ unsafe fn gameplay() {
arduboy.set_cursor(101, 2); arduboy.set_cursor(101, 2);
arduboy.print(G.ai_score as u16); arduboy.print(G.ai_score as u16);
arduboy.draw_fast_hline(0, 0, WIDTH, Color::White); arduboy.draw_fast_hline(0, 0, WIDTH as u8, Color::White);
arduboy.draw_fast_hline(0, (HEIGHT - 1) as i16, WIDTH, Color::White); arduboy.draw_fast_hline(0, (HEIGHT - 1) as i16, WIDTH as u8, Color::White);
G.player.draw(); G.player.draw();
G.ai.draw(); G.ai.draw();

22
Examples/Arduboy-Tutorials/demo9/src/lib.rs
View file

@ -12,7 +12,7 @@ const WORLD_HEIGHT: usize = 7;
const PLAYER_SIZE: i16 = 16; const PLAYER_SIZE: i16 = 16;
const PLAYER_X_OFFSET: i16 = WIDTH as i16 / 2 - PLAYER_SIZE / 2; const PLAYER_X_OFFSET: i16 = WIDTH as i16 / 2 - PLAYER_SIZE / 2;
const PLAYER_Y_OFFSET: i16 = HEIGHT as i16 / 2 - PLAYER_SIZE / 2; const PLAYER_Y_OFFSET: i16 = HEIGHT as i16 / 2 - PLAYER_SIZE / 2;
const TILE_SIZE: u8 = 16; const TILE_SIZE: i16 = 16;
const GRASS: u8 = 0; const GRASS: u8 = 0;
const WATER: u8 = 1; const WATER: u8 = 1;
const TREES: u8 = 2; const TREES: u8 = 2;
@ -119,20 +119,20 @@ unsafe fn draw_player() {
} }
unsafe fn draw_world() { unsafe fn draw_world() {
let tileswide: u8 = WIDTH / TILE_SIZE + 1; let tileswide: i16 = WIDTH / TILE_SIZE + 1;
let tilestall: u8 = HEIGHT / TILE_SIZE + 1; let tilestall: i16 = HEIGHT / TILE_SIZE + 1;
for y in 0..tilestall as i16 { for y in 0..tilestall {
for x in 0..tileswide as i16 { for x in 0..tileswide {
let tilesx: i16 = x - mapx / TILE_SIZE as i16; let tilesx: i16 = x - mapx / TILE_SIZE;
let tilesy: i16 = y - mapy / TILE_SIZE as i16; let tilesy: i16 = y - mapy / TILE_SIZE;
if tilesx >= 0 if tilesx >= 0
&& tilesy >= 0 && tilesy >= 0
&& tilesx < WORLD_WIDTH as i16 && tilesx < WORLD_WIDTH as i16
&& tilesy < WORLD_HEIGHT as i16 && tilesy < WORLD_HEIGHT as i16
{ {
sprites::draw_override( sprites::draw_override(
x * TILE_SIZE as i16 + mapx % TILE_SIZE as i16, x * TILE_SIZE + mapx % TILE_SIZE,
y * TILE_SIZE as i16 + mapy % TILE_SIZE as i16, y * TILE_SIZE + mapy % TILE_SIZE,
get_sprite_addr!(tiles), get_sprite_addr!(tiles),
world[tilesy as usize][tilesx as usize], world[tilesy as usize][tilesx as usize],
) )
@ -141,9 +141,9 @@ unsafe fn draw_world() {
} }
arduboy.fill_rect(0, 0, 48, 8, Color::Black); arduboy.fill_rect(0, 0, 48, 8, Color::Black);
arduboy.set_cursor(0, 0); arduboy.set_cursor(0, 0);
arduboy.print(0 - mapx / TILE_SIZE as i16); arduboy.print(0 - mapx / TILE_SIZE);
arduboy.print(f!(b",\0")); arduboy.print(f!(b",\0"));
arduboy.print(0 - mapy / TILE_SIZE as i16) arduboy.print(0 - mapy / TILE_SIZE)
} }
fn titlescreen() { fn titlescreen() {
arduboy.set_cursor(0, 0); arduboy.set_cursor(0, 0);

1
Project/game/src/lib.rs
View file

@ -12,6 +12,7 @@ const arduboy: Arduboy2 = Arduboy2::new();
// dynamic ram variables // dynamic ram variables
const FX_DATA_PAGE: u16 = 0xffff; const FX_DATA_PAGE: u16 = 0xffff;
#[allow(dead_code)]
const FX_DATA_BYTES: u32 = 234; const FX_DATA_BYTES: u32 = 234;
const FXlogo: u32 = 0x000000; const FXlogo: u32 = 0x000000;
const FXlogoWith: i16 = 115; const FXlogoWith: i16 = 115;