miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed problem when opening the story scene. Nevertheless, that function must be improved.

Browse Source 
git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@190 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
This commit is contained in:
gerstrong
2009-07-28 18:41:31 +00:00
parent 4e714eab46
commit 2f742e925e
4 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fileio/CExeFile.cpp
+1 -2
View File
@@ -17,7 +17,7 @@ using namespace std;
CExeFile::CExeFile(int episode, const std::string& datadirectory) {
m_episode = episode;
m_datadirectory = datadirectory;
if( m_datadirectory != "" && *(m_datadirectory.end()) != '/') m_datadirectory += "/";
if( m_datadirectory != "") if(*(m_datadirectory.end()-1) != '/') m_datadirectory += "/";
m_data = NULL;
}
@@ -30,7 +30,6 @@ bool CExeFile::readData()
std::string filename = "data/" + m_datadirectory + "keen" + itoa(m_episode) + ".exe";
std::ifstream File; OpenGameFileR(File, filename, ios::binary);
// TODO: If Exe-file wasn't detected, make the program quit somehow, or it crashes
if(!File) return false;
src/fileio/story.cpp
+26 -32
View File
@@ -24,43 +24,37 @@ int readStoryText(char **ptext, int episode, const std::string& path)
FILE *fp;
if((fp=OpenGameFile(buf.c_str(),"rt"))==NULL)
{
buf = buf2 + "keen" + itoa(episode) + ".exe";
unsigned char *filebuf;
int startflag=0, endflag=0; // where story begins and ends!
if((fp=OpenGameFile(buf.c_str(),"rb"))!=NULL)
CExeFile *ExeFile = new CExeFile(episode, path);
if(!ExeFile) return -1;
ExeFile->readData();
filebuf = ExeFile->getData();
if(episode == 2)
{
unsigned char *filebuf;
int startflag=0, endflag=0; // where story begins and ends!
startflag = 92864;
endflag = 96088;
}
if(episode == 3)
{
startflag = 101328;
endflag = 104435;
}
CExeFile *ExeFile = new CExeFile(episode, buf2);
ExeFile->readData();
filebuf = ExeFile->getData();
if(episode == 2)
{
startflag = 92864;
endflag = 96088;
}
if(episode == 3)
{
startflag = 101328;
endflag = 104435;
}
if(startflag == 0 || endflag == 0)
{
g_pLogFile->textOut(PURPLE,"Sorry, but your exe-file is not compatible for reading the story.<br>");
}
else
{
*ptext = (char*) malloc((endflag-startflag+10)*sizeof(char));
strncpy((*ptext),(char*)filebuf+startflag,(endflag-startflag)*sizeof(char));
}
delete ExeFile;
return (endflag-startflag);
if(startflag == 0 || endflag == 0)
{
g_pLogFile->textOut(PURPLE,"Sorry, but your exe-file is not compatible for reading the story.<br>");
}
else
return -1;
{
*ptext = (char*) malloc((endflag-startflag+10)*sizeof(char));
strncpy((*ptext),(char*)filebuf+startflag,(endflag-startflag)*sizeof(char));
}
delete ExeFile;
return (endflag-startflag);
}
else
{