Factored most of the file-handling code out into a separate file.
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
ldflags := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-cflags := -g $(shell sdl-config --cflags)
+cflags := -g $(shell sdl-config --cflags) -Wall
+
+my_objects := sound.o file.o main.o
+libs := SFont.o
+objects := $(libs) $(my_objects)
INSTALL = install
INSTALL_PROGRAM = $(INSTALL) -o games -g games
all: vor
%.o: %.c
- $(CC) $(cflags) -c -o $@ $^
+ $(CC) $(cflags) -c -o $@ $<
+
+$(my_objects): config.h
+
+main.o file.o: file.h
-vor: SFont.o sound.o main.o
+vor: $(objects)
$(CC) $(ldflags) -o $@ $^ $(LIBRARIES)
clean:
$(INSTALL_DATA) ./data/music/* $(DATA_PREFIX)/music/
$(INSTALL_DATA) ./data/sounds/* $(DATA_PREFIX)/sounds/
$(INSTALL_DATA) ./data/sprites/* $(DATA_PREFIX)/sprites/
- touch $(DATA_PREFIX)/.highscore
- chmod a+rw $(DATA_PREFIX)/.highscore
+ touch $(DATA_PREFIX)/scores
+ chmod a+rw $(DATA_PREFIX)/scores
uninstall:
rm -f $(PROGRAM_PREFIX)/vor
rm -f $(DATA_PREFIX)/music/*
rm -f $(DATA_PREFIX)/sounds/*
rm -f $(DATA_PREFIX)/sprites/*
- rm -f $(DATA_PREFIX)/.highscore
+ rm -f $(DATA_PREFIX)/scores $(DATA_PREFIX)/.highscore
if [ -d $(DATA_PREFIX)/banners ]; then rmdir $(DATA_PREFIX)/banners; fi
if [ -d $(DATA_PREFIX)/fonts ]; then rmdir $(DATA_PREFIX)/fonts; fi
#include <SDL/SDL.h>
+#include <stdlib.h>
#include "SFont.h"
#include "string.h"
while (text[i]) {
if (text[i]==' ') {
xwide += (int)(Font->CharPos[2]-Font->CharPos[1]);
- }
- else {
- ofs = (text[i]-33)*2+1;
+ } else {
+ ofs = (text[i]-33)*2+1;
xwide += (int)(Font->CharPos[ofs+1]-Font->CharPos[ofs]);
- }
- i++;
+ }
+ i++;
}
return xwide;
}
unsigned char ofs = 0;
while (text[i]!='\0') {
if (text[i]==' ') {
- x+=Font->CharPos[2]-Font->CharPos[1];
- i++;
- }
- else {
- ofs=(text[i]-33)*2+1;
- x+=Font->CharPos[ofs+1]-Font->CharPos[ofs];
- i++;
- }
+ x+=Font->CharPos[2]-Font->CharPos[1];
+ } else {
+ ofs=(text[i]-33)*2+1;
+ x+=Font->CharPos[ofs+1]-Font->CharPos[ofs];
+ }
+ i++;
}
return x+Font->CharPos[ofs+2]-Font->CharPos[ofs+1];
}
// Returns the width of "text" in pixels
int TextWidth(char *text);
int TextWidth2(SFont_FontInfo *Font, char *text);
+int SFont_wide(char *text);
// Blits a string to with centered x position
void XCenteredString (SDL_Surface *Surface, int y, char *text);
+#ifndef VOR_CONFIG_H
+#define VOR_CONFIG_H
+
#define VERSION "0.1"
// screen size
#define W 100
#define M 255
#define BLAST_RADIUS 200 // radius^2 (pixels) which will be cleared of rocks when you die
+
+#define MAX_PATH_LEN 1024
+
+#ifndef true
+#define true 1
+#endif
+
+#ifndef false
+#define false 0
+#endif
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#endif // VOR_CONFIG_H
--- /dev/null
+/* Variations on RockDodger
+ * Copyright (C) 2004 Joshua Grams <josh@qualdan.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "config.h"
+#include "file.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+char *g_data_dir;
+char *g_score_file;
+mode_t g_score_mode;
+
+char *
+load_file(char *filename)
+{
+ static char r[MAX_PATH_LEN];
+ snprintf(r, MAX_PATH_LEN, "%s/%s", g_data_dir, filename);
+ return r;
+}
+
+int
+is_dir(char *dirname)
+{
+ struct stat buf;
+ stat(dirname, &buf);
+ return S_ISDIR(buf.st_mode);
+}
+
+int
+is_file(char *filename)
+{
+ struct stat buf;
+ stat(filename, &buf);
+ return S_ISREG(buf.st_mode);
+}
+
+int
+find_data_dir(void)
+{
+ int i;
+ char *data_options[3] = {
+ "./data",
+ getenv("VOR_DATA"),
+ "/usr/share/vor"
+ };
+
+ for(i=0; i<3; i++) {
+ g_data_dir = strdup(data_options[i]);
+ if(is_dir(g_data_dir)) return true;
+ }
+
+ fprintf(stderr, "Can't find VoR data! Tried:\n");
+ for(i=0; i<3; i++) {
+ fprintf(stderr, "\t%s\n", data_options[i]);
+ }
+ return false;
+}
+
+int
+find_score_file(void)
+{
+ g_score_file = load_file("scores");
+ g_score_mode = 0111;
+ if(is_file(g_score_file)) return true;
+
+ g_score_file = malloc(MAX_PATH_LEN);
+ snprintf(g_score_file, MAX_PATH_LEN,
+ "%s/.vor-high", getenv("HOME"));
+ g_score_mode = 0177;
+ if(is_file(g_score_file)) return true;
+
+ return false;
+}
+
+int
+find_files(void)
+{
+ int r;
+ r = find_data_dir();
+ find_score_file();
+ return r;
+}
+
+FILE *
+open_score_file(char *mode)
+{
+ mode_t old_mask;
+ FILE *f = NULL;
+
+ if(!g_score_file) return f;
+
+ old_mask = umask(g_score_mode);
+ f = fopen(g_score_file, mode);
+
+ umask(old_mask);
+ return f;
+}
--- /dev/null
+/* Variations on RockDodger
+ * Copyright (C) 2004 Joshua Grams <josh@qualdan.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef VOR_FILE_H
+#define VOR_FILE_H
+
+#include <stdio.h>
+#include <sys/types.h>
+
+extern char *g_data_dir;
+extern char *g_score_file;
+extern mode_t g_score_mode;
+
+char *load_file(char *filename);
+int is_dir(char *dirname);
+int is_file(char *filename);
+int find_data_dir(void);
+int find_score_file(void);
+int find_files(void);
+FILE *open_score_file(char *mode);
+
+#endif // VOR_FILE_H
// includes {{{
#include "config.h"
+#include "file.h"
+#include "sound.h"
+
+#include <math.h>
#include <SDL/SDL.h>
#include <SDL/SDL_image.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <math.h>
-#include <stdarg.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
#include <unistd.h>
#include "SFont.h"
// to make room for a new ship appearing.
SDL_Surface *image;
int type_number;
- float heat;
};
struct black_point_struct {
int x,y;
// ************************************* FUNCS
-FILE *hs_fopen(char *mode) {
- FILE *f;
- mode_t mask;
- mask = umask(0111);
- if(f = fopen("/usr/share/vor/.highscore",mode)) {
- umask(mask);
- return f;
- }
- else {
- char s[1024];
- umask(0177);
- sprintf(s,"%s/.vor-high",getenv("HOME"));
- if(f = fopen(s,mode)) {
- umask(mask);
- return f;
- }
- else {
- umask(mask);
- return 0;
- }
- }
-}
void read_high_score_table() {
FILE *f;
int i;
- if(f = hs_fopen("r")) {
+
+ f = open_score_file("r");
+ if(f) {
// If the file exists, read from it
for(i = 0; i<8; i++) {
char s[1024];
fclose(f);
}
}
+
void write_high_score_table() {
FILE *f;
int i;
- if(f = hs_fopen("w")) {
+
+ f = open_score_file("w");
+ if(f) {
// If the file exists, write to it
for(i = 0; i<8; i++) {
fprintf (f, "%d %s\n", high[i].score, high[i].name);
}
}
-int makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) {
+void makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) {
// TODO - stop generating dots after a certain amount of time has passed, to cope with slower CPUs.
// TODO - generate and display dots in a circular buffer
- int i,x,y,n,endcount;
+ int x,y,endcount;
Uint16 *rawpixel,c;
- double theta,r,dx,dy;
+ double theta,r;
int begin_generate;
begin_generate = SDL_GetTicks();
endcount = 0;
while (endcount<3) {
+ for(x = 0; x<s->w; x++) {
+ for(y = 0; y<s->h; y++) {
+ c = rawpixel[s->pitch/2*y + x];
+ if(c && c != SDL_MapRGB(s->format,0,255,0)) {
- for(x = 0; x<s->w; x++) {
- for(y = 0; y<s->h; y++) {
- c = rawpixel[s->pitch/2*y + x];
- if(c && c != SDL_MapRGB(s->format,0,255,0)) {
-
- theta = rnd()*M_PI*2;
+ theta = rnd()*M_PI*2;
- r = 1-(rnd()*rnd());
+ r = 1-(rnd()*rnd());
- bdot[bd2].dx = (power/50.0)*45.0*cos(theta)*r + xvel;
- bdot[bd2].dy = (power/50.0)*45.0*sin(theta)*r + yvel;
- bdot[bd2].x = x + xbang;
- bdot[bd2].y = y + ybang;
+ bdot[bd2].dx = (power/50.0)*45.0*cos(theta)*r + xvel;
+ bdot[bd2].dy = (power/50.0)*45.0*sin(theta)*r + yvel;
+ bdot[bd2].x = x + xbang;
+ bdot[bd2].y = y + ybang;
- // Replace the last few bang dots with the pixels from the exploding object
- bdot[bd2].c = (endcount>0)?c:0;
- bdot[bd2].life = 100;
- bdot[bd2].decay = rnd()*3 + 1;
- bdot[bd2].active = 1;
+ // Replace the last few bang dots with the pixels from the exploding object
+ bdot[bd2].c = (endcount>0)?c:0;
+ bdot[bd2].life = 100;
+ bdot[bd2].decay = rnd()*3 + 1;
+ bdot[bd2].active = 1;
- bd2++;
- bd2 %= MAXBANGDOTS;
+ bd2++;
+ bd2 %= MAXBANGDOTS;
- // If the circular buffer is filled, who cares? They've had their chance.
- //if(bd2 == bd1-1) goto exitloop;
+ // If the circular buffer is filled, who cares? They've had their chance.
+ //if(bd2 == bd1-1) goto exitloop;
+ }
}
}
- }
-
- if(SDL_GetTicks() - begin_generate > 7) endcount++;
+ if(SDL_GetTicks() - begin_generate > 7) endcount++;
}
-exitloop:
SDL_UnlockSurface(s);
}
}
-int drawdots(SDL_Surface *s) {
+void drawdots(SDL_Surface *s) {
int m, scorepos, n;
SDL_LockSurface(s);
SDL_UnlockSurface(s);
}
-char * load_file(char *s) {
- static char retval[1024];
- snprintf(retval, 1024, "%s/%s", data_dir, s);
- return retval;
-}
-
-
-int missing(char *dirname) {
- struct stat buf;
- stat(dirname, &buf);
- return (!S_ISDIR(buf.st_mode));
-}
-
int init(int fullscreen) {
int i,j;
Uint16 *raw_pixels;
Uint32 flag;
- read_high_score_table();
-
// Where are our data files?
- // default: ./data
- // second alternative: RD_DATADIR
- // final alternative: /usr/share/vor
- data_dir = strdup("./data");
- if(missing(data_dir)) {
- char *env;
- env = getenv("RD_DATADIR");
- if(env != NULL) {
- data_dir = strdup(env);
- if(missing(data_dir)) {
- fprintf (stderr,"Cannot find data directory $RD_DATADIR\n");
- exit(-1);
- }
- } else {
- data_dir = strdup("/usr/share/vor");
- if(missing(data_dir)) {
- fprintf (stderr,"Cannot find data in %s\n", data_dir);
- exit(-2);
- }
- }
- }
+ if(!find_files()) exit(1);
+ read_high_score_table();
if(sound_flag) {
// Initialize SDL with audio and video
return 0;
}
int draw() {
- int i,n;
+ int i;
SDL_Rect src,dest;
struct black_point_struct *p;
Uint16 *raw_pixels;
char *text;
float fadegame,fadeover;
- char *statedisplay, buf[1024];
-
bang = 0;
src.x = 0;
// Draw the rock
SDL_BlitSurface(rock[i].image,&src,surf_screen,&dest);
- // Draw the heated part of the rock, in an alpha which reflects the
- // amount of heat in the rock.
- if(rock[i].heat>0) {
- SDL_Surface *deadrock;
- deadrock = surf_deadrock[rock[i].type_number];
- SDL_SetAlpha(deadrock,SDL_SRCALPHA,rock[i].heat*255/rock[i].image->h);
- dest.x = (int) rock[i].x; // kludge
- SDL_BlitSurface(deadrock,&src,surf_screen,&dest);
- if(rnd()<0.3) {
- rock[i].heat -= movementrate;
- }
- }
-
- // If the rock is heated past a certain point, the water content of
- // the rock flashes to steam, releasing enough energy to destroy
- // the rock in spectacular fashion.
- if(rock[i].heat>rock[i].image->h) {
- rock[i].active = 0;
- play_sound(1 + (int)(rnd()*3));
- makebangdots(rock[i].x,rock[i].y,rock[i].xvel,rock[i].yvel,rock[i].image,10);
- }
-
}
}
return bang;
}
+
int gameloop() {
int i = 0;
Uint8 *keystate;
rockptr->xvel = -(rockspeed)*(1 + rnd());
rockptr->yvel = rnd()-0.5;
rockptr->type_number = random() % NROCKS;
- rockptr->heat = 0;
rockptr->image = surf_rock[rockptr->type_number];// [random()%NROCKS];
rockptr->active = 1;
rockptr->y = rnd()*(YSIZE + rockptr->image->h);
}
}
}
+
+int
main(int argc, char **argv) {
int i, x, fullscreen;
return 1;
}
- while(1) {
- for(i = 0; i<MAXROCKS; i++) {
- rock[i].active = 0;
- rock[i].dead = 0;
- }
- rockrate = 54.0;
- rockspeed = 5.0;
- initticks = SDL_GetTicks();
- if(gameloop() == 0) {
- break;
- }
- printf ("score = %d\n",score);
- SDL_Delay(1000);
+ for(i = 0; i<MAXROCKS; i++) {
+ rock[i].active = 0;
+ rock[i].dead = 0;
}
+ rockrate = 54.0;
+ rockspeed = 5.0;
+ initticks = SDL_GetTicks();
+ gameloop();
return 0;
}
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include "sound.h"
extern int sound_flag, music_flag;
--- /dev/null
+/* Variations on RockDodger
+ * Copyright (C) 2004 Joshua Grams <josh@qualdan.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef VOR_SOUND_H
+#define VOR_SOUND_H
+
+#include <SDL/SDL.h>
+#include <SDL/SDL_mixer.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int init_sound(void);
+void play_sound(int i);
+void play_tune(int i);
+
+#endif // VOR_SOUND_H
Got questions, comments, patches, etc.? Contact Jason Woofenden