Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4aca4a9
)
removing most data subdirs
author
Joshua Grams
<josh@qualdan.com>
Mon, 10 Apr 2006 00:47:05 +0000
(
00:47
+0000)
committer
Joshua Grams
<josh@qualdan.com>
Mon, 10 Apr 2006 00:47:05 +0000
(
00:47
+0000)
33 files changed:
Makefile
patch
|
blob
|
history
config.h
patch
|
blob
|
history
data/4est_fulla3s.mod
[new file with mode: 0644]
patch
|
blob
data/b_game.png
[new file with mode: 0644]
patch
|
blob
data/b_on.png
[new file with mode: 0644]
patch
|
blob
data/b_over.png
[new file with mode: 0644]
patch
|
blob
data/b_rockdodger.png
[new file with mode: 0644]
patch
|
blob
data/b_variations.png
[new file with mode: 0644]
patch
|
blob
data/banners/game.png
[deleted file]
patch
|
blob
|
history
data/banners/on.png
[deleted file]
patch
|
blob
|
history
data/banners/over.png
[deleted file]
patch
|
blob
|
history
data/banners/rockdodger.png
[deleted file]
patch
|
blob
|
history
data/banners/variations.png
[deleted file]
patch
|
blob
|
history
data/boom.wav
[new file with mode: 0644]
patch
|
blob
data/booom.wav
[new file with mode: 0644]
patch
|
blob
data/bzboom.wav
[new file with mode: 0644]
patch
|
blob
data/cboom.wav
[new file with mode: 0644]
patch
|
blob
data/font.png
[new file with mode: 0644]
patch
|
blob
data/fonts/score.png
[deleted file]
patch
|
blob
|
history
data/getzznew.mod
[new file with mode: 0644]
patch
|
blob
data/magic.mod
[new file with mode: 0644]
patch
|
blob
data/music/4est_fulla3s.mod
[deleted file]
patch
|
blob
|
history
data/music/getzznew.mod
[deleted file]
patch
|
blob
|
history
data/music/magic.mod
[deleted file]
patch
|
blob
|
history
data/sounds/boom.wav
[deleted file]
patch
|
blob
|
history
data/sounds/booom.wav
[deleted file]
patch
|
blob
|
history
data/sounds/bzboom.wav
[deleted file]
patch
|
blob
|
history
data/sounds/cboom.wav
[deleted file]
patch
|
blob
|
history
file.c
patch
|
blob
|
history
file.h
patch
|
blob
|
history
gfx.mk
patch
|
blob
|
history
main.c
patch
|
blob
|
history
sound.c
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
133dbab
..
3656113
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-38,8
+38,8
@@
rocks += 10 11 12 13 14 15 16 17 18 19
rocks += 20 21 22 23 24 25 26 27 28 29
rocks += 30 31 32 33 34 35 36 37 38 39
rocks += 40 41 42 43 44 45 46 47 48 49
rocks += 20 21 22 23 24 25 26 27 28 29
rocks += 30 31 32 33 34 35 36 37 38 39
rocks += 40 41 42 43 44 45 46 47 48 49
-rocks := $(rocks:%=data/sprites/rock%.png)
-graphics := data/sprites/ship.png data/indicators/life.png $(rocks)
+rocks := $(rocks:%=data/rock%.png)
+graphics := data/ship.png data/life.png $(rocks)
INSTALL := install
INSTALL_PROGRAM := $(INSTALL) -o games -g games
INSTALL := install
INSTALL_PROGRAM := $(INSTALL) -o games -g games
@@
-105,22
+105,10
@@
data-clean:
mkinstalldirs:
if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
mkinstalldirs:
if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
- if [ ! -d $(DATA_PREFIX)/banners ]; then mkdir $(DATA_PREFIX)/banners; fi
- if [ ! -d $(DATA_PREFIX)/fonts ]; then mkdir $(DATA_PREFIX)/fonts; fi
if [ ! -d $(DATA_PREFIX)/icons ]; then mkdir $(DATA_PREFIX)/icons; fi
if [ ! -d $(DATA_PREFIX)/icons ]; then mkdir $(DATA_PREFIX)/icons; fi
- if [ ! -d $(DATA_PREFIX)/indicators ]; then mkdir $(DATA_PREFIX)/indicators; fi
- if [ ! -d $(DATA_PREFIX)/music ]; then mkdir $(DATA_PREFIX)/music; fi
- if [ ! -d $(DATA_PREFIX)/sounds ]; then mkdir $(DATA_PREFIX)/sounds; fi
- if [ ! -d $(DATA_PREFIX)/sprites ]; then mkdir $(DATA_PREFIX)/sprites; fi
rminstalldirs:
rminstalldirs:
- if [ -d $(DATA_PREFIX)/banners ]; then rmdir $(DATA_PREFIX)/banners; fi
- if [ -d $(DATA_PREFIX)/fonts ]; then rmdir $(DATA_PREFIX)/fonts; fi
if [ -d $(DATA_PREFIX)/icons ]; then rmdir $(DATA_PREFIX)/icons; fi
if [ -d $(DATA_PREFIX)/icons ]; then rmdir $(DATA_PREFIX)/icons; fi
- if [ -d $(DATA_PREFIX)/indicators ]; then rmdir $(DATA_PREFIX)/indicators; fi
- if [ -d $(DATA_PREFIX)/music ]; then rmdir $(DATA_PREFIX)/music; fi
- if [ -d $(DATA_PREFIX)/sounds ]; then rmdir $(DATA_PREFIX)/sounds; fi
- if [ -d $(DATA_PREFIX)/sprites ]; then rmdir $(DATA_PREFIX)/sprites; fi
if [ -d $(DATA_PREFIX) ]; then rmdir $(DATA_PREFIX); fi
install: all mkinstalldirs install-program install-data
if [ -d $(DATA_PREFIX) ]; then rmdir $(DATA_PREFIX); fi
install: all mkinstalldirs install-program install-data
@@
-129,13
+117,8
@@
install-program: program
$(INSTALL_PROGRAM) ./vor $(PROGRAM_PREFIX)
install-data: data
$(INSTALL_PROGRAM) ./vor $(PROGRAM_PREFIX)
install-data: data
- $(INSTALL_DATA) ./data/banners/* $(DATA_PREFIX)/banners/
- $(INSTALL_DATA) ./data/fonts/* $(DATA_PREFIX)/fonts/
+ $(INSTALL_DATA) ./data/* $(DATA_PREFIX)/
$(INSTALL_DATA) ./data/icons/* $(DATA_PREFIX)/icons/
$(INSTALL_DATA) ./data/icons/* $(DATA_PREFIX)/icons/
- $(INSTALL_DATA) ./data/indicators/* $(DATA_PREFIX)/indicators/
- $(INSTALL_DATA) ./data/music/* $(DATA_PREFIX)/music/
- $(INSTALL_DATA) ./data/sounds/* $(DATA_PREFIX)/sounds/
- $(INSTALL_DATA) ./data/sprites/* $(DATA_PREFIX)/sprites/
uninstall: uninstall-program uninstall-data rminstalldirs
uninstall: uninstall-program uninstall-data rminstalldirs
@@
-143,11
+126,5
@@
uninstall-program:
rm -f $(PROGRAM_PREFIX)/vor
uninstall-data:
rm -f $(PROGRAM_PREFIX)/vor
uninstall-data:
- rm -f $(DATA_PREFIX)/banners/*
- rm -f $(DATA_PREFIX)/fonts/*
+ rm -f $(DATA_PREFIX)/*
rm -f $(DATA_PREFIX)/icons/*
rm -f $(DATA_PREFIX)/icons/*
- rm -f $(DATA_PREFIX)/indicators/*
- rm -f $(DATA_PREFIX)/music/*
- rm -f $(DATA_PREFIX)/sounds/*
- rm -f $(DATA_PREFIX)/sprites/*
- rm -f $(DATA_PREFIX)/scores
diff --git
a/config.h
b/config.h
index
52967f8
..
4313697
100644
(file)
--- a/
config.h
+++ b/
config.h
@@
-12,9
+12,6
@@
#define SCREENDXMIN 7.5
#define SCREENDXMIN 7.5
-// image file containing font for score stuff.
-#define BIG_FONT_FILE "fonts/score.png"
-
// -----------------------------------------------------------------------
// Rocks
// -----------------------------------------------------------------------
// Rocks
diff --git a/data/4est_fulla3s.mod
b/data/4est_fulla3s.mod
new file mode 100644
(file)
index 0000000..
f84b409
Binary files /dev/null and b/data/4est_fulla3s.mod differ
diff --git a/data/b_game.png
b/data/b_game.png
new file mode 100644
(file)
index 0000000..
d12a809
Binary files /dev/null and b/data/b_game.png differ
diff --git a/data/b_on.png
b/data/b_on.png
new file mode 100644
(file)
index 0000000..
8f60240
Binary files /dev/null and b/data/b_on.png differ
diff --git a/data/b_over.png
b/data/b_over.png
new file mode 100644
(file)
index 0000000..
0daf7fa
Binary files /dev/null and b/data/b_over.png differ
diff --git a/data/b_rockdodger.png
b/data/b_rockdodger.png
new file mode 100644
(file)
index 0000000..
fca31e9
Binary files /dev/null and b/data/b_rockdodger.png differ
diff --git a/data/b_variations.png
b/data/b_variations.png
new file mode 100644
(file)
index 0000000..
c5cd4c1
Binary files /dev/null and b/data/b_variations.png differ
diff --git
a/data/banners/game.png
b/data/banners/game.png
deleted file mode 100644
(file)
index
d12a809
..0000000
Binary files a/data/banners/game.png and /dev/null differ
diff --git
a/data/banners/on.png
b/data/banners/on.png
deleted file mode 100644
(file)
index
8f60240
..0000000
Binary files a/data/banners/on.png and /dev/null differ
diff --git
a/data/banners/over.png
b/data/banners/over.png
deleted file mode 100644
(file)
index
0daf7fa
..0000000
Binary files a/data/banners/over.png and /dev/null differ
diff --git
a/data/banners/rockdodger.png
b/data/banners/rockdodger.png
deleted file mode 100644
(file)
index
fca31e9
..0000000
Binary files a/data/banners/rockdodger.png and /dev/null differ
diff --git
a/data/banners/variations.png
b/data/banners/variations.png
deleted file mode 100644
(file)
index
c5cd4c1
..0000000
Binary files a/data/banners/variations.png and /dev/null differ
diff --git a/data/boom.wav
b/data/boom.wav
new file mode 100644
(file)
index 0000000..
60226fd
Binary files /dev/null and b/data/boom.wav differ
diff --git a/data/booom.wav
b/data/booom.wav
new file mode 100644
(file)
index 0000000..
def49aa
Binary files /dev/null and b/data/booom.wav differ
diff --git a/data/bzboom.wav
b/data/bzboom.wav
new file mode 100644
(file)
index 0000000..
e6f4859
Binary files /dev/null and b/data/bzboom.wav differ
diff --git a/data/cboom.wav
b/data/cboom.wav
new file mode 100644
(file)
index 0000000..
cd162fc
Binary files /dev/null and b/data/cboom.wav differ
diff --git a/data/font.png
b/data/font.png
new file mode 100644
(file)
index 0000000..
eecd4e5
Binary files /dev/null and b/data/font.png differ
diff --git
a/data/fonts/score.png
b/data/fonts/score.png
deleted file mode 100644
(file)
index
eecd4e5
..0000000
Binary files a/data/fonts/score.png and /dev/null differ
diff --git a/data/getzznew.mod
b/data/getzznew.mod
new file mode 100644
(file)
index 0000000..
533f882
Binary files /dev/null and b/data/getzznew.mod differ
diff --git a/data/magic.mod
b/data/magic.mod
new file mode 100644
(file)
index 0000000..
46c7b02
Binary files /dev/null and b/data/magic.mod differ
diff --git
a/data/music/4est_fulla3s.mod
b/data/music/4est_fulla3s.mod
deleted file mode 100644
(file)
index
f84b409
..0000000
Binary files a/data/music/4est_fulla3s.mod and /dev/null differ
diff --git
a/data/music/getzznew.mod
b/data/music/getzznew.mod
deleted file mode 100644
(file)
index
533f882
..0000000
Binary files a/data/music/getzznew.mod and /dev/null differ
diff --git
a/data/music/magic.mod
b/data/music/magic.mod
deleted file mode 100644
(file)
index
46c7b02
..0000000
Binary files a/data/music/magic.mod and /dev/null differ
diff --git
a/data/sounds/boom.wav
b/data/sounds/boom.wav
deleted file mode 100644
(file)
index
60226fd
..0000000
Binary files a/data/sounds/boom.wav and /dev/null differ
diff --git
a/data/sounds/booom.wav
b/data/sounds/booom.wav
deleted file mode 100644
(file)
index
def49aa
..0000000
Binary files a/data/sounds/booom.wav and /dev/null differ
diff --git
a/data/sounds/bzboom.wav
b/data/sounds/bzboom.wav
deleted file mode 100644
(file)
index
e6f4859
..0000000
Binary files a/data/sounds/bzboom.wav and /dev/null differ
diff --git
a/data/sounds/cboom.wav
b/data/sounds/cboom.wav
deleted file mode 100644
(file)
index
cd162fc
..0000000
Binary files a/data/sounds/cboom.wav and /dev/null differ
diff --git
a/file.c
b/file.c
index
0c6177f
..
1e02c8e
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-31,12
+31,11
@@
char *g_data_dir;
char *g_score_file;
char *g_data_dir;
char *g_score_file;
-mode_t g_score_mask;
-char *
+static char *
add_path(char *path, char *file)
{
add_path(char *path, char *file)
{
- char *s;
+ char *r, *s;
size_t plen, flen;
if(!path || !file) return NULL;
size_t plen, flen;
if(!path || !file) return NULL;
@@
-58,27
+57,23
@@
add_data_path(char *filename)
#ifdef WIN32
#ifdef WIN32
-bool
-is_dir(char *dirname)
+static bool
+find_data_dir(void)
{
{
- WIN32_FILE_ATTRIBUTE_DATA buf;
- if(!GetFileAttributesEx(dirname, GetFileExInfoStandard, &buf))
- return false;
- return buf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+ g_data_dir = ".";
+ return true;
}
}
-bool
-is_file(char *filename)
+static bool
+find_score_file(void)
{
{
- WIN32_FILE_ATTRIBUTE_DATA buf;
- if(!GetFileAttributesEx(filename, GetFileExInfoStandard, &buf))
- return false;
- return buf.dwFileAttributes & FILE_ATTRIBUTE_NORMAL;
+ g_score_file = "scores";
+ return true;
}
#else /* !WIN32 */
}
#else /* !WIN32 */
-bool
+static bool
is_dir(char *dirname)
{
struct stat buf;
is_dir(char *dirname)
{
struct stat buf;
@@
-86,17
+81,7
@@
is_dir(char *dirname)
return S_ISDIR(buf.st_mode);
}
return S_ISDIR(buf.st_mode);
}
-bool
-is_file(char *filename)
-{
- struct stat buf;
- stat(filename, &buf);
- return S_ISREG(buf.st_mode);
-}
-
-#endif /* !WIN32 */
-
-bool
+static bool
find_data_dir(void)
{
int i;
find_data_dir(void)
{
int i;
@@
-119,7
+104,7
@@
find_data_dir(void)
return false;
}
return false;
}
-bool
+static bool
find_score_file(void)
{
char *dir, *s;
find_score_file(void)
{
char *dir, *s;
@@
-131,11
+116,12
@@
find_score_file(void)
s = add_path(dir, ".vor-scores");
if(s) {
g_score_file = s;
s = add_path(dir, ".vor-scores");
if(s) {
g_score_file = s;
- g_score_mask = 0177;
return true;
} else return false;
}
return true;
} else return false;
}
+#endif /* !WIN32 */
+
bool
find_files(void)
{
bool
find_files(void)
{
@@
-145,13
+131,6
@@
find_files(void)
FILE *
open_score_file(char *mode)
{
FILE *
open_score_file(char *mode)
{
- mode_t old_mask;
- FILE *f;
-
if(!g_score_file) return NULL;
if(!g_score_file) return NULL;
-
- old_mask = umask(g_score_mask);
- f = fopen(g_score_file, mode);
- umask(old_mask);
- return f;
+ return fopen(g_score_file, mode);
}
}
diff --git
a/file.h
b/file.h
index
f376213
..
df76403
100644
(file)
--- a/
file.h
+++ b/
file.h
@@
-23,10
+23,6
@@
#include <stdio.h>
char *add_data_path(char *filename);
#include <stdio.h>
char *add_data_path(char *filename);
-bool is_dir(char *dirname);
-bool is_file(char *filename);
-bool find_data_dir(void);
-bool find_score_file(void);
bool find_files(void);
FILE *open_score_file(char *mode);
bool find_files(void);
FILE *open_score_file(char *mode);
diff --git
a/gfx.mk
b/gfx.mk
index
048b8ef
..
762d236
100644
(file)
--- a/
gfx.mk
+++ b/
gfx.mk
@@
-1,11
+1,11
@@
gfx-deps := gfx.mk povimg.sh
gfx-deps := gfx.mk povimg.sh
-data/sprites/ship.png: ship.pov $(gfx-deps)
+data/ship.png: ship.pov $(gfx-deps)
./povimg.sh +W32 +H32 $< > $@
./povimg.sh +W32 +H32 $< > $@
-data/indicators/life.png: ship.pov $(gfx-deps)
+data/life.png: ship.pov $(gfx-deps)
./povimg.sh +W17 +H17 $< > $@
./povimg.sh +W17 +H17 $< > $@
-data/sprites/rock%.png: rocks.pov $(gfx-deps)
+data/rock%.png: rocks.pov $(gfx-deps)
./povimg.sh +H52 +W52 +K$* $< > $@
./povimg.sh +H52 +W52 +K$* $< > $@
diff --git
a/main.c
b/main.c
index
a2d7bee
..
11ebba6
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-103,12
+103,12
@@
float state_timeout = 600.0;
char *msgs[2][3] = {
{
"Press SPACE for normal game",
char *msgs[2][3] = {
{
"Press SPACE for normal game",
- "Press 'e' for easy game",
+ "Press '1' for easy game",
"http://jasonwoof.org/vor"
},
{
"Press SPACE for easy game",
"http://jasonwoof.org/vor"
},
{
"Press SPACE for easy game",
- "Press 'n' for normal game",
+ "Press '2' for normal game",
"http://jasonwoof.org/vor"
}
};
"http://jasonwoof.org/vor"
}
};
@@
-339,7
+339,7
@@
load_image(char *filename)
void
load_ship(void)
{
void
load_ship(void)
{
- load_sprite(SPRITE(&ship), "sprites/ship.png");
+ load_sprite(SPRITE(&ship), "ship.png");
}
int
}
int
@@
-391,18
+391,18
@@
init(void) {
}
// Load the banners
}
// Load the banners
- NULLERROR(surf_b_variations = load_image("banners/variations.png"));
- NULLERROR(surf_b_on = load_image("banners/on.png"));
- NULLERROR(surf_b_rockdodger = load_image("banners/rockdodger.png"));
+ NULLERROR(surf_b_variations = load_image("variations.png"));
+ NULLERROR(surf_b_on = load_image("on.png"));
+ NULLERROR(surf_b_rockdodger = load_image("rockdodger.png"));
- NULLERROR(surf_b_game = load_image("banners/game.png"));
- NULLERROR(surf_b_over = load_image("banners/over.png"));
+ NULLERROR(surf_b_game = load_image("game.png"));
+ NULLERROR(surf_b_over = load_image("over.png"));
// Load the life indicator (small ship) graphic.
// Load the life indicator (small ship) graphic.
- NULLERROR(surf_life = load_image("indicators/life.png"));
+ NULLERROR(surf_life = load_image("life.png"));
// Load the font image
// Load the font image
- s = add_data_path(BIG_FONT_FILE);
+ s = add_data_path("font.png");
if(s) {
NULLERROR(surf_font_big = IMG_Load(s));
free(s);
if(s) {
NULLERROR(surf_font_big = IMG_Load(s));
free(s);
@@
-692,20
+692,20
@@
gameloop() {
}
// new game
}
// new game
- if((keystate[SDLK_SPACE] || keystate[SDLK_e] || keystate[SDLK_n])
+ if((keystate[SDLK_SPACE] || keystate[SDLK_1] || keystate[SDLK_2])
&& (state == HIGH_SCORE_DISPLAY
|| state == TITLE_PAGE
|| state == GAME_OVER)) {
if(state == GAME_OVER && new_high_score(score))
init_score_entry();
else {
&& (state == HIGH_SCORE_DISPLAY
|| state == TITLE_PAGE
|| state == GAME_OVER)) {
if(state == GAME_OVER && new_high_score(score))
init_score_entry();
else {
- if((keystate[SDLK_SPACE] && !initial_rocks) || keystate[SDLK_n]) {
+ if((keystate[SDLK_SPACE] && !initial_rocks) || keystate[SDLK_2]) {
g_easy = 0;
initial_rocks = NORMAL_I_ROCKS;
final_rocks = NORMAL_F_ROCKS;
if(opt_gamespeed == EASY_GAMESPEED)
opt_gamespeed = NORMAL_GAMESPEED;
g_easy = 0;
initial_rocks = NORMAL_I_ROCKS;
final_rocks = NORMAL_F_ROCKS;
if(opt_gamespeed == EASY_GAMESPEED)
opt_gamespeed = NORMAL_GAMESPEED;
- } else if(keystate[SDLK_e]) {
+ } else if(keystate[SDLK_1]) {
g_easy = 1;
initial_rocks = EASY_I_ROCKS;
final_rocks = EASY_F_ROCKS;
g_easy = 1;
initial_rocks = EASY_I_ROCKS;
final_rocks = EASY_F_ROCKS;
diff --git
a/sound.c
b/sound.c
index
3794bef
..
0dc94ef
100644
(file)
--- a/
sound.c
+++ b/
sound.c
@@
-20,16
+20,16
@@
int audio_channels;
char *add_data_path(char *);
char *wav_file[] = {
char *add_data_path(char *);
char *wav_file[] = {
- "sounds/booom.wav",
- "sounds/cboom.wav",
- "sounds/boom.wav",
- "sounds/bzboom.wav"
+ "booom.wav",
+ "cboom.wav",
+ "boom.wav",
+ "bzboom.wav"
};
char *tune_file[] = {
};
char *tune_file[] = {
- "music/magic.mod",
- "music/getzznew.mod",
- "music/4est_fulla3s.mod"
+ "magic.mod",
+ "getzznew.mod",
+ "4est_fulla3s.mod"
};
// Return 1 if the sound is ready to roll, and 0 if not.
};
// Return 1 if the sound is ready to roll, and 0 if not.