Import of Ursula and Morris4 themed sprites

Removed the code where !Maestro (re)merged its sprites with the Wimp pool, aside from being unnecessary duplication, avoids needing to duplicate the Wimp's suffix searching algorithm.

Version 1.98. Tagged as 'Maestro-1_98'

Makefile

@@ -72,14 +72,20 @@ install_ install_Maestro: ${FILES}
 	${CP} ${LDIR}.!Help      ${INSTAPP}.!Help      ${CPFLAGS}
 	${CP} ${LDIR}.!Run       ${INSTAPP}.!Run       ${CPFLAGS}
 	${CP} ${RDIR}.!RunImage  ${INSTAPP}.!RunImage  ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites   ${INSTAPP}.!Sprites   ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites11 ${INSTAPP}.!Sprites11 ${CPFLAGS}
-	${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
 	${CP} ${RDIR}.EnsureRMA  ${INSTAPP}.EnsureRMA  ${CPFLAGS}
 	${CP} ${RDIR}.GenMessage ${INSTAPP}.Messages   ${CPFLAGS}
 	${CP} ${RDIR}.Sprites    ${INSTAPP}.Sprites    ${CPFLAGS}
 	${CP} ${RDIR}.Sprites22  ${INSTAPP}.Sprites22  ${CPFLAGS}
 	${CP} ${LDIR}.Templates  ${INSTAPP}.Templates  ${CPFLAGS}
+	${MKDIR} ${INSTAPP}.Themes.Ursula
+	${MKDIR} ${INSTAPP}.Themes.Morris4
+	${CP} ${RDIR}.!Sprites           ${INSTAPP}.Themes.!Sprites   ${CPFLAGS}
+	${CP} ${RDIR}.!Sprites11         ${INSTAPP}.Themes.!Sprites11 ${CPFLAGS}
+	${CP} ${RDIR}.!Sprites22         ${INSTAPP}.Themes.!Sprites22 ${CPFLAGS}
+	${CP} ${RDIR}.Ursula.!Sprites    ${INSTAPP}.Themes.Ursula.!Sprites   ${CPFLAGS}
+	${CP} ${RDIR}.Ursula.!Sprites22  ${INSTAPP}.Themes.Ursula.!Sprites22 ${CPFLAGS}
+	${CP} ${RDIR}.Morris4.!Sprites   ${INSTAPP}.Themes.Morris4.!Sprites   ${CPFLAGS}
+	${CP} ${RDIR}.Morris4.!Sprites22 ${INSTAPP}.Themes.Morris4.!Sprites22 ${CPFLAGS}
 	Access ${INSTAPP} /r
 	Access ${INSTAPP}.* lr/r
 	@echo ${COMPONENT}: Application installed {Disc}

Resources/!Boot,feb

-IconSprites <Obey$Dir>.!Sprites
+IconSprites <Obey$Dir>.Themes.!Sprites
 Set Alias$@RunType_AF1 Run <Obey$Dir>.!Run %%*0
 Set File$Type_AF1 Music

Resources/UK/!Run,feb

@@ -4,10 +4,10 @@
 |
 If "<Maestro$Running>"="Yes" Then Error Only one copy of !Maestro can be run at a time
 RMEnsure UtilityModule 3.60 Error This application is only suitable for use with RISC OS 3.60 or later versions
-IconSprites <Obey$Dir>.!Sprites
-Set Alias$@RunType_AF1 Run <Obey$Dir>.!Run %%*0
-Set File$Type_AF1 Music
 Set Maestro$Dir <Obey$Dir>
-Run "<Maestro$Dir>.EnsureRMA"
+IconSprites <Maestro$Dir>.Themes.!Sprites
+Set Alias$@RunType_AF1 Run <Maestro$Dir>.!Run %%*0
+Set File$Type_AF1 Music
+Run <Maestro$Dir>.EnsureRMA
 WimpSlot -min 256k -max 640k
-Run "<Maestro$Dir>.!RunImage" %*0
+Run <Maestro$Dir>.!RunImage %*0

VersionNum

-/* (1.97)
+/* (1.98)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.97
+#define Module_MajorVersion_CMHG        1.98
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                03 Apr 2013
+#define Module_Date_CMHG                12 May 2013
 
-#define Module_MajorVersion             "1.97"
-#define Module_Version                  197
+#define Module_MajorVersion             "1.98"
+#define Module_Version                  198
 #define Module_MinorVersion             ""
-#define Module_Date                     "03 Apr 2013"
+#define Module_Date                     "12 May 2013"
 
-#define Module_ApplicationDate          "03-Apr-13"
+#define Module_ApplicationDate          "12-May-13"
 
 #define Module_ComponentName            "Maestro"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Apps/Maestro"
 
-#define Module_FullVersion              "1.97"
-#define Module_HelpVersion              "1.97 (03 Apr 2013)"
-#define Module_LibraryVersionInfo       "1:97"
+#define Module_FullVersion              "1.98"
+#define Module_HelpVersion              "1.98 (12 May 2013)"
+#define Module_LibraryVersionInfo       "1:98"

bas/!RunImage

@@ -2890,7 +2890,7 @@ MIDIpresent%=TRUE : REM disable untested MIDI bits
 ENDPROC
 
 DEF PROCinitialise_miscellany
-LOCAL len, r0%, v%, a$, s%
+LOCAL len, v%, a$, s%
 DIM davidstempworkspaceforcolourtrans% 8
 DIM Resourcedir 255
 SYS "OS_ReadVarVal", "Maestro$dir", Resourcedir, 255, 0, 0 TO ,,len
@@ -2916,14 +2916,7 @@ DIM colour_temp% 16
 DIM String_Space% 256
 DIM sprite_factors% 16
 OS_File=&8
-SYS "XWimp_ReadSysInfo", 2 TO r0%; v%
 Sprite$=Resourcedir$+".Sprites"
-PSprite$=Resourcedir$+".!Sprites"
-IF (v% AND 1) = 0
-   a$ = PSprite$ + CHR$(r0%?0) + CHR$(r0%?1)
-   s% = OPENIN a$
-   IF s% THEN CLOSE#s%: PSprite$ = a$
-ENDIF
 CHANGED%=FALSE
 FILE%=FALSE
 laddr%=0
@@ -3073,7 +3066,6 @@ wimp_sprite_scaling% = TRUE : REM We do have to do some manual scaling now and t
 two_pools% = FALSE
 DIM factors% 16
 DIM pixtrans% 16
-SYS "Wimp_SpriteOp", 11,,PSprite$ :REM merge music file type sprite into wimp sprite area
 SpriteLen% = 12000
 
 REM See what sprites we have available