apple2: Fixed a number of compile errors: functions not defined; misleading guard

This commit is contained in:
Robbbert 2020-10-11 10:49:13 +11:00
parent ff0c706f76
commit 0908975665
2 changed files with 12 additions and 11 deletions

View File

@ -2387,10 +2387,11 @@ void apple2e_state::update_iic_mouse()
int diff = new_mx - last_mx;
/* check for wrap */
if (diff > 0x80)
diff -= 0x100;
else if (diff < -0x80)
diff += 0x100;
if (diff > 0x80)
diff -= 0x100;
else
if (diff < -0x80)
diff += 0x100;
count_x += diff;
last_mx = new_mx;
@ -2404,7 +2405,7 @@ void apple2e_state::update_iic_mouse()
/* check for wrap */
if (diff > 0x80)
diff = 0x100-diff;
if (diff < -0x80)
if (diff < -0x80)
diff = -0x100-diff;
count_y += diff;

View File

@ -74,12 +74,12 @@ protected:
void init_palette();
private:
void plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, const uint8_t *textgfx_data, uint32_t textgfx_datalen, int fg, int bg);
void plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, const uint8_t *textgfx_data, uint32_t textgfx_datalen, int fg, int bg);
void plot_text_character_orig(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, const uint8_t *textgfx_data, uint32_t textgfx_datalen, int fg, int bg);
void plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, const uint8_t *textgfx_data, uint32_t textgfx_datalen, int fg, int bg);
void plot_text_character_dodo(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, const uint8_t *textgfx_data, uint32_t textgfx_datalen, int fg, int bg);
void plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, const uint8_t *textgfx_data, uint32_t textgfx_datalen, int fg, int bg);
void plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg);
void plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg);
void plot_text_character_orig(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg);
void plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg);
void plot_text_character_dodo(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg);
void plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg);
};
// device type definition