Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- removed hard coded enabled system and network debug (someone must have left this code in there) 

- added verbose output in mod menu for content metadata output
- bugfix for masterserver php files not using proper variuable for imageurl output
This commit is contained in:
Mark Vejvoda 2011-04-08 01:58:34 +00:00
parent b4e5327c24
commit 93a92e9dee
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/main/main.cpp
View File

@ -2015,8 +2015,8 @@ int glestMain(int argc, char** argv) {
} }
SystemFlags::init(haveSpecialOutputCommandLineOption); SystemFlags::init(haveSpecialOutputCommandLineOption);
SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled = true; //SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled = true;
SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled = true; //SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled = true;
MainWindow *mainWindow= NULL; MainWindow *mainWindow= NULL;
Program *program= NULL; Program *program= NULL;

4
source/glest_game/menu/menu_state_mods.cpp
View File

@ -1462,7 +1462,7 @@ void MenuStateMods::showDesription(const ModInfo *modInfo) {
modInfoSelected = *modInfo; modInfoSelected = *modInfo;
modDescrLabel.setText(modInfo->description); modDescrLabel.setText(modInfo->description);
//printf("### modInfo->imageUrl [%s]\n",modInfo->imageUrl.c_str()); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("### modInfo->imageUrl [%s]\n",modInfo->imageUrl.c_str());
if(modInfo->imageUrl != "") { if(modInfo->imageUrl != "") {
string tempImage = getPreviewImageFileForMod(modInfo); string tempImage = getPreviewImageFileForMod(modInfo);
@ -1559,7 +1559,7 @@ void MenuStateMods::render() {
if(modPreviewImage == NULL) { if(modPreviewImage == NULL) {
string tempImage = getPreviewImageFileForMod(&modInfoSelected); string tempImage = getPreviewImageFileForMod(&modInfoSelected);
//printf("### Render tempImage [%s] fileExists(tempImage) = %d\n",tempImage.c_str(),fileExists(tempImage)); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("### Render tempImage [%s] fileExists(tempImage) = %d\n",tempImage.c_str(),fileExists(tempImage));
if(tempImage != "" && fileExists(tempImage) == true) { if(tempImage != "" && fileExists(tempImage) == true) {
cleanupPreviewTexture(); cleanupPreviewTexture();

2
source/masterserver/showScenariosForGlest.php
View File

@ -22,7 +22,7 @@
foreach( $all_scenarios as &$scenario ) foreach( $all_scenarios as &$scenario )
{ {
$outString = $outString =
"${scenario['scenarioname']}|${scenario['crc']}|${scenario['description']}|${scenario['url']}|${map['imageUrl']}|"; "${scenario['scenarioname']}|${scenario['crc']}|${scenario['description']}|${scenario['url']}|${scenario['imageUrl']}|";
$outString = $outString . "\n"; $outString = $outString . "\n";
echo ($outString); echo ($outString);

2
source/masterserver/showTechsForGlest.php
View File

@ -22,7 +22,7 @@
foreach( $all_techs as &$tech ) foreach( $all_techs as &$tech )
{ {
$outString = $outString =
"${tech['techname']}|${tech['factioncount']}|${tech['crc']}|${tech['description']}|${tech['url']}|${map['imageUrl']}|"; "${tech['techname']}|${tech['factioncount']}|${tech['crc']}|${tech['description']}|${tech['url']}|${tech['imageUrl']}|";
$outString = $outString . "\n"; $outString = $outString . "\n";
echo ($outString); echo ($outString);

2
source/masterserver/showTilesetsForGlest.php
View File

@ -22,7 +22,7 @@
foreach( $all_tilesets as &$tileset ) foreach( $all_tilesets as &$tileset )
{ {
$outString = $outString =
"${tileset['tilesetname']}|${tileset['crc']}|${tileset['description']}|${tileset['url']}|${map['imageUrl']}|"; "${tileset['tilesetname']}|${tileset['crc']}|${tileset['description']}|${tileset['url']}|${tileset['imageUrl']}|";
$outString = $outString . "\n"; $outString = $outString . "\n";
echo ($outString); echo ($outString);

8
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@ -1192,14 +1192,16 @@ void createDirectoryPaths(string Path) {
while(*path) { while(*path) {
//if (('\\' == *path) || ('/' == *path)) //if (('\\' == *path) || ('/' == *path))
if ('/' == *path) { if ('/' == *path) {
if(isdir(DirName) == false) {
#ifdef WIN32 #ifdef WIN32
int result = _mkdir(DirName); int result = _mkdir(DirName);
#elif defined(__GNUC__) #elif defined(__GNUC__)
int result = mkdir(DirName, S_IRWXU | S_IRWXO | S_IRWXG); int result = mkdir(DirName, S_IRWXU | S_IRWXO | S_IRWXG);
#else #else
#error "Your compiler needs to support mkdir!" #error "Your compiler needs to support mkdir!"
#endif #endif
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] DirName [%s] result = %d, errno = %d\n",__FILE__,__FUNCTION__,__LINE__,DirName,result,errno); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] DirName [%s] result = %d, errno = %d\n",__FILE__,__FUNCTION__,__LINE__,DirName,result,errno);
}
} }
*dirName++ = *path++; *dirName++ = *path++;
*dirName = '\0'; *dirName = '\0';