archives/DinkSmallwoodHD
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Fixed issue with Bloop being slow (actually that's a Proton fix, so update that!)

Browse source 
* Some misc fixes to stuff
* File import/export partially done, not ready yet
* HTML5 build system updated to use new shared template code

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1627 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2018-06-13 11:00:20 +00:00
parent bc4a02cf86
commit 7b8c9cb79a
11 changed files with 209 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
source/dink/dink.cpp
View file

@ -950,7 +950,7 @@ void load_map(const int num)
FILE * fp;
int holdme,lsize;
LogMsg("Loading map %d...",num);
//LogMsg("Loading map %d...",num);
g_dglos.m_bRenderBackgroundOnLoad = true;
StreamingInstance *pFile = GetFileManager()->GetStreaming(GetFileLocationString(g_dglos.current_map), NULL, false);
@ -5059,7 +5059,7 @@ bool PlayMidi(const char *sFileName)
g_dglo.m_lastMusicPath = sFileName;
GetAudioManager()->Play(GetFileLocationString(fName), true, true, false);
LogMsg("Playing music %s", sFileName);
//LogMsg("Playing music %s", sFileName);
return true;
}
@ -7950,13 +7950,14 @@ pass:
LogMsg("Was told to kill game, so doing it like a good boy.");
g_sprite[1].freeze = 0;
SaveState(g_dglo.m_savePath+"continue_state.dat");
SaveState(g_dglo.m_savePath+"continue_state.dat", false);
WriteLastPathSaved("");
//kill our state.dat if it existed, not needed now, this can exist if an iphone goes into suspend, but then is resumed
RemoveFile(GetSavePath()+"state.dat", false);
DinkQuitGame();
SyncPersistentData();
//uncomment below if you want this to actually work
//PostMessage(g_hWndMain, WM_CLOSE, 0, 0);
@ -17564,7 +17565,7 @@ bool LoadScriptState(FILE *fp)
}
bool SaveState(string const &path)
bool SaveState(string const &path, bool bSyncSaves)
{
LogMsg("Saving %s (inside %s which is off of %s)", path.c_str(), g_dglo.m_gameDir.c_str(), g_dglo.m_savePath.c_str());
CreateDirectoryRecursively(g_dglo.m_savePath, g_dglo.m_gameDir);
@ -17607,7 +17608,8 @@ bool SaveState(string const &path)
fclose(fp);
SyncPersistentData();
if (bSyncSaves)
SyncPersistentData();
return bOk; //success
}
@ -17983,7 +17985,7 @@ void DinkOnForeground()
bForceReinit = true;
#endif
#ifdef PLATFORM_HTML5
//bForceReinit = true;
bForceReinit = true;
#endif
if (IsDesktop() || GetEmulatedPlatformID() == PLATFORM_ID_ANDROID || bForceReinit) //xoom needs this too after a suspend/resume from hitting the power button

4
source/dink/dink.h
View file

@ -206,7 +206,7 @@ struct sequence
byte m_spaceAllowed;
byte m_bFrameSetUsed;
byte m_bIsAnim;
byte m_bDidFileScan;
byte m_bDidFileScan;
};
@ -751,7 +751,7 @@ bool DinkLoadPlayerScript(const string fileName);
void DinkUnloadUnusedGraphicsByUsageTime(unsigned int timeMS);
bool LoadState(string const &path, bool bLoadPathsOnly);
bool SaveState(string const &path);
bool SaveState(string const &path, bool bSyncSaves = true);
eDinkGameState GetDinkGameState();
void SetDinkGameState(eDinkGameState state);
void DinkModStrength(int mod);