Commit 9a878980 authored by Ben Avison's avatar Ben Avison
Browse files

Now calls recalcmodevars on Service_ModeChanging instead of Service_ModeChange

(this was clashing with the Interlace module at one point during STB
development, and had the potential to trip us up again in the future).

No longer produces build errors if some resources are absent.

Corrected token in Japan messages file to use valid UTF-8 character.

Service call table now included by default.

Version 4.23. Tagged as 'Wimp-4_23'
parent dd9202cb
......@@ -26,6 +26,7 @@
# Templates and Sprites. Doesn't copy Sprites22
# 23-Oct-98 BJGA Changed to use objasm, so that we can override the
# choice of options file using an argument to amu
# 03-Aug-99 BJGA No longer produces build errors if some resources are absent
#
#
......@@ -81,13 +82,13 @@ resources: resources-${CMDHELP}
resources_common:
${MKDIR} ${RESDIR}.${COMPONENT}
${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
${CP} LocalRes:<UserIF>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
${CP} LocalRes:<UserIF>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
-${CP} LocalRes:<UserIF>.Sprites22 ${RESDIR}.${COMPONENT}.Sprites22 ${CPFLAGS}
-${CP} LocalRes:<UserIF>.TileN ${RESDIR}.${COMPONENT}.TileN ${CPFLAGS}
-${CP} LocalRes:<UserIF>.TileV ${RESDIR}.${COMPONENT}.TileV ${CPFLAGS}
${CP} LocalRes:<UserIF>.Tools ${RESDIR}.${COMPONENT}.Tools ${CPFLAGS}
IfThere LocalRes:<UserIF>.Messages Then ${CP} LocalRes:<UserIF>.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
IfThere LocalRes:<UserIF>.Templates Then ${CP} LocalRes:<UserIF>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites Then ${CP} LocalRes:<UserIF>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
IfThere LocalRes:<UserIF>.Sprites22 Then ${CP} LocalRes:<UserIF>.Sprites22 ${RESDIR}.${COMPONENT}.Sprites22 ${CPFLAGS}
IfThere LocalRes:<UserIF>.TileN Then ${CP} LocalRes:<UserIF>.TileN ${RESDIR}.${COMPONENT}.TileN ${CPFLAGS}
IfThere LocalRes:<UserIF>.TileV Then ${CP} LocalRes:<UserIF>.TileV ${RESDIR}.${COMPONENT}.TileV ${CPFLAGS}
IfThere LocalRes:<UserIF>.Tools Then ${CP} LocalRes:<UserIF>.Tools ${RESDIR}.${COMPONENT}.Tools ${CPFLAGS}
resources-None: resources_common
@
......
......@@ -23,7 +23,7 @@
Option Stork, true ; try saving power by calling Portable_Idle
Option Medusa, true ; support Medusa Memory management
Option ServiceCallTable, false ; Add Ursula kernel Service Call table
Option ServiceCallTable, true ; Add Ursula kernel Service Call table
Option BounceClose, false ; debounce close icon
Option windowsprite, true ; use tile_1 for colour 1 work areas
Option outlinefont, true ; replace VDU 5 rendering of text with outline font
......
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "4.22"
Module_Version SETA 422
Module_MajorVersion SETS "4.23"
Module_Version SETA 423
Module_MinorVersion SETS ""
Module_Date SETS "26 Jul 1999"
Module_FullVersion SETS "4.22"
Module_Date SETS "03 Aug 1999"
Module_FullVersion SETS "4.23"
END
/* (4.22)
/* (4.23)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 4.22
#define Module_MajorVersion_CMHG 4.23
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Jul 1999
#define Module_Date_CMHG 03 Aug 1999
#define Module_MajorVersion "4.22"
#define Module_Version 422
#define Module_MajorVersion "4.23"
#define Module_Version 423
#define Module_MinorVersion ""
#define Module_Date "26 Jul 1999"
#define Module_Date "03 Aug 1999"
#define Module_FullVersion "4.22"
#define Module_FullVersion "4.23"
......@@ -1690,6 +1690,8 @@ wf_newformat * 2_10000000000000000000000000000000
wf2_truecolour * 2_00000001 ; use title validation string colours
; (implies w_title+4 is always used as validation string pointer, unless
; already in use as spriteareaCB ptr, or part of non-indirected string)
wf2_reserved * 2_00001100 ; these bits are (erroneously) set in ResEd's window-object prototype
; so we can't use them
]
[ ChildWindows
......@@ -3535,7 +3537,6 @@ ServiceTable
] ;
DCD Service_Reset ; &27 ;
DCD Service_NewApplication ; &2A ;
DCD Service_ModeChange ; &46 ;
[ :LNOT: UseAMBControl ;
DCD Service_MemoryMoved ; &4E ;
] ; must be in ascending order
......@@ -3547,6 +3548,7 @@ ServiceTable
DCD Service_SwitchingOutputToSprite ; &72 ;
]
DCD Service_InvalidateCache ; &82 ;
DCD Service_ModeChanging ; &89 ;
[ Medusa :LAND: :LNOT: UseAMBControl ;
DCD Service_PagesSafe ; &8F ;
]
......@@ -3566,7 +3568,6 @@ Service
TEQ R1, #Service_Reset
]
TEQNE R1, #Service_NewApplication
TEQNE R1, #Service_ModeChange
[ :LNOT: UseAMBControl
TEQNE R1, #Service_MemoryMoved
]
......@@ -3578,6 +3579,7 @@ Service
TEQNE R1, #Service_SwitchingOutputToSprite
]
TEQNE R1, #Service_InvalidateCache
TEQNE R1, #Service_ModeChanging
[ Medusa :LAND: :LNOT: UseAMBControl
TEQNE R1, #Service_PagesSafe
]
......@@ -3637,8 +3639,6 @@ Service2
TEQ R1, #Service_SwitchingOutputToSprite
BEQ switchingtosprite
]
TEQ R1,#Service_ModeChange
BEQ recalcmodevars
TEQ R1,#Service_ResourceFSStarting ; redeclare resource files
BEQ serviceresourcefsstarting
TEQ R1,#Service_ResourceFSStarted ; re-link to sprite file
......@@ -3647,6 +3647,8 @@ Service2
BEQ loseromsprites
TEQ R1,#Service_InvalidateCache ; ColourTrans changed palette
BEQ invalidatecache
TEQ R1,#Service_ModeChanging
BEQ recalcmodevars
TEQ R1,#Service_Reset
MOVNE PC,LR
......@@ -3825,7 +3827,7 @@ switchingtosprite_recache
EXITS
]
; Service_ModeChange: cache new graphics parameters
; Service_ModeChanging: cache new graphics parameters
recalcmodevars
Push "LR"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment