Author: evgeni Date: 2011-05-08 19:05:43 +0000 (Sun, 08 May 2011) New Revision: 12239
Modified: packages/trunk/kiki-the-nano-bot/debian/patches/ogg-sound.patch Log: lineending fuckup Modified: packages/trunk/kiki-the-nano-bot/debian/patches/ogg-sound.patch =================================================================== --- packages/trunk/kiki-the-nano-bot/debian/patches/ogg-sound.patch 2011-05-08 18:59:35 UTC (rev 12238) +++ packages/trunk/kiki-the-nano-bot/debian/patches/ogg-sound.patch 2011-05-08 19:05:43 UTC (rev 12239) @@ -1,78 +1,78 @@ -Description: use OGG instead of WAV files as sounds -Author: Peter De Wachter <[email protected]> - +Description: use OGG instead of WAV files as sounds +Author: Peter De Wachter <[email protected]> + --- a/src/sound/KikiSound.cpp +++ b/src/sound/KikiSound.cpp @@ -30,39 +30,39 @@ - // __________________________________________________________________________________________________ - static KikiSoundData KikiSounds[] = - { -- { KikiSound::BOT_MOVE, "bot_move.wav", 0.2 }, -- { KikiSound::BOT_JUMP, "bot_jump.wav", 0.7 }, -- { KikiSound::BOT_LAND, "bot_land.wav", 0.7 }, -- { KikiSound::BOT_SPIKED, "bot_move.wav", 1.0 }, -- { KikiSound::BOT_HEALTH_ALERT, "bot_health_alert.wav", 1.0 }, -- { KikiSound::BOT_DEATH, "bot_death.wav", 1.0 }, -- { KikiSound::BOT_NO_ENERGY, "bot_no_energy.wav", 1.0 }, -- { KikiSound::BULLET_SHOT, "bullet_shot.wav", 1.0 }, -- { KikiSound::BULLET_HIT_WALL, "bullet_hit_wall.wav", 1.0 }, -- { KikiSound::BULLET_HIT_OBJECT, "bullet_hit_object.wav", 1.0 }, -- { KikiSound::BULLET_HIT_PLAYER, "bullet_hit_player.wav", 1.0 }, -- { KikiSound::BULLET_HIT_MUTANT, "bullet_hit_mutant.wav", 1.0 }, -- { KikiSound::STONE_MOVE, "stone_move.wav", 1.0 }, -- { KikiSound::STONE_LAND, "stone_land.wav", 1.0 }, -- { KikiSound::SWITCH_ON, "switch_on.wav", 1.0 }, -- { KikiSound::SWITCH_OFF, "switch_on.wav", 0.5 }, -- { KikiSound::ATOM_BIRTH, "atom_digest.wav", 1.0 }, -- { KikiSound::ATOM_DIGEST, "atom_digest.wav", 1.0 }, -- { KikiSound::SPIKES_START, "bot_move.wav", 1.0 }, -- { KikiSound::MENU_FADE, "menu_fade.wav", 1.0 }, -- { KikiSound::MENU_ITEM, "menu_item.wav", 1.0 }, -- { KikiSound::MENU_SELECT, "menu_select.wav", 1.0 }, -- { KikiSound::MENU_ABORT, "menu_abort.wav", 1.0 }, -- { KikiSound::GATE_OPEN, "gate_open.wav", 1.0 }, -- { KikiSound::GATE_CLOSE, "gate_close.wav", 1.0 }, -- { KikiSound::GATE_WARP, "gate_warp.wav", 1.0 }, -- { KikiSound::BOMB_EXPLODE, "bomb_explode.wav", 1.0 }, -- { KikiSound::BOMB_SPLITTER, "bomb_splitter.wav", 1.0 }, -- { KikiSound::GEAR_ON, "gear_on.wav", 1.0 }, -- { KikiSound::GEAR_OFF, "gear_off.wav", 1.0 }, -- { KikiSound::GENERATOR_ON, "generator_on.wav", 1.0 }, -- { KikiSound::GENERATOR_OFF, "generator_off.wav", 1.0 }, -- { KikiSound::MOTOR, "bomb_splitter.wav", 1.0 }, -+ { KikiSound::BOT_MOVE, "bot_move.ogg", 0.2 }, -+ { KikiSound::BOT_JUMP, "bot_jump.ogg", 0.7 }, -+ { KikiSound::BOT_LAND, "bot_land.ogg", 0.7 }, -+ { KikiSound::BOT_SPIKED, "bot_move.ogg", 1.0 }, -+ { KikiSound::BOT_HEALTH_ALERT, "bot_health_alert.ogg", 1.0 }, -+ { KikiSound::BOT_DEATH, "bot_death.ogg", 1.0 }, -+ { KikiSound::BOT_NO_ENERGY, "bot_no_energy.ogg", 1.0 }, -+ { KikiSound::BULLET_SHOT, "bullet_shot.ogg", 1.0 }, -+ { KikiSound::BULLET_HIT_WALL, "bullet_hit_wall.ogg", 1.0 }, -+ { KikiSound::BULLET_HIT_OBJECT, "bullet_hit_object.ogg", 1.0 }, -+ { KikiSound::BULLET_HIT_PLAYER, "bullet_hit_player.ogg", 1.0 }, -+ { KikiSound::BULLET_HIT_MUTANT, "bullet_hit_mutant.ogg", 1.0 }, -+ { KikiSound::STONE_MOVE, "stone_move.ogg", 1.0 }, -+ { KikiSound::STONE_LAND, "stone_land.ogg", 1.0 }, -+ { KikiSound::SWITCH_ON, "switch_on.ogg", 1.0 }, -+ { KikiSound::SWITCH_OFF, "switch_on.ogg", 0.5 }, -+ { KikiSound::ATOM_BIRTH, "atom_digest.ogg", 1.0 }, -+ { KikiSound::ATOM_DIGEST, "atom_digest.ogg", 1.0 }, -+ { KikiSound::SPIKES_START, "bot_move.ogg", 1.0 }, -+ { KikiSound::MENU_FADE, "menu_fade.ogg", 1.0 }, -+ { KikiSound::MENU_ITEM, "menu_item.ogg", 1.0 }, -+ { KikiSound::MENU_SELECT, "menu_select.ogg", 1.0 }, -+ { KikiSound::MENU_ABORT, "menu_abort.ogg", 1.0 }, -+ { KikiSound::GATE_OPEN, "gate_open.ogg", 1.0 }, -+ { KikiSound::GATE_CLOSE, "gate_close.ogg", 1.0 }, -+ { KikiSound::GATE_WARP, "gate_warp.ogg", 1.0 }, -+ { KikiSound::BOMB_EXPLODE, "bomb_explode.ogg", 1.0 }, -+ { KikiSound::BOMB_SPLITTER, "bomb_splitter.ogg", 1.0 }, -+ { KikiSound::GEAR_ON, "gear_on.ogg", 1.0 }, -+ { KikiSound::GEAR_OFF, "gear_off.ogg", 1.0 }, -+ { KikiSound::GENERATOR_ON, "generator_on.ogg", 1.0 }, -+ { KikiSound::GENERATOR_OFF, "generator_off.ogg", 1.0 }, -+ { KikiSound::MOTOR, "bomb_splitter.ogg", 1.0 }, - }; - - // __________________________________________________________________________________________________ + // __________________________________________________________________________________________________ + static KikiSoundData KikiSounds[] = + { +- { KikiSound::BOT_MOVE, "bot_move.wav", 0.2 }, +- { KikiSound::BOT_JUMP, "bot_jump.wav", 0.7 }, +- { KikiSound::BOT_LAND, "bot_land.wav", 0.7 }, +- { KikiSound::BOT_SPIKED, "bot_move.wav", 1.0 }, +- { KikiSound::BOT_HEALTH_ALERT, "bot_health_alert.wav", 1.0 }, +- { KikiSound::BOT_DEATH, "bot_death.wav", 1.0 }, +- { KikiSound::BOT_NO_ENERGY, "bot_no_energy.wav", 1.0 }, +- { KikiSound::BULLET_SHOT, "bullet_shot.wav", 1.0 }, +- { KikiSound::BULLET_HIT_WALL, "bullet_hit_wall.wav", 1.0 }, +- { KikiSound::BULLET_HIT_OBJECT, "bullet_hit_object.wav", 1.0 }, +- { KikiSound::BULLET_HIT_PLAYER, "bullet_hit_player.wav", 1.0 }, +- { KikiSound::BULLET_HIT_MUTANT, "bullet_hit_mutant.wav", 1.0 }, +- { KikiSound::STONE_MOVE, "stone_move.wav", 1.0 }, +- { KikiSound::STONE_LAND, "stone_land.wav", 1.0 }, +- { KikiSound::SWITCH_ON, "switch_on.wav", 1.0 }, +- { KikiSound::SWITCH_OFF, "switch_on.wav", 0.5 }, +- { KikiSound::ATOM_BIRTH, "atom_digest.wav", 1.0 }, +- { KikiSound::ATOM_DIGEST, "atom_digest.wav", 1.0 }, +- { KikiSound::SPIKES_START, "bot_move.wav", 1.0 }, +- { KikiSound::MENU_FADE, "menu_fade.wav", 1.0 }, +- { KikiSound::MENU_ITEM, "menu_item.wav", 1.0 }, +- { KikiSound::MENU_SELECT, "menu_select.wav", 1.0 }, +- { KikiSound::MENU_ABORT, "menu_abort.wav", 1.0 }, +- { KikiSound::GATE_OPEN, "gate_open.wav", 1.0 }, +- { KikiSound::GATE_CLOSE, "gate_close.wav", 1.0 }, +- { KikiSound::GATE_WARP, "gate_warp.wav", 1.0 }, +- { KikiSound::BOMB_EXPLODE, "bomb_explode.wav", 1.0 }, +- { KikiSound::BOMB_SPLITTER, "bomb_splitter.wav", 1.0 }, +- { KikiSound::GEAR_ON, "gear_on.wav", 1.0 }, +- { KikiSound::GEAR_OFF, "gear_off.wav", 1.0 }, +- { KikiSound::GENERATOR_ON, "generator_on.wav", 1.0 }, +- { KikiSound::GENERATOR_OFF, "generator_off.wav", 1.0 }, +- { KikiSound::MOTOR, "bomb_splitter.wav", 1.0 }, ++ { KikiSound::BOT_MOVE, "bot_move.ogg", 0.2 }, ++ { KikiSound::BOT_JUMP, "bot_jump.ogg", 0.7 }, ++ { KikiSound::BOT_LAND, "bot_land.ogg", 0.7 }, ++ { KikiSound::BOT_SPIKED, "bot_move.ogg", 1.0 }, ++ { KikiSound::BOT_HEALTH_ALERT, "bot_health_alert.ogg", 1.0 }, ++ { KikiSound::BOT_DEATH, "bot_death.ogg", 1.0 }, ++ { KikiSound::BOT_NO_ENERGY, "bot_no_energy.ogg", 1.0 }, ++ { KikiSound::BULLET_SHOT, "bullet_shot.ogg", 1.0 }, ++ { KikiSound::BULLET_HIT_WALL, "bullet_hit_wall.ogg", 1.0 }, ++ { KikiSound::BULLET_HIT_OBJECT, "bullet_hit_object.ogg", 1.0 }, ++ { KikiSound::BULLET_HIT_PLAYER, "bullet_hit_player.ogg", 1.0 }, ++ { KikiSound::BULLET_HIT_MUTANT, "bullet_hit_mutant.ogg", 1.0 }, ++ { KikiSound::STONE_MOVE, "stone_move.ogg", 1.0 }, ++ { KikiSound::STONE_LAND, "stone_land.ogg", 1.0 }, ++ { KikiSound::SWITCH_ON, "switch_on.ogg", 1.0 }, ++ { KikiSound::SWITCH_OFF, "switch_on.ogg", 0.5 }, ++ { KikiSound::ATOM_BIRTH, "atom_digest.ogg", 1.0 }, ++ { KikiSound::ATOM_DIGEST, "atom_digest.ogg", 1.0 }, ++ { KikiSound::SPIKES_START, "bot_move.ogg", 1.0 }, ++ { KikiSound::MENU_FADE, "menu_fade.ogg", 1.0 }, ++ { KikiSound::MENU_ITEM, "menu_item.ogg", 1.0 }, ++ { KikiSound::MENU_SELECT, "menu_select.ogg", 1.0 }, ++ { KikiSound::MENU_ABORT, "menu_abort.ogg", 1.0 }, ++ { KikiSound::GATE_OPEN, "gate_open.ogg", 1.0 }, ++ { KikiSound::GATE_CLOSE, "gate_close.ogg", 1.0 }, ++ { KikiSound::GATE_WARP, "gate_warp.ogg", 1.0 }, ++ { KikiSound::BOMB_EXPLODE, "bomb_explode.ogg", 1.0 }, ++ { KikiSound::BOMB_SPLITTER, "bomb_splitter.ogg", 1.0 }, ++ { KikiSound::GEAR_ON, "gear_on.ogg", 1.0 }, ++ { KikiSound::GEAR_OFF, "gear_off.ogg", 1.0 }, ++ { KikiSound::GENERATOR_ON, "generator_on.ogg", 1.0 }, ++ { KikiSound::GENERATOR_OFF, "generator_off.ogg", 1.0 }, ++ { KikiSound::MOTOR, "bomb_splitter.ogg", 1.0 }, + }; + + // __________________________________________________________________________________________________ _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
