1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-08 15:29:09 +00:00

Corrects improper initialisation order of the Commodore .tap and CRTMachine::Machine.

This commit is contained in:
Thomas Harte 2017-11-10 22:08:40 -05:00
parent ff7ba526fb
commit 46e7c199b2
3 changed files with 4 additions and 7 deletions

View File

@ -23,8 +23,6 @@ namespace CRTMachine {
*/ */
class Machine: public ROMMachine::Machine { class Machine: public ROMMachine::Machine {
public: public:
Machine() : clock_is_unlimited_(false), delegate_(nullptr) {}
/*! /*!
Causes the machine to set up its CRT and, if it has one, speaker. The caller guarantees Causes the machine to set up its CRT and, if it has one, speaker. The caller guarantees
that an OpenGL context is bound. that an OpenGL context is bound.
@ -75,9 +73,9 @@ class Machine: public ROMMachine::Machine {
} }
private: private:
Delegate *delegate_; Delegate *delegate_ = nullptr;
double clock_rate_; double clock_rate_ = 1.0;
bool clock_is_unlimited_; bool clock_is_unlimited_ = false;
}; };
} }

View File

@ -13,7 +13,6 @@
using namespace Storage::Tape; using namespace Storage::Tape;
CommodoreTAP::CommodoreTAP(const char *file_name) : CommodoreTAP::CommodoreTAP(const char *file_name) :
is_at_end_(false),
file_(file_name) file_(file_name)
{ {
if(!file_.check_signature("C64-TAPE-RAW")) if(!file_.check_signature("C64-TAPE-RAW"))

View File

@ -44,7 +44,7 @@ class CommodoreTAP: public Tape {
uint32_t file_size_; uint32_t file_size_;
Pulse current_pulse_; Pulse current_pulse_;
bool is_at_end_; bool is_at_end_ = false;
}; };
} }