X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=23b1db0311dd68a53079e491f714f16bd94d1983;hb=3298cad1177f79827e36c26bca4409bc5490b538;hp=714ed11cbdd44f05a73585a2e998aa8a0a406c40;hpb=8837dd6bdac03ce5fd87b470d22c01a56373ed89;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 714ed11..23b1db0 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -58,6 +58,7 @@
 #include "world_routes_ui.c"
 #include "particle.c"
 #include "player_effects.c"
+#include "freecam.c"
 
 static int k_tools_mode = 0;
 
@@ -82,6 +83,10 @@ static void vg_launch_opt(void){
    if( vg_long_opt( "tools" ) ){
       k_tools_mode = 1;
    }
+
+   if( vg_long_opt( "demo" ) ){
+      skaterift.demo_mode = 1;
+   }
 }
 
 static void vg_preload(void){
@@ -93,6 +98,12 @@ vg_info("            |   \\/   | |        /     |      |    \\ | /   | \n" );
 vg_info("            '        ' '--' [] '----- '----- '     ' '---'  " 
         "SOFTWARE\n" );
 
+   /* please forgive me! */
+   u32 sz; char *drm;
+   if( (drm = vg_file_read_text( vg_mem.scratch, "DRM", &sz )) )
+      if( !strcmp(drm, "blibby!") )
+         skaterift.demo_mode = 0;
+
    vg_loader_step( remote_players_init, NULL );
 
    if( k_tools_mode )
@@ -171,6 +182,8 @@ static void vg_load(void){
    vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
    vg_console_reg_cmd( "switch_active_instance", 
                         skaterift_switch_instance_cmd, NULL );
+   vg_console_reg_cmd( "fc", freecam_cmd, NULL );
+   vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 );
 
    vg_loader_step( render_init, NULL );
    vg_loader_step( menu_init, NULL );
@@ -217,8 +230,10 @@ static void vg_load(void){
 
    /* hub world */
    addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub", 0 );
-   skaterift_mount_world_unloadable( "maps/mp_spawn", ADDON_REG_CITY );
-   skaterift_mount_world_unloadable( "maps/mp_mtzero", ADDON_REG_MTZERO );
+   skaterift_mount_world_unloadable( "maps/mp_spawn", 
+         ADDON_REG_CITY|ADDON_REG_PREMIUM );
+   skaterift_mount_world_unloadable( "maps/mp_mtzero", 
+         ADDON_REG_MTZERO|ADDON_REG_PREMIUM );
    skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
 
    /* load home/permanent world manually */
@@ -534,8 +549,16 @@ static void skaterift_composite_maincamera(void){
    camera_lerp( &localplayer.cam, &world_static.focus_cam,
                 vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
 
-   if( skaterift.activity == k_skaterift_replay ){
-      skaterift_get_replay_camera( &skaterift.cam );
+   if( skaterift.freecam ){
+      freecam_preupdate();
+      v3_copy( skaterift.replay_freecam.pos, skaterift.cam.pos );
+      v3_copy( skaterift.replay_freecam.angles, skaterift.cam.angles );
+      skaterift.cam.fov = skaterift.replay_freecam.fov;
+   }
+   else {
+      if( skaterift.activity == k_skaterift_replay ){
+         replay_get_camera( &skaterift.replay, &skaterift.cam );
+      }
    }
 
    skaterift.cam.nearz = 0.1f;