From: hgn Date: Sat, 31 May 2025 17:42:08 +0000 (+0100) Subject: Yea X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=7c45fb96fc5cde716a0da4d9dc35c3047c355890;p=carveJwlIkooP6JGAAIwe30JlM.git Yea --- diff --git a/build.c b/build.c index c2e1912..0e76dea 100644 --- 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 947ad38..1a63b81 100644 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 09f9516..6291ce3 100644 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 fbf0f7b..a4fbcbc 100644 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 96041c6..3bf242e 100644 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 3b401b8..20b72b4 100644 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 bca19c3..6b7be29 100644 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 6703c1f..45d3de8 100644 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 3825fa3..9cad58e 100644 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 5e9d08b..173bb82 100644 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 c390b88..e4c5167 100644 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 7664757..6a210de 100644 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 6a6ea27..df9fc7c 100644 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 41e7849..59839ab 100644 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 d26e40a..2e04bf3 100644 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 b263ea0..00ee860 100644 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 472a39b..af648e1 100644 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 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 3ad2cb0..c1aed58 100644 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 9808e08..57ff4ed 100644 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 f770e80..8fd76ef 100644 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 763168e..f8208cf 100644 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 c2580ba..5c633ca 100644 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 fbe1181..09ecbb8 100644 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 a330c27..45b8e1c 100644 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 ebde86e..0495dd8 100644 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 47cab06..1a16cb6 100644 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 c3221f7..786b324 100644 --- 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 94f0a6a..241080e 100644 --- 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 7229a94..f611ba2 100644 --- 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 e251b9a..b9e1d14 100644 --- 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 8181e75..198c96a 100644 --- 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 4899bf4..922d1d8 100644 --- 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 feae789..4ea22b7 100644 --- 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 22ce6bc..72cbcbb 100644 --- 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 ebc8c30..69eaea3 100644 --- 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 a3a84b5..41d7fd8 100644 --- 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 256c4fb..8fe7ed2 100644 --- 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) )