Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some formatting issues that cause compile issues on bsd.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2011-02-01 11:54:38 +00:00
parent b42dbf0655
commit b6dcb0dcd3
3 changed files with 88 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/include/utils.h
View File

@@ -117,6 +117,6 @@ u32 ramAvailable(void);
#define MAKEDIR(name) mkdir(name, 0777) #define MAKEDIR(name) mkdir(name, 0777)
#endif #endif
#endif bool FileExists(const string& strFilename);
bool FileExists(const string& strFilename); #endif

2
projects/mtg/src/DeckManager.cpp
View File

@@ -239,4 +239,4 @@ int DeckManager::getDifficultyRating(Player *statsPlayer, Player *player)
DeckManager::~DeckManager() DeckManager::~DeckManager()
{ {
instanceFlag = false; instanceFlag = false;
} }

167
projects/mtg/src/utils.cpp
View File

@@ -95,21 +95,21 @@ int fileExists(const char * filename)
} }
/* /*
#ifdef LINUX #ifdef LINUX
#include <execinfo.h> #include <execinfo.h>
void dumpStack() void dumpStack()
{ {
void* buffer[50]; void* buffer[50];
int s = backtrace(buffer, 50); int s = backtrace(buffer, 50);
char** tab = backtrace_symbols(buffer, s); char** tab = backtrace_symbols(buffer, s);
for (int i = 1; i < s; ++i) printf("%s\n", tab[i]); for (int i = 1; i < s; ++i) printf("%s\n", tab[i]);
printf("\n"); printf("\n");
free(tab); free(tab);
} }
#endif #endif
*/ */
/* RAM simple check functions source */ /* RAM simple check functions source */
@@ -230,14 +230,14 @@ std::vector<std::string>& split(const std::string& s, char delim, std::vector<st
std::string join(vector<string>& v, string delim) std::string join(vector<string>& v, string delim)
{ {
std::string retVal; std::string retVal;
for ( vector<string>::iterator it = v.begin(); it != v.end(); ++it ) for ( vector<string>::iterator it = v.begin(); it != v.end(); ++it )
{ {
retVal.append( *it ); retVal.append( *it );
retVal.append( delim ); retVal.append( delim );
} }
return retVal; return retVal;
} }
std::vector<std::string> split(const std::string& s, char delim) std::vector<std::string> split(const std::string& s, char delim)
@@ -251,75 +251,78 @@ std::vector<std::string> split(const std::string& s, char delim)
// Not sure how this translates into non-english fonts. // Not sure how this translates into non-english fonts.
std::string wordWrap(const std::string& sentence, float width, int fontId) std::string wordWrap(const std::string& sentence, float width, int fontId)
{ {
WFont * mFont = WResourceManager::Instance()->GetWFont(fontId); WFont * mFont = WResourceManager::Instance()->GetWFont(fontId);
float lineWidth = mFont->GetStringWidth( sentence.c_str() ); float lineWidth = mFont->GetStringWidth( sentence.c_str() );
string retVal = sentence; string retVal = sentence;
if ( lineWidth < width ) return sentence; if ( lineWidth < width ) return sentence;
int numLines = 1; int numLines = 1;
int breakIdx = 0; int breakIdx = 0;
for( size_t idx = 0; idx < sentence.length(); idx ++ ) for( size_t idx = 0; idx < sentence.length(); idx ++ )
{ {
if ( sentence[idx] == ' ' ) if ( sentence[idx] == ' ' )
{ {
string currentSentence = sentence.substr(breakIdx, idx - breakIdx); string currentSentence = sentence.substr(breakIdx, idx - breakIdx);
float stringLength = mFont->GetStringWidth( currentSentence.c_str() ); float stringLength = mFont->GetStringWidth( currentSentence.c_str() );
if (stringLength >= width) if (stringLength >= width)
{ {
if ( stringLength > width ) if ( stringLength > width )
{ {
while ( sentence[idx-1] != ' ' ) while ( sentence[idx-1] != ' ' )
idx--; idx--;
} }
retVal[idx-1] = '\n'; retVal[idx-1] = '\n';
breakIdx = idx; breakIdx = idx;
numLines++; numLines++;
} }
} }
else if ( sentence[idx] == '\n' ) else if ( sentence[idx] == '\n' )
{ {
string currentSentence = sentence.substr(breakIdx, idx - breakIdx); string currentSentence = sentence.substr(breakIdx, idx - breakIdx);
float stringLength = mFont->GetStringWidth( currentSentence.c_str() ); float stringLength = mFont->GetStringWidth( currentSentence.c_str() );
if (stringLength >= width) if (stringLength >= width)
{ {
if ( stringLength > width ) if ( stringLength > width )
{ {
while ( sentence[idx-1] != ' ' ) while ( sentence[idx-1] != ' ' )
idx--; idx--;
retVal[idx-1] = '\n'; retVal[idx-1] = '\n';
} }
numLines++; numLines++;
} }
breakIdx = idx; breakIdx = idx;
numLines++; numLines++;
} }
} }
return retVal; return retVal;
} }
bool FileExists(const string& strFilename)
{
struct stat stFileInfo;
bool blnReturn;
int intStat;
bool FileExists(const string& strFilename) { // Attempt to get the file attributes
struct stat stFileInfo; intStat = stat(strFilename.c_str(),&stFileInfo);
bool blnReturn; if(intStat == 0)
int intStat; {
// We were able to get the file attributes
// so the file obviously exists.
blnReturn = true;
}
else
{
// We were not able to get the file attributes.
// This may mean that we don't have permission to
// access the folder which contains this file. If you
// need to do that level of checking, lookup the
// return values of stat which will give you
// more details on why stat failed.
blnReturn = false;
}
// Attempt to get the file attributes return(blnReturn);
intStat = stat(strFilename.c_str(),&stFileInfo);
if(intStat == 0) {
// We were able to get the file attributes
// so the file obviously exists.
blnReturn = true;
} else {
// We were not able to get the file attributes.
// This may mean that we don't have permission to
// access the folder which contains this file. If you
// need to do that level of checking, lookup the
// return values of stat which will give you
// more details on why stat failed.
blnReturn = false;
}
return(blnReturn);
} }