Skip to content

Commit

Permalink
Starting to refactor WebPlayer to create a PlayerController component…
Browse files Browse the repository at this point in the history
…, which will be shared with the (desktop) Player component. Removed <interface> as an available tag, as this wasn't used by WebPlayer (there is a different approach for embedding custom HTML now, which will work with desktop Player too after this refactoring).

git-svn-id: https://quest.svn.codeplex.com/svn/trunk@6095 4a90e977-6436-4932-9605-20e10c2b6fb3
  • Loading branch information
alexwarren committed Mar 19, 2011
1 parent 10cffdb commit 82b7557
Show file tree
Hide file tree
Showing 19 changed files with 558 additions and 440 deletions.
Binary file added Dependencies/Moq.dll
Binary file not shown.
1 change: 0 additions & 1 deletion EditorController/EditorController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ private void InitialiseTreeStructure()
AddTreeHeader(ElementType.DynamicTemplate, "_dynamictemplate", "Dynamic Templates", "_advanced");
AddTreeHeader(ElementType.Delegate, "_delegate", "Delegates", "_advanced");
AddTreeHeader(ElementType.ObjectType, "_objecttype", "Object Types", "_advanced");
AddTreeHeader(ElementType.Interface, "_interface", "Interface", "_advanced");
AddTreeHeader(ElementType.Editor, "_editor", "Editors", "_advanced");
}

Expand Down
1 change: 0 additions & 1 deletion IASL/IASL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace AxeSoftware.Quest
public interface IASL
{
bool Initialise(IPlayer player);
string GetInterface();
void Begin();
void SendCommand(string command);
void SendEvent(string eventName, string param);
Expand Down
4 changes: 0 additions & 4 deletions Legacy/LegacyGame.vb
Original file line number Diff line number Diff line change
Expand Up @@ -13197,10 +13197,6 @@ ErrorHandler:

Public Event LogError(errorMessage As String) Implements IASL.LogError

Public Function GetInterface() As String Implements IASL.GetInterface
Return System.IO.Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().CodeBase), "PlayerDefault.htm")
End Function

Public Event PrintText(ByVal text As String) Implements IASL.PrintText

Public Event RequestRaised(ByVal request As Request, ByVal data As String) Implements IASL.RequestRaised
Expand Down
7 changes: 1 addition & 6 deletions Player/Player.vb
Original file line number Diff line number Diff line change
Expand Up @@ -404,12 +404,7 @@ Public Class Player
m_debugger = Nothing

If success Then
Dim URL As String = m_game.GetInterface()
If Not URL Is Nothing Then
wbOutput.Navigate(m_game.GetInterface())
Else
TryInitialiseStage2()
End If
TryInitialiseStage2()
End If

ElseIf m_stage = 2 Then
Expand Down
Loading

0 comments on commit 82b7557

Please sign in to comment.