TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

compiler related changes (thanks to Chris Taylor)

Browse source
This commit is contained in:
zicodxx 2006-10-02 14:36:10 +00:00
parent aa82be1f22
commit 7d1c6107a5
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/ogl/gr.c
View file

@ -58,7 +58,6 @@ void gr_do_fullscreen(int f){
int gr_toggle_fullscreen(void){
gr_do_fullscreen(!ogl_fullscreen);
glFlush(); // ZICO - prevents black screen, screen glitches etc.
return ogl_fullscreen;
}

10
main/credits.c
View file

@ -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 "compbit.h"
#include "songs.h"
#ifdef OGL
#include "ogl_init.h" // ZICO - for gl_scissors
#endif
#define ROW_SPACING (GHEIGHT/17)
#define NUM_LINES 20 //14
@ -108,6 +105,8 @@ typedef struct box {
int left, top, width, height;
} box;
extern inline void scale_line(unsigned char *in, unsigned char *out, int ilen, int olen);
//if filename passed is NULL, show normal credits
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) ) {
int y;
box *new_box;
grs_bitmap *tempbmp;
y = first_line_offset - i;
#ifdef OGL
@ -264,9 +265,6 @@ void credits_show(char *credits_filename)
}
// Wacky Fast Credits Thing
box *new_box;
grs_bitmap *tempbmp;
for (j=0; j<NUM_LINES; j++ )
{
new_box = &dirty_box[j];

4
main/scores.c
View file

@ -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 };
grs_canvas canvas;
#ifdef OGL
gr_palette_load( gr_palette ); // ZICO - added to be sure right palette is loaded after endgame
#endif
ReshowScores:
scores_read();