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

made it possible to add a big plunger blocking a player's view (does not yet work with plunger, to be completed)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2008-12-26 20:12:57 +00:00
parent 77914fcf05
commit 16beb446c3
5 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/race_gui.cpp
View File

@ -102,7 +102,10 @@ RaceGUI::RaceGUI()
m_speed_back_icon->getState()->disable(GL_CULL_FACE);
m_speed_fore_icon = material_manager->getMaterial("speedfore.rgb");
m_speed_fore_icon->getState()->disable(GL_CULL_FACE);
m_plunger_face = material_manager->getMaterial("plungerface.rgb");
m_plunger_face->getState()->disable(GL_CULL_FACE);
m_fps_counter = 0;
m_fps_string[0]=0;
m_fps_timer.reset();
@ -637,7 +640,7 @@ void RaceGUI::drawSpeed(Kart* kart, int offset_x, int offset_y,
if ( speedRatio > 1 )
speedRatio = 1;
m_speed_fore_icon->getState()->force();
glBegin ( GL_POLYGON ) ;
glTexCoord2f(1, 0);glVertex2i(offset_x+width, offset_y);
@ -876,8 +879,7 @@ void RaceGUI::drawStatusText(const float dt)
for(int pla = 0; pla < numPlayers; pla++)
{
int offset_x, offset_y;
offset_x = offset_y = 0;
int offset_x = 0, offset_y = 0;
if(numPlayers == 2)
{
@ -917,6 +919,24 @@ void RaceGUI::drawStatusText(const float dt)
split_screen_ratio_x, split_screen_ratio_y );
drawAllMessages (player_kart, offset_x, offset_y,
split_screen_ratio_x, split_screen_ratio_y );
if(player_kart->hasViewBlockedByPlunger())
{
const int screen_width = (numPlayers > 2) ? user_config->m_width/2 : user_config->m_width;
const int plunger_size = (numPlayers > 1) ? user_config->m_height/2 : user_config->m_height;
int plunger_x = offset_x + screen_width/2 - plunger_size/2;
if (numPlayers == 3 && pla > 1)
plunger_x = offset_x + user_config->m_width/2 - plunger_size/2;
m_plunger_face->getState()->force();
glBegin ( GL_QUADS ) ;
glTexCoord2f(1, 0); glVertex2i(plunger_x+plunger_size, offset_y);
glTexCoord2f(0, 0); glVertex2i(plunger_x, offset_y);
glTexCoord2f(0, 1); glVertex2i(plunger_x, offset_y+plunger_size);
glTexCoord2f(1, 1); glVertex2i(plunger_x+plunger_size, offset_y+plunger_size);
glEnd () ;
}
} // next player
drawTimer();

1
src/gui/race_gui.hpp
View File

@ -102,6 +102,7 @@ private:
const char *m_pos_string [11];
Material *m_speed_back_icon;
Material *m_speed_fore_icon;
Material *m_plunger_face;
typedef std::vector<TimedMessage> AllMessageType;
AllMessageType m_messages;

2
src/karts/kart.cpp
View File

@ -80,6 +80,8 @@ Kart::Kart (const std::string& kart_name, int position,
m_nitro = NULL;
m_skidmarks = NULL;
m_view_blocked_by_plunger = false;
// Set position and heading:
m_reset_transform = init_transform;

6
src/karts/kart.hpp
View File

@ -91,6 +91,8 @@ private:
float m_finish_time;
bool m_finished_race;
bool m_view_blocked_by_plunger;
float m_speed;
float m_rpm;
float m_current_gear_ratio;
@ -142,6 +144,10 @@ public:
void getClosestKart (float *cdist, int *closest);
void updatePhysics (float dt);
bool hasViewBlockedByPlunger() const
{ return m_view_blocked_by_plunger; }
void blockViewWithPlunger() { m_view_blocked_by_plunger = true; }
/**
returns a bullet transform object located at the kart's position
and oriented in the direction the kart is going. Can be useful

3
src/modes/standard_race.cpp
View File

@ -98,6 +98,9 @@ void StandardRace::getDefaultCollectibles(int& collectible_type, int& amount)
amount = race_manager->getNumLaps();
}
else World::getDefaultCollectibles(collectible_type, amount);
collectible_type = POWERUP_PLUNGER;
amount = 5;
}
//-----------------------------------------------------------------------------
bool StandardRace::enableBonusBoxes()