asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style: Cosmetic fixes to play nice with clang-format

Browse source
This commit is contained in:
Rémi Verschelde 2017-01-15 16:38:54 +01:00
parent 52e2a1e98d
commit e0faf8a51b
7 changed files with 141 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/command_queue_mt.h
View file

@ -179,7 +179,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class R> template<class T,class M,class P1,class R>
@ -204,7 +204,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class R> template<class T,class M,class P1,class P2,class P3,class R>
@ -218,7 +218,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2,p3); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2,p3); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class R> template<class T,class M,class P1,class P2,class P3,class P4,class R>
@ -233,7 +233,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class R> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class R>
@ -249,7 +249,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class R> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class R>
@ -266,7 +266,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5,p6); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5,p6); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7,class R> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7,class R>
@ -284,7 +284,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5,p6,p7); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5,p6,p7); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7,class P8,class R> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7,class P8,class R>
@ -303,7 +303,7 @@ class CommandQueueMT {
R* ret; R* ret;
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5,p6,p7,p8); sync->sem->post(); sync->in_use=false; ; } virtual void call() { *ret = (instance->*method)(p1,p2,p3,p4,p5,p6,p7,p8); sync->sem->post(); sync->in_use=false; }
}; };
/** commands that don't return but sync */ /** commands that don't return but sync */
@ -318,7 +318,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1> template<class T,class M,class P1>
@ -330,7 +330,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2> template<class T,class M,class P1,class P2>
@ -343,7 +343,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3> template<class T,class M,class P1,class P2,class P3>
@ -357,7 +357,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2,p3); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2,p3); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4> template<class T,class M,class P1,class P2,class P3,class P4>
@ -372,7 +372,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2,p3,p4); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2,p3,p4); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5> template<class T,class M,class P1,class P2,class P3,class P4,class P5>
@ -388,7 +388,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2,p3,p4,p5); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2,p3,p4,p5); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6>
@ -405,7 +405,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2,p3,p4,p5,p6); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2,p3,p4,p5,p6); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7>
@ -423,7 +423,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2,p3,p4,p5,p6,p7); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2,p3,p4,p5,p6,p7); sync->sem->post(); sync->in_use=false; }
}; };
template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7,class P8> template<class T,class M,class P1,class P2,class P3,class P4,class P5,class P6,class P7,class P8>
@ -442,7 +442,7 @@ class CommandQueueMT {
SyncSemaphore *sync; SyncSemaphore *sync;
virtual void call() { (instance->*method)(p1,p2,p3,p4,p5,p6,p7,p8); sync->sem->post(); sync->in_use=false; ; } virtual void call() { (instance->*method)(p1,p2,p3,p4,p5,p6,p7,p8); sync->sem->post(); sync->in_use=false; }
}; };
/***** BASE *******/ /***** BASE *******/

70
modules/chibi/cp_loader_xm.cpp
View file

@ -380,22 +380,23 @@ CPLoader::Error CPLoader_XM::load_song(const char *p_file,CPSong *p_song,bool p_
uint32_t cpos=file->get_pos(); uint32_t cpos=file->get_pos();
//printf("pos is %i\n",cpos); //printf("pos is %i\n",cpos);
/* +4 */
uint32_t hsize=file->get_dword(); //header length
/* +4 */ uint32_t hsize=file->get_dword(); //header length
char instrname[23]; char instrname[23];
instrname[22]=0; instrname[22]=0;
file->get_byte_array((uint8_t*)instrname,22); file->get_byte_array((uint8_t*)instrname,22);
//XM_LOAD_DEBUG printf("name is %s\n",instrname); //XM_LOAD_DEBUG printf("name is %s\n",instrname);
/* +27 */ aux=file->get_byte(); //byte that must be ignored /* +27 */
//XM_LOAD_DEBUG printf("header size is %i\n",hsize); aux=file->get_byte(); //byte that must be ignored
//XM_LOAD_DEBUG printf("header size is %i\n",hsize);
/* +29 */ sampnum=file->get_word(); /* +29 */
sampnum=file->get_word();
//XM_LOAD_DEBUG printf("samples %i\n",sampnum); //XM_LOAD_DEBUG printf("samples %i\n",sampnum);
instrument.set_name( instrname ); instrument.set_name( instrname );
@ -410,7 +411,8 @@ CPLoader::Error CPLoader_XM::load_song(const char *p_file,CPSong *p_song,bool p_
continue; continue;
} }
/* +33 */ file->get_dword(); /* +33 */
file->get_dword();
if (Error result=load_instrument_internal(&instrument,false,cpos,hsize,sampnum)) { if (Error result=load_instrument_internal(&instrument,false,cpos,hsize,sampnum)) {
@ -418,9 +420,8 @@ CPLoader::Error CPLoader_XM::load_song(const char *p_file,CPSong *p_song,bool p_
file->close(); file->close();
return result; return result;
} }
} }
//
file->close(); file->close();
return FILE_OK; return FILE_OK;
} }
@ -440,7 +441,8 @@ CPLoader::Error CPLoader_XM::load_instrument_internal(CPInstrument *p_instr,bool
instrname[22]=0; instrname[22]=0;
/* +129 */ file->get_byte_array((uint8_t*)notenumb,96); /* +129 */
file->get_byte_array((uint8_t*)notenumb,96);
for (int j=0;j<24;j++) { for (int j=0;j<24;j++) {
volenv[j]=file->get_word(); volenv[j]=file->get_word();
} }
@ -448,35 +450,47 @@ CPLoader::Error CPLoader_XM::load_instrument_internal(CPInstrument *p_instr,bool
panenv[j]=file->get_word(); panenv[j]=file->get_word();
} }
/* +177 */ /* +177 */
/* +225 */ /* +225 */
/* +226 */ volpoints=file->get_byte(); /* +226 */
/* +227 */ panpoints=file->get_byte(); volpoints=file->get_byte();
/* +230 */ vol_sustain_loop=file->get_byte(); /* +227 */
/* +228 */ vol_loop_begin=file->get_byte(); panpoints=file->get_byte();
/* +229 */ vol_loop_end=file->get_byte(); /* +230 */
vol_sustain_loop=file->get_byte();
/* +228 */
vol_loop_begin=file->get_byte();
/* +229 */
vol_loop_end=file->get_byte();
//XM_LOAD_DEBUG printf("1- volpoints: %i, panpoints: %i, susloop: %i, loop begin: %i, loop end %i\n",volpoints,panpoints,vol_sustain_loop,vol_loop_begin,vol_loop_end); //XM_LOAD_DEBUG printf("1- volpoints: %i, panpoints: %i, susloop: %i, loop begin: %i, loop end %i\n",volpoints,panpoints,vol_sustain_loop,vol_loop_begin,vol_loop_end);
pan_sustain_loop=file->get_byte(); pan_sustain_loop=file->get_byte();
/* +231 */ pan_loop_begin=file->get_byte(); /* +231 */
/* +232 */ pan_loop_end=file->get_byte(); pan_loop_begin=file->get_byte();
/* +232 */
pan_loop_end=file->get_byte();
/* +234 */ aux=file->get_byte(); /* +234 */
aux=file->get_byte();
p_instr->get_volume_envelope()->reset(); p_instr->get_volume_envelope()->reset();
p_instr->get_volume_envelope()->set_enabled(aux&1); p_instr->get_volume_envelope()->set_enabled(aux&1);
p_instr->get_volume_envelope()->set_sustain_loop_enabled((aux&2)?true:false); p_instr->get_volume_envelope()->set_sustain_loop_enabled((aux&2)?true:false);
p_instr->get_volume_envelope()->set_loop_enabled((aux&4)?true:false); p_instr->get_volume_envelope()->set_loop_enabled((aux&4)?true:false);
/* +235 */ aux=file->get_byte(); /* +235 */
aux=file->get_byte();
p_instr->get_pan_envelope()->reset(); p_instr->get_pan_envelope()->reset();
p_instr->get_pan_envelope()->set_enabled(aux&1); p_instr->get_pan_envelope()->set_enabled(aux&1);
p_instr->get_pan_envelope()->set_sustain_loop_enabled((aux&2)?true:false); p_instr->get_pan_envelope()->set_sustain_loop_enabled((aux&2)?true:false);
p_instr->get_pan_envelope()->set_loop_enabled((aux&4)?true:false); p_instr->get_pan_envelope()->set_loop_enabled((aux&4)?true:false);
/* +239 */ aux=file->get_dword(); // sadly, cant use those /* +239 */
/* +241 */ p_instr->set_volume_fadeout( file->get_word() >> 4 ); aux=file->get_dword(); // sadly, cant use those
/* +243 */ aux=file->get_word(); // reserved! /* +241 */
p_instr->set_volume_fadeout( file->get_word() >> 4 );
/* +243 */
aux=file->get_word(); // reserved!

111
modules/gdscript/gd_function.cpp
View file

@ -331,8 +331,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
#endif #endif
ip+=5; ip+=5;
continue;
} continue; }
case OPCODE_EXTENDS_TEST: { case OPCODE_EXTENDS_TEST: {
CHECK_SPACE(4); CHECK_SPACE(4);
@ -404,8 +404,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst=extends_ok; *dst=extends_ok;
ip+=4; ip+=4;
continue;
} continue; }
case OPCODE_SET: { case OPCODE_SET: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -429,7 +429,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
ip+=4; ip+=4;
} continue; continue;
}
case OPCODE_GET: { case OPCODE_GET: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -460,7 +461,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst=ret; *dst=ret;
#endif #endif
ip+=4; ip+=4;
} continue; continue;
}
case OPCODE_SET_NAMED: { case OPCODE_SET_NAMED: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -483,7 +485,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
ip+=4; ip+=4;
} continue; continue;
}
case OPCODE_GET_NAMED: { case OPCODE_GET_NAMED: {
@ -518,7 +521,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst=ret; *dst=ret;
#endif #endif
ip+=4; ip+=4;
} continue; continue;
}
case OPCODE_SET_MEMBER: { case OPCODE_SET_MEMBER: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -540,7 +544,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip+=3; ip+=3;
} continue; continue;
}
case OPCODE_GET_MEMBER: { case OPCODE_GET_MEMBER: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -557,8 +562,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip+=3; ip+=3;
continue;
} continue; }
case OPCODE_ASSIGN: { case OPCODE_ASSIGN: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -568,8 +573,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = *src; *dst = *src;
ip+=3; ip+=3;
continue;
} continue; }
case OPCODE_ASSIGN_TRUE: { case OPCODE_ASSIGN_TRUE: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -578,7 +583,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = true; *dst = true;
ip+=2; ip+=2;
} continue; continue;
}
case OPCODE_ASSIGN_FALSE: { case OPCODE_ASSIGN_FALSE: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -587,7 +593,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst = false; *dst = false;
ip+=2; ip+=2;
} continue; continue;
}
case OPCODE_CONSTRUCT: { case OPCODE_CONSTRUCT: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -612,7 +619,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
ip+=4+argc; ip+=4+argc;
//construct a basic type //construct a basic type
} continue; continue;
}
case OPCODE_CONSTRUCT_ARRAY: { case OPCODE_CONSTRUCT_ARRAY: {
CHECK_SPACE(1); CHECK_SPACE(1);
@ -632,8 +640,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst=array; *dst=array;
ip+=3+argc; ip+=3+argc;
continue;
} continue; }
case OPCODE_CONSTRUCT_DICTIONARY: { case OPCODE_CONSTRUCT_DICTIONARY: {
CHECK_SPACE(1); CHECK_SPACE(1);
@ -655,8 +663,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
*dst=dict; *dst=dict;
ip+=3+argc*2; ip+=3+argc*2;
continue;
} continue; }
case OPCODE_CALL_RETURN: case OPCODE_CALL_RETURN:
case OPCODE_CALL: { case OPCODE_CALL: {
@ -737,8 +745,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
//_call_func(NULL,base,*methodname,ip,argc,p_instance,stack); //_call_func(NULL,base,*methodname,ip,argc,p_instance,stack);
ip+=argc+1; ip+=argc+1;
continue;
} continue; }
case OPCODE_CALL_BUILT_IN: { case OPCODE_CALL_BUILT_IN: {
CHECK_SPACE(4); CHECK_SPACE(4);
@ -775,12 +783,12 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
break; break;
} }
ip+=argc+1; ip+=argc+1;
continue;
} continue; }
case OPCODE_CALL_SELF: { case OPCODE_CALL_SELF: {
break;
} break; }
case OPCODE_CALL_SELF_BASE: { case OPCODE_CALL_SELF_BASE: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -857,8 +865,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
ip+=4+argc; ip+=4+argc;
continue;
} continue; }
case OPCODE_YIELD: case OPCODE_YIELD:
case OPCODE_YIELD_SIGNAL: { case OPCODE_YIELD_SIGNAL: {
@ -938,8 +946,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
exit_ok=true; exit_ok=true;
break;
} break; }
case OPCODE_YIELD_RESUME: { case OPCODE_YIELD_RESUME: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -950,8 +958,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
GET_VARIANT_PTR(result,1); GET_VARIANT_PTR(result,1);
*result=p_state->result; *result=p_state->result;
ip+=2; ip+=2;
continue;
} continue; }
case OPCODE_JUMP: { case OPCODE_JUMP: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -959,8 +967,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
ERR_BREAK(to<0 || to>_code_size); ERR_BREAK(to<0 || to>_code_size);
ip=to; ip=to;
continue;
} continue; }
case OPCODE_JUMP_IF: { case OPCODE_JUMP_IF: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -983,7 +991,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
continue; continue;
} }
ip+=3; ip+=3;
} continue; continue;
}
case OPCODE_JUMP_IF_NOT: { case OPCODE_JUMP_IF_NOT: {
CHECK_SPACE(3); CHECK_SPACE(3);
@ -1006,21 +1015,22 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
continue; continue;
} }
ip+=3; ip+=3;
} continue; continue;
}
case OPCODE_JUMP_TO_DEF_ARGUMENT: { case OPCODE_JUMP_TO_DEF_ARGUMENT: {
CHECK_SPACE(2); CHECK_SPACE(2);
ip=_default_arg_ptr[defarg]; ip=_default_arg_ptr[defarg];
continue;
} continue; }
case OPCODE_RETURN: { case OPCODE_RETURN: {
CHECK_SPACE(2); CHECK_SPACE(2);
GET_VARIANT_PTR(r,1); GET_VARIANT_PTR(r,1);
retvalue=*r; retvalue=*r;
exit_ok=true; exit_ok=true;
break;
} break; }
case OPCODE_ITERATE_BEGIN: { case OPCODE_ITERATE_BEGIN: {
CHECK_SPACE(8); //space for this an regular iterate CHECK_SPACE(8); //space for this an regular iterate
@ -1050,8 +1060,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
ip+=5; //skip regular iterate which is always next ip+=5; //skip regular iterate which is always next
continue;
} continue; }
case OPCODE_ITERATE: { case OPCODE_ITERATE: {
CHECK_SPACE(4); CHECK_SPACE(4);
@ -1079,7 +1089,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
ip+=5; //loop again ip+=5; //loop again
} continue; continue;
}
case OPCODE_ASSERT: { case OPCODE_ASSERT: {
CHECK_SPACE(2); CHECK_SPACE(2);
GET_VARIANT_PTR(test,1); GET_VARIANT_PTR(test,1);
@ -1105,7 +1116,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
#endif #endif
ip+=2; ip+=2;
} continue; continue;
}
case OPCODE_BREAKPOINT: { case OPCODE_BREAKPOINT: {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (ScriptDebugger::get_singleton()) { if (ScriptDebugger::get_singleton()) {
@ -1113,7 +1125,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
} }
#endif #endif
ip+=1; ip+=1;
} continue; continue;
}
case OPCODE_LINE: { case OPCODE_LINE: {
CHECK_SPACE(2); CHECK_SPACE(2);
@ -1142,17 +1155,19 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
ScriptDebugger::get_singleton()->line_poll(); ScriptDebugger::get_singleton()->line_poll();
} }
} continue; continue;
}
case OPCODE_END: { case OPCODE_END: {
exit_ok=true; exit_ok=true;
break; break;
} break; }
default: { default: {
err_text="Illegal opcode "+itos(_code_ptr[ip])+" at address "+itos(ip); err_text="Illegal opcode "+itos(_code_ptr[ip])+" at address "+itos(ip);
} break; break;
}
} }

4
modules/gdscript/gd_parser.cpp
View file

@ -1043,8 +1043,8 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
case GDTokenizer::TK_OP_ASSIGN_MUL: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_MUL ; break; case GDTokenizer::TK_OP_ASSIGN_MUL: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_MUL ; break;
case GDTokenizer::TK_OP_ASSIGN_DIV: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_DIV ; break; case GDTokenizer::TK_OP_ASSIGN_DIV: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_DIV ; break;
case GDTokenizer::TK_OP_ASSIGN_MOD: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_MOD ; break; case GDTokenizer::TK_OP_ASSIGN_MOD: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_MOD ; break;
case GDTokenizer::TK_OP_ASSIGN_SHIFT_LEFT: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_SHIFT_LEFT; ; break; case GDTokenizer::TK_OP_ASSIGN_SHIFT_LEFT: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_SHIFT_LEFT; break;
case GDTokenizer::TK_OP_ASSIGN_SHIFT_RIGHT: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_SHIFT_RIGHT; ; break; case GDTokenizer::TK_OP_ASSIGN_SHIFT_RIGHT: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_SHIFT_RIGHT; break;
case GDTokenizer::TK_OP_ASSIGN_BIT_AND: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_BIT_AND ; break; case GDTokenizer::TK_OP_ASSIGN_BIT_AND: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_BIT_AND ; break;
case GDTokenizer::TK_OP_ASSIGN_BIT_OR: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_BIT_OR ; break; case GDTokenizer::TK_OP_ASSIGN_BIT_OR: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_BIT_OR ; break;
case GDTokenizer::TK_OP_ASSIGN_BIT_XOR: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_BIT_XOR ; break; case GDTokenizer::TK_OP_ASSIGN_BIT_XOR: _VALIDATE_ASSIGN op=OperatorNode::OP_ASSIGN_BIT_XOR ; break;

2
scene/3d/character_camera.cpp
View file

@ -97,7 +97,7 @@ void CharacterCamera::_get_property_list( List<PropertyInfo> *p_list) const {
p_list->push_back( PropertyInfo( Variant::INT, "type", PROPERTY_HINT_ENUM, "Fixed,Follow") ); p_list->push_back( PropertyInfo( Variant::INT, "type", PROPERTY_HINT_ENUM, "Fixed,Follow") );
p_list->push_back( PropertyInfo( Variant::VECTOR2, "orbit" ) ); p_list->push_back( PropertyInfo( Variant::VECTOR2, "orbit" ) );
p_list->push_back( PropertyInfo( Variant::REAL, "height", PROPERTY_HINT_RANGE,"-1024,1024,0.01" ) ); p_list->push_back( PropertyInfo( Variant::REAL, "height", PROPERTY_HINT_RANGE,"-1024,1024,0.01" ) );
p_list->push_back( PropertyInfo( Variant::REAL, "inclination", PROPERTY_HINT_RANGE,"-90,90,0.01" ) ); ; p_list->push_back( PropertyInfo( Variant::REAL, "inclination", PROPERTY_HINT_RANGE,"-90,90,0.01" ) );
p_list->push_back( PropertyInfo( Variant::REAL, "max_orbit_x", PROPERTY_HINT_RANGE,"-90,90,0.01" ) ); p_list->push_back( PropertyInfo( Variant::REAL, "max_orbit_x", PROPERTY_HINT_RANGE,"-90,90,0.01" ) );
p_list->push_back( PropertyInfo( Variant::REAL, "min_orbit_x", PROPERTY_HINT_RANGE,"-90,90,0.01" ) ); p_list->push_back( PropertyInfo( Variant::REAL, "min_orbit_x", PROPERTY_HINT_RANGE,"-90,90,0.01" ) );
p_list->push_back( PropertyInfo( Variant::REAL, "min_distance", PROPERTY_HINT_RANGE,"0,100,0.01" ) ); p_list->push_back( PropertyInfo( Variant::REAL, "min_distance", PROPERTY_HINT_RANGE,"0,100,0.01" ) );

16
servers/physics/area_sw.cpp
View file

@ -126,14 +126,14 @@ void AreaSW::set_space_override_mode(PhysicsServer::AreaSpaceOverrideMode p_mode
void AreaSW::set_param(PhysicsServer::AreaParameter p_param, const Variant& p_value) { void AreaSW::set_param(PhysicsServer::AreaParameter p_param, const Variant& p_value) {
switch(p_param) { switch(p_param) {
case PhysicsServer::AREA_PARAM_GRAVITY: gravity=p_value; ; break; case PhysicsServer::AREA_PARAM_GRAVITY: gravity=p_value; break;
case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR: gravity_vector=p_value; ; break; case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR: gravity_vector=p_value; break;
case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: gravity_is_point=p_value; ; break; case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: gravity_is_point=p_value; break;
case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: gravity_distance_scale=p_value; ; break; case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: gravity_distance_scale=p_value; break;
case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: point_attenuation=p_value; ; break; case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: point_attenuation=p_value; break;
case PhysicsServer::AREA_PARAM_LINEAR_DAMP: linear_damp=p_value; ; break; case PhysicsServer::AREA_PARAM_LINEAR_DAMP: linear_damp=p_value; break;
case PhysicsServer::AREA_PARAM_ANGULAR_DAMP: angular_damp=p_value; ; break; case PhysicsServer::AREA_PARAM_ANGULAR_DAMP: angular_damp=p_value; break;
case PhysicsServer::AREA_PARAM_PRIORITY: priority=p_value; ; break; case PhysicsServer::AREA_PARAM_PRIORITY: priority=p_value; break;
} }

16
servers/physics_2d/area_2d_sw.cpp
View file

@ -125,14 +125,14 @@ void Area2DSW::set_space_override_mode(Physics2DServer::AreaSpaceOverrideMode p_
void Area2DSW::set_param(Physics2DServer::AreaParameter p_param, const Variant& p_value) { void Area2DSW::set_param(Physics2DServer::AreaParameter p_param, const Variant& p_value) {
switch(p_param) { switch(p_param) {
case Physics2DServer::AREA_PARAM_GRAVITY: gravity=p_value; ; break; case Physics2DServer::AREA_PARAM_GRAVITY: gravity=p_value; break;
case Physics2DServer::AREA_PARAM_GRAVITY_VECTOR: gravity_vector=p_value; ; break; case Physics2DServer::AREA_PARAM_GRAVITY_VECTOR: gravity_vector=p_value; break;
case Physics2DServer::AREA_PARAM_GRAVITY_IS_POINT: gravity_is_point=p_value; ; break; case Physics2DServer::AREA_PARAM_GRAVITY_IS_POINT: gravity_is_point=p_value; break;
case Physics2DServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: gravity_distance_scale=p_value; ; break; case Physics2DServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE: gravity_distance_scale=p_value; break;
case Physics2DServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: point_attenuation=p_value; ; break; case Physics2DServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION: point_attenuation=p_value; break;
case Physics2DServer::AREA_PARAM_LINEAR_DAMP: linear_damp=p_value; ; break; case Physics2DServer::AREA_PARAM_LINEAR_DAMP: linear_damp=p_value; break;
case Physics2DServer::AREA_PARAM_ANGULAR_DAMP: angular_damp=p_value; ; break; case Physics2DServer::AREA_PARAM_ANGULAR_DAMP: angular_damp=p_value; break;
case Physics2DServer::AREA_PARAM_PRIORITY: priority=p_value; ; break; case Physics2DServer::AREA_PARAM_PRIORITY: priority=p_value; break;
} }