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

fixed canvas stuff to show summary correctly in OGL, added new strings for CTF and HOARD, code cleanup

Browse source
This commit is contained in:
zicodxx 2007-01-12 14:21:05 +00:00
parent ef1a1de34b
commit 2b80efdce9
2 changed files with 450 additions and 484 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dxx-changelog.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog D2X-Rebirth Changelog
20070112
--------
main/kmatrix.c: fixed canvas stuff to show summary correctly in OGL, added new strings for CTF and HOARD, code cleanup
20070110 20070110
-------- --------
main/kconfig.c, main/newmenu.c: joystick axes can be reassigned; higher offset for axes moving detection; correction for menus that are bigger than screen main/kconfig.c, main/newmenu.c: joystick axes can be reassigned; higher offset for axes moving detection; correction for menus that are bigger than screen

92
main/kmatrix.c
View file

@ -55,7 +55,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "network.h" #include "network.h"
#define CENTERING_OFFSET(x) ((300 - (70 + (x)*25 ))/2) #define CENTERING_OFFSET(x) ((300 - (70 + (x)*25 ))/2)
#define CENTERSCREEN (MenuHires?320:160) #define CENTERSCREEN (SWIDTH/2)
int kmatrix_kills_changed = 0; int kmatrix_kills_changed = 0;
char ConditionLetters[]={' ','P','E','D','E','E','V','W'}; char ConditionLetters[]={' ','P','E','D','E','E','V','W'};
@ -69,8 +69,8 @@ void kmatrix_reactor (char *message);
void kmatrix_phallic (); void kmatrix_phallic ();
void kmatrix_redraw_coop(); void kmatrix_redraw_coop();
#define LHX(x) ((x)*(MenuHires?2:1)) #define LHX(x) ((x)*(MenuHires?2*((double)SWIDTH/640):((double)SWIDTH/320)))
#define LHY(y) ((y)*(MenuHires?2.4:1)) #define LHY(y) ((y)*(MenuHires?2.4*((double)SHEIGHT/480):((double)SHEIGHT/200)))
void kmatrix_draw_item( int i, int *sorted ) void kmatrix_draw_item( int i, int *sorted )
{ {
@ -107,7 +107,6 @@ void kmatrix_draw_item( int i, int *sorted )
gr_printf( x, y, "%d", kill_matrix[sorted[i]][sorted[j]] ); gr_printf( x, y, "%d", kill_matrix[sorted[i]][sorted[j]] );
} }
} }
} }
if (Players[sorted[i]].net_killed_total+Players[sorted[i]].net_kills_total==0) if (Players[sorted[i]].net_killed_total+Players[sorted[i]].net_kills_total==0)
@ -131,7 +130,6 @@ void kmatrix_draw_coop_item( int i, int *sorted )
gr_printf( LHX(CENTERING_OFFSET(N_players)), y, "%s", Players[sorted[i]].callsign ); gr_printf( LHX(CENTERING_OFFSET(N_players)), y, "%s", Players[sorted[i]].callsign );
gr_printf (LHX(CENTERING_OFFSET(N_players)-15),y,"%c",ConditionLetters[Players[sorted[i]].connected]); gr_printf (LHX(CENTERING_OFFSET(N_players)-15),y,"%c",ConditionLetters[Players[sorted[i]].connected]);
x = CENTERSCREEN; x = CENTERSCREEN;
gr_set_fontcolor( BM_XRGB(60,40,10),-1 ); gr_set_fontcolor( BM_XRGB(60,40,10),-1 );
@ -146,9 +144,7 @@ void kmatrix_draw_coop_item( int i, int *sorted )
void kmatrix_draw_names(int *sorted) void kmatrix_draw_names(int *sorted)
{ {
int j, x; int j, x, color;
int color;
if (Kmatrix_nomovie_message) if (Kmatrix_nomovie_message)
{ {
@ -170,14 +166,13 @@ void kmatrix_draw_names(int *sorted)
gr_set_fontcolor(gr_getcolor(player_rgb[color].r,player_rgb[color].g,player_rgb[color].b),-1 ); gr_set_fontcolor(gr_getcolor(player_rgb[color].r,player_rgb[color].g,player_rgb[color].b),-1 );
gr_printf( x, LHY(40), "%c", Players[sorted[j]].callsign[0] ); gr_printf( x, LHY(40), "%c", Players[sorted[j]].callsign[0] );
} }
x = LHX(72 + CENTERING_OFFSET(N_players) + N_players*25); x = LHX(72 + CENTERING_OFFSET(N_players) + N_players*25);
gr_set_fontcolor( BM_XRGB(31,31,31),-1 ); gr_set_fontcolor( BM_XRGB(31,31,31),-1 );
gr_printf( x, LHY(40), "K/E"); gr_printf( x, LHY(40), "K/E");
} }
void kmatrix_draw_coop_names(int *sorted) void kmatrix_draw_coop_names(int *sorted)
{ {
sorted=sorted; sorted=sorted;
@ -190,7 +185,6 @@ void kmatrix_draw_coop_names(int *sorted)
gr_set_fontcolor( BM_XRGB(63,31,31),-1 ); gr_set_fontcolor( BM_XRGB(63,31,31),-1 );
gr_printf( CENTERSCREEN, LHY(40), "SCORE"); gr_printf( CENTERSCREEN, LHY(40), "SCORE");
gr_set_fontcolor( BM_XRGB(63,31,31),-1 ); gr_set_fontcolor( BM_XRGB(63,31,31),-1 );
gr_printf( CENTERSCREEN+LHX(50), LHY(40), "DEATHS"); gr_printf( CENTERSCREEN+LHX(50), LHY(40), "DEATHS");
} }
@ -207,7 +201,6 @@ void kmatrix_draw_deaths(int *sorted)
x = LHX(35); x = LHX(35);
{ {
int sw, sh, aw; int sw, sh, aw;
gr_set_fontcolor(gr_find_closest_color(63,20,0),-1); gr_set_fontcolor(gr_find_closest_color(63,20,0),-1);
@ -252,8 +245,8 @@ void kmatrix_draw_deaths(int *sorted)
if (Game_mode & GM_HOARD) if (Game_mode & GM_HOARD)
kmatrix_phallic(); kmatrix_phallic();
} }
void kmatrix_draw_coop_deaths(int *sorted) void kmatrix_draw_coop_deaths(int *sorted)
{ {
int j, x, y; int j, x, y;
@ -261,7 +254,6 @@ void kmatrix_draw_coop_deaths(int *sorted)
y = LHY(55 + N_players * 9); y = LHY(55 + N_players * 9);
// gr_set_fontcolor(gr_getcolor(player_rgb[j].r,player_rgb[j].g,player_rgb[j].b),-1 );
gr_set_fontcolor( BM_XRGB(31,31,31),-1 ); gr_set_fontcolor( BM_XRGB(31,31,31),-1 );
x = CENTERSCREEN+LHX(50); x = CENTERSCREEN+LHX(50);
@ -276,7 +268,6 @@ void kmatrix_draw_coop_deaths(int *sorted)
x = LHX(35); x = LHX(35);
{ {
int sw, sh, aw; int sw, sh, aw;
gr_set_fontcolor(gr_find_closest_color(63,20,0),-1); gr_set_fontcolor(gr_find_closest_color(63,20,0),-1);
@ -285,7 +276,6 @@ void kmatrix_draw_coop_deaths(int *sorted)
if (!((Game_mode & GM_MODEM) || (Game_mode & GM_SERIAL))) if (!((Game_mode & GM_MODEM) || (Game_mode & GM_SERIAL)))
gr_printf( CENTERSCREEN-(sw/2), y,"P-Playing E-Escaped D-Died"); gr_printf( CENTERSCREEN-(sw/2), y,"P-Playing E-Escaped D-Died");
y+=(sh+5); y+=(sh+5);
gr_get_string_size("V-Viewing scores W-Waiting", &sw, &sh, &aw); gr_get_string_size("V-Viewing scores W-Waiting", &sw, &sh, &aw);
@ -298,6 +288,7 @@ void kmatrix_draw_coop_deaths(int *sorted)
{ {
int sw, sh, aw; int sw, sh, aw;
gr_set_fontcolor(gr_find_closest_color(63,63,63),-1); gr_set_fontcolor(gr_find_closest_color(63,63,63),-1);
if (Players[Player_num].connected==7) if (Players[Player_num].connected==7)
@ -319,7 +310,6 @@ void kmatrix_draw_coop_deaths(int *sorted)
sprintf((char *)&reactor_message, "%s: %d %s ", TXT_TIME_REMAINING, Countdown_seconds_left, TXT_SECONDS); sprintf((char *)&reactor_message, "%s: %d %s ", TXT_TIME_REMAINING, Countdown_seconds_left, TXT_SECONDS);
kmatrix_reactor ((char *)&reactor_message); kmatrix_reactor ((char *)&reactor_message);
} }
} }
void kmatrix_reactor (char *message) void kmatrix_reactor (char *message)
@ -336,12 +326,11 @@ void kmatrix_reactor (char *message)
{ {
gr_set_fontcolor(gr_find_closest_color(0,0,0),-1); gr_set_fontcolor(gr_find_closest_color(0,0,0),-1);
gr_get_string_size(oldmessage, &sw, &sh, &aw); gr_get_string_size(oldmessage, &sw, &sh, &aw);
// gr_printf( CENTERSCREEN-(sw/2), LHY(55+72+12), oldmessage);
} }
gr_set_fontcolor(gr_find_closest_color(0,32,63),-1); gr_set_fontcolor(gr_find_closest_color(0,32,63),-1);
gr_get_string_size(message, &sw, &sh, &aw); gr_get_string_size(message, &sw, &sh, &aw);
gr_printf( CENTERSCREEN-(sw/2), LHY(55+72+12), message); gr_printf( CENTERSCREEN-(sw/2), LHY(55+72+12), message);
strcpy ((char *)&oldmessage,message); strcpy ((char *)&oldmessage,message);
} }
@ -369,17 +358,12 @@ void kmatrix_phallic ()
gr_printf( CENTERSCREEN-(sw/2), LHY(55+72+3), message); gr_printf( CENTERSCREEN-(sw/2), LHY(55+72+3), message);
} }
void load_stars(void); void load_stars(void);
grs_canvas *StarBackCanvas;
void kmatrix_redraw() void kmatrix_redraw()
{ {
int i, color; int i, color;
int sorted[MAX_NUM_NET_PLAYERS]; int sorted[MAX_NUM_NET_PLAYERS];
grs_canvas *tempcanvas;
if (Game_mode & GM_MULTI_COOP) if (Game_mode & GM_MULTI_COOP)
{ {
@ -389,14 +373,15 @@ void kmatrix_redraw()
multi_sort_kill_list(); multi_sort_kill_list();
tempcanvas=gr_create_canvas( grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h ); gr_set_current_canvas(NULL);
gr_set_current_canvas (tempcanvas);
gr_bitmap (0,0,&StarBackCanvas->cv_bitmap);
grd_curcanv->cv_font = MEDIUM3_FONT; grd_curcanv->cv_font = MEDIUM3_FONT;
if (Game_mode & GM_CAPTURE)
gr_string( 0x8000, LHY(10), "CAPTURE THE FLAG SUMMARY");
else if (Game_mode & GM_HOARD)
gr_string( 0x8000, LHY(10), "HOARD SUMMARY");
else
gr_string( 0x8000, LHY(10), TXT_KILL_MATRIX_TITLE); gr_string( 0x8000, LHY(10), TXT_KILL_MATRIX_TITLE);
grd_curcanv->cv_font = SMALL_FONT; grd_curcanv->cv_font = SMALL_FONT;
@ -406,8 +391,6 @@ void kmatrix_redraw()
kmatrix_draw_names(sorted); kmatrix_draw_names(sorted);
for (i=0; i<N_players; i++ ) { for (i=0; i<N_players; i++ ) {
// mprintf((0, "Sorted kill list pos %d = %d.\n", i+1, sorted[i]));
if (Game_mode & GM_TEAM) if (Game_mode & GM_TEAM)
color = get_team(sorted[i]); color = get_team(sorted[i]);
else else
@ -423,27 +406,19 @@ void kmatrix_redraw()
kmatrix_draw_deaths(sorted); kmatrix_draw_deaths(sorted);
gr_set_current_canvas(NULL); gr_update();
gr_bitmap (0,0,&tempcanvas->cv_bitmap);
gr_palette_load(gr_palette); gr_palette_load(gr_palette);
gr_free_canvas (tempcanvas); gr_update();
} }
void kmatrix_redraw_coop() void kmatrix_redraw_coop()
{ {
int i, color; int i, color;
int sorted[MAX_NUM_NET_PLAYERS]; int sorted[MAX_NUM_NET_PLAYERS];
grs_canvas *tempcanvas;
multi_sort_kill_list(); multi_sort_kill_list();
tempcanvas=gr_create_canvas( grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h ); gr_set_current_canvas(NULL);
gr_set_current_canvas (tempcanvas);
gr_bitmap (0,0,&StarBackCanvas->cv_bitmap);
grd_curcanv->cv_font = MEDIUM3_FONT; grd_curcanv->cv_font = MEDIUM3_FONT;
gr_string( 0x8000, LHY(10), "COOPERATIVE SUMMARY"); gr_string( 0x8000, LHY(10), "COOPERATIVE SUMMARY");
@ -468,12 +443,9 @@ void kmatrix_redraw_coop()
kmatrix_draw_deaths(sorted); kmatrix_draw_deaths(sorted);
gr_set_current_canvas(NULL); gr_update();
gr_bitmap (0,0,&tempcanvas->cv_bitmap);
gr_palette_load(gr_palette); gr_palette_load(gr_palette);
gr_free_canvas (tempcanvas); gr_update();
} }
#define MAX_VIEW_TIME F1_0*15 #define MAX_VIEW_TIME F1_0*15
@ -481,7 +453,6 @@ void kmatrix_redraw_coop()
fix StartAbortMenuTime; fix StartAbortMenuTime;
#ifdef MACINTOSH #ifdef MACINTOSH
extern void load_stars_palette(); extern void load_stars_palette();
#endif #endif
@ -504,8 +475,6 @@ void kmatrix_view(int network)
set_screen_mode( SCREEN_MENU ); set_screen_mode( SCREEN_MENU );
StarBackCanvas=gr_create_canvas( grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h );
gr_set_current_canvas(StarBackCanvas);
#ifdef MACINTOSH #ifdef MACINTOSH
if (virtual_memory_on) { if (virtual_memory_on) {
load_stars_palette(); // horrible hack to prevent too much paging when doing endlevel syncing load_stars_palette(); // horrible hack to prevent too much paging when doing endlevel syncing
@ -517,7 +486,6 @@ void kmatrix_view(int network)
WaitingForOthers=0; WaitingForOthers=0;
kmatrix_redraw(); kmatrix_redraw();
//@@gr_palette_fade_in( gr_palette,32, 0);
game_flush_inputs(); game_flush_inputs();
done = 0; done = 0;
@ -528,7 +496,8 @@ void kmatrix_view(int network)
if (network) if (network)
network_endlevel(&key); network_endlevel(&key);
while(!done) { while(!done)
{
kmatrix_kills_changed = 0; kmatrix_kills_changed = 0;
for (i=0; i<4; i++ ) for (i=0; i<4; i++ )
if (joy_get_button_down_cnt(i)>0) if (joy_get_button_down_cnt(i)>0)
@ -540,14 +509,12 @@ void kmatrix_view(int network)
Players[Player_num].connected=0; Players[Player_num].connected=0;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
gr_free_canvas (StarBackCanvas);
multi_leave_game(); multi_leave_game();
Kmatrix_nomovie_message=0; Kmatrix_nomovie_message=0;
longjmp(LeaveGame, 0); longjmp(LeaveGame, 0);
return; return;
} }
} }
Players[Player_num].connected=7; Players[Player_num].connected=7;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
@ -563,7 +530,6 @@ void kmatrix_view(int network)
Players[Player_num].connected=0; Players[Player_num].connected=0;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
gr_free_canvas (StarBackCanvas);
multi_leave_game(); multi_leave_game();
Kmatrix_nomovie_message=0; Kmatrix_nomovie_message=0;
longjmp(LeaveGame, 0); longjmp(LeaveGame, 0);
@ -596,7 +562,6 @@ void kmatrix_view(int network)
Players[Player_num].connected=0; Players[Player_num].connected=0;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
gr_free_canvas (StarBackCanvas);
multi_leave_game(); multi_leave_game();
Kmatrix_nomovie_message=0; Kmatrix_nomovie_message=0;
longjmp(LeaveGame, 0); longjmp(LeaveGame, 0);
@ -608,6 +573,7 @@ void kmatrix_view(int network)
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
break; break;
case KEY_ESC: case KEY_ESC:
if (Game_mode & GM_NETWORK) if (Game_mode & GM_NETWORK)
{ {
@ -621,7 +587,6 @@ void kmatrix_view(int network)
Players[Player_num].connected=0; Players[Player_num].connected=0;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
gr_free_canvas (StarBackCanvas);
multi_leave_game(); multi_leave_game();
Kmatrix_nomovie_message=0; Kmatrix_nomovie_message=0;
longjmp(LeaveGame, 0); longjmp(LeaveGame, 0);
@ -629,18 +594,20 @@ void kmatrix_view(int network)
} }
else else
kmatrix_kills_changed=1; kmatrix_kills_changed=1;
break; break;
case KEY_PRINT_SCREEN: case KEY_PRINT_SCREEN:
save_screen_shot(0); save_screen_shot(0);
break; break;
case KEY_BACKSP: case KEY_BACKSP:
Int3(); Int3();
break; break;
default: default:
break; break;
} }
if (timer_get_approx_seconds() >= (entry_time+MAX_VIEW_TIME) && Players[Player_num].connected!=7) if (timer_get_approx_seconds() >= (entry_time+MAX_VIEW_TIME) && Players[Player_num].connected!=7)
{ {
if (is_D2_OEM) if (is_D2_OEM)
@ -650,7 +617,6 @@ void kmatrix_view(int network)
Players[Player_num].connected=0; Players[Player_num].connected=0;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
gr_free_canvas (StarBackCanvas);
multi_leave_game(); multi_leave_game();
Kmatrix_nomovie_message=0; Kmatrix_nomovie_message=0;
longjmp(LeaveGame, 0); longjmp(LeaveGame, 0);
@ -663,6 +629,7 @@ void kmatrix_view(int network)
done=1; done=1;
break; break;
} }
Players[Player_num].connected=7; Players[Player_num].connected=7;
if (network) if (network)
network_send_endlevel_packet(); network_send_endlevel_packet();
@ -692,6 +659,7 @@ void kmatrix_view(int network)
oldstates[i]=Players[i].connected; oldstates[i]=Players[i].connected;
network_send_endlevel_packet(); network_send_endlevel_packet();
} }
if (Players[i].connected==0 || Players[i].connected==7) if (Players[i].connected==0 || Players[i].connected==7)
num_ready++; num_ready++;
@ -715,7 +683,6 @@ void kmatrix_view(int network)
kmatrix_redraw(); kmatrix_redraw();
kmatrix_kills_changed=0; kmatrix_kills_changed=0;
} }
} }
} }
@ -724,14 +691,9 @@ void kmatrix_view(int network)
if (network) if (network)
network_send_endlevel_packet(); // make sure network_send_endlevel_packet(); // make sure
// Restore background and exit
gr_palette_fade_out( gr_palette, 32, 0 ); gr_palette_fade_out( gr_palette, 32, 0 );
game_flush_inputs(); game_flush_inputs();
gr_free_canvas (StarBackCanvas);
Kmatrix_nomovie_message=0; Kmatrix_nomovie_message=0;
} }