Browse Source

[changed] Improved control flow to display both action output and song manager

Dank 8 months ago
parent
commit
49d3c751ad
3 changed files with 11 additions and 7 deletions
  1. 1 1
      locations/music_actions.qsrc
  2. 8 5
      locations/music_onlinemusic.qsrc
  3. 2 1
      locations/music_songsmenu.qsrc

+ 1 - 1
locations/music_actions.qsrc

@@ -290,7 +290,7 @@ end
 if $ARGS[0] = 'open_menu':
     !! TODO - get rid of all this location/argument setting; this seems very likely to break things.
     !!act 'Open Music Menu': gt 'music_songsmenu', 'menu'
-    *clr & cla
+    ! *clr & cla
 
     !! output from purchase
     ! if $message ! '':

+ 8 - 5
locations/music_onlinemusic.qsrc

@@ -258,7 +258,8 @@ if $ARGS[0] = 'record_song':
 	end
 
 	if $ARGS[3] = 'songs_manager':
-		act 'Return to Manager': gt 'music_actions', 'open_menu'
+		! act 'Return to Manager': gt 'music_actions', 'open_menu'
+		gs 'music_actions', 'open_menu'
 	else
 		act 'Leave': gs 'music_onlinemusic', 'finish', 'recording'
 	end
@@ -357,7 +358,8 @@ if $ARGS[0] = 'edit_song':
 	end
 
 	if $ARGS[2] = 'songs_manager':
-		act 'Return to Manager': gt 'music_actions', 'open_menu'
+		! act 'Return to Manager': gt 'music_actions', 'open_menu'
+		gs 'music_actions', 'open_menu'
 	else
 		act 'Leave': gs 'music_actions', 'start'
 	end
@@ -393,9 +395,10 @@ if $ARGS[0] = 'uploadmusic':
 	killvar 'will_cost'
 	killvar 'upload_index'
 	
-	if $ARGS[3] = 'songs_manager': act 'Return to Manager': gt 'music_actions', 'open_menu'
-	
-	if $ARGS[1] = 'recording': 
+	if $ARGS[3] = 'songs_manager': 
+		! act 'Return to Manager': gt 'music_actions', 'open_menu'
+		gs 'music_actions', 'open_menu'
+	elseif $ARGS[1] = 'recording': 
 		act 'Leave': gs 'music_onlinemusic', 'finish', 'recording'
 	else
 		act 'Leave': gs 'music_actions', 'start'

+ 2 - 1
locations/music_songsmenu.qsrc

@@ -86,7 +86,8 @@ if $ARGS[0] = 'menu':
     else:
         'You do not have any songs to manage. Record some music!'
     end
-    
+    *nl
+    '<center><a href="exec:gt ''music_onlinemusic'', ''record_song'', '''', <<0>>, ''songs_manager''">Record a new song</a></center>'
     !! Exit option and cleanup
     gs 'music_songsmenu', 'finish'
 end