mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-12 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

splaytree gutting

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@269 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-07-16 04:39:22 +00:00
parent 7cad288715
commit 7066917125
26 changed files with 391 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/projectM-engine/InitCond.cpp
View File

@ -30,7 +30,7 @@
#include "Expr.hpp"
#include "InitCond.hpp"
#include "Param.hpp"
#include "SplayTree.hpp"
#include <map>
#include "wipemalloc.h"
@ -45,7 +45,7 @@ InitCond::InitCond( Param * param, CValue init_val ) {
if ( INIT_COND_DEBUG ) {
DWRITE( "InitCond::InitCond: %s -> %X -> %X\n",
this->param->name, this->param, this->param->engine_val );
this->param->name.c_str(), this->param, this->param->engine_val );
}
}
@ -63,7 +63,7 @@ void InitCond::eval_init_cond() {
param->matrix_flag = 0;
if (param->type == P_TYPE_BOOL) {
if (INIT_COND_DEBUG) {
DWRITE( "init_cond: %s = %d (TYPE BOOL)\n", param->name, init_val.bool_val);
DWRITE( "init_cond: %s = %d (TYPE BOOL)\n", param->name.c_str(), init_val.bool_val);
}
*((int*)param->engine_val) = init_val.bool_val;
return;
@ -72,10 +72,10 @@ void InitCond::eval_init_cond() {
/* Parameter is an integer type, just like C */
if ( param->type == P_TYPE_INT) {
if (strcmp( param->name, "wave_mode" ) == 0 ) {
if ((param->name == "wave_mode") == 0 ) {
}
if (INIT_COND_DEBUG) {
DWRITE( "init_cond: %s = %d (TYPE INT)\n", param->name, init_val.int_val);
DWRITE( "init_cond: %s = %d (TYPE INT)\n", param->name.c_str(), init_val.int_val);
}
*((int*)param->engine_val) = init_val.int_val;
return;
@ -85,7 +85,7 @@ void InitCond::eval_init_cond() {
if (param->type == P_TYPE_DOUBLE) {
if (INIT_COND_DEBUG) {
DWRITE( "init_cond: %s = %f (TYPE DOUBLE) -> %f -> %X -> %X\n", param->name,
DWRITE( "init_cond: %s = %f (TYPE DOUBLE) -> %f -> %X -> %X\n", param->name.c_str(),
init_val.float_val, *((float *)param->engine_val),
param, param->engine_val );
}
@ -107,13 +107,13 @@ void InitCond::init_cond_to_string() {
switch (param->type) {
case P_TYPE_BOOL:
sprintf(string, "%s=%d\n", param->name, init_val.bool_val);
sprintf(string, "%s=%d\n", param->name.c_str(), init_val.bool_val);
break;
case P_TYPE_INT:
sprintf(string, "%s=%d\n", param->name, init_val.int_val);
sprintf(string, "%s=%d\n", param->name.c_str(), init_val.int_val);
break;
case P_TYPE_DOUBLE:
sprintf(string, "%s=%f\n", param->name, init_val.float_val);
sprintf(string, "%s=%f\n", param->name.c_str(), init_val.float_val);
break;
default:
return;