From 3298cad1177f79827e36c26bca4409bc5490b538 Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Mon, 4 Dec 2023 21:19:49 +0000
Subject: [PATCH] demo fixes

---
 ent_skateshop.c         | 15 ++++++++++-----
 network.c               |  5 +++++
 steam_build_script.vdf  |  2 +-
 steam_demo_build.vdf    | 21 +++++++++++++++++++++
 upload_demo_to_steam.sh |  1 +
 5 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 steam_demo_build.vdf
 create mode 100755 upload_demo_to_steam.sh

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 50b4569..251a585 100644
--- 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 14edfaf..eaad202 100644
--- 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 02d53f7..a80fd6e 100644
--- a/steam_build_script.vdf
+++ b/steam_build_script.vdf
@@ -35,7 +35,7 @@
             "recursive" "1"
          }
       }
-      "2720161" // Extreme DRM solutions
+      "2103944" // Extreme DRM solutions
       {
          "FileMapping"
          {
diff --git a/steam_demo_build.vdf b/steam_demo_build.vdf
new file mode 100644
index 0000000..99150fe
--- /dev/null
+++ b/steam_demo_build.vdf
@@ -0,0 +1,21 @@
+"AppBuild"
+{
+	"AppID" "2720160"
+	"Desc" "SR Demo"
+
+	"ContentRoot" "/home/harry/Documents/carve/dist/bin/"
+	"BuildOutput" "dist/steam_cache"
+
+	"Depots"
+	{
+		"2720161" // Linux Binary
+		{
+			"FileMapping"
+			{
+				"LocalPath" "skaterift-demo/*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+	}
+}
diff --git a/upload_demo_to_steam.sh b/upload_demo_to_steam.sh
new file mode 100755
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
-- 
2.25.1