Files
extra/blockrage/fix-build.patch
2025-06-22 20:39:04 -05:00

91 lines
3.3 KiB
Diff

--- a/src/main.c 2005-10-24 21:47:16.000000000 +0200
+++ b/src/main.c 2023-04-07 21:34:17.000000000 +0200
@@ -102,7 +102,7 @@
int immedstart;
int quit;
-static int statx[6],staty[6];
+static int statsx[6],statsy[6];
int diffx,diffy; /* coordinates of the difficulty level display box */
int ts_x0,ts_x1; /* x-coordinates of the top-ten names(ts_x0) & scores(ts_x1) */
int no_of_sets;
@@ -191,14 +191,14 @@
static void game_drawscore(player_t *p, int bgvcpy) {
if(bgvcpy) {
- v_drawscrarea(bmp_game[players-1].data,statx[1],staty[1],
+ v_drawscrarea(bmp_game[players-1].data,statsx[1],statsy[1],
strpixlen("0000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
}
t_align=T_LEFT;
- v_printf(statx[1],staty[1],FONT_HIGHLIGHTED,"%07d",p->score);
+ v_printf(statsx[1],statsy[1],FONT_HIGHLIGHTED,"%07d",p->score);
if(bgvcpy) {
- virt_cpyarea(statx[1],staty[1],
+ virt_cpyarea(statsx[1],statsy[1],
strpixlen("00000000",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
}
}
@@ -206,28 +206,28 @@
static void game_drawlevelnum(int bgvcpy) {
if(bgvcpy) {
- v_drawscrarea(bmp_game[players-1].data,statx[3],staty[3],
+ v_drawscrarea(bmp_game[players-1].data,statsx[3],statsy[3],
strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
}
t_align=T_LEFT;
- v_printf(statx[3],staty[3],FONT_HIGHLIGHTED,"%02d",level);
+ v_printf(statsx[3],statsy[3],FONT_HIGHLIGHTED,"%02d",level);
if(bgvcpy) {
- virt_cpyarea(statx[3],staty[3],
+ virt_cpyarea(statsx[3],statsy[3],
strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
}
}
static void game_drawblocksleft(int bgvcpy) {
if(bgvcpy) {
- v_drawscrarea(bmp_game[players-1].data,statx[5],staty[5],
+ v_drawscrarea(bmp_game[players-1].data,statsx[5],statsy[5],
strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
}
t_align=T_LEFT;
- v_printf(statx[5],staty[5],FONT_HIGHLIGHTED,"%02d",blocksleft);
+ v_printf(statsx[5],statsy[5],FONT_HIGHLIGHTED,"%02d",blocksleft);
if(bgvcpy) {
- virt_cpyarea(statx[5],staty[5],
+ virt_cpyarea(statsx[5],statsy[5],
strpixlen("00",FONT_HIGHLIGHTED),font[FONT_HIGHLIGHTED].ch);
}
}
@@ -371,9 +371,9 @@
void game_statistics_draw(void) {
if(players==1) {
t_align=T_LEFT;
- v_print(statx[0],staty[0],FONT_NORMAL,"Score:");
- v_print(statx[2],staty[2],FONT_NORMAL,"Level:");
- v_print(statx[4],staty[4],FONT_NORMAL,"Blocks:");
+ v_print(statsx[0],statsy[0],FONT_NORMAL,"Score:");
+ v_print(statsx[2],statsy[2],FONT_NORMAL,"Level:");
+ v_print(statsx[4],statsy[4],FONT_NORMAL,"Blocks:");
game_drawlevelnum(0);
game_drawblocksleft(0);
game_drawscore(&(player[0]),0);
@@ -1530,9 +1530,9 @@
fscanf(f,"%d %d %d %d %d %d",&nx_x0[0],&nx_y0[0],
&nx_x0[1],&nx_y0[1],&nx_x0[2],&nx_y0[2]);
- fscanf(f,"%d %d %d %d",&statx[0],&staty[0],&statx[1],&staty[1]);
- fscanf(f,"%d %d %d %d",&statx[2],&staty[2],&statx[3],&staty[3]);
- fscanf(f,"%d %d %d %d",&statx[4],&staty[4],&statx[5],&staty[5]);
+ fscanf(f,"%d %d %d %d",&statsx[0],&statsy[0],&statsx[1],&statsy[1]);
+ fscanf(f,"%d %d %d %d",&statsx[2],&statsy[2],&statsx[3],&statsy[3]);
+ fscanf(f,"%d %d %d %d",&statsx[4],&statsy[4],&statsx[5],&statsy[5]);
fscanf(f,"%d %d",&diffx,&diffy);
fscanf(f,"%d %d",&ts_x0,&ts_x1);