From 4bbdb57275406b016a9f8e8a7e5da01e9229bfb1 Mon Sep 17 00:00:00 2001
From: kmetykog <kmetykog@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Sat, 18 Sep 2010 00:09:34 +0000
Subject: [PATCH] Display correct track name on loading. Fixes #151.

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

Former-commit-id: 403ded2fb6f0cd2426c5de9e24513716694d602b
Former-commit-id: a367a5f9e3021841ff37700e14b1aa628b307d0b
---
 src/libs/raceengineclient/raceinit.cpp | 81 +++++++++++++-------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/libs/raceengineclient/raceinit.cpp b/src/libs/raceengineclient/raceinit.cpp
index 084dc566..e98a1a23 100644
--- a/src/libs/raceengineclient/raceinit.cpp
+++ b/src/libs/raceengineclient/raceinit.cpp
@@ -949,61 +949,58 @@ reDumpTrack(const tTrack *track, int verbose)
 int
 ReInitTrack(void)
 {
-    const char  *trackName;
-    const char  *catName;
-    const char  *raceName;
+  const char  *trackName;
+  const char  *catName;
+  const char  *raceName;
 
-    int curTrkIdx;
-    int cloud;
-    int Timeday;
-    //int rain;
+  //int rain;
 
-    void  *params = ReInfo->params;
-    void  *results = ReInfo->results;
+  void  *params = ReInfo->params;
+  void  *results = ReInfo->results;
   
-    raceName = ReInfo->_reRaceName = ReGetCurrentRaceName();
+  raceName = ReInfo->_reRaceName = ReGetCurrentRaceName();
 
-    curTrkIdx = (int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_TRACK, NULL, 1);
-    sprintf(buf, "%s/%d", RM_SECT_TRACKS, curTrkIdx);
-    trackName = GfParmGetStr(params, buf, RM_ATTR_NAME, 0);
-    if (!trackName)
+  int curTrkIdx = (int)GfParmGetNum(results, RE_SECT_CURRENT, RE_ATTR_CUR_TRACK, NULL, 1);
+  sprintf(buf, "%s/%d", RM_SECT_TRACKS, curTrkIdx);
+  trackName = GfParmGetStr(params, buf, RM_ATTR_NAME, 0);
+  if (!trackName)
     return -1;
 
-    catName = GfParmGetStr(params, buf, RM_ATTR_CATEGORY, 0);
-    if (!catName) 
+  catName = GfParmGetStr(params, buf, RM_ATTR_CATEGORY, 0);
+  if (!catName) 
     return -1;
 
-    sprintf(buf, "Loading track %s ...", trackName);
-    RmLoadingScreenSetText(buf);
+  GfLogDebug("Race Name is '%s'\n", raceName);
+  sprintf(buf, "tracks/%s/%s/%s.%s", catName, trackName, trackName, TRKEXT);
+  ReInfo->track = ReInfo->_reTrackItf.trkBuild(buf);
 
-    Timeday = GfParmGetNum(params, raceName, RM_ATTR_TIME, NULL, 0);
-    cloud = GfParmGetNum(params, raceName, RM_ATTR_WEATHER, NULL, 0);
+  sprintf(buf, "Loading track %s", ReInfo->track->name);
+  RmLoadingScreenSetText(buf);
 
-    GfLogDebug("Race Name is '%s'\n", raceName);
-    sprintf(buf, "tracks/%s/%s/%s.%s", catName, trackName, trackName, TRKEXT);
-    ReInfo->track = ReInfo->_reTrackItf.trkBuild(buf);
+  int Timeday = GfParmGetNum(params, raceName, RM_ATTR_TIME, NULL, 0);
+  int cloud = GfParmGetNum(params, raceName, RM_ATTR_WEATHER, NULL, 0);
 
-    ReInfo->track->weather = cloud;
-    ReInfo->track->Timeday = Timeday;
-  
-    reDumpTrack(ReInfo->track, 0.0);
+  ReInfo->track->Timeday = Timeday;
+  ReInfo->track->weather = cloud;
 
-    ReStartWeather();
+  reDumpTrack(ReInfo->track, 0.0);
+
+  ReStartWeather();
+
+  //DEBUG WEATHER - Verification function update friction
+#ifdef DEBUG
+  tTrack *track = ReInfo->track;
+  tTrackSurface *curSurf;
+  curSurf = track->surfaces;
+  do {
+    GfLogDebug("ReInitTrack: Friction = %f - RollRes = %f\n", curSurf->kFriction, curSurf->kRollRes);
+    curSurf = curSurf->next;
+    } while ( curSurf != 0);
+#endif
+  // End Function DEBUG TRACE Variable kFriction
+  return 0;
+}//ReInitTrack
 
-    //DEBUG WEATHER - Verification function update friction
-    #ifdef DEBUG
-      tTrack *track = ReInfo->track;
-      tTrackSurface *curSurf;
-      curSurf = track->surfaces;
-      do
-      {
-      GfLogDebug("ReInitTrack: Friction = %f - RollRes = %f\n", curSurf->kFriction, curSurf->kRollRes);
-      curSurf = curSurf->next;
-      } while ( curSurf != 0);
-    #endif
-   // End Function DEBUG TRACE Variable kFriction
-    return 0;
-}
 
 /**
  * This functions initialized the graphics.