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

Some fixes

Browse Source
This commit is contained in:
Flakebi 2014-09-09 14:12:20 +02:00
parent 9c911a2891
commit f02c4403e2
3 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/guiengine/widget.hpp
View File

@ -62,21 +62,21 @@ namespace GUIEngine
/** display a lock on the widget, to mean a certain game feature is locked */
LOCKED_BADGE = 1,
/** display a green check on a widget, useful e.g. to display confirmation */
OK_BADGE = 1 << 1,
OK_BADGE = 2,
/** display a red mark badge on the widget, useful e.g. to warn of an invalid choice */
BAD_BADGE = 1 << 2,
BAD_BADGE = 4,
/** display a trophy badge on the widget, useful e.g. for challenges */
TROPHY_BADGE = 1 << 3,
TROPHY_BADGE = 8,
/** A gamepad icon */
GAMEPAD_BADGE = 1 << 4,
GAMEPAD_BADGE = 16,
/** A keyboard icon */
KEYBOARD_BADGE = 1 << 5,
KEYBOARD_BADGE = 32,
/** An hourglass badge to indicate loading */
LOADING_BADGE = 1 << 6,
LOADING_BADGE = 64,
/** A zipper badge to indicate that this player receives a boost */
ZIPPER_BADGE = 1 << 7,
ZIPPER_BADGE = 128,
/** A anchor badge to indicate that this player receives a handicap */
ANCHOR_BADGE = 1 << 8
ANCHOR_BADGE = 256
};

57
src/guiengine/widgets/player_kart_widget.cpp
View File

@ -231,9 +231,6 @@ PlayerKartWidget::~PlayerKartWidget()
GUIEngine::focusNothingForPlayer(m_player_id);
}
//if (m_player_ID_label->getIrrlichtElement() != NULL)
// m_player_ID_label->getIrrlichtElement()->remove();
if (m_player_ident_spinner != NULL)
{
m_player_ident_spinner->setListener(NULL);
@ -289,18 +286,6 @@ void PlayerKartWidget::setPlayerID(const int newPlayerID)
{
m_player_ident_spinner->setID(m_player_id);
}
m_model_view->unsetBadge(ZIPPER_BADGE);
m_model_view->unsetBadge(ANCHOR_BADGE);
// Add badge for per player difficulty if necessary
if (!m_parent_screen->m_from_overworld && (m_parent_screen->m_multiplayer || !m_parent_screen->profile_to_use->isSingleplayerDifficulty()))
{
PerPlayerDifficulty difficulty = m_parent_screen->profile_to_use->getDifficulty();
if (difficulty < PLAYER_DIFFICULTY_NORMAL)
m_model_view->setBadge(ZIPPER_BADGE);
else if (difficulty > PLAYER_DIFFICULTY_NORMAL)
m_model_view->setBadge(ANCHOR_BADGE);
}
} // setPlayerID
// ------------------------------------------------------------------------
@ -335,8 +320,6 @@ void PlayerKartWidget::add()
assert(mineInList);
}
//m_player_ID_label->add();
// the first player will have an ID of its own to allow for keyboard
// navigation despite this widget being added last
if (m_irrlicht_widget_id != -1)
@ -441,7 +424,6 @@ void PlayerKartWidget::markAsReady()
m_model_view->setRotateTo(30.0f, 1.0f);
player_id_w *= 2;
player_name_w = 0;
m_model_view->setBadge(OK_BADGE);
@ -600,9 +582,21 @@ GUIEngine::EventPropagation PlayerKartWidget::transmitEvent(Widget* w,
if (m_parent_screen->m_multiplayer)
{
m_associated_player->setPlayerProfile(
PlayerManager::get()->getPlayer(m_player_ident_spinner
->getValue()) );
PlayerProfile* profile = PlayerManager::get()->getPlayer(
m_player_ident_spinner->getValue());
m_associated_player->setPlayerProfile(profile);
// Add badge for per player difficulty if necessary
m_model_view->unsetBadge(ZIPPER_BADGE);
m_model_view->unsetBadge(ANCHOR_BADGE);
if (!m_parent_screen->m_from_overworld && (m_parent_screen->m_multiplayer || !profile->isSingleplayerDifficulty()))
{
PerPlayerDifficulty difficulty = profile->getDifficulty();
if (difficulty < PLAYER_DIFFICULTY_NORMAL)
m_model_view->setBadge(ZIPPER_BADGE);
else if (difficulty > PLAYER_DIFFICULTY_NORMAL)
m_model_view->setBadge(ANCHOR_BADGE);
}
}
}
@ -621,9 +615,6 @@ void PlayerKartWidget::setSize(const int x, const int y, const int w, const int
m_h = h;
// -- sizes
player_id_w = w;
player_id_h = GUIEngine::getFontHeight();
player_name_h = 40;
player_name_w = std::min(400, w);
@ -636,24 +627,19 @@ void PlayerKartWidget::setSize(const int x, const int y, const int w, const int
const float factor = h / 175.0f;
kart_name_h = (int)(kart_name_h*factor);
player_name_h = (int)(player_name_h*factor);
player_id_h = (int)(player_id_h*factor);
}
// --- layout
player_id_x = x;
player_id_y = y;
player_name_x = x + w/2 - player_name_w/2;
player_name_y = y + player_id_h;
player_name_y = y;
if (m_parent_screen->m_multiplayer)
{
const int modelMaxHeight = (h - kart_name_h - player_name_h
- player_id_h)/2;
const int modelMaxHeight = (h - kart_name_h - player_name_h)/2;
const int modelMaxWidth = w;
const int bestSize = std::min(modelMaxWidth, modelMaxHeight);
model_x = x + w/2 - (int)(bestSize/2);
model_y = y + player_name_h + player_id_h;
model_y = y + player_name_h;
model_w = bestSize;
model_h = bestSize;
@ -664,14 +650,13 @@ void PlayerKartWidget::setSize(const int x, const int y, const int w, const int
}
else
{
const int modelMaxHeight = h - kart_name_h - player_name_h
- player_id_h;
const int modelMaxHeight = h - kart_name_h - player_name_h;
const int modelMaxWidth = w;
const int bestSize = std::min(modelMaxWidth, modelMaxHeight);
const int modelY = y + player_name_h + player_id_h;
const int modelY = y + player_name_h;
model_x = x + w/4 - (int)(bestSize/2);
model_y = modelY + modelMaxHeight/2 - bestSize/2;
model_w = (int)(bestSize);
model_w = bestSize;
model_h = bestSize;
m_kart_stats_w = w/2;

2
src/guiengine/widgets/player_kart_widget.hpp
View File

@ -48,7 +48,6 @@ namespace GUIEngine
bool m_ready;
/** widget coordinates */
int player_id_x, player_id_y, player_id_w, player_id_h;
int player_name_x, player_name_y, player_name_w, player_name_h;
int model_x, model_y, model_w, model_h;
int kart_name_x, kart_name_y, kart_name_w, kart_name_h;
@ -92,7 +91,6 @@ namespace GUIEngine
irr::gui::IGUIStaticText* m_ready_text;
//LabelWidget *getPlayerIDLabel() {return m_player_ID_label;}
core::stringw deviceName;
std::string m_kartInternalName;