Re #572: use short names in leaderboards

- short names in leaderboards (Key '3', mode 1,2,3)
- and car ahead/car behind in car board #2

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5317 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 8e35a57fe3a8322e772d503ed5bc74fae903f966
Former-commit-id: 63ab3c554821d50c7b1540b932d7dfbf33539ac8
This commit is contained in:
kmetykog 2013-03-13 07:29:35 +00:00
parent 821b69c5a1
commit 3f1f99cb34

View file

@ -595,7 +595,7 @@ cGrBoard::grDispCarBoard2(const tSituation *s)
// Display car ahead and diff // Display car ahead and diff
color = ahead_color_; color = ahead_color_;
if (car_->_pos != 1) { if (car_->_pos != 1) {
snprintf(buf, sizeof(buf), "%s", s->cars[car_->_pos - 2]->_name); snprintf(buf, sizeof(buf), "%s", s->cars[car_->_pos - 2]->_sname);
GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y); GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y);
if (s->_raceType == RM_TYPE_RACE) { if (s->_raceType == RM_TYPE_RACE) {
if (s->cars[car_->_pos - 2]->_laps == car_->_laps) { if (s->cars[car_->_pos - 2]->_laps == car_->_laps) {
@ -623,7 +623,7 @@ cGrBoard::grDispCarBoard2(const tSituation *s)
// Display car behind and diff // Display car behind and diff
color = normal_color_; //white color = normal_color_; //white
if (car_->_pos != s->_ncars) { if (car_->_pos != s->_ncars) {
snprintf(buf, sizeof(buf), "%s", s->cars[car_->_pos]->_name); snprintf(buf, sizeof(buf), "%s", s->cars[car_->_pos]->_sname);
GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y); GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y);
if (s->_raceType == RM_TYPE_RACE) { if (s->_raceType == RM_TYPE_RACE) {
if (s->cars[car_->_pos]->_laps == car_->_laps) { if (s->cars[car_->_pos]->_laps == car_->_laps) {
@ -856,8 +856,8 @@ cGrBoard::grDispLeaderBoard(const tSituation *s)
else else
color = normal_color_; color = normal_color_;
// Driver position + name // Driver position + short name
snprintf(buf, sizeof(buf), "%3d: %s", i + 1, s->cars[i]->_name); snprintf(buf, sizeof(buf), "%3d: %s", i + 1, s->cars[i]->_sname);
GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y); GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y);
// Display driver time / time behind leader / laps behind leader // Display driver time / time behind leader / laps behind leader
@ -1066,7 +1066,7 @@ cGrBoard::grDispArcade(const tSituation *s)
width, GFUI_ALIGN_HR); width, GFUI_ALIGN_HR);
// Display driver name // Display driver name
snprintf(buf, sizeof(buf), "%s", car_->_name); snprintf(buf, sizeof(buf), "%s", car_->_sname);
GfuiDrawString(buf, arcade_color_, GFUI_FONT_LARGE_C, x, y, GfuiDrawString(buf, arcade_color_, GFUI_FONT_LARGE_C, x, y,
width, GFUI_ALIGN_HC); width, GFUI_ALIGN_HC);
@ -1585,8 +1585,8 @@ cGrBoard::grDispLeaderBoardScroll(const tSituation *s)
color = (i == current) color = (i == current)
? emphasized_color_ : grCarInfo[s->cars[i]->index].iconColor; ? emphasized_color_ : grCarInfo[s->cars[i]->index].iconColor;
// Driver position + name // Driver position + short name
snprintf(buf, sizeof(buf), "%3d: %s", i + 1, s->cars[i]->_name); snprintf(buf, sizeof(buf), "%3d: %s", i + 1, s->cars[i]->_sname);
GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y); GfuiDrawString(buf, color, GFUI_FONT_SMALL_C, x, y);
// Display driver time / time behind leader / laps behind leader // Display driver time / time behind leader / laps behind leader