Normalized defaults

This commit is contained in:
mathusummut
2018-12-16 15:06:51 +01:00
parent fb9a48fd02
commit 4769e132d0
39 changed files with 322 additions and 323 deletions

View File

@@ -334,7 +334,7 @@ namespace Shared {
if (modelPath != "") {
this->modelPathList.push_back(modelPath);
printf("Startup Adding model [%s] list size " MG_SIZE_T_SPECIFIER "\n", modelPath.c_str(), this->modelPathList.size());
printf("Startup Adding model [%s] list size " SIZE_T_SPECIFIER "\n", modelPath.c_str(), this->modelPathList.size());
}
if (particlePath != "") {
this->particlePathList.push_back(particlePath);
@@ -1271,14 +1271,14 @@ namespace Shared {
try {
if (path != "" && fileExists(path) == true) {
this->modelPathList.push_back(path);
printf("Adding model [%s] list size " MG_SIZE_T_SPECIFIER "\n", path.c_str(), this->modelPathList.size());
printf("Adding model [%s] list size " SIZE_T_SPECIFIER "\n", path.c_str(), this->modelPathList.size());
}
string titlestring = winHeader;
for (unsigned int idx = 0; idx < this->modelPathList.size(); idx++) {
string modelPath = this->modelPathList[idx];
//printf("Loading model [%s] %u of " MG_SIZE_T_SPECIFIER "\n",modelPath.c_str(),idx, this->modelPathList.size());
//printf("Loading model [%s] %u of " SIZE_T_SPECIFIER "\n",modelPath.c_str(),idx, this->modelPathList.size());
if (timer) timer->Stop();
//delete model;
@@ -1405,7 +1405,7 @@ namespace Shared {
}
void MainWindow::loadProjectileParticle(string path) {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] about to load [%s] particleProjectilePathList.size() = " MG_SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleProjectilePathList.size());
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] about to load [%s] particleProjectilePathList.size() = " SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleProjectilePathList.size());
if (timer) timer->Stop();
if (path != "" && fileExists(path) == true) {
@@ -1425,7 +1425,7 @@ namespace Shared {
try {
if (this->particleProjectilePathList.empty() == false) {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("this->particleProjectilePathList.size() = " MG_SIZE_T_SPECIFIER "\n", this->particleProjectilePathList.size());
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("this->particleProjectilePathList.size() = " SIZE_T_SPECIFIER "\n", this->particleProjectilePathList.size());
string titlestring = winHeader;
for (unsigned int idx = 0; idx < this->particleProjectilePathList.size(); idx++) {
@@ -1521,7 +1521,7 @@ namespace Shared {
}
void MainWindow::loadSplashParticle(string path) { // uses ParticleSystemTypeSplash::load (and own list...)
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] about to load [%s] particleSplashPathList.size() = " MG_SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleSplashPathList.size());
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] about to load [%s] particleSplashPathList.size() = " SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleSplashPathList.size());
if (timer) timer->Stop();
if (path != "" && fileExists(path) == true) {
@@ -1622,7 +1622,7 @@ namespace Shared {
wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a ZetaGlest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal();
}
if (timer) timer->Start(100);
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] after load [%s] particleSplashPathList.size() = " MG_SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleSplashPathList.size());
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] after load [%s] particleSplashPathList.size() = " SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleSplashPathList.size());
}
void MainWindow::onMenuModeNormals(wxCommandEvent &event) {