From 616a7e5281feb29945f186d754f0c8b4333014ad Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Mon, 3 Sep 2007 20:50:24 +0000 Subject: [PATCH] another lower case mod git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@390 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/CustomWave.cpp | 4 ++-- src/projectM-engine/Parser.cpp | 14 +++++++++++--- src/projectM-engine/Preset.cpp | 4 ++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp index d3ddad323..1b0e3e7dd 100755 --- a/src/projectM-engine/CustomWave.cpp +++ b/src/projectM-engine/CustomWave.cpp @@ -235,7 +235,7 @@ CustomWave::CustomWave(int _id): } - if ((param = Param::new_param_bool("bUseDots", P_FLAG_NONE, &this->bUseDots, 1, 0, 0)) == NULL) + if ((param = Param::new_param_bool("busedots", P_FLAG_NONE, &this->bUseDots, 1, 0, 0)) == NULL) { delete(this); /// @bug make exception @@ -248,7 +248,7 @@ CustomWave::CustomWave(int _id): abort(); } - if ((param = Param::new_param_bool("bAdditive", P_FLAG_NONE, &this->bAdditive, 1, 0, 0)) == NULL) + if ((param = Param::new_param_bool("badditive", P_FLAG_NONE, &this->bAdditive, 1, 0, 0)) == NULL) { delete(this); abort(); diff --git a/src/projectM-engine/Parser.cpp b/src/projectM-engine/Parser.cpp index e9e2682b0..d976cb5f4 100755 --- a/src/projectM-engine/Parser.cpp +++ b/src/projectM-engine/Parser.cpp @@ -169,10 +169,18 @@ token_t Parser::parseToken(std::istream & fs, char * string) { } std::cerr << "parsed away =" << std::endl; - --i; - break; + --i; + + // if (fs && fs.get() == '\n') { + // line_mode = NORMAL_LINE_MODE; +// return tEOL; + // } else if (fs) + //fs.unget(); + + break; } - + + line_mode = NORMAL_LINE_MODE; return tEOL; case ',': diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp index 612b1668a..e28c165a5 100755 --- a/src/projectM-engine/Preset.cpp +++ b/src/projectM-engine/Preset.cpp @@ -194,6 +194,10 @@ void Preset::evalCustomWavePerFrameEquations() { assert(_pos->second); _pos->second->evaluate(); + +// if (_pos->second->param->name =="busedots") +// std::cerr << "busedots: " << (*(bool*)_pos->second->param->engine_val) << std::endl; +// else std::cerr << "name: " << _pos->second->param->name < & per_frame_eqn_tree = (*pos)->per_frame_eqn_tree;