demo fixes

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 50b456941c9bde1ee8fc77d1ea4a0c70d130f33b..251a58595addae93f9f51c241159612c811c04cb 100644 (file)
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -219,10 +219,15 @@ static void skateshop_server_helper_update(void){
    vg_strnull( &text, global_skateshop.helper_toggle->text, 
                sizeof(global_skateshop.helper_toggle->text) );
 
-   if( network_client.user_intent == k_server_intent_online )
-      vg_strcat( &text, "Disconnect" );
-   else
-      vg_strcat( &text, "Go Online" );
+   if( skaterift.demo_mode ){
+      vg_strcat( &text, "Not availible in demo" );
+   }
+   else {
+      if( network_client.user_intent == k_server_intent_online )
+         vg_strcat( &text, "Disconnect" );
+      else
+         vg_strcat( &text, "Go Online" );
+   }
 }
 
 /*
@@ -410,7 +415,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){
    else if( shop->type == k_skateshop_type_server ){
       f64 delta = vg.time_real - network_client.last_intent_change;
 
-      if( delta > 5.0 ){
+      if( (delta > 5.0) && (!skaterift.demo_mode) ){
          global_skateshop.helper_pick->greyed = 0;
          if( button_down( k_srbind_maccept ) ){
             network_client.user_intent = !network_client.user_intent;

diff --git a/network.c b/network.c
index 14edfafb1d464a7a219e05d308007d31b657567a..eaad202773f4d6a16ea7b841fd821bddbbdab63c 100644 (file)
--- a/network.c
+++ b/network.c
@@ -300,6 +300,11 @@ static void network_disconnect(void){
 }
 
 static void network_status_string( vg_str *str, u32 *colour ){
+   if( skaterift.demo_mode ){
+      vg_strcat( str, "Offline" );
+      return;
+   }
+
    if( steam_ready ){
       if( network_client.user_intent == k_server_intent_offline ){
          vg_strcat( str, "Offline" );

diff --git a/steam_build_script.vdf b/steam_build_script.vdf
index 02d53f7784f0f2fbf29fb90a83ae17fb89c31907..a80fd6ee949a383dc97269079699b4c7dcf3ce6a 100644 (file)
--- a/steam_build_script.vdf
+++ b/steam_build_script.vdf
@@ -35,7 +35,7 @@
             "recursive" "1"\r
          }\r
       }\r
-      "2720161" // Extreme DRM solutions\r
+      "2103944" // Extreme DRM solutions\r
       {\r
          "FileMapping"\r
          {\r

diff --git a/steam_demo_build.vdf b/steam_demo_build.vdf
new file mode 100644 (file)
index 0000000..99150fe
--- /dev/null
+++ b/steam_demo_build.vdf
@@ -0,0 +1,21 @@
+"AppBuild"\r
+{\r
+       "AppID" "2720160"\r
+       "Desc" "SR Demo"\r
+\r
+       "ContentRoot" "/home/harry/Documents/carve/dist/bin/"\r
+       "BuildOutput" "dist/steam_cache"\r
+\r
+       "Depots"\r
+       {\r
+               "2720161" // Linux Binary\r
+               {\r
+                       "FileMapping"\r
+                       {\r
+                               "LocalPath" "skaterift-demo/*"\r
+                               "DepotPath" "."\r
+                               "recursive" "1"\r
+                       }\r
+               }\r
+       }\r
+}\r

diff --git a/upload_demo_to_steam.sh b/upload_demo_to_steam.sh
new file mode 100755 (executable)
index 0000000..1ac938f
--- /dev/null
+++ b/upload_demo_to_steam.sh
@@ -0,0 +1 @@
+steamworks_sdk/tools/ContentBuilder/builder_linux/steamcmd.sh +login $1 $2 +run_app_build ~/Documents/carve/steam_demo_build.vdf