C64 warning fixes

This commit is contained in:
simon.kagstrom 2010-02-08 18:44:58 +00:00
parent 108de6db83
commit bd26a17da3
2 changed files with 11 additions and 11 deletions

View File

@ -49,13 +49,13 @@ enum
}; };
// Sizes of memory areas // Sizes of memory areas
const int C64_RAM_SIZE = 0x10000; const size_t C64_RAM_SIZE = 0x10000;
const int COLOR_RAM_SIZE = 0x400; const size_t COLOR_RAM_SIZE = 0x400;
const int BASIC_ROM_SIZE = 0x2000; const size_t BASIC_ROM_SIZE = 0x2000;
const int KERNAL_ROM_SIZE = 0x2000; const size_t KERNAL_ROM_SIZE = 0x2000;
const int CHAR_ROM_SIZE = 0x1000; const size_t CHAR_ROM_SIZE = 0x1000;
const int DRIVE_RAM_SIZE = 0x800; const size_t DRIVE_RAM_SIZE = 0x800;
const int DRIVE_ROM_SIZE = 0x4000; const size_t DRIVE_ROM_SIZE = 0x4000;
// false: Frodo, true: FrodoSC // false: Frodo, true: FrodoSC

View File

@ -11,6 +11,7 @@
#include <dirent.h> #include <dirent.h>
#include "gui/gui.hh" #include "gui/gui.hh"
#include "gui/status_bar.hh"
#include "gui/virtual_keyboard.hh" #include "gui/virtual_keyboard.hh"
#if defined(GEKKO) #if defined(GEKKO)
@ -182,9 +183,8 @@ void C64::network_vblank()
} }
else if (err != AGAIN_ERROR) else if (err != AGAIN_ERROR)
{ {
if (err == VERSION_ERROR) { if (err == VERSION_ERROR)
TheDisplay->display_status_string("YOUR FRODO IS TOO OLD, DOWNLOAD NEW AT HTTP://FRODO-WII.GOOGLECODE.COM", 5); Gui::gui->status_bar->queueMessage("Get a new version at http://www.c64-network.org");
}
delete remote; delete remote;
this->peer = NULL; this->peer = NULL;
} }
@ -203,7 +203,7 @@ void C64::network_vblank()
js, this->TheSID) == false) js, this->TheSID) == false)
{ {
/* Disconnect or sending crap, remove this guy! */ /* Disconnect or sending crap, remove this guy! */
TheDisplay->display_status_string("PEER DISCONNECTED", 3); Gui::gui->status_bar->queueMessage("Peer disconnected");
delete remote; delete remote;
this->peer = NULL; this->peer = NULL;
if (this->network_connection_type == CLIENT) if (this->network_connection_type == CLIENT)