Apple-2-Tools/Epple-II
1
0
Fork 0
mirror of https://github.com/cmosher01/Epple-II.git synced 2025-08-15 08:27:57 +00:00
Code Issues Projects Releases Wiki Activity

reduce screen types to the most interesting 3

Browse Source
This commit is contained in:
Christopher Mosher
2013-12-19 23:19:45 -05:00
parent fedaaebe69
commit cbed0ef42c
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/analogtv.cpp
View File

@@ -234,13 +234,8 @@ void AnalogTV::drawCurrent()
switch (this->type) switch (this->type)
{ {
case MONITOR_COLOR: drawMonitorColor(); break; case MONITOR_COLOR: drawMonitorColor(); break;
case MONITOR_WHITE: drawMonitorWhite(); break;
case MONITOR_GREEN: drawMonitorGreen(); break; case MONITOR_GREEN: drawMonitorGreen(); break;
case MONITOR_ORANGE: drawMonitorOrange(); break;
case TV_OLD_COLOR: drawTVOld(); break; case TV_OLD_COLOR: drawTVOld(); break;
case TV_OLD_BW: drawTVOld(); break;
case TV_NEW_COLOR: drawTVNew(); break;
case TV_NEW_BW: drawTVNew(); break;
} }
} }
else else
@@ -261,7 +256,7 @@ void AnalogTV::drawMonitorColor()
for (int row = 0; row < 192; ++row) for (int row = 0; row < 192; ++row)
{ {
const CB cb = get_cb(row); const CB cb = get_cb(row);
const bool removeColor = (this->type == TV_NEW_BW || !cb.isColor()); const bool removeColor = !cb.isColor();
ntsc_to_rgb_monitor(row*AppleNTSC::H+350,AppleNTSC::H-350,rgb); ntsc_to_rgb_monitor(row*AppleNTSC::H+350,AppleNTSC::H-350,rgb);
for (int col = 350; col < AppleNTSC::H-2; ++col) for (int col = 350; col < AppleNTSC::H-2; ++col)
{ {
@@ -350,7 +345,7 @@ void AnalogTV::drawTVNew()
for (int row = 0; row < 192; ++row) for (int row = 0; row < 192; ++row)
{ {
const CB cb = get_cb(row); const CB cb = get_cb(row);
const bool removeColor = (this->type == TV_NEW_BW || !cb.isColor()); const bool removeColor = false; //(this->type == TV_NEW_BW || !cb.isColor());
ntsc_to_rgb_newtv(row*AppleNTSC::H+350,AppleNTSC::H-350,rgb); ntsc_to_rgb_newtv(row*AppleNTSC::H+350,AppleNTSC::H-350,rgb);
for (int col = 350; col < AppleNTSC::H-2; ++col) for (int col = 350; col < AppleNTSC::H-2; ++col)
{ {

5
src/analogtv.h
View File

@@ -35,13 +35,8 @@ public:
enum DisplayType enum DisplayType
{ {
MONITOR_COLOR, MONITOR_COLOR,
MONITOR_WHITE,
MONITOR_GREEN, MONITOR_GREEN,
MONITOR_ORANGE,
TV_OLD_COLOR, TV_OLD_COLOR,
TV_OLD_BW,
TV_NEW_COLOR,
TV_NEW_BW,
NUM_DISPLAY_TYPES NUM_DISPLAY_TYPES
}; };

7
src/screenimage.cpp
View File

@@ -133,13 +133,8 @@ void ScreenImage::drawCassette() {
static const char* displays[] = { static const char* displays[] = {
"COLOR MONITOR ", "COLOR MONITOR ",
"WHITE MONITOR ",
"GREEN MONITOR ", "GREEN MONITOR ",
"ORANGE MONITOR", "TELEVISION ",
"OLD COLOR TV ",
"OLD B & W TV ",
"NEW COLOR TV ",
"NEW B & W TV ",
}; };
void ScreenImage::drawFnKeys() { void ScreenImage::drawFnKeys() {