projects
/
hackover2013-badge-firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4d6194
)
Verbesserte Rotor-Sprites.
author
Wintermute
<wintermute@hannover.ccc.de>
Mon, 14 Oct 2013 19:54:38 +0000
(21:54 +0200)
committer
Wintermute
<wintermute@hannover.ccc.de>
Mon, 14 Oct 2013 19:54:38 +0000
(21:54 +0200)
badge/jumpnrun/enemies.c
patch
|
blob
|
history
diff --git
a/badge/jumpnrun/enemies.c
b/badge/jumpnrun/enemies.c
index
4d87c32
..
46326bc
100644
(file)
--- a/
badge/jumpnrun/enemies.c
+++ b/
badge/jumpnrun/enemies.c
@@
-45,10
+45,16
@@
static badge_sprite const anim_spiral[] = {
};
static badge_sprite const anim_rotor[] = {
};
static badge_sprite const anim_rotor[] = {
+ { 9, 9, (uint8_t const *) "\x00\x00\x00\x00\xf0\xe1\x42\x0c\x18\x70\x00" },
+ { 9, 9, (uint8_t const *) "\x1c\x30\x60\x80\xf0\xe1\x40\x00\x00\x00\x00" },
+ { 9, 9, (uint8_t const *) "\x1c\x30\x60\x84\x0e\x1f\x00\x00\x00\x00\x00" },
+ { 9, 9, (uint8_t const *) "\x00\x00\x00\x04\x0e\x1f\x02\x0c\x18\x70\x00" }
+ /*
{ 9, 9, (uint8_t const *) "\x00\x00\x00\x00\xf0\xe1\x40\x00\x00\x00\x00" },
{ 9, 9, (uint8_t const *) "\x1c\x30\x60\x80\x00\x01\x00\x00\x00\x00\x00" },
{ 9, 9, (uint8_t const *) "\x00\x00\x00\x04\x0e\x1f\x00\x00\x00\x00\x00" },
{ 9, 9, (uint8_t const *) "\x00\x00\x00\x00\x00\x01\x02\x0c\x18\x70\x00" }
{ 9, 9, (uint8_t const *) "\x00\x00\x00\x00\xf0\xe1\x40\x00\x00\x00\x00" },
{ 9, 9, (uint8_t const *) "\x1c\x30\x60\x80\x00\x01\x00\x00\x00\x00\x00" },
{ 9, 9, (uint8_t const *) "\x00\x00\x00\x04\x0e\x1f\x00\x00\x00\x00\x00" },
{ 9, 9, (uint8_t const *) "\x00\x00\x00\x00\x00\x01\x02\x0c\x18\x70\x00" }
+ */
};
static void enemy_animation_advance(jumpnrun_enemy *enemy) {
};
static void enemy_animation_advance(jumpnrun_enemy *enemy) {
@@
-289,7
+295,7
@@
jumpnrun_enemy_type const jumpnrun_enemy_type_data[JUMPNRUN_ENEMY_TYPE_COUNT] =
.collision_player = enemy_collision_player_deadly,
.game_tick = enemy_tick_swing_up_and_down
}, {
.collision_player = enemy_collision_player_deadly,
.game_tick = enemy_tick_swing_up_and_down
}, {
- .animation_ticks_per_frame =
6
,
+ .animation_ticks_per_frame =
3
,
.animation_length = ARRAY_SIZE(anim_rotor),
.animation_frames = anim_rotor,
.extent = { FIXED_INT_I(9), FIXED_INT_I(9) },
.animation_length = ARRAY_SIZE(anim_rotor),
.animation_frames = anim_rotor,
.extent = { FIXED_INT_I(9), FIXED_INT_I(9) },
This page took
0.025669 seconds
and
4
git commands to generate.