aboutsummaryrefslogtreecommitdiff
path: root/source/nds/entry.cpp
diff options
context:
space:
mode:
authorNebuleon Fumika2013-01-18 02:41:32 -0500
committerNebuleon Fumika2013-01-18 02:41:32 -0500
commitbf5cb54162afa5390eab1ae155a9defd44d0f898 (patch)
treebee1bc56126f6ac5f036ab0169642609a30be06c /source/nds/entry.cpp
parent5c4e96b326073d411a577fc6a8c03ea1c0a7242e (diff)
downloadsnes9x2005-bf5cb54162afa5390eab1ae155a9defd44d0f898.tar.gz
snes9x2005-bf5cb54162afa5390eab1ae155a9defd44d0f898.tar.bz2
snes9x2005-bf5cb54162afa5390eab1ae155a9defd44d0f898.zip
Fix multiple compiler warnings: forward declaration, implicit declaration, unused variable, variable used uninitialised, unused function (when not used anywhere else with a #define).
Diffstat (limited to 'source/nds/entry.cpp')
-rw-r--r--source/nds/entry.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/source/nds/entry.cpp b/source/nds/entry.cpp
index 8672a14..1301ba7 100644
--- a/source/nds/entry.cpp
+++ b/source/nds/entry.cpp
@@ -20,6 +20,7 @@
#include "draw.h"
#include "gui.h"
+#include "entry.h"
#include "ds2sound.h"
void S9xProcessSound (unsigned int);
@@ -413,12 +414,6 @@ void init_sfc_setting(void)
Settings.HBlankStart = (256 * Settings.H_Max) / SNES_HCOUNTER_MAX;
}
-extern "C" {
- int game_load_state(char* file);
- int game_save_state(char* file);
- void S9xAutoSaveSRAM ();
-}
-
void S9xAutoSaveSRAM ()
{
Memory.SaveSRAM (S9xGetFilename (".srm"));
@@ -448,16 +443,12 @@ int game_save_state(char* file)
return flag;
}
-extern "C" void game_restart(void);
-
void game_restart(void)
{
CPU.Flags = 0;
S9xReset ();
}
-extern "C" int load_gamepak(char* file);
-
int load_gamepak(char* file)
{
CPU.Flags = 0;
@@ -640,7 +631,7 @@ void S9xSyncSpeed ()
else if (Settings.SkipFrames == AUTO_FRAMERATE /* && !game_fast_forward */)
{
// frame_time is in getSysTime units: 42.667 microseconds.
- uint32 frame_time = Settings.PAL ? 468 /* = 20.0 ms */ : 391 /* = 16.67 ms */;
+ int32 frame_time = Settings.PAL ? 468 /* = 20.0 ms */ : 391 /* = 16.67 ms */;
if (sync_last > syncnow) // Overflow occurred! (every 50 hrs)
{
// Render this frame regardless, set the