X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=ab97cbc611dc46b60f043111c0d7778b1e325d4f;hp=78c2ca03e42865ed88460fc4d4f61e086510c2f6;hb=44c1168e314f92adf033104c615284384572c0b7;hpb=0ebbb01f731d0c9bb71140a93cfddd9abde509e5 diff --git a/main.c b/main.c index 78c2ca0..ab97cbc 100644 --- a/main.c +++ b/main.c @@ -21,11 +21,9 @@ #undef DEBUG -extern int font_height; -void clearBuffer(); - #include "config.h" #include "file.h" +#include "score.h" #include "sound.h" #include @@ -81,21 +79,6 @@ 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 @@ -112,6 +95,8 @@ SDL_Surface *surf_deadrock[NROCKS], // THE DEAD ROCKS *surf_font_big; // The big font +SFont_Font *g_font; + // Structure global variables struct enginedots edot[MAXENGINEDOTS], *dotptr = edot; struct rock_struct rock[MAXROCKS], *rockptr = rock; @@ -122,12 +107,11 @@ struct spacedot sdot[MAXSPACEDOTS]; // Other global variables char topline[1024]; char *initerror = ""; -char name[1024], debug1[1024]; float xship,yship = 240.0; // X position, 0..XSIZE float xvel,yvel; // Change in X position per tick. float rockrate,rockspeed; -float movementrate; +float movementrate; // this controls the speed of everything that moves. float yscroll; float scrollvel; @@ -138,30 +122,24 @@ int maneuver = 0; int sound_flag = 1, music_flag = 0; int tail_plume = 0; // display big engine at the back? int friction = 0; // should there be friction? -int scorerank; -float fadetimer = 0,faderate; +float fadetimer = 0, faderate; -int pausedown = 0,paused = 0; +int pausedown = 0, paused = 0; // bangdot start (bd1) and end (bd2) position: int bd1 = 0, bd2 = 0; -int xoffset[NROCKS][MAXROCKHEIGHT]; - enum states { TITLE_PAGE, GAMEPLAY, DEAD_PAUSE, GAME_OVER, HIGH_SCORE_ENTRY, - HIGH_SCORE_DISPLAY, - DEMO + HIGH_SCORE_DISPLAY }; enum states state = TITLE_PAGE; float state_timeout = 600.0; -const int fakesin[] = {0,1,0,-1}; -const int fakecos[] = {1,0,-1,0}; #define NSEQUENCE 2 char *sequence[] = { "Press SPACE to start", @@ -182,58 +160,6 @@ 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() { return (float)random()/(float)RAND_MAX; @@ -453,7 +379,7 @@ create_engine_dots2(int newdots, int m) { // Don't create fresh engine dots when // the game is not being played and a demo is not beng shown - if(state != GAMEPLAY && state != DEMO) return; + if(state != GAMEPLAY) return; for(i = 0; iactive == 0) { @@ -504,7 +430,7 @@ create_engine_dots2(int newdots, int m) { void drawdots(SDL_Surface *s) { - int m, scorepos, n; + int m; SDL_LockSurface(s); // Draw the background stars aka space dots @@ -514,10 +440,8 @@ 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); } @@ -526,8 +450,7 @@ 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++) { @@ -593,30 +516,30 @@ init(int fullscreen) { } // Load the banners - NULLERROR(temp = IMG_Load(load_file("banners/variations.png"))); + NULLERROR(temp = IMG_Load(add_path("banners/variations.png"))); NULLERROR(surf_b_variations = SDL_DisplayFormat(temp)); - NULLERROR(temp = IMG_Load(load_file("banners/on.png"))); + NULLERROR(temp = IMG_Load(add_path("banners/on.png"))); NULLERROR(surf_b_on = SDL_DisplayFormat(temp)); - NULLERROR(temp = IMG_Load(load_file("banners/rockdodger.png"))); + NULLERROR(temp = IMG_Load(add_path("banners/rockdodger.png"))); NULLERROR(surf_b_rockdodger = SDL_DisplayFormat(temp)); - NULLERROR(temp = IMG_Load(load_file("banners/game.png"))); + NULLERROR(temp = IMG_Load(add_path("banners/game.png"))); NULLERROR(surf_b_game = SDL_DisplayFormat(temp)); - NULLERROR(temp = IMG_Load(load_file("banners/over.png"))); + NULLERROR(temp = IMG_Load(add_path("banners/over.png"))); NULLERROR(surf_b_over = SDL_DisplayFormat(temp)); - surf_font_big = IMG_Load(load_file(BIG_FONT_FILE)); - InitFont(surf_font_big); + surf_font_big = IMG_Load(add_path(BIG_FONT_FILE)); + g_font = SFont_InitFont(surf_font_big); // Load the spaceship graphic. - NULLERROR(temp = IMG_Load(load_file("sprites/ship.png"))); + NULLERROR(temp = IMG_Load(add_path("sprites/ship.png"))); NULLERROR(surf_ship = SDL_DisplayFormat(temp)); // Load the life indicator (small ship) graphic. - NULLERROR(temp = IMG_Load(load_file("indicators/life.png"))); + NULLERROR(temp = IMG_Load(add_path("indicators/life.png"))); NULLERROR(surf_life = SDL_DisplayFormat(temp)); // Create the array of black points; @@ -641,11 +564,11 @@ init(int fullscreen) { for(i = 0; iw; src.h = surf_ship->h; dest.w = src.w; @@ -775,63 +698,36 @@ 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); + case GAMEPLAY: + case DEAD_PAUSE: + ; // no action necessary } if(!gameover && state == GAMEPLAY) { @@ -906,49 +802,35 @@ 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; - break; + break; + case GAMEPLAY: + ; // no action necessary } } else { if(state == DEAD_PAUSE) { @@ -1077,7 +959,7 @@ gameloop() { return 0; } - if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE || state == DEMO)) { + if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) { for(i = 0; i