Skip to content

Commit

Permalink
Sluicebox: fix LSL5 TTDialer
Browse files Browse the repository at this point in the history 
https://bugs.scummvm.org/ticket/15269#comment:4
  • Loading branch information
@Kawa-oneechan
Kawa-oneechan committed Jul 16, 2024
1 parent 0c887b5 commit 7e2f396
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 54 deletions.
13 changes: 0 additions & 13 deletions SCICompanion/SCICompanion.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<Text Include="Files\TemplateGame\SCI0\game.txt" />
<Text Include="Files\TemplateGame\SCI1.1.txt" />
<Text Include="Files\License.txt" />
<Text Include="ReadMe.txt" />
<Text Include="Tools\DOSBox\DOSBox 0.74 Manual.txt" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -518,7 +517,6 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<None Include="Docs\source\Classes\Collection.rst" />
<None Include="Docs\source\Classes\Control.rst" />
<None Include="Docs\source\Classes\ControlIcon.rst" />
<None Include="Docs\source\Classes\ControlItem.rst" />
<None Include="Docs\source\Classes\Controls.rst" />
<None Include="Docs\source\Classes\Conversation.rst" />
<None Include="Docs\source\Classes\Cue.rst" />
Expand Down Expand Up @@ -558,15 +556,11 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<None Include="Docs\source\Classes\GradualCycler.rst" />
<None Include="Docs\source\Classes\GradualLooper.rst" />
<None Include="Docs\source\Classes\IconBar.rst" />
<None Include="Docs\source\Classes\IconI.rst" />
<None Include="Docs\source\Classes\IconItem.rst" />
<None Include="Docs\source\Classes\Inset.rst" />
<None Include="Docs\source\Classes\InsetWindow.rst" />
<None Include="Docs\source\Classes\Inv.rst" />
<None Include="Docs\source\Classes\InventoryBase.rst" />
<None Include="Docs\source\Classes\InventoryItem.rst" />
<None Include="Docs\source\Classes\InvI.rst" />
<None Include="Docs\source\Classes\InvItem.rst" />
<None Include="Docs\source\Classes\Jump.rst" />
<None Include="Docs\source\Classes\JumpTo.rst" />
<None Include="Docs\source\Classes\List.rst" />
Expand Down Expand Up @@ -635,14 +629,12 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<None Include="Docs\source\Compiler\break.rst" />
<None Include="Docs\source\Compiler\classes.rst" />
<None Include="Docs\source\Compiler\classheader.rst" />
<None Include="Docs\source\Compiler\codeblock.rst" />
<None Include="Docs\source\Compiler\comment.rst" />
<None Include="Docs\source\Compiler\cond.rst" />
<None Include="Docs\source\Compiler\conditionalexpressions.rst" />
<None Include="Docs\source\Compiler\continue.rst" />
<None Include="Docs\source\Compiler\define.rst" />
<None Include="Docs\source\Compiler\differences.rst" />
<None Include="Docs\source\Compiler\do.rst" />
<None Include="Docs\source\Compiler\for.rst" />
<None Include="Docs\source\Compiler\if.rst" />
<None Include="Docs\source\Compiler\include.rst" />
Expand All @@ -658,7 +650,6 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<None Include="Docs\source\Compiler\saids.rst" />
<None Include="Docs\source\Compiler\selectors.rst" />
<None Include="Docs\source\Compiler\selfsuper.rst" />
<None Include="Docs\source\Compiler\sendselfsuper.rst" />
<None Include="Docs\source\Compiler\strings.rst" />
<None Include="Docs\source\Compiler\switch.rst" />
<None Include="Docs\source\Compiler\switchto.rst" />
Expand Down Expand Up @@ -909,12 +900,9 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<None Include="Docs\source\Scripts\GameEgo.rst" />
<None Include="Docs\source\Scripts\Gauge.rst" />
<None Include="Docs\source\Scripts\Grooper.rst" />
<None Include="Docs\source\Scripts\IconI.rst" />
<None Include="Docs\source\Scripts\IconItem.rst" />
<None Include="Docs\source\Scripts\Inset.rst" />
<None Include="Docs\source\Scripts\InventoryItem.rst" />
<None Include="Docs\source\Scripts\InvI.rst" />
<None Include="Docs\source\Scripts\InvItem.rst" />
<None Include="Docs\source\Scripts\Jump.rst" />
<None Include="Docs\source\Scripts\Main.rst" />
<None Include="Docs\source\Scripts\Messager.rst" />
Expand All @@ -941,7 +929,6 @@ xcopy /S /Y /I /D "$(ProjectDir)Tools" "$(OutDir)Tools"</Command>
<None Include="Docs\source\Scripts\ScaleTo.rst" />
<None Include="Docs\source\Scripts\ScrollableInventory.rst" />
<None Include="Docs\source\Scripts\ScrollInsetWindow.rst" />
<None Include="Docs\source\Scripts\SettingsPane.rst" />
<None Include="Docs\source\Scripts\Sight.rst" />
<None Include="Docs\source\Scripts\Slider.rst" />
<None Include="Docs\source\Scripts\SmoothLooper.rst" />
Expand Down
37 changes: 0 additions & 37 deletions SCICompanion/SCICompanion.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
<Text Include="Files\Licenses\giflib-AUTHORS.txt" />
<Text Include="Files\Licenses\r8brain-License.txt" />
<Text Include="Files\License.txt" />
Expand Down Expand Up @@ -1112,9 +1111,6 @@
<None Include="Docs\source\StudioCompiler\codeblock.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Compiler\codeblock.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\Collection.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -1166,9 +1162,6 @@
<None Include="Docs\source\Classes\Control.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\ControlItem.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Scripts\Controls.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -1385,9 +1378,6 @@
<None Include="Docs\source\Kernels\DisposeWindow.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Compiler\do.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\StudioCompiler\do.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -1880,12 +1870,6 @@
<None Include="Docs\source\Classes\IconBar.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\IconI.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Scripts\IconI.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\IconItem.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -1928,9 +1912,6 @@
<None Include="Docs\source\Classes\InsetWindow.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\Inv.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\intro.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -1994,18 +1975,6 @@
<None Include="Docs\source\Procedures\IsOnScreen.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\InvI.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Scripts\InvI.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Classes\InvItem.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Scripts\InvItem.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Kernels\IsItSkip.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -2543,9 +2512,6 @@
<None Include="Docs\source\Procedures\SetUpEgo.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Scripts\SettingsPane.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Kernels\SetSynonyms.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down Expand Up @@ -2576,9 +2542,6 @@
<None Include="Docs\source\StudioCompiler\sendselfsuper.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Compiler\sendselfsuper.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
<None Include="Docs\source\Compiler\selfsuper.rst">
<Filter>Resource Files\Help sources</Filter>
</None>
Expand Down
2 changes: 1 addition & 1 deletion SCICompanionLib/Src/Compile/CompileContext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ vector<species_property> CompileContext::GetSpeciesProperties(const string &spec
const vector<CSCOObjectProperty> &properties = pClass->GetProperties();
for (auto &theProp : properties)
{
species_property specProp = { theProp.GetSelector(), theProp.GetValue(), DataTypeAny, false };
species_property specProp = { theProp.GetSelector(), theProp.GetValue(), DataTypeAny, theProp.NeedsReloc() };
propertiesRet.push_back(specProp);
}
break;
Expand Down
10 changes: 7 additions & 3 deletions SCICompanionLib/Src/Compile/GenerateScriptResource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1118,9 +1118,13 @@ void GenerateSCOObjects(CompileContext &context, const Script &script)
for (species_property &speciesProp : speciesProps)
{
WORD wValue = speciesProp.wValue;
// name is tracked by default (since we populate with a string by default)
// Other species props are not tracked by default.
bool fTrackRelocation = (iIndex == nameIndex);

// name is tracked by default (since we populate with a string by default).
// other properties are tracked by default if the superclass property is tracked.
// this only produces meaningful relocations when the object and super are in the
// same script. we could filter if they are in different scripts, but sierra didn't.
bool fTrackRelocation = (iIndex == nameIndex) || speciesProp.fTrackRelocation;

property_vector::const_iterator overriddenIt = find_if(newProps.begin(), newProps.end(), bind2nd(MatchSelector(), speciesProp.wSelector));
if (overriddenIt != newProps.end())
{
Expand Down

0 comments on commit 7e2f396

Please sign in to comment.