X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=e06a01080e5c755c51574953b4636d76687adea8;hp=51d8e9f14233742aaa5849c39583f1e3ee6b7891;hb=6f82bba8833f187abebab53375ac87905487cf8c;hpb=a2af96e68b210b7c3db90b7ec474498c5611a3a7 diff --git a/main.c b/main.c index 51d8e9f..e06a010 100644 --- a/main.c +++ b/main.c @@ -21,12 +21,9 @@ #undef DEBUG -extern int font_height; -void clearBuffer(); - -// includes {{{ #include "config.h" #include "file.h" +#include "score.h" #include "sound.h" #include @@ -39,13 +36,9 @@ void clearBuffer(); #include #include "SFont.h" -// }}} -// constants {{{ -// }}} -// macros {{{ + #define CONDERROR(a) if((a)) {initerror = strdup(SDL_GetError());return 1;} #define NULLERROR(a) CONDERROR((a) == NULL) -// }}} // ************************************* STRUCTS struct rock_struct { @@ -86,25 +79,9 @@ struct spacedot { float x,y,dx; Uint16 color; }; -// High score table {{{ -struct highscore { - int score; - char *name; - int allocated; -} high[] = { - {13000,"Pad",0}, - {12500,"Pad",0}, - {6500,"Pad",0}, - {5000,"Pad",0}, - {3000,"Pad",0}, - {2500,"Pad",0}, - {2000,"Pad",0}, - {1500,"Pad",0} -}; -// }}} // ************************************* VARS -// SDL_Surface global variables {{{ +// SDL_Surface global variables SDL_Surface *surf_screen, // Screen *surf_b_variations, // "variations" banner @@ -117,15 +94,17 @@ SDL_Surface *surf_rock[NROCKS], // THE ROCKS *surf_deadrock[NROCKS], // THE DEAD ROCKS *surf_font_big; // The big font -// }}} -// Structure global variables {{{ + +SFont_Font *g_font; + +// Structure global variables struct enginedots edot[MAXENGINEDOTS], *dotptr = edot; struct rock_struct rock[MAXROCKS], *rockptr = rock; struct black_point_struct black_point[MAXBLACKPOINTS], *blackptr = black_point; struct bangdots bdot[MAXBANGDOTS], *bdotptr = bdot; struct spacedot sdot[MAXSPACEDOTS]; -// }}} -// Other global variables {{{ + +// Other global variables char topline[1024]; char *initerror = ""; char name[1024], debug1[1024]; @@ -180,7 +159,6 @@ Uint16 heatcolor[W*3]; char *data_dir; extern char *optarg; extern int optind, opterr, optopt; -// }}} float dist_sq(float x1, float y1, float x2, float y2) { @@ -189,63 +167,21 @@ float dist_sq(float x1, float y1, float x2, float y2) // ************************************* FUNCS -void read_high_score_table() { - FILE *f; - int i; - - f = open_score_file("r"); - if(f) { - // If the file exists, read from it - for(i = 0; i<8; i++) { - char s[1024]; - int highscore; - if(fscanf (f, "%d %[^\n]", &highscore, s) != 2) { - break; - } - if(high[i].allocated) { - free(high[i].name); - } - high[i].name = strdup(s); - high[i].score = highscore; - high[i].allocated = 1; - } - fclose(f); - } -} - -void write_high_score_table() { - FILE *f; - int i; - - 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); - } - fclose(f); - } -} -void snprintscore(char *s, size_t n, int score) { - int min = score/60000; - int sec = score/1000%60; - int tenths = score%1000/100; - if(min) { - snprintf(s, n, "%2d:%.2d.%d", min, sec, tenths); - } else { - snprintf(s, n, " %2d.%d", sec, tenths); - } -} -float rnd() { +float +rnd() { return (float)random()/(float)RAND_MAX; } -void init_engine_dots() { + +void +init_engine_dots() { int i; for(i = 0; ipixels; @@ -385,7 +324,8 @@ void draw_space_dots(SDL_Surface *s) { } } -void draw_engine_dots(SDL_Surface *s) { +void +draw_engine_dots(SDL_Surface *s) { int i; Uint16 *rawpixel; rawpixel = (Uint16 *) s->pixels; @@ -408,7 +348,8 @@ void draw_engine_dots(SDL_Surface *s) { } } -void create_engine_dots(int newdots) { +void +create_engine_dots(int newdots) { int i; double theta,r,dx,dy; @@ -438,7 +379,8 @@ void create_engine_dots(int newdots) { } } -void create_engine_dots2(int newdots, int m) { +void +create_engine_dots2(int newdots, int m) { int i; double theta, theta2, dx, dy, adx, ady; @@ -493,8 +435,9 @@ void create_engine_dots2(int newdots, int m) { } } -void drawdots(SDL_Surface *s) { - int m, scorepos, n; +void +drawdots(SDL_Surface *s) { + int m; SDL_LockSurface(s); // Draw the background stars aka space dots @@ -504,10 +447,8 @@ void drawdots(SDL_Surface *s) { if(1 || state == GAMEPLAY || state == DEAD_PAUSE || state == GAME_OVER ) { SDL_UnlockSurface(s); - scorepos = XSIZE-250; - n = snprintf(topline, 50, "Time: "); - snprintscore(topline + n, 50-n, score); - PutString(s,scorepos,0,topline); + snprintscore_line(topline, 50, score); + SFont_Write(s,g_font,XSIZE-250,0,topline); SDL_LockSurface(s); } @@ -516,8 +457,7 @@ void drawdots(SDL_Surface *s) { draw_engine_dots(s); // Create more engine dots comin out da back - if(!gameover) - create_engine_dots(200); + if(!gameover) create_engine_dots(200); // Create engine dots out the side we're moving from for(m = 0; m<4; m++) { @@ -533,7 +473,8 @@ void drawdots(SDL_Surface *s) { SDL_UnlockSurface(s); } -int init(int fullscreen) { +int +init(int fullscreen) { int i,j; SDL_Surface *temp; @@ -598,7 +539,7 @@ int init(int fullscreen) { NULLERROR(surf_b_over = SDL_DisplayFormat(temp)); surf_font_big = IMG_Load(load_file(BIG_FONT_FILE)); - InitFont(surf_font_big); + g_font = SFont_InitFont(surf_font_big); // Load the spaceship graphic. NULLERROR(temp = IMG_Load(load_file("sprites/ship.png"))); @@ -646,7 +587,9 @@ int init(int fullscreen) { return 0; } -int draw() { + +int +draw() { int i; SDL_Rect src,dest; struct black_point_struct *p; @@ -665,38 +608,6 @@ int draw() { // Draw a fully black background SDL_FillRect(surf_screen,NULL,0); - -#ifdef DEBUG - // DEBUG {{{ - // Show the current state - switch (state) { - case TITLE_PAGE: - statedisplay = "title_page"; - break; - case GAMEPLAY: - statedisplay = "gameplay"; - break; - case DEAD_PAUSE: - statedisplay = "dead_pause"; - break; - case GAME_OVER: - statedisplay = "game_over"; - break; - case HIGH_SCORE_ENTRY: - statedisplay = "high_score_entry"; - break; - case HIGH_SCORE_DISPLAY: - statedisplay = "high_score_display"; - break; - case DEMO: - statedisplay = "demo"; - break; - } - snprintf(buf,1024, "mode = %s", statedisplay); - PutString(surf_screen,0,YSIZE-50,buf); - // }}} -#endif - // Draw the background dots drawdots(surf_screen); @@ -794,62 +705,33 @@ int draw() { SDL_BlitSurface(surf_b_rockdodger,&src,surf_screen,&dest); text = "Version " VERSION; - x = (XSIZE-SFont_wide(text))/2 + sin(fadetimer/4.5)*10; - PutString(surf_screen,x,YSIZE-50 + sin(fadetimer/2)*5,text); + x = (XSIZE-SFont_TextWidth(g_font,text))/2 + sin(fadetimer/4.5)*10; + SFont_Write(surf_screen,g_font,x,YSIZE-50 + sin(fadetimer/2)*5,text); text = sequence[(int)(fadetimer/40)%NSEQUENCE]; //text = "Press SPACE to start!"; - x = (XSIZE-SFont_wide(text))/2 + cos(fadetimer/4.5)*10; - PutString(surf_screen,x,YSIZE-100 + cos(fadetimer/3)*5,text); + x = (XSIZE-SFont_TextWidth(g_font,text))/2 + cos(fadetimer/4.5)*10; + SFont_Write(surf_screen,g_font,x,YSIZE-100 + cos(fadetimer/3)*5,text); break; case HIGH_SCORE_ENTRY: + play_tune(2); + if(!process_score_input()) { // done inputting name - if(score >= high[7].score) { - play_tune(2); - if(SFont_Input (surf_screen, 330, 50 + (scorerank + 2)*font_height, 300, name)) { - // Insert name into high score table - - // Lose the lowest name forever (loser!) - //if(high[7].allocated) - // free(high[7].name); // THIS WAS CRASHING SO I REMOVED IT - - // Insert new high score - high[scorerank].score = score; - high[scorerank].name = strdup(name); // MEMORY NEVER FREED! - high[scorerank].allocated = 1; - - // Set the global name string to "", ready for the next winner - name[0] = 0; - - // Change state to briefly show high scores page - state = HIGH_SCORE_DISPLAY; - state_timeout = 200; - - // Write the high score table to the file - write_high_score_table(); - - // Play the title page tune - play_tune(0); - } - } else { + // Change state to briefly show high scores page state = HIGH_SCORE_DISPLAY; - state_timeout = 400; - } - // FALL THROUGH + state_timeout = 200; + // Write the high score table to the file + write_high_score_table(); + + // Play the title page tune + play_tune(0); + } + // FALL THROUGH TO case HIGH_SCORE_DISPLAY: // Display de list o high scores mon. - PutString(surf_screen,180,50,"High scores"); - for(i = 0; i<8; i++) { - char s[1024]; - sprintf(s, "#%1d",i + 1); - PutString(surf_screen, 150, 50 + (i + 2)*font_height,s); - snprintscore(s, 1024, high[i].score); - PutString(surf_screen, 200, 50 + (i + 2)*font_height,s); - sprintf(s, "%3s", high[i].name); - PutString(surf_screen, 330, 50 + (i + 2)*font_height,s); - } + display_scores(surf_screen, 150,50); } @@ -908,7 +790,8 @@ int draw() { return bang; } -int gameloop() { +int +gameloop() { int i = 0; Uint8 *keystate; @@ -924,45 +807,29 @@ int gameloop() { state = GAMEPLAY; play_tune(1); xship -= 50; - break; + break; case GAME_OVER: state = HIGH_SCORE_ENTRY; - clearBuffer(); - name[0] = 0; state_timeout = 5.0e6; - - if(score >= high[7].score) { - // Read the high score table from the storage file - read_high_score_table(); - - // Find ranking of this score, store as scorerank - for(i = 0; i<8; i++) { - if(high[i].score <= score) { - scorerank = i; - break; - } - } - - // Move all lower scores down a notch - for(i = 7; i >= scorerank; i--) - high[i] = high[i-1]; - - // Insert blank high score - high[scorerank].score = score; - high[scorerank].name = ""; - high[scorerank].allocated = 0; + if(new_high_score(score)) { + SDL_Event e; + SDL_EnableUNICODE(1); + while(SDL_PollEvent(&e)) + ; + } else { + state = HIGH_SCORE_DISPLAY; + state_timeout = 400; } - - break; + break; case HIGH_SCORE_DISPLAY: state = TITLE_PAGE; state_timeout = 500.0; - break; + break; case HIGH_SCORE_ENTRY: // state = TITLE_PAGE; // play_tune(1); // state_timeout = 100.0; - break; + break; case TITLE_PAGE: state = HIGH_SCORE_DISPLAY; state_timeout = 200.0;