xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed conditionals to close Ticket 356 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6084 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
beaglejoe 2015-08-21 00:07:15 +00:00
parent f564e6bbe1
commit 1e29484189
21 changed files with 20 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/options.cmake
View File

@ -76,10 +76,6 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
SET(OPTION_3RDPARTY_SQLITE3 false CACHE BOOL "Use SQLite3 as database for record/replay")
SET(OPTION_START_PAUSED true CACHE BOOL "Enable Starting races in a Paused state")
SET(OPTION_COOLDOWN true CACHE BOOL "Enable post-session cooldown driving")
# Enable building with 3rd party SOLID library under Windows, as we ship the binary package,
# but not under Linux, where FreeSolid seems not to be available by default on most distros.
IF(WIN32)
@ -164,14 +160,6 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
ADD_DEFINITIONS(-DTHIRD_PARTY_SQLITE3)
ENDIF(OPTION_3RDPARTY_SQLITE3)
IF(OPTION_START_PAUSED)
ADD_DEFINITIONS(-DSTARTPAUSED)
ENDIF(OPTION_START_PAUSED)
IF(OPTION_COOLDOWN)
ADD_DEFINITIONS(-DCOOLDOWN)
ENDIF(OPTION_COOLDOWN)
IF(OPTION_3RDPARTY_SOLID)
ADD_DEFINITIONS(-DTHIRD_PARTY_SOLID)
ENDIF(OPTION_3RDPARTY_SOLID)

8
data/data/menu/simuconfigmenu.xml
View File

@ -384,7 +384,7 @@
<attstr name="font" val="small_t"/>
</section>
<!--<section name="8">
<section name="8">
<attstr name="type" val="label"/>
<attnum name="x" val="20"/>
<attnum name="y" val="202"/>
@ -392,9 +392,9 @@
<attstr name="h align" val="right"/>
<attnum name="width" val="220"/>
<attstr name="font" val="small_t"/>
</section>-->
</section>
<!--<section name="9">
<section name="9">
<attstr name="type" val="label"/>
<attnum name="x" val="20"/>
<attnum name="y" val="172"/>
@ -402,7 +402,7 @@
<attstr name="h align" val="right"/>
<attnum name="width" val="220"/>
<attstr name="font" val="small_t"/>
</section>-->
</section>
</section>

5
src/interfaces/iraceengine.h
View File

@ -67,13 +67,8 @@ public:
virtual void step(double dt) = 0;
#endif
#ifdef STARTPAUSED
virtual void stopPreracePause() = 0;
#endif
#ifdef COOLDOWN
virtual void stopCooldown() = 0;
#endif
virtual GfRace* race() = 0;
virtual const GfRace* race() const = 0;

5
src/interfaces/iuserinterface.h
View File

@ -61,13 +61,8 @@ public:
virtual bool onRaceEventFinished(bool bMultiEvent, bool careerNonHuman) = 0;
virtual void onOptimizationInitializing() = 0;
#ifdef STARTPAUSED
virtual bool onRaceStartingPaused() = 0;
#endif
#ifdef COOLDOWN
virtual bool onRaceCooldownStarting() = 0;
#endif
// Loading messages management.
virtual void addLoadingMessage(const char* pszText) = 0;

9
src/interfaces/raceman.h
View File

@ -119,12 +119,8 @@ typedef struct Situation {
#define RE_STATE_WAITFORKEYPRESS 15
#define RE_STATE_ERROR 16
#define RE_STATE_EXIT 17
#ifdef STARTPAUSED
#define RE_STATE_PRE_RACE_PAUSE 18
#endif
#ifdef COOLDOWN
#define RE_STATE_RACE_COOLDOWN 19
#endif
/** Race Engine Car Information about the race */
typedef struct
@ -446,13 +442,8 @@ typedef struct RmInfo
#define RM_ATTR_THREAD_AFFINITY "thread affinity"
#define RM_ATTR_REPLAY_RATE "replay rate"
#ifdef STARTPAUSED
#define RM_ATTR_STARTPAUSED "startpaused"
#endif
#ifdef COOLDOWN
#define RM_ATTR_COOLDOWN "cooldown"
#endif
#define RM_VAL_AUTO "auto"
#define RM_VAL_ON "on"

3
src/libs/tgfclient/gui.cpp
View File

@ -1073,7 +1073,6 @@ GfuiAddKey(void *scr, int key, int modifier, const char *descr, void *userData,
}
}
#ifdef STARTPAUSED
/** Remove a Keyboard shortcut from the screen
@ingroup gui
@param scr Target screen
@ -1147,7 +1146,7 @@ GfuiRemoveKey(void *scr, int key, int modifier, const char *descr)
}
return bFound;
}
#endif
/** Enable/disable the key auto-repeat for the given screen.
@ingroup screen
@param scr Screen

2
src/libs/tgfclient/tgfclient.h
View File

@ -303,10 +303,8 @@ TGFCLIENT_API void GfuiKeyEventRegister(void *scr, tfuiKeyCallback onKeyAction);
TGFCLIENT_API void GfuiKeyEventRegisterCurrent(tfuiKeyCallback onKeyAction);
TGFCLIENT_API void GfuiInitWindowPositionAndSize(int x, int y, int w, int h);
#ifdef STARTPAUSED
TGFCLIENT_API bool GfuiRemoveKey(void *scr, int key, const char *descr);
TGFCLIENT_API bool GfuiRemoveKey(void *scr, int key, int modifier, const char *descr);
#endif
TGFCLIENT_API void GfuiRedraw(void);
TGFCLIENT_API void GfuiSwapBuffers(void);

9
src/modules/racing/genparoptv1/genparoptv1.h
View File

@ -90,13 +90,8 @@ public:
virtual void step(double dt);
#endif
#ifdef STARTPAUSED
virtual void stopPreracePause(){};
#endif
#ifdef COOLDOWN
virtual void stopCooldown(){};
#endif
virtual void stopPreracePause(){};
virtual void stopCooldown(){};
virtual GfRace* race();
virtual const GfRace* race() const;

8
src/modules/racing/standardgame/racemain.cpp
View File

@ -620,7 +620,6 @@ RePreRace(void)
return RM_SYNC | RM_NEXT_STEP;
}
#ifdef STARTPAUSED
/* return state mode */
int
RePreRacePause(void)
@ -655,7 +654,6 @@ ReStopPreracePause()
ReSituation::self().setRaceMessage("", -1/*always*/, /*big=*/true);
::ReStart();
}
#endif
/* return state mode */
int
@ -1177,7 +1175,6 @@ ReCleanupStandardgame()
}
}
#if defined(STARTPAUSED) || defined(COOLDOWN)
bool
ReSessionHasHuman()
{
@ -1193,8 +1190,7 @@ ReSessionHasHuman()
}
return hasHuman;
}
#endif
#ifdef COOLDOWN
int
ReRaceCooldown()
{
@ -1226,5 +1222,3 @@ ReStopCooldown()
{
ReStateApply((void*)RE_STATE_RACE_END);
}
#endif

9
src/modules/racing/standardgame/racemain.h
View File

@ -27,20 +27,14 @@
#define _RACEMAIN_H_
extern bool ReHumanInGroup();
#if defined(STARTPAUSED) || defined(COOLDOWN)
extern bool ReSessionHasHuman();
#endif
extern int ReConfigure();
extern int ReRaceEventInit();
extern int RePreRace();
#ifdef STARTPAUSED
extern int RePreRacePause();
#endif
#ifdef COOLDOWN
extern int ReRaceCooldown();
extern void ReStopCooldown();
#endif
extern int ReRaceStart();
extern int ReRaceRealStart();
extern int ReRaceStop();
@ -52,10 +46,7 @@ extern void ReRaceAbandon();
extern void ReRaceAbort();
extern void ReRaceSkipSession();
extern void ReRaceRestart();
#ifdef STARTPAUSED
extern void ReStopPreracePause();
#endif
#endif /* _RACEMAIN_H_ */

14
src/modules/racing/standardgame/racestate.cpp
View File

@ -94,16 +94,11 @@ ReStateManage(void)
mode = ReNetworkWaitReady();
if (mode & RM_NEXT_STEP) {
// Not an online race, or else all online players ready
#ifdef STARTPAUSED
ReInfo->_reState = RE_STATE_PRE_RACE_PAUSE;
GfLogInfo("%s now in PRE RACE PAUSE state\n", ReInfo->_reName);
#else
ReInfo->_reState = RE_STATE_RACE;
GfLogInfo("%s now in RACE state\n", ReInfo->_reName);
#endif
}
break;
#ifdef STARTPAUSED
case RE_STATE_PRE_RACE_PAUSE:
mode = RePreRacePause();
if (mode & RM_NEXT_STEP) {
@ -113,13 +108,11 @@ ReStateManage(void)
GfLogInfo("%s now in RACE state\n", ReInfo->_reName);
}
break;
#endif
case RE_STATE_RACE:
mode = ReUpdate();
if (ReInfo->s->_raceState == RM_RACE_ENDED) {
// Race is finished
#if COOLDOWN
mode = ReRaceCooldown();
if (mode & RM_NEXT_STEP) {
ReInfo->_reState = RE_STATE_RACE_END;
@ -128,16 +121,12 @@ ReStateManage(void)
ReInfo->_reState = RE_STATE_RACE_COOLDOWN;
GfLogInfo("%s now in COOLDOWN state\n", ReInfo->_reName);
}
#else
ReInfo->_reState = RE_STATE_RACE_END;
#endif
} else if (mode & RM_END_RACE) {
// Race was interrupted (paused) by the player
ReInfo->_reState = RE_STATE_RACE_STOP;
}
break;
#if COOLDOWN
case RE_STATE_RACE_COOLDOWN:
{
// Player is on victory lap or joy riding
@ -146,7 +135,6 @@ ReStateManage(void)
mode = ReUpdate();
}
break;
#endif
case RE_STATE_RACE_STOP:
GfLogInfo("%s now in RACE_STOP state\n", ReInfo->_reName);

11
src/modules/racing/standardgame/standardgame.cpp
View File

@ -210,7 +210,6 @@ void StandardGame::resumeRace()
//************************************************************
void StandardGame::startRace()
{
#ifdef STARTPAUSED
int mode = ::ReRaceRealStart();
if(mode & RM_ERROR)
{
@ -222,18 +221,12 @@ void StandardGame::startRace()
// Maybe should be RE_STATE_NETWORK_WAIT
ReInfo->_reState = RE_STATE_PRE_RACE_PAUSE;
}
#else
// TODO: Process error status ?
(void)::ReRaceRealStart();
#endif
}
#if COOLDOWN
void StandardGame::stopCooldown()
{
::ReStopCooldown();
}
#endif
void StandardGame::abandonRace()
{
@ -277,12 +270,12 @@ void StandardGame::step(double dt)
::ReOneStep(dt);
}
#endif
#ifdef STARTPAUSED
void StandardGame::stopPreracePause()
{
::ReStopPreracePause();
}
#endif
//************************************************************
GfRace* StandardGame::race()
{

5
src/modules/racing/standardgame/standardgame.h
View File

@ -87,13 +87,8 @@ public:
virtual void step(double dt);
#endif
#ifdef STARTPAUSED
virtual void stopPreracePause();
#endif
#ifdef COOLDOWN
virtual void stopCooldown();
#endif
virtual GfRace* race();
virtual const GfRace* race() const;

56
src/modules/userinterface/legacymenu/confscreens/simuconfig.cpp
View File

@ -60,19 +60,15 @@ static const char *ReplaySchemeDispNameList[] = {"off", "Low", "Normal", "High"
static const int NbReplaySchemes = sizeof(ReplaySchemeList) / sizeof(ReplaySchemeList[0]);
static int CurReplayScheme = 0;
#ifdef STARTPAUSED
/* list of available start paused schemes */
static const char *StartPausedSchemeList[] = {RM_VAL_ON, RM_VAL_OFF};
static const int NbStartPausedSchemes = sizeof(StartPausedSchemeList) / sizeof(StartPausedSchemeList[0]);
static int CurStartPausedScheme = 0; // On
#endif
#ifdef COOLDOWN
/* list of available cooldown schemes */
static const char *CooldownSchemeList[] = {RM_VAL_ON, RM_VAL_OFF};
static const int NbCooldownSchemes = sizeof(CooldownSchemeList) / sizeof(CooldownSchemeList[0]);
static int CurCooldownScheme = 0; // On
#endif
/* gui label ids */
static int SimuVersionId;
@ -80,13 +76,9 @@ static int MultiThreadSchemeId;
static int ThreadAffinitySchemeId;
static int ReplayRateSchemeId;
#ifdef STARTPAUSED
static int StartPausedSchemeId;
#endif
#ifdef COOLDOWN
static int CooldownSchemeId;
#endif
/* gui screen handles */
static void *ScrHandle = NULL;
@ -99,12 +91,9 @@ static void loadSimuCfg(void)
const char *multiThreadSchemeName;
const char *threadAffinitySchemeName;
const char *replayRateSchemeName;
#ifdef STARTPAUSED
const char *startPausedSchemeName;
#endif
#ifdef COOLDOWN
const char *cooldownSchemeName;
#endif
const char *startPausedSchemeName;
const char *cooldownSchemeName;
int i;
char buf[1024];
@ -161,7 +150,6 @@ static void loadSimuCfg(void)
CurReplayScheme = 0;
#endif
#ifdef STARTPAUSED
// startpaused
startPausedSchemeName = GfParmGetStr(paramHandle,RM_SECT_RACE_ENGINE, RM_ATTR_STARTPAUSED, StartPausedSchemeList[1]);
for (i = 0; i < NbStartPausedSchemes; i++) {
@ -170,9 +158,7 @@ static void loadSimuCfg(void)
break;
}
}
#endif
#ifdef COOLDOWN
// cooldown
cooldownSchemeName = GfParmGetStr(paramHandle,RM_SECT_RACE_ENGINE, RM_ATTR_COOLDOWN, CooldownSchemeList[1]);
for (i = 0; i < NbCooldownSchemes; i++) {
@ -181,7 +167,6 @@ static void loadSimuCfg(void)
break;
}
}
#endif
GfParmReleaseHandle(paramHandle);
@ -192,12 +177,8 @@ static void loadSimuCfg(void)
#ifndef THIRD_PARTY_SQLITE3
GfuiEnable(ScrHandle, ReplayRateSchemeId, GFUI_DISABLE);
#endif
#ifdef STARTPAUSED
GfuiLabelSetText(ScrHandle, StartPausedSchemeId, StartPausedSchemeList[CurStartPausedScheme]);
#endif
#ifdef COOLDOWN
GfuiLabelSetText(ScrHandle, CooldownSchemeId, CooldownSchemeList[CurCooldownScheme]);
#endif
GfuiLabelSetText(ScrHandle, StartPausedSchemeId, StartPausedSchemeList[CurStartPausedScheme]);
GfuiLabelSetText(ScrHandle, CooldownSchemeId, CooldownSchemeList[CurCooldownScheme]);
}
@ -212,12 +193,8 @@ static void storeSimuCfg(void * /* dummy */)
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_MULTI_THREADING, MultiThreadSchemeList[CurMultiThreadScheme]);
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_THREAD_AFFINITY, ThreadAffinitySchemeList[CurThreadAffinityScheme]);
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_REPLAY_RATE, ReplaySchemeList[CurReplayScheme]);
#ifdef STARTPAUSED
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_STARTPAUSED, StartPausedSchemeList[CurStartPausedScheme]);
#endif
#ifdef COOLDOWN
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_COOLDOWN, CooldownSchemeList[CurCooldownScheme]);
#endif
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_STARTPAUSED, StartPausedSchemeList[CurStartPausedScheme]);
GfParmSetStr(paramHandle, RM_SECT_RACE_ENGINE, RM_ATTR_COOLDOWN, CooldownSchemeList[CurCooldownScheme]);
GfParmWriteFile(NULL, paramHandle, "raceengine");
GfParmReleaseHandle(paramHandle);
@ -280,7 +257,6 @@ onChangeReplayRateScheme(void *vp)
GfuiLabelSetText(ScrHandle, ReplayRateSchemeId, ReplaySchemeDispNameList[CurReplayScheme]);
}
#ifdef STARTPAUSED
/* Change the startpaused scheme */
static void
onChangeStartPausedScheme(void *vp)
@ -290,9 +266,7 @@ onChangeStartPausedScheme(void *vp)
GfuiLabelSetText(ScrHandle, StartPausedSchemeId, StartPausedSchemeList[CurStartPausedScheme]);
}
#endif
#ifdef COOLDOWN
/* Change the cooldown scheme */
static void
onChangeCooldownScheme(void *vp)
@ -302,7 +276,6 @@ onChangeCooldownScheme(void *vp)
GfuiLabelSetText(ScrHandle, CooldownSchemeId, CooldownSchemeList[CurCooldownScheme]);
}
#endif
static void onActivate(void * /* dummy */)
{
@ -345,31 +318,16 @@ SimuMenuInit(void *prevMenu)
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "replayraterightarrow", (void*)1, onChangeReplayRateScheme);
#endif
#ifdef STARTPAUSED
// TODO remove this and uncomment the static controls in 'simuconfigmenu.xml'
// if/when STARTPAUSED is officially included
// HACK to allow CMake option 'OPTION_START_PAUSED' to show/hide these labels
GfuiMenuCreateLabelControl(ScrHandle,menuDescHdle,"startpausedstaticlabel");
// end of code to remove
StartPausedSchemeId = GfuiMenuCreateLabelControl(ScrHandle, menuDescHdle, "startpausedlabel");
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "startpausedleftarrow", (void*)-1, onChangeStartPausedScheme);
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "startpausedrightarrow", (void*)1, onChangeStartPausedScheme);
#endif
#ifdef COOLDOWN
// TODO remove this and uncomment the static controls in 'simuconfigmenu.xml'
// if/when COOLDOWN is officially included
// HACK to allow CMake option 'OPTION_COOLDOWN' to show/hide these labels
GfuiMenuCreateLabelControl(ScrHandle,menuDescHdle,"cooldownstaticlabel");
// end of code to remove
CooldownSchemeId = GfuiMenuCreateLabelControl(ScrHandle, menuDescHdle, "cooldownlabel");
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "cooldownleftarrow", (void*)-1, onChangeCooldownScheme);
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "cooldownrightarrow", (void*)1, onChangeCooldownScheme);
#endif
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "ApplyButton", PrevScrHandle, storeSimuCfg);
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "CancelButton", PrevScrHandle, GfuiScreenActivate);

4
src/modules/userinterface/legacymenu/legacymenu.cpp
View File

@ -396,7 +396,6 @@ void LegacyMenu::onRaceSimulationReady()
}
}
#ifdef STARTPAUSED
bool LegacyMenu::onRaceStartingPaused(){
GfLogDebug("LegacyMenu::onRaceStartingPaused()\n");
@ -417,7 +416,6 @@ bool LegacyMenu::onRaceStartingPaused(){
// Tell the race engine if Prerace Pause is enabled
return preracePauseEnabled;
}
#endif
void LegacyMenu::onRaceStarted()
{
@ -447,7 +445,6 @@ void LegacyMenu::onRaceInterrupted() {
::RmStopRaceMenu();
}
#if COOLDOWN
bool LegacyMenu::onRaceCooldownStarting(){
bool cooldownEnabled = false;
@ -467,7 +464,6 @@ bool LegacyMenu::onRaceCooldownStarting(){
// Tell the race engine if Cooldown is enabled
return cooldownEnabled;
}
#endif
void LegacyMenu::onRaceFinishing()
{

4
src/modules/userinterface/legacymenu/legacymenu.h
View File

@ -85,12 +85,8 @@ public:
virtual bool onRaceEventFinished(bool bMultiEvent, bool careerNonHumanGroup);
virtual void onOptimizationInitializing();
#ifdef STARTPAUSED
virtual bool onRaceStartingPaused();
#endif
#if COOLDOWN
virtual bool onRaceCooldownStarting();
#endif
// Loading messages management.
virtual void addLoadingMessage(const char* pszText);

29
src/modules/userinterface/legacymenu/racescreens/racerunningmenus.cpp
View File

@ -180,9 +180,7 @@ static bool rmRacePaused = false;
// Flag to know if the menu state has been changed (and thus needs a redraw+redisplay).
static bool rmbMenuChanged = false;
#ifdef STARTPAUSED
bool rmPreRacePause = false;
#endif
struct RmMovieCapture
{
@ -324,14 +322,10 @@ rmRedisplay()
#endif
// Exec the "slow resume race" manager, if needed.
#ifdef STARTPAUSED
if (!rmPreRacePause)
{
rmProgressiveTimeModifier.execute();
}
#else
rmProgressiveTimeModifier.execute();
#endif
// Redraw the graphics part of the GUI if requested.
const bool bUpdateGraphics =
@ -399,11 +393,7 @@ rmScreenActivate(void * /* dummy */)
GfuiApp().eventLoop().setRedisplayCB(rmRedisplay);
// If not paused ...
#ifdef STARTPAUSED
if ((!rmRacePaused)&&(!rmPreRacePause))
#else
if (!rmRacePaused)
#endif
if ((!rmRacePaused)&&(!rmPreRacePause))
{
// Reset normal sound volume.
if (LegacyMenu::self().soundEngine())
@ -423,7 +413,6 @@ rmScreenActivate(void * /* dummy */)
static void
rmRacePause(void * /* vboard */)
{
#ifdef STARTPAUSED
// Pause is disabled during Pre Race Pause
// as the simulation is already Paused
if (!rmPreRacePause)
@ -432,12 +421,6 @@ rmRacePause(void * /* vboard */)
{
if (LegacyMenu::self().soundEngine())
LegacyMenu::self().soundEngine()->mute(false);
#else
if (rmRacePaused)
{
if (LegacyMenu::self().soundEngine())
LegacyMenu::self().soundEngine()->mute(false);
#endif
LmRaceEngine().start();
@ -472,9 +455,7 @@ rmRacePause(void * /* vboard */)
// The menu changed.
rmbMenuChanged = true;
#ifdef STARTPAUSED
}
#endif
}
}
static void
@ -616,9 +597,7 @@ RmScreenInit()
// We are starting "unpaused".
GfuiVisibilitySet(rmScreenHandle, rmPauseId, GFUI_INVISIBLE);
rmRacePaused = false;
#ifdef STARTPAUSED
rmPreRacePause = false;
#endif
// Re-initialize the progressive time modifier,
// in case the race was exited while it was running.
@ -664,7 +643,6 @@ RmShutdownReUpdateStateHook()
pvUpdateStateHookHandle = 0;
}
#ifdef STARTPAUSED
static void
RmReadyToRace(void * /* dummy */)
{
@ -709,9 +687,7 @@ RmAddPreRacePauseItems()
}
}
}
#endif
#if COOLDOWN
static void
RmResultShow(void * /* dummy */)
{
@ -730,7 +706,6 @@ RmAddCooldownItems()
rmbMenuChanged = true;
}
}
#endif
/**************************************************************************
* Result only screen (blind mode)

5
src/modules/userinterface/legacymenu/racescreens/racescreens.h
View File

@ -135,13 +135,8 @@ extern void RmResScreenRemoveText(int nRowIndex);
extern int RmResGetRows();
extern void RmResEraseScreen();
#ifdef STARTPAUSED
extern void RmAddPreRacePauseItems();
#endif
#if COOLDOWN
extern void RmAddCooldownItems();
#endif
// From networkingmenu.
extern void RmNetworkClientMenu(void* pVoid);

6
src/modules/userinterface/legacymenu/racescreens/racestopmenu.cpp
View File

@ -33,9 +33,7 @@
extern RmProgressiveTimeModifier rmProgressiveTimeModifier;
#ifdef STARTPAUSED
extern bool rmPreRacePause;
#endif
static void *hscreen = 0;
static int curPlayerIdx = 0;
@ -91,11 +89,7 @@ rmBackToRaceHookActivate(void * /* dummy */)
LegacyMenu::self().activateGameScreen();
// Launch the "slow resume race" manager if non-blind mode.
#ifdef STARTPAUSED
if ((!rmPreRacePause) && (LmRaceEngine().outData()->_displayMode == RM_DISP_MODE_NORMAL))
#else
if (LmRaceEngine().outData()->_displayMode == RM_DISP_MODE_NORMAL)
#endif
rmProgressiveTimeModifier.start();
}

5
src/modules/userinterface/textonly/textonly.cpp
View File

@ -195,7 +195,6 @@ void TextOnlyUI::updateRaceEngine()
ToRaceEngine().updateState();
}
#ifdef STARTPAUSED
bool TextOnlyUI::onRaceStartingPaused()
{
GfLogDebug("TextOnlyUI::onRaceStartingPaused()\n");
@ -203,7 +202,6 @@ bool TextOnlyUI::onRaceStartingPaused()
// Tell the race engine that Pre-race Pause is not supported
return false;
}
#endif
void TextOnlyUI::onRaceStarted()
{
@ -247,7 +245,6 @@ void TextOnlyUI::onRaceFinishing()
GfApp().eventLoop().setRecomputeCB(0);
}
#if COOLDOWN
bool TextOnlyUI::onRaceCooldownStarting()
{
GfLogDebug("TextOnlyUI::onRaceCooldownStarting()\n");
@ -255,8 +252,6 @@ bool TextOnlyUI::onRaceCooldownStarting()
// Tell the race engine that Cooldown not supported
return false;
}
#endif
bool TextOnlyUI::onRaceFinished(bool bEndOfSession)
{

5
src/modules/userinterface/textonly/textonly.h
View File

@ -78,13 +78,8 @@ public:
virtual bool onRaceEventFinished(bool bMultiEvent, bool careerNonHumanGroupo);
virtual void onOptimizationInitializing();
#ifdef STARTPAUSED
virtual bool onRaceStartingPaused();
#endif
#if COOLDOWN
virtual bool onRaceCooldownStarting();
#endif
// Loading messages management.
virtual void addLoadingMessage(const char* pszText);