Yea

diff --git a/build.c b/build.c
index c2e19129f275347bab4e00856f3df1d2e028006b..0e76dea2c12c01b911c5c0dee31a78ca90716af2 100644 (file)
--- a/build.c
+++ b/build.c
@@ -84,13 +84,13 @@ void build_game_metadata(void)
                             "content_skaterift/playermodels/skaterift_outlaw/addon.inf", 0 );
    write_generic_addon_inf( k_addon_type_player,
                             "Chip", "ch_chip.mdl",
-                            "content_skaterift/playermodels/skaterift_chip/addon.inf", 0 );
+                            "content_skaterift/playermodels/skaterift_chip/addon.inf", ADDON_REG_HIDDEN );
    write_generic_addon_inf( k_addon_type_player,
                             "Aaron", "ch_aaron.mdl",
                             "content_skaterift/playermodels/skaterift_aaron/addon.inf", 0 );
    write_generic_addon_inf( k_addon_type_player,
                             "JC", "ch_john.mdl",
-                            "content_skaterift/playermodels/skaterift_john/addon.inf", 0 );
+                            "content_skaterift/playermodels/skaterift_john/addon.inf", ADDON_REG_HIDDEN );
    write_generic_addon_inf( k_addon_type_player,
                             "Ela", "ch_ela.mdl",
                             "content_skaterift/playermodels/skaterift_ela/addon.inf", 0 );
@@ -108,7 +108,6 @@ void build_game_metadata(void)
                             "President", "ch_president.mdl",
                             "content_skaterift/playermodels/skaterift_president/addon.inf", ADDON_REG_HIDDEN );
 
-
    struct 
    {
       const char *title, *location, *file;

diff --git a/content_skaterift/maps/dev_hub/main.mdl b/content_skaterift/maps/dev_hub/main.mdl
index 947ad38aa21dd89ba49ea1d6dd4a0d104bfc828c..1a63b818661bc7d524f12be9e584c3f516e6158d 100644 (file)
Binary files a/content_skaterift/maps/dev_hub/main.mdl and b/content_skaterift/maps/dev_hub/main.mdl differ

diff --git a/content_skaterift/maps/mp_line1/main.mdl b/content_skaterift/maps/mp_line1/main.mdl
index 09f951610ebfb2a70888ecf1eedeb2fd9f62d1c4..6291ce3d3bfd37584c2dfce8cfebd2e89b7ca03b 100644 (file)
Binary files a/content_skaterift/maps/mp_line1/main.mdl and b/content_skaterift/maps/mp_line1/main.mdl differ

diff --git a/content_skaterift/maps/mp_mtzero/before.mdl b/content_skaterift/maps/mp_mtzero/before.mdl
index fbf0f7b06cfa18c6daab2ef471a313217c29f085..a4fbcbc95028acb974cbcd1ab216d0dff30dae46 100644 (file)
Binary files a/content_skaterift/maps/mp_mtzero/before.mdl and b/content_skaterift/maps/mp_mtzero/before.mdl differ

diff --git a/content_skaterift/maps/mp_mtzero/main.mdl b/content_skaterift/maps/mp_mtzero/main.mdl
index 96041c62ee0f0158ebdb0f8a6802ab5ac8d31e0f..3bf242e86063616dcc9e753452003d3aae630ae7 100644 (file)
Binary files a/content_skaterift/maps/mp_mtzero/main.mdl and b/content_skaterift/maps/mp_mtzero/main.mdl differ

diff --git a/content_skaterift/maps/mp_spawn/main.mdl b/content_skaterift/maps/mp_spawn/main.mdl
index 3b401b8ba0bae50de772f5acac8a3cdafcd478e3..20b72b478be95e86f159739e8eff257f8dcb2cc8 100644 (file)
Binary files a/content_skaterift/maps/mp_spawn/main.mdl and b/content_skaterift/maps/mp_spawn/main.mdl differ

diff --git a/content_skaterift/metascenes/ch1s2.ms b/content_skaterift/metascenes/ch1s2.ms
index bca19c320739d954be969f5ceb96588a4e258eba..6b7be29db74c455682226315f75f315e4c6a700d 100644 (file)
Binary files a/content_skaterift/metascenes/ch1s2.ms and b/content_skaterift/metascenes/ch1s2.ms differ

diff --git a/content_skaterift/metascenes/ch1s3.ms b/content_skaterift/metascenes/ch1s3.ms
index 6703c1fd08687dac67de6b6311c537fd751bbe6f..45d3de893624bb50464f9a8c46f5c79a3b84f09f 100644 (file)
Binary files a/content_skaterift/metascenes/ch1s3.ms and b/content_skaterift/metascenes/ch1s3.ms differ

diff --git a/content_skaterift/metascenes/ch1s3b.ms b/content_skaterift/metascenes/ch1s3b.ms
index 3825fa3dc501a28c4232db3d1bc12c139b581a3a..9cad58e1a51440a31ba4bde6e0c3af56b26f5d91 100644 (file)
Binary files a/content_skaterift/metascenes/ch1s3b.ms and b/content_skaterift/metascenes/ch1s3b.ms differ

diff --git a/content_skaterift/metascenes/ch1s4.ms b/content_skaterift/metascenes/ch1s4.ms
index 5e9d08b323ef204b93c600710341c9cd6b25b784..173bb820a275b8797a2c684a8d830fe428a49108 100644 (file)
Binary files a/content_skaterift/metascenes/ch1s4.ms and b/content_skaterift/metascenes/ch1s4.ms differ

diff --git a/content_skaterift/metascenes/ch1s5.ms b/content_skaterift/metascenes/ch1s5.ms
index c390b8831d7f3a853bcf5d643d5986f427c50049..e4c5167e2af8287813c6048fa9d8811ca6fe9782 100644 (file)
Binary files a/content_skaterift/metascenes/ch1s5.ms and b/content_skaterift/metascenes/ch1s5.ms differ

diff --git a/content_skaterift/metascenes/ch1s6a.ms b/content_skaterift/metascenes/ch1s6a.ms
index 7664757a87b717efc597fd2e51e3ae544d2cbf02..6a210dee7d89f693dd4bb8dc4a992278b67ad577 100644 (file)
Binary files a/content_skaterift/metascenes/ch1s6a.ms and b/content_skaterift/metascenes/ch1s6a.ms differ

diff --git a/content_skaterift/metascenes/ch2e1.ms b/content_skaterift/metascenes/ch2e1.ms
index 6a6ea2730fcbf715e106b4fd494925253d6153ad..df9fc7c77cfb42a0932b4ad073c52710aa7465c3 100644 (file)
Binary files a/content_skaterift/metascenes/ch2e1.ms and b/content_skaterift/metascenes/ch2e1.ms differ

diff --git a/content_skaterift/metascenes/ch2s1.ms b/content_skaterift/metascenes/ch2s1.ms
index 41e78498be712e90b23ae27d157fe43b870de828..59839ab8b1b8874f996c0417a9d43209919cbcd2 100644 (file)
Binary files a/content_skaterift/metascenes/ch2s1.ms and b/content_skaterift/metascenes/ch2s1.ms differ

diff --git a/content_skaterift/metascenes/ch2s2.ms b/content_skaterift/metascenes/ch2s2.ms
index d26e40ab77f3a275916f0aa1f3f5b90aa2dd3cf9..2e04bf3c196f5d103cc7007be936c546c89ed1f8 100644 (file)
Binary files a/content_skaterift/metascenes/ch2s2.ms and b/content_skaterift/metascenes/ch2s2.ms differ

diff --git a/content_skaterift/metascenes/ch2s3a.ms b/content_skaterift/metascenes/ch2s3a.ms
index b263ea07eb7777d83818cf76094db919b543ef1b..00ee860f9e8dcd5f4eb3397f568119696a1d8599 100644 (file)
Binary files a/content_skaterift/metascenes/ch2s3a.ms and b/content_skaterift/metascenes/ch2s3a.ms differ

diff --git a/content_skaterift/metascenes/ch2s4.ms b/content_skaterift/metascenes/ch2s4.ms
index 472a39be49cc09cba6798c8eada9cf650e5a7a7e..af648e1f3c99c28002744f8e71a6f9ec5697a495 100644 (file)
Binary files a/content_skaterift/metascenes/ch2s4.ms and b/content_skaterift/metascenes/ch2s4.ms differ

diff --git a/content_skaterift/metascenes/ch2s4FUCK.ms b/content_skaterift/metascenes/ch2s4FUCK.ms
deleted file mode 100644 (file)
index 385ad49..0000000
Binary files a/content_skaterift/metascenes/ch2s4FUCK.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/ch2s5.ms b/content_skaterift/metascenes/ch2s5.ms
index 3ad2cb08a74c74e8c95ac54f996303ec46b3b1bd..c1aed58c4bdb4d85d26398fea61f497e192a6e6a 100644 (file)
Binary files a/content_skaterift/metascenes/ch2s5.ms and b/content_skaterift/metascenes/ch2s5.ms differ

diff --git a/content_skaterift/metascenes/ch2s6.ms b/content_skaterift/metascenes/ch2s6.ms
index 9808e0873b2aa18a24bb890b56cee1177ace36a8..57ff4ed7ac7471baab4955c5337da907605cf70b 100644 (file)
Binary files a/content_skaterift/metascenes/ch2s6.ms and b/content_skaterift/metascenes/ch2s6.ms differ

diff --git a/content_skaterift/metascenes/ch3s1.ms b/content_skaterift/metascenes/ch3s1.ms
index f770e807713df11d9b25fa3954c96278c291ac71..8fd76ef0f7b7fcc800b138cb1ac9f5201203dccf 100644 (file)
Binary files a/content_skaterift/metascenes/ch3s1.ms and b/content_skaterift/metascenes/ch3s1.ms differ

diff --git a/content_skaterift/metascenes/ch3s2.ms b/content_skaterift/metascenes/ch3s2.ms
index 763168eae67f55ff9162b90f93ce0c7c8ddda33a..f8208cfa0a2f9fd3a1a60337d492ad8444359743 100644 (file)
Binary files a/content_skaterift/metascenes/ch3s2.ms and b/content_skaterift/metascenes/ch3s2.ms differ

diff --git a/content_skaterift/metascenes/ch3s3.ms b/content_skaterift/metascenes/ch3s3.ms
index c2580ba0de6d9458016c53cb7e20e10b2fd8c07e..5c633ca530611e657d08d102235dd6b7dfb739e5 100644 (file)
Binary files a/content_skaterift/metascenes/ch3s3.ms and b/content_skaterift/metascenes/ch3s3.ms differ

diff --git a/content_skaterift/metascenes/ch4s1.ms b/content_skaterift/metascenes/ch4s1.ms
index fbe1181065e806b7d951b4d07c25ac8088ab75ab..09ecbb88671dc79b1c3cda944c42cdcde6c65102 100644 (file)
Binary files a/content_skaterift/metascenes/ch4s1.ms and b/content_skaterift/metascenes/ch4s1.ms differ

diff --git a/content_skaterift/metascenes/ch4s1a.ms b/content_skaterift/metascenes/ch4s1a.ms
index a330c27ab18df5e2a168029b7cc1836a5713d444..45b8e1cd5a1e19d4cd005c151dce289139ffb044 100644 (file)
Binary files a/content_skaterift/metascenes/ch4s1a.ms and b/content_skaterift/metascenes/ch4s1a.ms differ

diff --git a/content_skaterift/metascenes/ch4s2.ms b/content_skaterift/metascenes/ch4s2.ms
index ebde86e6d33ba8155b9f28c2fdd393a36bf48312..0495dd874f63570f67331d98b00a0c5069c90920 100644 (file)
Binary files a/content_skaterift/metascenes/ch4s2.ms and b/content_skaterift/metascenes/ch4s2.ms differ

diff --git a/content_skaterift/metascenes/ch4s3.ms b/content_skaterift/metascenes/ch4s3.ms
index 47cab06f1d01c703a1db17620aaccf2e59fc7712..1a16cb6b53a5627feaf70f0c9ddb230293bb1d42 100644 (file)
Binary files a/content_skaterift/metascenes/ch4s3.ms and b/content_skaterift/metascenes/ch4s3.ms differ

diff --git a/content_skaterift/metascenes/grave/battery_intro.ms b/content_skaterift/metascenes/grave/battery_intro.ms
deleted file mode 100644 (file)
index 831d89c..0000000
Binary files a/content_skaterift/metascenes/grave/battery_intro.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch1s2.ms b/content_skaterift/metascenes/grave/ch1s2.ms
deleted file mode 100644 (file)
index dab0ebe..0000000
Binary files a/content_skaterift/metascenes/grave/ch1s2.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch1s3.ms b/content_skaterift/metascenes/grave/ch1s3.ms
deleted file mode 100644 (file)
index 3d2576d..0000000
Binary files a/content_skaterift/metascenes/grave/ch1s3.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch1s3b.ms b/content_skaterift/metascenes/grave/ch1s3b.ms
deleted file mode 100644 (file)
index e760242..0000000
Binary files a/content_skaterift/metascenes/grave/ch1s3b.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch1s4.ms b/content_skaterift/metascenes/grave/ch1s4.ms
deleted file mode 100644 (file)
index 4a4901f..0000000
Binary files a/content_skaterift/metascenes/grave/ch1s4.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch1s5.ms b/content_skaterift/metascenes/grave/ch1s5.ms
deleted file mode 100644 (file)
index 5fa5f81..0000000
Binary files a/content_skaterift/metascenes/grave/ch1s5.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch1s6a.ms b/content_skaterift/metascenes/grave/ch1s6a.ms
deleted file mode 100644 (file)
index 58ee0bf..0000000
Binary files a/content_skaterift/metascenes/grave/ch1s6a.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2e1.ms b/content_skaterift/metascenes/grave/ch2e1.ms
deleted file mode 100644 (file)
index 5565ebf..0000000
Binary files a/content_skaterift/metascenes/grave/ch2e1.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2s1.ms b/content_skaterift/metascenes/grave/ch2s1.ms
deleted file mode 100644 (file)
index 5fa2d0a..0000000
Binary files a/content_skaterift/metascenes/grave/ch2s1.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2s2.ms b/content_skaterift/metascenes/grave/ch2s2.ms
deleted file mode 100644 (file)
index 43abc64..0000000
Binary files a/content_skaterift/metascenes/grave/ch2s2.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2s3a.ms b/content_skaterift/metascenes/grave/ch2s3a.ms
deleted file mode 100644 (file)
index 66b50d5..0000000
Binary files a/content_skaterift/metascenes/grave/ch2s3a.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2s4.ms b/content_skaterift/metascenes/grave/ch2s4.ms
deleted file mode 100644 (file)
index 8060b61..0000000
Binary files a/content_skaterift/metascenes/grave/ch2s4.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2s5.ms b/content_skaterift/metascenes/grave/ch2s5.ms
deleted file mode 100644 (file)
index 063c7f7..0000000
Binary files a/content_skaterift/metascenes/grave/ch2s5.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch2s6.ms b/content_skaterift/metascenes/grave/ch2s6.ms
deleted file mode 100644 (file)
index 73ed57c..0000000
Binary files a/content_skaterift/metascenes/grave/ch2s6.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch3s1.ms b/content_skaterift/metascenes/grave/ch3s1.ms
deleted file mode 100644 (file)
index 2091c2c..0000000
Binary files a/content_skaterift/metascenes/grave/ch3s1.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch3s2.ms b/content_skaterift/metascenes/grave/ch3s2.ms
deleted file mode 100644 (file)
index 0990752..0000000
Binary files a/content_skaterift/metascenes/grave/ch3s2.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch3s3.ms b/content_skaterift/metascenes/grave/ch3s3.ms
deleted file mode 100644 (file)
index 2e1c064..0000000
Binary files a/content_skaterift/metascenes/grave/ch3s3.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch4rk.ms b/content_skaterift/metascenes/grave/ch4rk.ms
deleted file mode 100644 (file)
index d2c4efe..0000000
Binary files a/content_skaterift/metascenes/grave/ch4rk.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch4s1.ms b/content_skaterift/metascenes/grave/ch4s1.ms
deleted file mode 100644 (file)
index 6e858e5..0000000
Binary files a/content_skaterift/metascenes/grave/ch4s1.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch4s1a.ms b/content_skaterift/metascenes/grave/ch4s1a.ms
deleted file mode 100644 (file)
index eb38e45..0000000
Binary files a/content_skaterift/metascenes/grave/ch4s1a.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch4s2.ms b/content_skaterift/metascenes/grave/ch4s2.ms
deleted file mode 100644 (file)
index 8b4ccf3..0000000
Binary files a/content_skaterift/metascenes/grave/ch4s2.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/ch4s3.ms b/content_skaterift/metascenes/grave/ch4s3.ms
deleted file mode 100644 (file)
index 5fe7a9f..0000000
Binary files a/content_skaterift/metascenes/grave/ch4s3.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/intro.ms b/content_skaterift/metascenes/grave/intro.ms
deleted file mode 100644 (file)
index 3488977..0000000
Binary files a/content_skaterift/metascenes/grave/intro.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/skater.ms b/content_skaterift/metascenes/grave/skater.ms
deleted file mode 100644 (file)
index fab3de8..0000000
Binary files a/content_skaterift/metascenes/grave/skater.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/test_scene.ms b/content_skaterift/metascenes/grave/test_scene.ms
deleted file mode 100644 (file)
index b5c5c1f..0000000
Binary files a/content_skaterift/metascenes/grave/test_scene.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/unlock_city.ms b/content_skaterift/metascenes/grave/unlock_city.ms
deleted file mode 100644 (file)
index 001e689..0000000
Binary files a/content_skaterift/metascenes/grave/unlock_city.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/unlock_docks.ms b/content_skaterift/metascenes/grave/unlock_docks.ms
deleted file mode 100644 (file)
index 9e29743..0000000
Binary files a/content_skaterift/metascenes/grave/unlock_docks.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/unlock_mtzero.ms b/content_skaterift/metascenes/grave/unlock_mtzero.ms
deleted file mode 100644 (file)
index c61668e..0000000
Binary files a/content_skaterift/metascenes/grave/unlock_mtzero.ms and /dev/null differ

diff --git a/content_skaterift/metascenes/grave/unlock_valley.ms b/content_skaterift/metascenes/grave/unlock_valley.ms
deleted file mode 100644 (file)
index 77285f1..0000000
Binary files a/content_skaterift/metascenes/grave/unlock_valley.ms and /dev/null differ

diff --git a/content_skaterift/sound/cs/03.JC.ogg b/content_skaterift/sound/cs/03.JC.ogg
deleted file mode 100644 (file)
index 844fad7..0000000
Binary files a/content_skaterift/sound/cs/03.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s1.EXO.ogg b/content_skaterift/sound/cs/ch1s1.EXO.ogg
deleted file mode 100644 (file)
index fb29b0b..0000000
Binary files a/content_skaterift/sound/cs/ch1s1.EXO.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s1.JC.ogg b/content_skaterift/sound/cs/ch1s1.JC.ogg
deleted file mode 100644 (file)
index 3cbcf23..0000000
Binary files a/content_skaterift/sound/cs/ch1s1.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s1.MIKE.ogg b/content_skaterift/sound/cs/ch1s1.MIKE.ogg
deleted file mode 100644 (file)
index 89dbeb8..0000000
Binary files a/content_skaterift/sound/cs/ch1s1.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s2.JC.ogg b/content_skaterift/sound/cs/ch1s2.JC.ogg
deleted file mode 100644 (file)
index 6bdc1ee..0000000
Binary files a/content_skaterift/sound/cs/ch1s2.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s2.ogg b/content_skaterift/sound/cs/ch1s2.ogg
new file mode 100644 (file)
index 0000000..76075ee
Binary files /dev/null and b/content_skaterift/sound/cs/ch1s2.ogg differ

diff --git a/content_skaterift/sound/cs/ch1s3.JC.ogg b/content_skaterift/sound/cs/ch1s3.JC.ogg
deleted file mode 100644 (file)
index 6dd7bb8..0000000
Binary files a/content_skaterift/sound/cs/ch1s3.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s3.ogg b/content_skaterift/sound/cs/ch1s3.ogg
new file mode 100644 (file)
index 0000000..ed2b51f
Binary files /dev/null and b/content_skaterift/sound/cs/ch1s3.ogg differ

diff --git a/content_skaterift/sound/cs/ch1s3b.JC.ogg b/content_skaterift/sound/cs/ch1s3b.JC.ogg
deleted file mode 100644 (file)
index d34a5a7..0000000
Binary files a/content_skaterift/sound/cs/ch1s3b.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s3b.ogg b/content_skaterift/sound/cs/ch1s3b.ogg
new file mode 100644 (file)
index 0000000..2905a7b
Binary files /dev/null and b/content_skaterift/sound/cs/ch1s3b.ogg differ

diff --git a/content_skaterift/sound/cs/ch1s4.JC.ogg b/content_skaterift/sound/cs/ch1s4.JC.ogg
deleted file mode 100644 (file)
index 37bbd75..0000000
Binary files a/content_skaterift/sound/cs/ch1s4.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s4.ogg b/content_skaterift/sound/cs/ch1s4.ogg
new file mode 100644 (file)
index 0000000..7e76898
Binary files /dev/null and b/content_skaterift/sound/cs/ch1s4.ogg differ

diff --git a/content_skaterift/sound/cs/ch1s5.JC.ogg b/content_skaterift/sound/cs/ch1s5.JC.ogg
deleted file mode 100644 (file)
index 348649c..0000000
Binary files a/content_skaterift/sound/cs/ch1s5.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s5.ogg b/content_skaterift/sound/cs/ch1s5.ogg
new file mode 100644 (file)
index 0000000..b8e0611
Binary files /dev/null and b/content_skaterift/sound/cs/ch1s5.ogg differ

diff --git a/content_skaterift/sound/cs/ch1s6a.JC.ogg b/content_skaterift/sound/cs/ch1s6a.JC.ogg
deleted file mode 100644 (file)
index 35cc628..0000000
Binary files a/content_skaterift/sound/cs/ch1s6a.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch1s6a.ogg b/content_skaterift/sound/cs/ch1s6a.ogg
new file mode 100644 (file)
index 0000000..b95f0f2
Binary files /dev/null and b/content_skaterift/sound/cs/ch1s6a.ogg differ

diff --git a/content_skaterift/sound/cs/ch2e1.JC.ogg b/content_skaterift/sound/cs/ch2e1.JC.ogg
deleted file mode 100644 (file)
index d5010f0..0000000
Binary files a/content_skaterift/sound/cs/ch2e1.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2e1.ogg b/content_skaterift/sound/cs/ch2e1.ogg
new file mode 100644 (file)
index 0000000..65326b5
Binary files /dev/null and b/content_skaterift/sound/cs/ch2e1.ogg differ

diff --git a/content_skaterift/sound/cs/ch2s1.JC.ogg b/content_skaterift/sound/cs/ch2s1.JC.ogg
deleted file mode 100644 (file)
index 442e849..0000000
Binary files a/content_skaterift/sound/cs/ch2s1.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s1.ogg b/content_skaterift/sound/cs/ch2s1.ogg
new file mode 100644 (file)
index 0000000..11055c7
Binary files /dev/null and b/content_skaterift/sound/cs/ch2s1.ogg differ

diff --git a/content_skaterift/sound/cs/ch2s2.MIKE.ogg b/content_skaterift/sound/cs/ch2s2.MIKE.ogg
deleted file mode 100644 (file)
index 4cb7247..0000000
Binary files a/content_skaterift/sound/cs/ch2s2.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s2.ogg b/content_skaterift/sound/cs/ch2s2.ogg
new file mode 100644 (file)
index 0000000..24dd57d
Binary files /dev/null and b/content_skaterift/sound/cs/ch2s2.ogg differ

diff --git a/content_skaterift/sound/cs/ch2s3.JC.ogg b/content_skaterift/sound/cs/ch2s3.JC.ogg
deleted file mode 100644 (file)
index 3ce35a9..0000000
Binary files a/content_skaterift/sound/cs/ch2s3.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s3a.JC.ogg b/content_skaterift/sound/cs/ch2s3a.JC.ogg
deleted file mode 100644 (file)
index 5b9a4fb..0000000
Binary files a/content_skaterift/sound/cs/ch2s3a.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s3a.MIKE.ogg b/content_skaterift/sound/cs/ch2s3a.MIKE.ogg
deleted file mode 100644 (file)
index ad0d509..0000000
Binary files a/content_skaterift/sound/cs/ch2s3a.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s3a.ogg b/content_skaterift/sound/cs/ch2s3a.ogg
new file mode 100644 (file)
index 0000000..bca08dc
Binary files /dev/null and b/content_skaterift/sound/cs/ch2s3a.ogg differ

diff --git a/content_skaterift/sound/cs/ch2s3b.JC.ogg b/content_skaterift/sound/cs/ch2s3b.JC.ogg
deleted file mode 100644 (file)
index de42dbd..0000000
Binary files a/content_skaterift/sound/cs/ch2s3b.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s3b.MIKE.ogg b/content_skaterift/sound/cs/ch2s3b.MIKE.ogg
deleted file mode 100644 (file)
index 901afdc..0000000
Binary files a/content_skaterift/sound/cs/ch2s3b.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s4.JC.ogg b/content_skaterift/sound/cs/ch2s4.JC.ogg
deleted file mode 100644 (file)
index f6d543b..0000000
Binary files a/content_skaterift/sound/cs/ch2s4.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s4.MIKE.ogg b/content_skaterift/sound/cs/ch2s4.MIKE.ogg
deleted file mode 100644 (file)
index 918c90c..0000000
Binary files a/content_skaterift/sound/cs/ch2s4.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s4.ogg b/content_skaterift/sound/cs/ch2s4.ogg
new file mode 100644 (file)
index 0000000..e3bf49e
Binary files /dev/null and b/content_skaterift/sound/cs/ch2s4.ogg differ

diff --git a/content_skaterift/sound/cs/ch2s5.MIKE.ogg b/content_skaterift/sound/cs/ch2s5.MIKE.ogg
deleted file mode 100644 (file)
index 3545859..0000000
Binary files a/content_skaterift/sound/cs/ch2s5.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s5.ogg b/content_skaterift/sound/cs/ch2s5.ogg
new file mode 100644 (file)
index 0000000..4346314
Binary files /dev/null and b/content_skaterift/sound/cs/ch2s5.ogg differ

diff --git a/content_skaterift/sound/cs/ch2s6.JC.ogg b/content_skaterift/sound/cs/ch2s6.JC.ogg
deleted file mode 100644 (file)
index ecb6eeb..0000000
Binary files a/content_skaterift/sound/cs/ch2s6.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s6.MIKE.ogg b/content_skaterift/sound/cs/ch2s6.MIKE.ogg
deleted file mode 100644 (file)
index fb3b189..0000000
Binary files a/content_skaterift/sound/cs/ch2s6.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch2s6.ogg b/content_skaterift/sound/cs/ch2s6.ogg
new file mode 100644 (file)
index 0000000..486816f
Binary files /dev/null and b/content_skaterift/sound/cs/ch2s6.ogg differ

diff --git a/content_skaterift/sound/cs/ch3s1.JC.ogg b/content_skaterift/sound/cs/ch3s1.JC.ogg
deleted file mode 100644 (file)
index 8bf3d77..0000000
Binary files a/content_skaterift/sound/cs/ch3s1.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch3s1.MIKE.ogg b/content_skaterift/sound/cs/ch3s1.MIKE.ogg
deleted file mode 100644 (file)
index cc25243..0000000
Binary files a/content_skaterift/sound/cs/ch3s1.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch3s1.ogg b/content_skaterift/sound/cs/ch3s1.ogg
new file mode 100644 (file)
index 0000000..418ca80
Binary files /dev/null and b/content_skaterift/sound/cs/ch3s1.ogg differ

diff --git a/content_skaterift/sound/cs/ch3s2.MIKE.ogg b/content_skaterift/sound/cs/ch3s2.MIKE.ogg
deleted file mode 100644 (file)
index f4de6ee..0000000
Binary files a/content_skaterift/sound/cs/ch3s2.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch3s2.ogg b/content_skaterift/sound/cs/ch3s2.ogg
new file mode 100644 (file)
index 0000000..166c41f
Binary files /dev/null and b/content_skaterift/sound/cs/ch3s2.ogg differ

diff --git a/content_skaterift/sound/cs/ch3s3.MIKE.ogg b/content_skaterift/sound/cs/ch3s3.MIKE.ogg
deleted file mode 100644 (file)
index b190d21..0000000
Binary files a/content_skaterift/sound/cs/ch3s3.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch3s3.PRESIDENT.ogg b/content_skaterift/sound/cs/ch3s3.PRESIDENT.ogg
deleted file mode 100644 (file)
index 651942d..0000000
Binary files a/content_skaterift/sound/cs/ch3s3.PRESIDENT.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch3s3.ogg b/content_skaterift/sound/cs/ch3s3.ogg
new file mode 100644 (file)
index 0000000..c68ecd9
Binary files /dev/null and b/content_skaterift/sound/cs/ch3s3.ogg differ

diff --git a/content_skaterift/sound/cs/ch4s1.MIKE.ogg b/content_skaterift/sound/cs/ch4s1.MIKE.ogg
deleted file mode 100644 (file)
index 5e3f72c..0000000
Binary files a/content_skaterift/sound/cs/ch4s1.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch4s1.ogg b/content_skaterift/sound/cs/ch4s1.ogg
new file mode 100644 (file)
index 0000000..e7e69aa
Binary files /dev/null and b/content_skaterift/sound/cs/ch4s1.ogg differ

diff --git a/content_skaterift/sound/cs/ch4s1a.MIKE.ogg b/content_skaterift/sound/cs/ch4s1a.MIKE.ogg
deleted file mode 100644 (file)
index bc95e73..0000000
Binary files a/content_skaterift/sound/cs/ch4s1a.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch4s1a.ogg b/content_skaterift/sound/cs/ch4s1a.ogg
new file mode 100644 (file)
index 0000000..94c8657
Binary files /dev/null and b/content_skaterift/sound/cs/ch4s1a.ogg differ

diff --git a/content_skaterift/sound/cs/ch4s2.FBI MAN.ogg b/content_skaterift/sound/cs/ch4s2.FBI MAN.ogg
deleted file mode 100644 (file)
index b8ad834..0000000
Binary files a/content_skaterift/sound/cs/ch4s2.FBI MAN.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch4s2.MIKE.ogg b/content_skaterift/sound/cs/ch4s2.MIKE.ogg
deleted file mode 100644 (file)
index 7860d0a..0000000
Binary files a/content_skaterift/sound/cs/ch4s2.MIKE.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch4s2.ogg b/content_skaterift/sound/cs/ch4s2.ogg
new file mode 100644 (file)
index 0000000..1ab8a8f
Binary files /dev/null and b/content_skaterift/sound/cs/ch4s2.ogg differ

diff --git a/content_skaterift/sound/cs/ch4s3.JC.ogg b/content_skaterift/sound/cs/ch4s3.JC.ogg
deleted file mode 100644 (file)
index b0fb832..0000000
Binary files a/content_skaterift/sound/cs/ch4s3.JC.ogg and /dev/null differ

diff --git a/content_skaterift/sound/cs/ch4s3.ogg b/content_skaterift/sound/cs/ch4s3.ogg
new file mode 100644 (file)
index 0000000..1045150
Binary files /dev/null and b/content_skaterift/sound/cs/ch4s3.ogg differ

diff --git a/content_skaterift/sound/cs/intro.OTHER.ogg b/content_skaterift/sound/cs/intro.OTHER.ogg
deleted file mode 100644 (file)
index c6e6754..0000000
Binary files a/content_skaterift/sound/cs/intro.OTHER.ogg and /dev/null differ

diff --git a/src/addon.c b/src/addon.c
index c3221f7e0a88ddbef9f9d5e6a0ecb6710558f82f..786b32458b39b91adc79a4db36ebf1247db09f83 100644 (file)
--- a/src/addon.c
+++ b/src/addon.c
@@ -410,7 +410,7 @@ addon_id _addon_mount_from_folder( const char *folder, enum addon_type type, con
 
       u32 flags = 0x00;
       vg_msg_getkvintg( &msg, "flags", k_vg_msg_u32, &flags, NULL );
-      reg->flags = ADDON_REG_MOUNTED | flags;
+      reg->flags |= ADDON_REG_MOUNTED | flags;
       addon_complete_allocation();
       return id;
    }
@@ -472,7 +472,7 @@ addon_id _addon_mount_from_folder( const char *folder, enum addon_type type, con
       if( msg.error == k_vg_msg_error_OK )
       {
          reg->metadata_len = msg.cur.co;
-         reg->flags = ADDON_REG_MOUNTED;
+         reg->flags |= ADDON_REG_MOUNTED;
          addon_complete_allocation();
          return id;
       }
@@ -569,7 +569,7 @@ static void workshop_mount_task( vg_async_task *task )
    }
 
    reg->alias.type = type;
-   reg->flags = ADDON_REG_MOUNTED;
+   reg->flags |= ADDON_REG_MOUNTED;
    addon_complete_allocation();
 }
 

diff --git a/src/input.h b/src/input.h
index 94f0a6a7114de61e2e359f1f690de27cab4ef9a2..241080eba213aec7a4acb719e302dda63fb6edb1 100644 (file)
--- a/src/input.h
+++ b/src/input.h
@@ -87,7 +87,7 @@ static vg_input_op *input_button_list[] = {
 },
 [k_srbind_skate] = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_Y ),
 [k_srbind_use]   = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_X ),
-[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
+[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_UP ),
 [k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
 [k_srbind_mleft] = INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_mright]= INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ),
@@ -261,7 +261,8 @@ static int button_press( enum sr_bind button )
 
 static void joystick_state( enum sr_joystick joystick, v2f state )
 {
-   if( (skaterift.activity == k_skaterift_menu) && (vg_input.display_input_method != k_input_method_kbm) )
+   if( (skaterift.activity == k_skaterift_menu) && (vg_input.display_input_method != k_input_method_kbm) &&
+       (menu.main_index != k_menu_main_map) )
    {
       v2_zero( state );
       return;

diff --git a/src/menu.c b/src/menu.c
index 7229a945dc54ba55cc84d7b0d3aee611dd943b32..f611ba29529a4cb7aa9e0a8f63ecacbfe757f373 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -81,6 +81,7 @@ void menu_on_world_change( addon_id addon )
 
 void menu_open( enum menu_page page )
 {
+   gui_helper_reset( k_gui_helper_mode_clear );
    skaterift.activity = k_skaterift_menu;
 
    if( _cutscene.state != k_cutscene_state_none )
@@ -1163,7 +1164,7 @@ n1:
       if( menu.main_index != main_index_before )
          world_map_initialize_view();
 
-      menu_backable_to_exit = (vg_input.display_input_method == k_input_method_kbm);
+      menu_backable_to_exit = 1;
       menu.bg_blur = 0;
 
       world_map_gui( ctx, (ui_rect){ 0, height, vg.window_x, vg.window_y - height }, mh, mv, &menu_backable_to_exit );
@@ -1180,7 +1181,7 @@ n1:
 /* PAGE main */
       if( menu.main_index == k_menu_main_main )
       {
-         i32 R = menu_nav( &menu.main_row, mv, 2 );
+         i32 R = menu_nav( &menu.main_row, mv, 3 );
 
          if( menu_button( ctx, list, R == 0, 1, "Resume" ) )
          {

diff --git a/src/network.c b/src/network.c
index e251b9a93516c456c3aa1bb51fd3286a149c132e..b9e1d14ce8d9cdafb9210f84fe20b6c0ecd40d17 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -517,7 +517,7 @@ static void _network_resolve_host( vg_async_task *co_task )
                         "falling back to a hardcoded IPv4. This might be wrong.\n" );
 
                strcpy( info->alias.host.adress, "46.101.34.155" );
-               strcpy( info->alias.host.port, "27403" );
+               strcpy( info->alias.host.port, "27408" );
                info->opt = k_resolve_opt_parse_numeric;
                vg_async_task_dispatch( task, _network_resolve_host );
                return;

diff --git a/src/network_common.h b/src/network_common.h
index 8181e759894e23370a58bea6fb3173470f54797e..198c96a8bc00d40827003ab6ee1e35f77727f1cb 100644 (file)
--- a/src/network_common.h
+++ b/src/network_common.h
@@ -14,7 +14,7 @@
 #define NETWORK_LEADERBOARD_ALLTIME 0
 #define NETWORK_LEADERBOARD_CURRENT_WEEK 1
 #define NETWORK_LEADERBOARD_ALLTIME_AND_CURRENT_WEEK 2
-#define NETWORK_PORT 27403
+#define NETWORK_PORT 27408
 #define NETWORK_PORT_STR(STR, X) STR #X
 
 #include "addon_types.h"

diff --git a/src/player_glide.c b/src/player_glide.c
index 4899bf4c1e694636f7764e5966f4ccd55aeca52c..922d1d82a0ae8827dc51aa585ffdb2072465d1e4 100644 (file)
--- a/src/player_glide.c
+++ b/src/player_glide.c
@@ -83,7 +83,7 @@ static i32 k_glide_pause = 0;
 
 void player_glide_pre_update(void)
 {
-   if( button_down(k_srbind_use) )
+   if( button_down(k_srbind_skate) )
    {
       localplayer.subsystem = k_player_subsystem_skate;
       localplayer.glider_orphan = 1;

diff --git a/src/skaterift.c b/src/skaterift.c
index feae789bc37b9cd9e6fde83b86ce74ae00a13af6..4ea22b7450ed3da4a7e2085b140c0af10820ff3e 100644 (file)
--- a/src/skaterift.c
+++ b/src/skaterift.c
@@ -167,6 +167,10 @@ static void game_load_co( vg_coroutine *co )
       _mount_workshop_addons( NULL );
    }
 
+   /* stalling for workshop to complete */
+   if( co_step( co, 1 ) ){}
+   if( co_step( co, 0 ) ){}
+
    if( co_step( co, 1 ) )
    {
       /* initializing / loading world. */

diff --git a/src/steam.c b/src/steam.c
index 22ce6bcee643cc07d3a10f4a5788e7d0e297b854..72cbcbb73f7b4487b745818c9b9e89ed2ae8b15f 100644 (file)
--- a/src/steam.c
+++ b/src/steam.c
@@ -56,24 +56,15 @@ void steam_set_achievement( const char *name )
    if( skaterift.demo_mode )
       return;
 
-   /* hack lol */
-   if( !strcmp(name,"MARC") ) skaterift.achievements |= 0x1;
-   if( !strcmp(name,"ALBERT") ) skaterift.achievements |= 0x2;
-   if( !strcmp(name,"JANET") ) skaterift.achievements |= 0x4;
-   if( !strcmp(name,"BERNADETTA") ) skaterift.achievements |= 0x8;
-
-   if( steam_ready && steam_stats_ready ){
-      if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) ){
+   if( steam_ready && steam_stats_ready )
+   {
+      if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) )
          vg_success( "Achievement set! '%s'\n", name );
-
-      }
-      else{
+      else
          vg_warn( "Failed to set achievement: %s\n", name );
-      }
    }
-   else{
+   else
       vg_warn( "Failed to set achievement (steam not ready): %s\n", name );
-   }
 }
 
 void steam_clear_achievement( const char *name )
@@ -160,19 +151,19 @@ static void steam_on_recieve_current_stats( CallbackMsg_t *msg )
       steamapi_bool set = 0;
       if( SteamAPI_ISteamUserStats_GetAchievement( hSteamUserStats, "MARC", &set ) )
       {
-         if( set ) skaterift.achievements |= 0x1;
+         if( set ) _atom_set( k_atom_list_global, "MARC", 1 );
       }
       if( SteamAPI_ISteamUserStats_GetAchievement( hSteamUserStats, "ALBERT", &set ) )
       {
-         if( set ) skaterift.achievements |= 0x2;
+         if( set ) _atom_set( k_atom_list_global, "ALBERT", 1 );
       }
       if( SteamAPI_ISteamUserStats_GetAchievement( hSteamUserStats, "JANET", &set ) )
       {
-         if( set ) skaterift.achievements |= 0x4;
+         if( set ) _atom_set( k_atom_list_global, "JANET", 1 );
       }
       if( SteamAPI_ISteamUserStats_GetAchievement( hSteamUserStats, "BERNADETTA", &set ) )
       {
-         if( set ) skaterift.achievements |= 0x8;
+         if( set ) _atom_set( k_atom_list_global, "BERNADETTA", 1 );
       }
    }
    else

diff --git a/src/world_map.c b/src/world_map.c
index ebc8c30b4b8b501fd54fe15dd1a25be3d73d4693..69eaea36ef60211045258ae3f7841b3d26b52734 100644 (file)
--- a/src/world_map.c
+++ b/src/world_map.c
@@ -861,12 +861,14 @@ void world_map_gui( ui_context *ctx, ui_rect main_area, i32 mh, i32 mv, bool *al
    }
    else if( world_map.activity >= k_map_activity_galaxy )
    {
+      if( vg_input.display_input_method == k_input_method_controller )
+         *allow_back_to_exit = 0;
+
       ui_rect panel = { 24, main_area[1]+24, WORKSHOP_PREVIEW_WIDTH+8, main_area[3]-(24+24) };
       ui_fill( ctx, panel, ui_opacity( GUI_COL_DARK, 0.35f ) );
 
-
       title_text = menu.clicked_world_name? menu.clicked_world_name: "...";
-      subtitle_text = (menu.clicked_world_id == _world.main.addon_id)? "Current Location": NULL;
+      subtitle_text = NULL;//(menu.clicked_world_id == _world.main.addon_id)? "You're here": NULL;
 
       ctx->font = &vgf_default_title;
       upper_title[2] = ui_text_line_width(ctx,title_text) + 24;
@@ -1050,9 +1052,10 @@ void world_map_gui( ui_context *ctx, ui_rect main_area, i32 mh, i32 mv, bool *al
       char buf[64];
       vg_str enter_helper;
       vg_strnull( &enter_helper, buf, sizeof(buf) );
-      vg_strcat( &enter_helper, "Enter location " );
+      vg_strcat( &enter_helper, menu.clicked_world_id == _world.main.addon_id? "Current location ": "Enter location " );
       if( vg_input.display_input_method == k_input_method_controller )
-         vg_input_string( &enter_helper, input_button_list[k_srbind_mhub], 1 );
+         vg_input_string( &enter_helper, 
+               input_button_list[menu.clicked_world_id == _world.main.addon_id? k_srbind_mback: k_srbind_mhub], 1 );
 
       bool enter_location = 0;
       if( menu_button( ctx, enter_world_box, 0, menu.clicked_world_id?1:0, buf ) )
@@ -1061,10 +1064,15 @@ void world_map_gui( ui_context *ctx, ui_rect main_area, i32 mh, i32 mv, bool *al
       if( button_down( k_srbind_mhub ) )
          enter_location = 1;
 
+      if( vg_input.display_input_method == k_input_method_controller )
+         if( button_down( k_srbind_mback ) )
+            world_map.activity = k_map_activity_local_world;
+
       if( enter_location && menu.clicked_world_id )
       {
          if( menu.clicked_world_id != _world.main.addon_id )
          {
+            menu_close();
             skaterift_load_world_start( menu.clicked_world_id, 0 );
          }
 

diff --git a/src/world_map.h b/src/world_map.h
index a3a84b542cd8465bd4e094578d9bcef033db37a5..41d7fd8304ad89cadc6d50a082de33f3a87e513a 100644 (file)
--- a/src/world_map.h
+++ b/src/world_map.h
@@ -52,7 +52,7 @@ bool world_map_get_transition_cam( vg_camera *cam );
 
 const char *_superworld_names[] =
 {
-   [k_superworld_venus_moon] = "One of Venus's moons",
+   [k_superworld_venus_moon] = "One of Saturn's moons",
    [k_superworld_infinite] = "Infinite Dimension",
    [k_superworld_campaign] = "Earth",
    [k_superworld_steam_workshop] = "Steam Workshop Planet",

diff --git a/src/world_volumes.c b/src/world_volumes.c
index 256c4fb70e0f544da14a6330e92aa29d64f175f0..8fe7ed22fd6f64d31f2d2a22ab8b807d826abf05 100644 (file)
--- a/src/world_volumes.c
+++ b/src/world_volumes.c
@@ -162,7 +162,7 @@ next_volume:;
             gui_helper_reset( k_gui_helper_mode_clear );
          }
       }
-      else if( button_down( k_srbind_maccept ) )
+      else if( button_down( k_srbind_maccept ) && (_cutscene.state == k_cutscene_state_none) )
       {
          srinput.state = k_input_state_resume;
          if( !(volume->flags & k_ent_volume_flag_repeatable) )