compiler related changes (thanks to Chris Taylor)
This commit is contained in:
parent
aa82be1f22
commit
7d1c6107a5
|
@ -58,7 +58,6 @@ void gr_do_fullscreen(int f){
|
||||||
|
|
||||||
int gr_toggle_fullscreen(void){
|
int gr_toggle_fullscreen(void){
|
||||||
gr_do_fullscreen(!ogl_fullscreen);
|
gr_do_fullscreen(!ogl_fullscreen);
|
||||||
glFlush(); // ZICO - prevents black screen, screen glitches etc.
|
|
||||||
return ogl_fullscreen;
|
return ogl_fullscreen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,9 +50,6 @@ static char rcsid[] = "$Id: credits.c,v 1.1.1.1 2006/03/17 19:44:11 zicodxx Exp
|
||||||
#include "cfile.h"
|
#include "cfile.h"
|
||||||
#include "compbit.h"
|
#include "compbit.h"
|
||||||
#include "songs.h"
|
#include "songs.h"
|
||||||
#ifdef OGL
|
|
||||||
#include "ogl_init.h" // ZICO - for gl_scissors
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ROW_SPACING (GHEIGHT/17)
|
#define ROW_SPACING (GHEIGHT/17)
|
||||||
#define NUM_LINES 20 //14
|
#define NUM_LINES 20 //14
|
||||||
|
@ -108,6 +105,8 @@ typedef struct box {
|
||||||
int left, top, width, height;
|
int left, top, width, height;
|
||||||
} box;
|
} box;
|
||||||
|
|
||||||
|
extern inline void scale_line(unsigned char *in, unsigned char *out, int ilen, int olen);
|
||||||
|
|
||||||
//if filename passed is NULL, show normal credits
|
//if filename passed is NULL, show normal credits
|
||||||
void credits_show(char *credits_filename)
|
void credits_show(char *credits_filename)
|
||||||
{
|
{
|
||||||
|
@ -219,6 +218,8 @@ void credits_show(char *credits_filename)
|
||||||
|
|
||||||
for (i=0; i<ROW_SPACING; i += (SWIDTH>=640?FONTSCALE_Y(2):1) ) {
|
for (i=0; i<ROW_SPACING; i += (SWIDTH>=640?FONTSCALE_Y(2):1) ) {
|
||||||
int y;
|
int y;
|
||||||
|
box *new_box;
|
||||||
|
grs_bitmap *tempbmp;
|
||||||
|
|
||||||
y = first_line_offset - i;
|
y = first_line_offset - i;
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
|
@ -264,9 +265,6 @@ void credits_show(char *credits_filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wacky Fast Credits Thing
|
// Wacky Fast Credits Thing
|
||||||
box *new_box;
|
|
||||||
grs_bitmap *tempbmp;
|
|
||||||
|
|
||||||
for (j=0; j<NUM_LINES; j++ )
|
for (j=0; j<NUM_LINES; j++ )
|
||||||
{
|
{
|
||||||
new_box = &dirty_box[j];
|
new_box = &dirty_box[j];
|
||||||
|
|
|
@ -573,6 +573,10 @@ void scores_view(int citem)
|
||||||
byte fades[64] = { 1,1,1,2,2,3,4,4,5,6,8,9,10,12,13,15,16,17,19,20,22,23,24,26,27,28,28,29,30,30,31,31,31,31,31,30,30,29,28,28,27,26,24,23,22,20,19,17,16,15,13,12,10,9,8,6,5,4,4,3,2,2,1,1 };
|
byte fades[64] = { 1,1,1,2,2,3,4,4,5,6,8,9,10,12,13,15,16,17,19,20,22,23,24,26,27,28,28,29,30,30,31,31,31,31,31,30,30,29,28,28,27,26,24,23,22,20,19,17,16,15,13,12,10,9,8,6,5,4,4,3,2,2,1,1 };
|
||||||
grs_canvas canvas;
|
grs_canvas canvas;
|
||||||
|
|
||||||
|
#ifdef OGL
|
||||||
|
gr_palette_load( gr_palette ); // ZICO - added to be sure right palette is loaded after endgame
|
||||||
|
#endif
|
||||||
|
|
||||||
ReshowScores:
|
ReshowScores:
|
||||||
scores_read();
|
scores_read();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue