[Supertuxkart-commit] SF.net SVN: supertuxkart:[13498] main/branches/soccer

[<yas...@us...>]

Revision: 13498
          http://sourceforge.net/p/supertuxkart/code/13498
Author:   yasin-ghannam
Date:     2013-08-18 12:25:08 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Goal SFX added.

Modified Paths:
--------------
    main/branches/soccer/data/sfx/sfx.xml
    main/branches/soccer/src/modes/soccer_world.cpp
    main/branches/soccer/src/modes/soccer_world.hpp
    main/branches/soccer/src/modes/world_status.cpp

Modified: main/branches/soccer/data/sfx/sfx.xml
===================================================================
--- main/branches/soccer/data/sfx/sfx.xml	2013-08-18 07:36:32 UTC (rev 13497)
+++ main/branches/soccer/data/sfx/sfx.xml	2013-08-18 12:25:08 UTC (rev 13498)
@@ -54,5 +54,6 @@
    <sfx filename="ugh.ogg"              volume="1.0" positional="false" />
    <sfx filename="wee.ogg"              volume="1.0" positional="false" />
    <sfx filename="wooden_bridge.ogg"    volume="0.4" positional="true" rolloff="0.2"  />
+   <sfx filename="goal_scored.ogg"      volume="1.0" positional="false";
 </sfx-config>
 

Modified: main/branches/soccer/src/modes/soccer_world.cpp
===================================================================
--- main/branches/soccer/src/modes/soccer_world.cpp	2013-08-18 07:36:32 UTC (rev 13497)
+++ main/branches/soccer/src/modes/soccer_world.cpp	2013-08-18 12:25:08 UTC (rev 13498)
@@ -21,6 +21,7 @@
 #include <IMeshSceneNode.h>
 
 #include "audio/music_manager.hpp"
+#include "audio/sfx_base.hpp"
 #include "io/file_manager.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/kart.hpp"
@@ -58,6 +59,7 @@
         fprintf(stderr, "No AI exists for this game mode\n");
         exit(1);
     }
+	m_goal_sound = sfx_manager->createSoundSource("goal_scored");
 	m_goal_target = race_manager->getMaxGoal();
 	printf("Max Goal: %d\n", m_goal_target);
 }   // init
@@ -102,12 +104,12 @@
         printf("*** GOOOOOOOOOAAAAAAALLLLLL!!!! (team: %d) ***\n", first_goal ? 0 : 1);
 		m_team_goals[first_goal ? 0 : 1]++;
 		printf("Score:\nTeam One %d : %d Team Two\n", m_team_goals[0], m_team_goals[1]);
+		World *world = World::getWorld();
+		world->setPhase(WorldStatus::GOAL_PHASE);
+		world->setClockMode(World::CLOCK_COUNTDOWN, 1.0);
+		m_goal_sound->play();
 	}
 
-	World *world = World::getWorld();
-	world->setPhase(WorldStatus::GOAL_PHASE);
-	world->setClockMode(World::CLOCK_COUNTDOWN, 1.0);
-
     //m_check_goals_enabled = false;    // TODO: remove?
 
     // Reset original positions for the soccer balls

Modified: main/branches/soccer/src/modes/soccer_world.hpp
===================================================================
--- main/branches/soccer/src/modes/soccer_world.hpp	2013-08-18 07:36:32 UTC (rev 13497)
+++ main/branches/soccer/src/modes/soccer_world.hpp	2013-08-18 12:25:08 UTC (rev 13498)
@@ -50,6 +50,7 @@
     /** Whether or not goals can be scored (they are disabled when a point is scored
     and re-enabled when the next game can be played)*/
     bool m_can_score_points;
+	SFXBase *m_goal_sound;
 	
 	/** Team karts */
 

Modified: main/branches/soccer/src/modes/world_status.cpp
===================================================================
--- main/branches/soccer/src/modes/world_status.cpp	2013-08-18 07:36:32 UTC (rev 13497)
+++ main/branches/soccer/src/modes/world_status.cpp	2013-08-18 12:25:08 UTC (rev 13498)
@@ -237,7 +237,7 @@
             // Nothing to do here.
             break;
 		case GOAL_PHASE:
-			printf("%f", m_time);
+			// Nothing to do here as well.
 
         default: break;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.