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

On NETGAMES list Bounty mode was not shown since MODE_NAMES define was not adjusted - so in the end introduced GMNames and GMNamesShrt Arrays in multi.c for globally displaying full or short Multiplayer game mode names

Browse source
This commit is contained in:
zicodxx 2011-01-19 19:55:38 +01:00
parent 16f2b23fe2
commit fd53a1264b
7 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -4,6 +4,7 @@ D2X-Rebirth Changelog
--------
main/game.h, main/gamerend.c, main/gauges.c, main/multi.c, main/multi.h, main/net_udp.c: Introducing new BOUNTY Multiplayer game mode by Matt "1360" Vandermeulen <matt1360@gmail.com>
main/gauges.c, main/multi.c: Fix for showing bounty target in kill list - was not actually checking if player_num == Bounty_target; When Bounty_target player leaves game host must select a new target so the game can proceed
main/gamerend.c, main/multi.c, main/multi.h, main/net_ipx.c, main/net_udp.c, main/text.h: On NETGAMES list Bounty mode was not shown since MODE_NAMES define was not adjusted - so in the end introduced GMNames and GMNamesShrt Arrays in multi.c for globally displaying full or short Multiplayer game mode names
20110118
--------

3
main/gamerend.c
View file

@ -160,7 +160,6 @@ void show_netplayerinfo()
{
int x=0, y=0, i=0, color=0, eff=0;
char *eff_strings[]={"trashing","really hurting","seriously effecting","hurting","effecting","tarnishing"};
char *NetworkModeNames[]={"Anarchy","Team Anarchy","Robo Anarchy","Cooperative","Capture the Flag","Hoard","Team Hoard","Bounty","Unknown"};
gr_set_current_canvas(NULL);
gr_set_curfont(GAME_FONT);
@ -182,7 +181,7 @@ void show_netplayerinfo()
x+=FSPACX(8);
y+=LINE_SPACING*2;
gr_printf(x,y,"game mode: %s",NetworkModeNames[Netgame.gamemode]);
gr_printf(x,y,"game mode: %s",GMNames[Netgame.gamemode]);
y+=LINE_SPACING;
gr_printf(x,y,"difficulty: %s",MENU_DIFFICULTY_TEXT(Netgame.difficulty));
y+=LINE_SPACING;

2
main/multi.c
View file

@ -152,6 +152,8 @@ int multi_goto_secret = 0;
short team_kills[2];
int multi_quit_game = 0;
int PacketUrgent = 0;
char *GMNames[9]={"Anarchy","Team Anarchy","Robo Anarchy","Cooperative","Capture the Flag","Hoard","Team Hoard","Bounty","Unknown"};
char *GMNamesShrt[9]={"ANRCHY","TEAM","ROBO","COOP","FLAG","HOARD","TMHOARD","BOUNTY","UNKNOWN"};
// For rejoin object syncing (used here and all protocols - globally)

3
main/multi.h
View file

@ -318,6 +318,9 @@ extern short team_kills[2];
extern int multi_goto_secret;
extern char *GMNames[9];
extern char *GMNamesShrt[9];
extern ushort my_segments_checksum;
//do we draw the kill list on the HUD?

17
main/net_ipx.c
View file

@ -3561,8 +3561,6 @@ void restart_net_searching(newmenu_item * m)
num_active_ipx_changed = 1;
}
char *ModeLetters[]={"ANRCHY","TEAM","ROBO","COOP","FLAG","HOARD","TMHOARD"};
void net_ipx_join_listen(newmenu *menu)
{
newmenu_item *menus = newmenu_get_items(menu);
@ -3644,7 +3642,7 @@ void net_ipx_join_listen(newmenu *menu)
if (game_status == NETSTAT_STARTING)
{
sprintf (menus[i+2].text,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",
i+1,GameName,ModeLetters[Active_ipx_games[i].gamemode],nplayers,
i+1,GameName,GMNamesShrt[Active_ipx_games[i].gamemode],nplayers,
Active_ipx_games[i].max_numplayers,MissName,levelname,"Forming");
}
else if (game_status == NETSTAT_PLAYING)
@ -3653,25 +3651,25 @@ void net_ipx_join_listen(newmenu *menu)
if (join_status==1)
sprintf (menus[i+2].text,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",
i+1,GameName,ModeLetters[Active_ipx_games[i].gamemode],nplayers,
i+1,GameName,GMNamesShrt[Active_ipx_games[i].gamemode],nplayers,
Active_ipx_games[i].max_numplayers,MissName,levelname,"Open");
else if (join_status==2)
sprintf (menus[i+2].text,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",
i+1,GameName,ModeLetters[Active_ipx_games[i].gamemode],nplayers,
i+1,GameName,GMNamesShrt[Active_ipx_games[i].gamemode],nplayers,
Active_ipx_games[i].max_numplayers,MissName,levelname,"Full");
else if (join_status==3)
sprintf (menus[i+2].text,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",
i+1,GameName,ModeLetters[Active_ipx_games[i].gamemode],nplayers,
i+1,GameName,GMNamesShrt[Active_ipx_games[i].gamemode],nplayers,
Active_ipx_games[i].max_numplayers,MissName,levelname,"Restrict");
else
sprintf (menus[i+2].text,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",
i+1,GameName,ModeLetters[Active_ipx_games[i].gamemode],nplayers,
i+1,GameName,GMNamesShrt[Active_ipx_games[i].gamemode],nplayers,
Active_ipx_games[i].max_numplayers,MissName,levelname,"Closed");
}
else
sprintf (menus[i+2].text,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",
i+1,GameName,ModeLetters[Active_ipx_games[i].gamemode],nplayers,
i+1,GameName,GMNamesShrt[Active_ipx_games[i].gamemode],nplayers,
Active_ipx_games[i].max_numplayers,MissName,levelname,"Between");
@ -5590,7 +5588,6 @@ static int show_game_info_handler(newmenu *menu, d_event *event, netgame_info *n
int net_ipx_show_game_stats(int choice)
{
char rinfo[512],*info=rinfo;
char *NetworkModeNames[]={"Anarchy","Team Anarchy","Robo Anarchy","Cooperative","Capture the Flag","Hoard","Team Hoard","Unknown"};
int c;
netgame_info *netgame = &Active_ipx_games[choice];
@ -5605,7 +5602,7 @@ int net_ipx_show_game_stats(int choice)
info+=sprintf (info," - Lvl %i",netgame->levelnum);
info+=sprintf (info,"\n\nDifficulty: %s",MENU_DIFFICULTY_TEXT(netgame->difficulty));
info+=sprintf (info,"\nGame Mode: %s",NetworkModeNames[netgame->gamemode]);
info+=sprintf (info,"\nGame Mode: %s",GMNames[netgame->gamemode]);
info+=sprintf (info,"\nPlayers: %i/%i",netgame->numconnected,netgame->max_numplayers);
c=nm_messagebox1("WELCOME", (int (*)(newmenu *, d_event *, void *))show_game_info_handler, netgame, 2, "JOIN GAME", "GAME INFO", rinfo);

5
main/net_udp.c
View file

@ -709,7 +709,7 @@ int net_udp_list_join_poll( newmenu *menu, d_event *event, direct_join *dj )
else
snprintf(status, sizeof(status), "BETWEEN ");
snprintf (menus[i+2].text,sizeof(char)*74,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",(i+(NLPage*UDP_NETGAMES_PPAGE))+1,GameName,MODE_NAMES(Active_udp_games[(i+(NLPage*UDP_NETGAMES_PPAGE))].gamemode),nplayers, Active_udp_games[(i+(NLPage*UDP_NETGAMES_PPAGE))].max_numplayers,MissName,levelname,status);
snprintf (menus[i+2].text,sizeof(char)*74,"%d.\t%s \t%s \t %d/%d \t%s \t %s \t%s",(i+(NLPage*UDP_NETGAMES_PPAGE))+1,GameName,GMNamesShrt[Active_udp_games[(i+(NLPage*UDP_NETGAMES_PPAGE))].gamemode],nplayers, Active_udp_games[(i+(NLPage*UDP_NETGAMES_PPAGE))].max_numplayers,MissName,levelname,status);
Assert(strlen(menus[i+2].text) < 75);
}
@ -5030,7 +5030,6 @@ static int show_game_info_handler(newmenu *menu, d_event *event, netgame_info *n
int net_udp_show_game_info()
{
char rinfo[512],*info=rinfo;
char *NetworkModeNames[]={"Anarchy","Team Anarchy","Robo Anarchy","Cooperative","Capture the Flag","Hoard","Team Hoard","Bounty","Unknown"};
int c;
netgame_info *netgame = &Netgame;
@ -5045,7 +5044,7 @@ int net_udp_show_game_info()
info+=sprintf (info," - Lvl %i",netgame->levelnum);
info+=sprintf (info,"\n\nDifficulty: %s",MENU_DIFFICULTY_TEXT(netgame->difficulty));
info+=sprintf (info,"\nGame Mode: %s",NetworkModeNames[netgame->gamemode]);
info+=sprintf (info,"\nGame Mode: %s",GMNames[netgame->gamemode]);
info+=sprintf (info,"\nPlayers: %i/%i",netgame->numconnected,netgame->max_numplayers);
c=nm_messagebox1("WELCOME", (int (*)(newmenu *, d_event *, void *))show_game_info_handler, netgame, 2, "JOIN GAME", "GAME INFO", rinfo);

5
main/text.h
View file

@ -671,11 +671,6 @@ extern char *Text_string[];
#define CONNECT_STATES(state_num) (*(&TXT_NET_DISCONNECTED + (state_num)))
// Network dump strings
#define NET_DUMP_STRINGS(dump_num) (*(&TXT_NET_GAME_CLOSED + (dump_num)))
#define MODE_NAMES(mode_num) (*(&TXT_ANARCHY + (mode_num)))
#define MODEM_ERROR_MESS(error_num) (*(&TXT_NO_DIAL_TONE + (error_num)))
#define MENU_DIFFICULTY_TEXT(difficulty) (*(&TXT_DIFFICULTY_1 + (difficulty)))
#define MENU_DETAIL_TEXT(detail) (*(&TXT_DETAIL_1 + (detail)))