Menu
▾
▴
[Supertuxkart-commit] SF.net SVN: supertuxkart:[12486] main/branches/bubblegum/trunk/src/items
|
From: <joh...@us...> - 2013-02-15 20:22:55
|
Revision: 12486
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=12486&view=rev
Author: johannesr1
Date: 2013-02-15 20:22:49 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Some refactoring/ cleanup.
Modified Paths:
--------------
main/branches/bubblegum/trunk/src/items/powerup.cpp
main/branches/bubblegum/trunk/src/items/powerup.hpp
Modified: main/branches/bubblegum/trunk/src/items/powerup.cpp
===================================================================
--- main/branches/bubblegum/trunk/src/items/powerup.cpp 2013-02-15 19:29:17 UTC (rev 12485)
+++ main/branches/bubblegum/trunk/src/items/powerup.cpp 2013-02-15 20:22:49 UTC (rev 12486)
@@ -163,8 +163,7 @@
m_sound_use = sfx_manager->createSoundSource("parachute");
break;
- case PowerupManager::POWERUP_BUBBLEGUM: //TODO: think about a workaround. Probably there needs to be a secondary sound. Or make the attachment have its own one.
- //m_sound_use = sfx_manager->createSoundSource("inflate");
+ case PowerupManager::POWERUP_BUBBLEGUM:
m_sound_use = sfx_manager->createSoundSource("goo");
break ;
@@ -193,7 +192,33 @@
return powerup_manager->getIcon(m_type);
}
+
+
+
+
//-----------------------------------------------------------------------------
+/** Does the sound configuration.
+ */
+void Powerup::adjustSound()
+{
+ m_sound_use->position(m_owner->getXYZ());
+ // in multiplayer mode, sounds are NOT positional (because we have multiple listeners)
+ // so the sounds of all AIs are constantly heard. So reduce volume of sounds.
+ if (race_manager->getNumLocalPlayers() > 1)
+ {
+ // player karts played at full volume; AI karts much dimmer
+
+ if (m_owner->getController()->isPlayerController())
+ {
+ m_sound_use->volume( 1.0f );
+ }
+ else
+ {
+ m_sound_use->volume( std::min(0.5f, 1.0f / race_manager->getNumberOfKarts()) );
+ }
+ }
+}
+//-----------------------------------------------------------------------------
/** Use (fire) this powerup.
*/
void Powerup::use()
@@ -235,25 +260,9 @@
case PowerupManager::POWERUP_BOWLING:
case PowerupManager::POWERUP_PLUNGER:
- m_sound_use->position(m_owner->getXYZ());
+ Powerup::adjustSound();
+ m_sound_use->play();
- // in multiplayer mode, sounds are NOT positional (because we have multiple listeners)
- // so the sounds of all AIs are constantly heard. So reduce volume of sounds.
- if (race_manager->getNumLocalPlayers() > 1)
- {
- // player karts played at full volume; AI karts much dimmer
-
- if (m_owner->getController()->isPlayerController())
- {
- m_sound_use->volume( 1.0f );
- }
- else
- {
- m_sound_use->volume( std::min(0.5f, 1.0f / race_manager->getNumberOfKarts()) );
- }
- }
-
- m_sound_use->play();
projectile_manager->newProjectile(m_owner, world->getTrack(), m_type);
break ;
@@ -263,25 +272,7 @@
m_owner->getKartProperties()->getSwatterDuration());
break;
case PowerupManager::POWERUP_BUBBLEGUM:
- // in multiplayer mode, sounds are NOT positional (because we have multiple listeners)
- // so the sounds of all AIs are constantly heard. So reduce volume of sounds.
- if (race_manager->getNumLocalPlayers() > 1)
- {
- const int np = race_manager->getNumLocalPlayers();
- const int nai = race_manager->getNumberOfKarts() - np;
- // player karts played at full volume; AI karts much dimmer
-
- if (m_owner->getController()->isPlayerController())
- {
- m_sound_use->volume( 1.0f );
- }
- else
- {
- m_sound_use->volume( 1.0f / nai );
- }
- m_sound_use->position(m_owner->getXYZ());
- }
// use the bubble gum the traditional way, if the kart is looking back
if (m_owner->getControls().m_look_back)
{
@@ -298,6 +289,7 @@
return;
normal.normalize();
+ Powerup::adjustSound();
m_sound_use->play();
pos.setY(hit_point.getY()-0.05f);
@@ -306,15 +298,25 @@
}
else // if the kart is looking forward, use the bubblegum as a shield
{
- m_owner->getAttachment()->set(Attachment::ATTACH_BUBBLE_GUM_SHIELD,
- stk_config->m_bubble_gum_shield_time);
+
if(m_owner->getShieldTime() <= 0.0f) //if the previous shield had been used up.
+ {
m_owner->setShieldTime(stk_config->m_bubble_gum_shield_time);
+ m_owner->getAttachment()->set(Attachment::ATTACH_BUBBLE_GUM_SHIELD,
+ stk_config->m_bubble_gum_shield_time);
+ }
else // using a bubble gum while still having a shield
+ {
m_owner->setShieldTime(stk_config->m_bubble_gum_shield_time + m_owner->getShieldTime());
+ m_owner->getAttachment()->set(Attachment::ATTACH_BUBBLE_GUM_SHIELD,
+ stk_config->m_bubble_gum_shield_time + m_owner->getShieldTime());
+ }
- m_sound_use = sfx_manager->createSoundSource("inflate"); //hack ?
+ m_sound_use = sfx_manager->createSoundSource("inflate");//Extraordinary. Usually sounds are set in Powerup::set()
+ //In this case this is a workaround, since the bubblegum item has two different sounds.
+
+ Powerup::adjustSound();
m_sound_use->play();
}// ENDOF PowerupManager::POWERUP_BUBBLEGUM
Modified: main/branches/bubblegum/trunk/src/items/powerup.hpp
===================================================================
--- main/branches/bubblegum/trunk/src/items/powerup.hpp 2013-02-15 19:29:17 UTC (rev 12485)
+++ main/branches/bubblegum/trunk/src/items/powerup.hpp 2013-02-15 20:22:49 UTC (rev 12486)
@@ -56,8 +56,9 @@
void set (PowerupManager::PowerupType _type, int n=1);
void reset ();
Material* getIcon () const;
+ void adjustSound ();
void use ();
- void hitBonusBox (const Item &item, int newC=-1);
+ void hitBonusBox (const Item &item, int newC=-1);
/** Returns the number of powerups. */
int getNum () const {return m_number;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|