ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable highlight until render gui during loading is bug free

Browse Source
This commit is contained in:
Benau 2018-12-21 19:52:27 +08:00
parent e4e03e6209
commit 2eba8c179f
6 changed files with 10 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
data/gui/screens/online/vote_overview.stkgui
View File

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
<div id="all-track" x="1%" y="1%" width="98%" height="96%" layout="vertical-row" >
<header width="80%" I18N="In the track selection screen" text="Votes"
align="center" text_align="center" />
<div id="rect-box" width="100%" height="89%" padding="15" layout="vertical-row">
<div proportion="1" width="100%" layout="horizontal-row" padding="1">
<box id="rect-box0" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-0" width="100%" height="10%"/>
<icon-button id="track-0" width="100%" height="40%"/>
<label id="numlaps-0" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-0" width="5%" height="10%"/>
</box>
<box id="rect-box1" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-1" width="100%" height="10%"/>
<icon-button id="track-1" width="100%" height="40%"/>
<label id="numlaps-1" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-1" width="5%" height="10%"/>
</box>
<box id="rect-box2" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-2" width="100%" height="10%"/>
<icon-button id="track-2" width="100%" height="40%"/>
<label id="numlaps-2" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-2" width="5%" height="10%"/>
</box>
<box id="rect-box3" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-3" width="100%" height="10%"/>
<icon-button id="track-3" width="100%" height="40%"/>
<label id="numlaps-3" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-3" width="5%" height="10%"/>
</box>
</div>
<div proportion="1" width="100%" layout="horizontal-row" padding="1">
<box id="rect-box4" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-4" width="100%" height="10%"/>
<icon-button id="track-4" width="100%" height="40%"/>
<label id="numlaps-4" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-4" width="5%" height="10%"/>
</box>
<box id="rect-box5" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-5" width="100%" height="10%"/>
<icon-button id="track-5" width="100%" height="40%"/>
<label id="numlaps-5" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-5" width="5%" height="10%"/>
</box>
<box id="rect-box6" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-6" width="100%" height="10%"/>
<icon-button id="track-6" width="100%" height="40%"/>
<label id="numlaps-6" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-6" width="5%" height="10%"/>
</box>
<box id="rect-box7" width="24%" height="100%" padding="15" layout="vertical-row">
<label id="name-7" width="100%" height="10%"/>
<icon-button id="track-7" width="100%" height="40%"/>
<label id="numlaps-7" proportion="1" width="100%" height="10%" text=""></label>
<label id="reverse-7" width="5%" height="10%"/>
</box>
</div>
</div>
<progressbar x="1%" id="timer" height="4%" width="98%"></progressbar>
</div>
</stkgui>

2
src/main_loop.cpp
View File

@ -42,7 +42,6 @@
#include "race/history.hpp"
#include "race/race_manager.hpp"
#include "states_screens/state_manager.hpp"
#include "states_screens/online/tracks_screen.hpp"
#include "utils/profiler.hpp"
#include "utils/time.hpp"
@ -543,6 +542,7 @@ void MainLoop::run()
*/
void MainLoop::renderGUI(int phase, int loop_index, int loop_size)
{
return;
#ifdef SERVER_ONLY
return;
#else

3
src/network/protocols/client_lobby.cpp
View File

@ -271,7 +271,8 @@ void ClientLobby::addAllPlayers(Event* event)
configRemoteKart(players);
loadWorld();
StateManager::get()->enterGameState();
// Disable until render gui during loading is bug free
//StateManager::get()->enterGameState();
// Switch to assign mode in case a player hasn't chosen any karts
input_manager->getDeviceManager()->setAssignMode(ASSIGN);

14
src/race/race_manager.cpp
View File

@ -57,7 +57,6 @@
#include "states_screens/grand_prix_win.hpp"
#include "states_screens/kart_selection.hpp"
#include "states_screens/main_menu_screen.hpp"
#include "states_screens/online/tracks_screen.hpp"
#include "states_screens/state_manager.hpp"
#include "tracks/track_manager.hpp"
#include "utils/ptr_vector.hpp"
@ -478,10 +477,10 @@ void RaceManager::startNextRace()
// sfx_manager->dump();
IrrlichtDevice* device = irr_driver->getDevice();
//GUIEngine::renderLoading();
//device->getVideoDriver()->endScene();
//device->getVideoDriver()->beginScene(true, true,
// video::SColor(255,100,101,140));
GUIEngine::renderLoading();
device->getVideoDriver()->endScene();
device->getVideoDriver()->beginScene(true, true,
video::SColor(255,100,101,140));
m_num_finished_karts = 0;
m_num_finished_players = 0;
@ -968,7 +967,8 @@ void RaceManager::startSingleRace(const std::string &track_ident,
// In networking, make sure that the tracks screen is shown. This will
// allow for a 'randomly pick track' animation to be shown while
// world is loaded.
if (NetworkConfig::get()->isNetworking() &&
// Disable until render gui during loading is bug free
/*if (NetworkConfig::get()->isNetworking() &&
NetworkConfig::get()->isClient() )
{
// TODO: The enterGameState() call above deleted all GUIs, which
@ -980,7 +980,7 @@ void RaceManager::startSingleRace(const std::string &track_ident,
ts->setNetworkTracks();
ts->push();
}
}
}*/
setTrack(track_ident);

1
src/states_screens/gp_info_screen.cpp
View File

@ -35,7 +35,6 @@
#include "race/grand_prix_data.hpp"
#include "race/race_manager.hpp"
#include "states_screens/state_manager.hpp"
#include "states_screens/online/tracks_screen.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#include "utils/translation.hpp"

1
src/states_screens/track_info_screen.cpp
View File

@ -37,7 +37,6 @@
#include "race/highscore_manager.hpp"
#include "race/race_manager.hpp"
#include "states_screens/state_manager.hpp"
#include "states_screens/online/tracks_screen.hpp"
#include "tracks/track.hpp"
#include "tracks/track_manager.hpp"
#include "utils/string_utils.hpp"