mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-10 05:35:48 +00:00
Code Issues Projects Releases Wiki Activity

- init cond stuff refactored properly

Browse Source 
- hit a wall in splaytree compilation, involving symbolic types


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@220 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-06-24 04:49:28 +00:00
parent d03e24e347
commit 8dcfbceafd
9 changed files with 94 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/projectM-engine/Parser.cpp
View File

@ -758,18 +758,17 @@ GenExpr * Parser::parse_gen_expr ( FILE * fs, TreeExpr * tree_expr, Preset * pre
/* CASE 5: custom wave variable */
if (current_wave != NULL) {
if ((param = current_wave->findParam(string, FALSE)) == NULL) {
if ((param = ParamUtils::find<ParamUtils::NO_CREATE>(string, current_wave->param_tree)) == NULL) {
if ((param = preset->builtinParams.find_builtin_param(string)) == NULL)
if ((param = current_wave->findParam(string, TRUE)) == NULL) {
if ((param = ParamUtils::find<ParamUtils::AUTO_CREATE>(string, current_wave->param_tree)) == NULL) {
delete tree_expr;
return NULL;
}
}
if (PARSE_DEBUG) {
DWRITE("parse_gen_expr: custom wave parameter (name = %s)... \n", param->name);
}
/* Convert parameter to an expression */
@ -782,12 +781,12 @@ GenExpr * Parser::parse_gen_expr ( FILE * fs, TreeExpr * tree_expr, Preset * pre
/* Parse the rest of the line */
return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset);
}
/* CASE 6: regular parameter. Will be created if necessary and the string has no invalid characters */
if ((param = Param::find_param(string, preset, P_CREATE)) != NULL) {
if (PARSE_DEBUG) {
DWRITE("parse_gen_expr: parameter (name = %s)...\n", param->name);