Enemy Territory

Project: Bug Fix

The objective

The goal of this project is to provide modders in the ET community with a SDK code base that contains fixes for various bugs which are present in the stock etmain game (version 2.60).

26th september 2006: Sadly bugfix 088 had a bug :-( There were 3 lines that should have been deleted for the fix to work correctly.

Show index
Previous bug: Playing time shown at debriefing keep increasing
Next bug: Complaint votes sticks around, so vote no if we have complaints turned off

Bugfix 095 - Campaign window not big enough to contain big campaigns

Problem:

The layout of the debriefing screen, is only suited for 3 map campaigns. However up to 10 maps per campaign is possible.

Solution:

Rearrange the layout

2.60 Code

cg_debriefing.c @ 312 panel_button_t debriefMissionTitleWindow = { NULL, NULL, { 10, 30, 193, 326 }, // CHRUKER: b095 - Campaign window now spans down to the chat window { 0, 0, 0, 0, 0, 0, 0, 0 }, NULL, /* font */ NULL, /* keyDown */
cg_debriefing.c @ 372 panel_button_t debriefMissionStatsWindow = { NULL, "MISSION STATS", { 213, 280-6, 417, 70+12 }, // CHRUKER: b095 - Campaign window now spans down to the chat window { 0, 0, 0, 0, 0, 0, 0, 0 }, NULL, /* font */ NULL, /* keyDown */ NULL, /* keyUp */ CG_PanelButtonsRender_Window, NULL, }; panel_button_t debriefMissionStatsHeaders = { NULL, NULL, { 219, 298, 405, 16 }, // CHRUKER: b095 - Campaign window now spans down to the chat window { 0, 0, 0, 0, 0, 0, 0, 0 }, NULL, /* font */ NULL, /* keyDown */ NULL, /* keyUp */ CG_Debriefing2TeamSkillHeaders_Draw, NULL, }; panel_button_t debriefMissionStatsWinner = { NULL, NULL, { 219, 314, 405, 16 }, // CHRUKER: b095 - Campaign window now spans down to the chat window { 0, 0, 0, 0, 0, 0, 0, 0 }, NULL, /* font */ NULL, /* keyDown */ NULL, /* keyUp */ CG_Debriefing2TeamSkillXP_Draw, NULL, }; panel_button_t debriefMissionStatsLoser = { NULL, NULL, { 219, 330, 405, 16 }, // CHRUKER: b095 - Campaign window now spans down to the chat window { 1, 0, 0, 0, 0, 0, 0, 0 }, NULL, /* font */ NULL, /* keyDown */
cg_debriefing.c @ 2498 CG_FillRect( button->rect.x + 2, y + 2, button->rect.w - 4, 12, clrBck ); }
// CHRUKER: b095 - Removed the map counter
CG_Text_Paint_Ext( button->rect.x + 8, y + 11, 0.19f, 0.19f, clrTxtBck, va( "%i. %s", i+1, cgs.campaignData.arenas[i].longname ), 0, 0, 0, &cgs.media.limboFont2 ); if( i <= cgs.currentCampaignMap ) { str = CG_Debreifing2_WinStringForTeam( CG_Debriefing_FindWinningTeamForPos( i + 1 ) ); w = CG_Text_Width_Ext( str, 0.2f, 0, &cgs.media.limboFont2 ); CG_Text_Paint_Ext( button->rect.x + button->rect.w - w - 8, y + 11, 0.19f, 0.19f, clrTxtBck, str, 0, 0, 0, &cgs.media.limboFont2 ); }
// CHRUKER: b095 - This makes the list fit better to the new window size
y += 13; } } else if( cg_gameType.integer == GT_WOLF_STOPWATCH ) { }
cg_debriefing.c @ 2792 return qfalse; }
// CHRUKER: b095 - Repositioning mission stats
int skillPositions[ SK_NUM_SKILLS + 1 ] = { 0, 55, 110, 150, 200, 250, 290, 330, }; // b095 void CG_Debriefing2TeamSkillHeaders_Draw( panel_button_t* button ) { int i, j;
cg_debriefing.c @ 2832 } if( *str ) {
// CHRUKER: b095 - Rescaling and repositioning the headers
w = CG_Text_Width_Ext( str, 0.175f, 0, &cgs.media.limboFont2 ); CG_Text_Paint_Ext( button->rect.x + 60 + skillPositions[ i ] - (w*0.5f), button->rect.y + (j*11), 0.2f, 0.2f, clrTxtBck, str, 0, 0, 0, &cgs.media.limboFont2 );
// b095
} } }
cg_debriefing.c @ 2860 } if( team == winner ) { scale = 0.225f; // CHRUKER: b095 - New scale to make it fit the new window size } else { scale = 0.175f; // CHRUKER: b095 - New scale to make it fit the new window size } switch( team ) {
cg_debriefing.c @ 2888 w = CG_Text_Width_Ext( str, scale, 0, &cgs.media.limboFont2 );
// CHRUKER: b095 - Repositioning where the XP stats start
CG_Text_Paint_Ext( button->rect.x + 60 + skillPositions[ i ] - (w*0.5f), button->rect.y + 11, scale, scale, clrTxtBck, str, 0, 0, 0, &cgs.media.limboFont2 ); } }

Show index
Previous bug: Playing time shown at debriefing keep increasing
Next bug: Complaint votes sticks around, so vote no if we have complaints turned off

Color coding

Sample = New code
Sample = Changed code (the new version is what is displayed)
Sample = Deleted code

©2017 Chruker