mirror of
https://github.com/sehugg/8bitworkshop.git
synced 2024-06-14 00:29:35 +00:00
updated .gitmodules
This commit is contained in:
parent
ce4cb791db
commit
0b9da464cd
6
.gitmodules
vendored
6
.gitmodules
vendored
|
@ -9,10 +9,10 @@
|
||||||
url = git@github.com:sehugg/codemirror
|
url = git@github.com:sehugg/codemirror
|
||||||
[submodule "octokat.js"]
|
[submodule "octokat.js"]
|
||||||
path = octokat.js
|
path = octokat.js
|
||||||
url = ./octokat.js
|
url = https://github.com/philschatz/octokat.js
|
||||||
[submodule "tss"]
|
[submodule "tss"]
|
||||||
path = tss
|
path = tss
|
||||||
url = ./tss
|
url = https://github.com/toyoshim/tss
|
||||||
[submodule "FileSaver.js"]
|
[submodule "FileSaver.js"]
|
||||||
path = FileSaver.js
|
path = FileSaver.js
|
||||||
url = ./FileSaver.js
|
url = https://github.com/eligrey/FileSaver.js
|
||||||
|
|
12
Makefile
Normal file
12
Makefile
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
|
||||||
|
check:
|
||||||
|
closure-compiler src/*.js src/cpu/*.js src/platform/*.js > /dev/null
|
||||||
|
|
||||||
|
lint:
|
||||||
|
gjslint -r src
|
||||||
|
|
||||||
|
archive:
|
||||||
|
mkdir -p release
|
||||||
|
git-archive-all --prefix 8bitworkshop-1.1/ release/8bitworkshop-1.1.tgz
|
||||||
|
#git archive --output release/8bitworkshop-1.1.tgz --prefix 8bitworkshop-1.1/ 1.1
|
||||||
|
|
|
@ -88,7 +88,7 @@ const byte font8x8[0x100][8] = {
|
||||||
|
|
||||||
const char BOX_CHARS[8] = { 218, 191, 192, 217, 196, 196, 179, 179 };
|
const char BOX_CHARS[8] = { 218, 191, 192, 217, 196, 196, 179, 179 };
|
||||||
|
|
||||||
void draw_box(byte x, byte y, byte x2, byte y2, const char* chars) {
|
void draw_box(byte x, byte y, byte x2, byte y2, const char chars[]) {
|
||||||
byte x1 = x;
|
byte x1 = x;
|
||||||
putchar(x, y, chars[2]);
|
putchar(x, y, chars[2]);
|
||||||
putchar(x2, y, chars[3]);
|
putchar(x2, y, chars[3]);
|
||||||
|
@ -128,42 +128,42 @@ void reset_players() {
|
||||||
players[0].collided = players[1].collided = 0;
|
players[0].collided = players[1].collided = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void draw_player(Player* p) {
|
void draw_player(byte p) {
|
||||||
putchar(p->x, p->y, p->head_attr);
|
putchar(players[p].x, players[p].y, players[p].head_attr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void erase_player(Player* p) {
|
void erase_player(byte p) {
|
||||||
putchar(p->x, p->y, p->tail_attr);
|
putchar(players[p].x, players[p].y, players[p].tail_attr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void move_player(Player* p) {
|
void move_player(byte p) {
|
||||||
erase_player(p);
|
erase_player(p);
|
||||||
p->x += DIR_X[p->dir];
|
players[p].x += DIR_X[players[p].dir];
|
||||||
p->y += DIR_Y[p->dir];
|
players[p].y += DIR_Y[players[p].dir];
|
||||||
if (getchar(p->x, p->y) != CHAR(' '))
|
if (getchar(players[p].x, players[p].y) != CHAR(' '))
|
||||||
p->collided = 1;
|
players[p].collided = 1;
|
||||||
draw_player(p);
|
draw_player(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
void human_control(Player* p) {
|
void human_control(byte p) {
|
||||||
Direction dir = 0xff;
|
Direction dir = 0xff;
|
||||||
if (LEFT1) dir = D_LEFT;
|
if (LEFT1) dir = D_LEFT;
|
||||||
if (RIGHT1) dir = D_RIGHT;
|
if (RIGHT1) dir = D_RIGHT;
|
||||||
if (UP1) dir = D_UP;
|
if (UP1) dir = D_UP;
|
||||||
if (DOWN1) dir = D_DOWN;
|
if (DOWN1) dir = D_DOWN;
|
||||||
// don't let the player reverse
|
// don't let the player reverse
|
||||||
if (dir != 0xff && dir != (p->dir ^ 2)) {
|
if (dir != 0xff && dir != (players[p].dir ^ 2)) {
|
||||||
p->dir = dir;
|
players[p].dir = dir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ai_control(Player* p) {
|
void ai_control(byte p) {
|
||||||
byte x,y;
|
byte x,y;
|
||||||
Direction dir = p->dir;
|
Direction dir = players[p].dir;
|
||||||
x = p->x + DIR_X[dir];
|
x = players[p].x + DIR_X[dir];
|
||||||
y = p->y + DIR_Y[dir];
|
y = players[p].y + DIR_Y[dir];
|
||||||
if (getchar(x,y) != CHAR(' ')) {
|
if (getchar(x,y) != CHAR(' ')) {
|
||||||
p->dir = (dir + 1) & 3;
|
players[p].dir = (dir + 1) & 3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,8 +175,8 @@ void flash_colliders() {
|
||||||
if (players[1].collided) players[1].head_attr ^= 0x80;
|
if (players[1].collided) players[1].head_attr ^= 0x80;
|
||||||
wait_for_vsync();
|
wait_for_vsync();
|
||||||
wait_for_vsync();
|
wait_for_vsync();
|
||||||
draw_player(&players[0]);
|
draw_player(0);
|
||||||
draw_player(&players[1]);
|
draw_player(1);
|
||||||
palette = i;
|
palette = i;
|
||||||
}
|
}
|
||||||
palette = 0;
|
palette = 0;
|
||||||
|
@ -185,13 +185,13 @@ void flash_colliders() {
|
||||||
void make_move() {
|
void make_move() {
|
||||||
byte i;
|
byte i;
|
||||||
for (i=0; i<FRAMES_PER_MOVE; i++) {
|
for (i=0; i<FRAMES_PER_MOVE; i++) {
|
||||||
human_control(&players[0]);
|
human_control(0);
|
||||||
wait_for_vsync();
|
wait_for_vsync();
|
||||||
}
|
}
|
||||||
ai_control(&players[1]);
|
ai_control(1);
|
||||||
// if players collide, 2nd player gets the point
|
// if players collide, 2nd player gets the point
|
||||||
move_player(&players[1]);
|
move_player(1);
|
||||||
move_player(&players[0]);
|
move_player(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void play_round() {
|
void play_round() {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
%.tga: %.png
|
%.tga: %.png
|
||||||
convert $< -resize 192 $<.gif
|
convert $< -resize 192 $<.gif
|
||||||
convert $<.gif +dither -type palette -compress RLE -colors 8 +dither -flip $@
|
convert $<.gif +dither -type palette -depth 4 -compress RLE -colors 8 -flip $@
|
||||||
convert $@ $@.png
|
convert $@ $@.png
|
||||||
|
|
||||||
%.pcx: %.png
|
%.pcx: %.png
|
||||||
|
|
Loading…
Reference in New Issue
Block a user