Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/fix tape and record #15

Merged
merged 3 commits into from
Jun 8, 2023
Merged

Bugfix/fix tape and record #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a82eaf
Fix tape, to be error prone
Jun 7, 2023
821ac91
Fix: remove accentued characters
Jun 8, 2023
4232bf4
Merge remote-tracking branch 'origin/develop' into bugfix/fix_tape_an…
Tom1975 Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CPCCoreEmu/BreakpointHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class BreakpointHandler : public IBreakpoint
virtual void ToggleBreakpoint ( unsigned short addr );
virtual int GetBreakpointNumber() { return breakpoint_number_; };
void AddBreakpoint(IBreakpointItem* breakpoint);
// Impl�mentation

void ClearBreakpoints();
void CreateBreakpoint(int indice, std::vector<std::string> param);
Expand Down
2 changes: 1 addition & 1 deletion CPCCoreEmu/Machine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ class CPCCOREEMU_API EmulatorEngine : public ILoadingProgree
void MultifaceStop (){multiface_stop_ = true;}
void MultifaceToggleVisible (){multiface2_.Visible(multiface2_.IsVisible()?false:true);};
bool IsMultifaceIIVisible () { return multiface2_.IsVisible();};
// Donn�es
// Data
IPrinterPort* GetPrinter () { return motherboard_.GetPrinter();};
Memory* GetMem () { return motherboard_.GetMem();};
Asic* GetAsic() { return motherboard_.GetAsic(); }
Expand Down
2 changes: 1 addition & 1 deletion CPCCoreEmu/Sig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class CPCCOREEMU_API CSig
// Bus d'adresse
Bus* address_bus_;

// Bus de donn�es
// Data bus
Bus* data_bus_;

// ASIC
Expand Down
2 changes: 1 addition & 1 deletion CPCCoreEmu/VGA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class CPCCOREEMU_API GateArray : public IComponent
// Bus d'adresse
Bus* address_bus_;

// Bus de donn�es
// Data bus
Bus* data_bus_;

// Signaux;
Expand Down