godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unnecessary assignments

This commit is contained in:
Wilson E. Alvarez 2017-08-21 15:15:36 -04:00
parent 4717d37bfa
commit 738d2ab969
37 changed files with 65 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/bind/core_bind.cpp
View File

@ -1406,11 +1406,10 @@ Error _File::open_encrypted_pass(const String &p_path, int p_mode_flags, const S
Error _File::open_compressed(const String &p_path, int p_mode_flags, int p_compress_mode) { Error _File::open_compressed(const String &p_path, int p_mode_flags, int p_compress_mode) {
FileAccessCompressed *fac = memnew(FileAccessCompressed); FileAccessCompressed *fac = memnew(FileAccessCompressed);
Error err = OK;
fac->configure("GCPF", (Compression::Mode)p_compress_mode); fac->configure("GCPF", (Compression::Mode)p_compress_mode);
err = fac->_open(p_path, p_mode_flags); Error err = fac->_open(p_path, p_mode_flags);
if (err) { if (err) {
memdelete(fac); memdelete(fac);

1
core/io/file_access_compressed.cpp
View File

@ -368,7 +368,6 @@ FileAccessCompressed::FileAccessCompressed() {
f = NULL; f = NULL;
magic = "GCMP"; magic = "GCMP";
block_size = 16384;
cmode = Compression::MODE_ZSTD; cmode = Compression::MODE_ZSTD;
writing = false; writing = false;
write_ptr = 0; write_ptr = 0;

1
drivers/gles2/rasterizer_gles2.cpp
View File

@ -654,7 +654,6 @@ Ref<Image> RasterizerGLES2::_get_gl_image_and_format(const Ref<Image> &p_image,
} else { } else {
r_gl_internal_format = _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT : _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG; r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT : _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
r_gl_components = 1; //doesn't matter much r_gl_components = 1; //doesn't matter much
r_compressed = true; r_compressed = true;

1
editor/code_editor.cpp
View File

@ -258,7 +258,6 @@ void FindReplaceBar::_get_search_from(int &r_line, int &r_col) {
int selection_from_col = text_edit->get_selection_from_column(); int selection_from_col = text_edit->get_selection_from_column();
if (r_col >= selection_from_col && r_col <= text_edit->get_selection_to_column()) { if (r_col >= selection_from_col && r_col <= text_edit->get_selection_to_column()) {
r_col = selection_line;
r_col = selection_from_col; r_col = selection_from_col;
} }
} }

2
editor/editor_asset_installer.cpp
View File

@ -100,7 +100,7 @@ void EditorAssetInstaller::open(const String &p_path, int p_depth) {
//get filename //get filename
unz_file_info info; unz_file_info info;
char fname[16384]; char fname[16384];
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0); unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0);
String name = fname; String name = fname;
files_sorted.insert(name); files_sorted.insert(name);

8
editor/export_template_manager.cpp
View File

@ -195,7 +195,7 @@ void ExportTemplateManager::_install_from_file(const String &p_file) {
data.resize(info.uncompressed_size); data.resize(info.uncompressed_size);
//read //read
ret = unzOpenCurrentFile(pkg); unzOpenCurrentFile(pkg);
ret = unzReadCurrentFile(pkg, data.ptr(), data.size()); ret = unzReadCurrentFile(pkg, data.ptr(), data.size());
unzCloseCurrentFile(pkg); unzCloseCurrentFile(pkg);
@ -257,7 +257,7 @@ void ExportTemplateManager::_install_from_file(const String &p_file) {
//get filename //get filename
unz_file_info info; unz_file_info info;
char fname[16384]; char fname[16384];
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0); unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0);
String file = fname; String file = fname;
@ -265,8 +265,8 @@ void ExportTemplateManager::_install_from_file(const String &p_file) {
data.resize(info.uncompressed_size); data.resize(info.uncompressed_size);
//read //read
ret = unzOpenCurrentFile(pkg); unzOpenCurrentFile(pkg);
ret = unzReadCurrentFile(pkg, data.ptr(), data.size()); unzReadCurrentFile(pkg, data.ptr(), data.size());
unzCloseCurrentFile(pkg); unzCloseCurrentFile(pkg);
print_line(fname); print_line(fname);

3
editor/filesystem_dock.cpp
View File

@ -1465,10 +1465,9 @@ void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) {
return; return;
} }
EditorFileSystemDirectory *efsd = NULL;
int pos; int pos;
efsd = EditorFileSystem::get_singleton()->find_file(path, &pos); EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->find_file(path, &pos);
if (efsd) { if (efsd) {

5
editor/import/editor_import_collada.cpp
View File

@ -1584,14 +1584,12 @@ Error ColladaImport::_create_resources(Collada::Node *p_node) {
apply_xform = Transform(); apply_xform = Transform();
} }
Collada::SkinControllerData::Source *joint_src = NULL;
ERR_FAIL_COND_V(!skin->weights.sources.has("JOINT"), ERR_INVALID_DATA); ERR_FAIL_COND_V(!skin->weights.sources.has("JOINT"), ERR_INVALID_DATA);
String joint_id = skin->weights.sources["JOINT"].source; String joint_id = skin->weights.sources["JOINT"].source;
ERR_FAIL_COND_V(!skin->sources.has(joint_id), ERR_INVALID_DATA); ERR_FAIL_COND_V(!skin->sources.has(joint_id), ERR_INVALID_DATA);
joint_src = &skin->sources[joint_id]; Collada::SkinControllerData::Source *joint_src = &skin->sources[joint_id];
bone_remap.resize(joint_src->sarray.size()); bone_remap.resize(joint_src->sarray.size());
@ -2317,7 +2315,6 @@ Ref<Animation> EditorSceneImporterCollada::import_animation(const String &p_path
if (state.animations.size() == 0) if (state.animations.size() == 0)
return Ref<Animation>(); return Ref<Animation>();
Ref<Animation> anim = state.animations[0]; Ref<Animation> anim = state.animations[0];
anim = state.animations[0];
print_line("Anim Load OK"); print_line("Anim Load OK");
String base = p_path.get_basename().to_lower(); String base = p_path.get_basename().to_lower();
if (p_flags & IMPORT_ANIMATION_DETECT_LOOP) { if (p_flags & IMPORT_ANIMATION_DETECT_LOOP) {

4
editor/plugins/particles_editor_plugin.cpp
View File

@ -270,9 +270,7 @@ void ParticlesEditor::_generate_emission_points() {
Vector3 dir; Vector3 dir;
dir[Math::rand() % 3] = 1.0; dir[Math::rand() % 3] = 1.0;
Vector3 ofs = Vector3(1, 1, 1) - dir; Vector3 ofs = (Vector3(1, 1, 1) - dir) * Vector3(Math::randf(), Math::randf(), Math::randf()) * aabb.size + aabb.position;
ofs = (Vector3(1, 1, 1) - dir) * Vector3(Math::randf(), Math::randf(), Math::randf()) * aabb.size;
ofs += aabb.position;
Vector3 ofsv = ofs + aabb.size * dir; Vector3 ofsv = ofs + aabb.size * dir;

25
editor/script_create_dialog.cpp
View File

@ -531,28 +531,19 @@ void ScriptCreateDialog::_bind_methods() {
ScriptCreateDialog::ScriptCreateDialog() { ScriptCreateDialog::ScriptCreateDialog() {
GridContainer *gc = memnew(GridContainer);
VBoxContainer *vb = memnew(VBoxContainer);
HBoxContainer *hb = memnew(HBoxContainer);
Label *l = memnew(Label);
Control *empty = memnew(Control);
Control *empty_h = memnew(Control);
Control *empty_v = memnew(Control);
PanelContainer *pc = memnew(PanelContainer);
/* DIALOG */ /* DIALOG */
/* Main Controls */ /* Main Controls */
gc = memnew(GridContainer); GridContainer *gc = memnew(GridContainer);
gc->set_columns(2); gc->set_columns(2);
/* Error Messages Field */ /* Error Messages Field */
vb = memnew(VBoxContainer); VBoxContainer *vb = memnew(VBoxContainer);
hb = memnew(HBoxContainer); HBoxContainer *hb = memnew(HBoxContainer);
l = memnew(Label); Label *l = memnew(Label);
l->set_text(" - "); l->set_text(" - ");
hb->add_child(l); hb->add_child(l);
error_label = memnew(Label); error_label = memnew(Label);
@ -571,19 +562,19 @@ ScriptCreateDialog::ScriptCreateDialog() {
hb->add_child(path_error_label); hb->add_child(path_error_label);
vb->add_child(hb); vb->add_child(hb);
pc = memnew(PanelContainer); PanelContainer *pc = memnew(PanelContainer);
pc->set_h_size_flags(Control::SIZE_FILL); pc->set_h_size_flags(Control::SIZE_FILL);
pc->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("bg", "Tree")); pc->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("bg", "Tree"));
pc->add_child(vb); pc->add_child(vb);
/* Margins */ /* Margins */
empty_h = memnew(Control); Control *empty_h = memnew(Control);
empty_h->set_name("empty_h"); //duplicate() doesn't like nodes without a name empty_h->set_name("empty_h"); //duplicate() doesn't like nodes without a name
empty_h->set_h_size_flags(Control::SIZE_EXPAND_FILL); empty_h->set_h_size_flags(Control::SIZE_EXPAND_FILL);
empty_h->set_v_size_flags(Control::SIZE_EXPAND_FILL); empty_h->set_v_size_flags(Control::SIZE_EXPAND_FILL);
empty_h->set_custom_minimum_size(Size2(0, 10 * EDSCALE)); empty_h->set_custom_minimum_size(Size2(0, 10 * EDSCALE));
empty_v = memnew(Control); Control *empty_v = memnew(Control);
empty_v->set_name("empty_v"); empty_v->set_name("empty_v");
empty_v->set_h_size_flags(Control::SIZE_EXPAND_FILL); empty_v->set_h_size_flags(Control::SIZE_EXPAND_FILL);
empty_v->set_v_size_flags(Control::SIZE_EXPAND_FILL); empty_v->set_v_size_flags(Control::SIZE_EXPAND_FILL);
@ -684,7 +675,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
internal = memnew(CheckButton); internal = memnew(CheckButton);
internal->connect("pressed", this, "_built_in_pressed"); internal->connect("pressed", this, "_built_in_pressed");
hb = memnew(HBoxContainer); hb = memnew(HBoxContainer);
empty = memnew(Control); Control *empty = memnew(Control);
hb->add_child(internal); hb->add_child(internal);
hb->add_child(empty); hb->add_child(empty);
l = memnew(Label); l = memnew(Label);

5
main/main.cpp
View File

@ -904,9 +904,10 @@ Error Main::setup2() {
MAIN_PRINT("Main: Setup Logo"); MAIN_PRINT("Main: Setup Logo");
bool show_logo = true;
#ifdef JAVASCRIPT_ENABLED #ifdef JAVASCRIPT_ENABLED
show_logo = false; bool show_logo = false;
#else
bool show_logo = true;
#endif #endif
if (init_screen != -1) { if (init_screen != -1) {

3
main/tests/test_string.cpp
View File

@ -802,7 +802,6 @@ bool test_28() {
bool test_29() { bool test_29() {
bool state = true; bool state = true;
bool success = false;
IP_Address ip0("2001:0db8:85a3:0000:0000:8a2e:0370:7334"); IP_Address ip0("2001:0db8:85a3:0000:0000:8a2e:0370:7334");
OS::get_singleton()->print("ip0 is %ls\n", String(ip0).c_str()); OS::get_singleton()->print("ip0 is %ls\n", String(ip0).c_str());
@ -817,7 +816,7 @@ bool test_29() {
OS::get_singleton()->print("ip6 is %ls\n", String(ip3).c_str()); OS::get_singleton()->print("ip6 is %ls\n", String(ip3).c_str());
String ip4 = "192.168.0.1"; String ip4 = "192.168.0.1";
success = ip4.is_valid_ip_address(); bool success = ip4.is_valid_ip_address();
OS::get_singleton()->print("Is valid ipv4: %ls, %s\n", ip4.c_str(), success ? "OK" : "FAIL"); OS::get_singleton()->print("Is valid ipv4: %ls, %s\n", ip4.c_str(), success ? "OK" : "FAIL");
if (!success) state = false; if (!success) state = false;

3
modules/gdnative/gdnative.cpp
View File

@ -247,9 +247,8 @@ bool GDNative::terminate() {
return false; return false;
} }
Error error = OK;
void *library_terminate; void *library_terminate;
error = OS::get_singleton()->get_dynamic_library_symbol_handle( Error error = OS::get_singleton()->get_dynamic_library_symbol_handle(
native_handle, native_handle,
terminate_symbol, terminate_symbol,
library_terminate); library_terminate);

4
modules/gdscript/gd_compiler.cpp
View File

@ -1451,15 +1451,13 @@ Error GDCompiler::_parse_function(GDScript *p_script, const GDParser::ClassNode
codegen.opcodes.push_back(GDFunction::OPCODE_END); codegen.opcodes.push_back(GDFunction::OPCODE_END);
GDFunction *gdfunc = NULL;
/* /*
if (String(p_func->name)=="") { //initializer func if (String(p_func->name)=="") { //initializer func
gdfunc = &p_script->initializer; gdfunc = &p_script->initializer;
*/ */
//} else { //regular func //} else { //regular func
p_script->member_functions[func_name] = memnew(GDFunction); p_script->member_functions[func_name] = memnew(GDFunction);
gdfunc = p_script->member_functions[func_name]; GDFunction *gdfunc = p_script->member_functions[func_name];
//} //}
if (p_func) { if (p_func) {

20
modules/gdscript/gd_parser.cpp
View File

@ -2381,9 +2381,7 @@ void GDParser::_parse_block(BlockNode *p_block, bool p_static) {
if (tokenizer->get_token() == GDTokenizer::TK_OP_ASSIGN) { if (tokenizer->get_token() == GDTokenizer::TK_OP_ASSIGN) {
tokenizer->advance(); tokenizer->advance();
Node *subexpr = NULL; Node *subexpr = _parse_and_reduce_expression(p_block, p_static);
subexpr = _parse_and_reduce_expression(p_block, p_static);
if (!subexpr) { if (!subexpr) {
if (_recover_from_completion()) { if (_recover_from_completion()) {
break; break;
@ -3135,9 +3133,7 @@ void GDParser::_parse_class(ClassNode *p_class) {
if (tokenizer->get_token() == GDTokenizer::TK_OP_ASSIGN) { if (tokenizer->get_token() == GDTokenizer::TK_OP_ASSIGN) {
defaulting = true; defaulting = true;
tokenizer->advance(1); tokenizer->advance(1);
Node *defval = NULL; Node *defval = _parse_and_reduce_expression(p_class, _static);
defval = _parse_and_reduce_expression(p_class, _static);
if (!defval || error_set) if (!defval || error_set)
return; return;
@ -3875,9 +3871,7 @@ void GDParser::_parse_class(ClassNode *p_class) {
#endif #endif
tokenizer->advance(); tokenizer->advance();
Node *subexpr = NULL; Node *subexpr = _parse_and_reduce_expression(p_class, false, autoexport);
subexpr = _parse_and_reduce_expression(p_class, false, autoexport);
if (!subexpr) { if (!subexpr) {
if (_recover_from_completion()) { if (_recover_from_completion()) {
break; break;
@ -4035,9 +4029,7 @@ void GDParser::_parse_class(ClassNode *p_class) {
tokenizer->advance(); tokenizer->advance();
Node *subexpr = NULL; Node *subexpr = _parse_and_reduce_expression(p_class, true, true);
subexpr = _parse_and_reduce_expression(p_class, true, true);
if (!subexpr) { if (!subexpr) {
if (_recover_from_completion()) { if (_recover_from_completion()) {
break; break;
@ -4103,9 +4095,7 @@ void GDParser::_parse_class(ClassNode *p_class) {
if (tokenizer->get_token() == GDTokenizer::TK_OP_ASSIGN) { if (tokenizer->get_token() == GDTokenizer::TK_OP_ASSIGN) {
tokenizer->advance(); tokenizer->advance();
Node *subexpr = NULL; Node *subexpr = _parse_and_reduce_expression(p_class, true, true);
subexpr = _parse_and_reduce_expression(p_class, true, true);
if (!subexpr) { if (!subexpr) {
if (_recover_from_completion()) { if (_recover_from_completion()) {
break; break;

4
modules/gdscript/gd_tokenizer.cpp
View File

@ -1187,9 +1187,7 @@ Error GDTokenizerBuffer::set_code_buffer(const Vector<uint8_t> &p_buffer) {
int line_count = decode_uint32(&buf[16]); int line_count = decode_uint32(&buf[16]);
int token_count = decode_uint32(&buf[20]); int token_count = decode_uint32(&buf[20]);
const uint8_t *b = buf; const uint8_t *b = &buf[24];
b = &buf[24];
total_len -= 24; total_len -= 24;
identifiers.resize(identifier_count); identifiers.resize(identifier_count);

3
modules/nativescript/api_generator.cpp
View File

@ -155,10 +155,9 @@ List<ClassAPI> generate_c_api_classes() {
class_api.is_instanciable = !class_api.is_singleton && ClassDB::can_instance(class_name); class_api.is_instanciable = !class_api.is_singleton && ClassDB::can_instance(class_name);
{ {
bool is_reference = false;
List<StringName> inheriters; List<StringName> inheriters;
ClassDB::get_inheriters_from_class("Reference", &inheriters); ClassDB::get_inheriters_from_class("Reference", &inheriters);
is_reference = !!inheriters.find(class_name); bool is_reference = !!inheriters.find(class_name);
// @Unclear // @Unclear
class_api.is_reference = !class_api.is_singleton && is_reference; class_api.is_reference = !class_api.is_singleton && is_reference;
} }

13
modules/openssl/stream_peer_openssl.cpp
View File

@ -41,27 +41,22 @@ bool StreamPeerOpenSSL::_match_host_name(const char *name, const char *hostname)
Error StreamPeerOpenSSL::_match_common_name(const char *hostname, const X509 *server_cert) { Error StreamPeerOpenSSL::_match_common_name(const char *hostname, const X509 *server_cert) {
int common_name_loc = -1;
X509_NAME_ENTRY *common_name_entry = NULL;
ASN1_STRING *common_name_asn1 = NULL;
char *common_name_str = NULL;
// Find the position of the CN field in the Subject field of the certificate // Find the position of the CN field in the Subject field of the certificate
common_name_loc = X509_NAME_get_index_by_NID(X509_get_subject_name((X509 *)server_cert), NID_commonName, -1); int common_name_loc = X509_NAME_get_index_by_NID(X509_get_subject_name((X509 *)server_cert), NID_commonName, -1);
ERR_FAIL_COND_V(common_name_loc < 0, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(common_name_loc < 0, ERR_INVALID_PARAMETER);
// Extract the CN field // Extract the CN field
common_name_entry = X509_NAME_get_entry(X509_get_subject_name((X509 *)server_cert), common_name_loc); X509_NAME_ENTRY *common_name_entry = X509_NAME_get_entry(X509_get_subject_name((X509 *)server_cert), common_name_loc);
ERR_FAIL_COND_V(common_name_entry == NULL, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(common_name_entry == NULL, ERR_INVALID_PARAMETER);
// Convert the CN field to a C string // Convert the CN field to a C string
common_name_asn1 = X509_NAME_ENTRY_get_data(common_name_entry); ASN1_STRING *common_name_asn1 = X509_NAME_ENTRY_get_data(common_name_entry);
ERR_FAIL_COND_V(common_name_asn1 == NULL, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(common_name_asn1 == NULL, ERR_INVALID_PARAMETER);
common_name_str = (char *)ASN1_STRING_data(common_name_asn1); char *common_name_str = (char *)ASN1_STRING_data(common_name_asn1);
// Make sure there isn't an embedded NUL character in the CN // Make sure there isn't an embedded NUL character in the CN
bool malformed_certificate = (size_t)ASN1_STRING_length(common_name_asn1) != strlen(common_name_str); bool malformed_certificate = (size_t)ASN1_STRING_length(common_name_asn1) != strlen(common_name_str);

3
modules/pbm/bitmap_loader_pbm.cpp
View File

@ -95,6 +95,9 @@ static bool _get_token(FileAccessRef &f, uint8_t &saved, PoolVector<uint8_t> &r_
resized = true; resized = true;
} }
if (resized) { if (resized) {
// Note: Certain C++ static analyzers might point out that the following assigment is unnecessary.
// This is wrong since PoolVector<class T>::Write has an operator= method where the lhs gets updated under certain conditions.
// See core/dvector.h.
w = PoolVector<uint8_t>::Write(); w = PoolVector<uint8_t>::Write();
r_token.resize(token_max); r_token.resize(token_max);
w = r_token.write(); w = r_token.write();

1
modules/theora/video_stream_theora.cpp
View File

@ -451,7 +451,6 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
ti.frame_width, ti.frame_height, ti.pic_x, ti.pic_y); ti.frame_width, ti.frame_height, ti.pic_x, ti.pic_y);
th_decode_ctl(td, TH_DECCTL_GET_PPLEVEL_MAX, &pp_level_max, th_decode_ctl(td, TH_DECCTL_GET_PPLEVEL_MAX, &pp_level_max,
sizeof(pp_level_max)); sizeof(pp_level_max));
pp_level = pp_level_max;
pp_level = 0; pp_level = 0;
th_decode_ctl(td, TH_DECCTL_SET_PPLEVEL, &pp_level, sizeof(pp_level)); th_decode_ctl(td, TH_DECCTL_SET_PPLEVEL, &pp_level, sizeof(pp_level));
pp_inc = 0; pp_inc = 0;

1
platform/android/audio_driver_jandroid.cpp
View File

@ -80,7 +80,6 @@ Error AudioDriverAndroid::init() {
int mix_rate = GLOBAL_DEF("audio/mix_rate", 44100); int mix_rate = GLOBAL_DEF("audio/mix_rate", 44100);
int latency = GLOBAL_DEF("audio/output_latency", 25); int latency = GLOBAL_DEF("audio/output_latency", 25);
latency = 50;
unsigned int buffer_size = next_power_of_2(latency * mix_rate / 1000); unsigned int buffer_size = next_power_of_2(latency * mix_rate / 1000);
if (OS::get_singleton()->is_stdout_verbose()) { if (OS::get_singleton()->is_stdout_verbose()) {
print_line("audio buffer size: " + itos(buffer_size)); print_line("audio buffer size: " + itos(buffer_size));

4
platform/android/export/export.cpp
View File

@ -3024,7 +3024,7 @@ public:
args.push_back(devices[p_device].id); args.push_back(devices[p_device].id);
args.push_back("reverse"); args.push_back("reverse");
args.push_back("--remove-all"); args.push_back("--remove-all");
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
int dbg_port = EditorSettings::get_singleton()->get("network/debug/remote_port"); int dbg_port = EditorSettings::get_singleton()->get("network/debug/remote_port");
args.clear(); args.clear();
@ -3034,7 +3034,7 @@ public:
args.push_back("tcp:" + itos(dbg_port)); args.push_back("tcp:" + itos(dbg_port));
args.push_back("tcp:" + itos(dbg_port)); args.push_back("tcp:" + itos(dbg_port));
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
print_line("Reverse result: " + itos(rv)); print_line("Reverse result: " + itos(rv));
int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port"); int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port");

6
platform/iphone/audio_driver_iphone.cpp
View File

@ -46,10 +46,8 @@ Error AudioDriverIphone::init() {
strdesc.mBytesPerPacket = strdesc.mBytesPerPacket =
strdesc.mBytesPerFrame * strdesc.mFramesPerPacket; strdesc.mBytesPerFrame * strdesc.mFramesPerPacket;
OSStatus result = noErr;
AURenderCallbackStruct callback; AURenderCallbackStruct callback;
AudioComponentDescription desc; AudioComponentDescription desc;
AudioComponent comp = NULL;
const AudioUnitElement output_bus = 0; const AudioUnitElement output_bus = 0;
const AudioUnitElement bus = output_bus; const AudioUnitElement bus = output_bus;
const AudioUnitScope scope = kAudioUnitScope_Input; const AudioUnitScope scope = kAudioUnitScope_Input;
@ -57,10 +55,10 @@ Error AudioDriverIphone::init() {
zeromem(&desc, sizeof(desc)); zeromem(&desc, sizeof(desc));
desc.componentType = kAudioUnitType_Output; desc.componentType = kAudioUnitType_Output;
desc.componentSubType = kAudioUnitSubType_RemoteIO; /* !!! FIXME: ? */ desc.componentSubType = kAudioUnitSubType_RemoteIO; /* !!! FIXME: ? */
comp = AudioComponentFindNext(NULL, &desc); AudioComponent comp = AudioComponentFindNext(NULL, &desc);
desc.componentManufacturer = kAudioUnitManufacturer_Apple; desc.componentManufacturer = kAudioUnitManufacturer_Apple;
result = AudioComponentInstanceNew(comp, &audio_unit); OSStatus result = AudioComponentInstanceNew(comp, &audio_unit);
ERR_FAIL_COND_V(result != noErr, FAILED); ERR_FAIL_COND_V(result != noErr, FAILED);
ERR_FAIL_COND_V(comp == NULL, FAILED); ERR_FAIL_COND_V(comp == NULL, FAILED);

10
platform/osx/joypad_osx.cpp
View File

@ -217,10 +217,9 @@ static void joypad_added_callback(void *ctx, IOReturn res, void *sender, IOHIDDe
} }
static bool is_joypad(IOHIDDeviceRef p_device_ref) { static bool is_joypad(IOHIDDeviceRef p_device_ref) {
CFTypeRef refCF = NULL;
int usage_page = 0; int usage_page = 0;
int usage = 0; int usage = 0;
refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDPrimaryUsagePageKey)); CFTypeRef refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDPrimaryUsagePageKey));
if (refCF) { if (refCF) {
CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &usage_page); CFNumberGetValue((CFNumberRef)refCF, kCFNumberSInt32Type, &usage_page);
} }
@ -289,13 +288,11 @@ static String _hex_str(uint8_t p_byte) {
bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) { bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) {
CFTypeRef refCF = NULL;
p_joy->device_ref = p_device_ref; p_joy->device_ref = p_device_ref;
/* get device name */ /* get device name */
String name; String name;
char c_name[256]; char c_name[256];
refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDProductKey)); CFTypeRef refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDProductKey));
if (!refCF) { if (!refCF) {
refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDManufacturerKey)); refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDManufacturerKey));
} }
@ -334,8 +331,7 @@ bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) {
input->joy_connection_changed(id, true, name, guid); input->joy_connection_changed(id, true, name, guid);
} }
CFArrayRef array = NULL; CFArrayRef array = IOHIDDeviceCopyMatchingElements(p_device_ref, NULL, kIOHIDOptionsTypeNone);
array = IOHIDDeviceCopyMatchingElements(p_device_ref, NULL, kIOHIDOptionsTypeNone);
if (array) { if (array) {
p_joy->add_hid_elements(array); p_joy->add_hid_elements(array);
CFRelease(array); CFRelease(array);

3
platform/windows/os_windows.cpp
View File

@ -716,8 +716,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
} break; } break;
case WM_DROPFILES: { case WM_DROPFILES: {
HDROP hDropInfo = NULL; HDROP hDropInfo = (HDROP)wParam;
hDropInfo = (HDROP)wParam;
const int buffsize = 4096; const int buffsize = 4096;
wchar_t buf[buffsize]; wchar_t buf[buffsize];

4
platform/x11/context_gl_x11.cpp
View File

@ -98,11 +98,9 @@ static void set_class_hint(Display *p_display, Window p_window) {
Error ContextGL_X11::initialize() { Error ContextGL_X11::initialize() {
GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = NULL;
//const char *extensions = glXQueryExtensionsString(x11_display, DefaultScreen(x11_display)); //const char *extensions = glXQueryExtensionsString(x11_display, DefaultScreen(x11_display));
glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((const GLubyte *)"glXCreateContextAttribsARB"); GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((const GLubyte *)"glXCreateContextAttribsARB");
ERR_FAIL_COND_V(!glXCreateContextAttribsARB, ERR_UNCONFIGURED); ERR_FAIL_COND_V(!glXCreateContextAttribsARB, ERR_UNCONFIGURED);

6
platform/x11/os_x11.cpp
View File

@ -191,8 +191,7 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au
::XIMStyles *xim_styles = NULL; ::XIMStyles *xim_styles = NULL;
xim_style = 0L; xim_style = 0L;
char *imvalret = NULL; char *imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL);
imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL);
if (imvalret != NULL || xim_styles == NULL) { if (imvalret != NULL || xim_styles == NULL) {
fprintf(stderr, "Input method doesn't support any styles\n"); fprintf(stderr, "Input method doesn't support any styles\n");
} }
@ -2140,8 +2139,7 @@ bool OS_X11::is_vsync_enabled() const {
void OS_X11::set_context(int p_context) { void OS_X11::set_context(int p_context) {
XClassHint *classHint = NULL; XClassHint *classHint = XAllocClassHint();
classHint = XAllocClassHint();
if (classHint) { if (classHint) {
if (p_context == CONTEXT_EDITOR) if (p_context == CONTEXT_EDITOR)

4
scene/2d/polygon_2d.cpp
View File

@ -143,9 +143,7 @@ void Polygon2D::_notification(int p_what) {
Transform2D texmat(tex_rot, tex_ofs); Transform2D texmat(tex_rot, tex_ofs);
texmat.scale(tex_scale); texmat.scale(tex_scale);
Size2 tex_size = Vector2(1, 1); Size2 tex_size = texture->get_size();
tex_size = texture->get_size();
uvs.resize(points.size()); uvs.resize(points.size());
if (points.size() == uv.size()) { if (points.size() == uv.size()) {

3
scene/3d/vehicle_body.cpp
View File

@ -559,6 +559,9 @@ void VehicleBody::_resolve_single_bilateral(PhysicsDirectBodyState *s, const Vec
b2invinertia, b2invinertia,
b2invmass); b2invmass);
// FIXME: rel_vel assignment here is overwritten by the following assignment.
// What seemes to be intented in the next next assignment is: rel_vel = normal.dot(rel_vel);
// Investigate why.
real_t rel_vel = jac.getRelativeVelocity( real_t rel_vel = jac.getRelativeVelocity(
s->get_linear_velocity(), s->get_linear_velocity(),
s->get_transform().basis.transposed().xform(s->get_angular_velocity()), s->get_transform().basis.transposed().xform(s->get_angular_velocity()),

4
scene/gui/text_edit.cpp
View File

@ -3898,11 +3898,9 @@ bool TextEdit::search(const String &p_key, uint32_t p_search_flags, int p_from_l
//search through the whole documment, but start by current line //search through the whole documment, but start by current line
int line = -1; int line = p_from_line;
int pos = -1; int pos = -1;
line = p_from_line;
for (int i = 0; i < text.size() + 1; i++) { for (int i = 0; i < text.size() + 1; i++) {
//backwards is broken... //backwards is broken...
//int idx=(p_search_flags&SEARCH_BACKWARDS)?(text.size()-i):i; //do backwards seearch //int idx=(p_search_flags&SEARCH_BACKWARDS)?(text.size()-i):i; //do backwards seearch

1
scene/gui/tree.cpp
View File

@ -1459,7 +1459,6 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c
c.selected = true; c.selected = true;
selected_item = p_selected; selected_item = p_selected;
selected_col = 0; selected_col = 0;
selected_item = p_selected;
if (!emitted_row) { if (!emitted_row) {
emit_signal("item_selected"); emit_signal("item_selected");
emitted_row = true; emitted_row = true;

1
scene/gui/video_player.cpp
View File

@ -399,7 +399,6 @@ VideoPlayer::VideoPlayer() {
paused = false; paused = false;
autoplay = false; autoplay = false;
expand = true; expand = true;
loops = false;
audio_track = 0; audio_track = 0;

10
scene/resources/primitive_meshes.cpp
View File

@ -1016,13 +1016,9 @@ void PrismMesh::_create_mesh_array(Array &p_arr) const {
for (j = 0; j <= (subdivide_h + 1); j++) { for (j = 0; j <= (subdivide_h + 1); j++) {
float scale = (y - start_pos.y) / size.y; float scale = (y - start_pos.y) / size.y;
float scaled_size_x = size.x * scale; float scaled_size_x = size.x * scale;
float start_x = start_pos.x; float start_x = start_pos.x + (1.0 - scale) * size.x * left_to_right;
float offset_front = 0.0; float offset_front = (1.0 - scale) * onethird * left_to_right;
float offset_back = 0.0; float offset_back = (1.0 - scale) * onethird * (1.0 - left_to_right);
start_x += (1.0 - scale) * size.x * left_to_right;
offset_front += (1.0 - scale) * onethird * left_to_right;
offset_back = (1.0 - scale) * onethird * (1.0 - left_to_right);
x = 0.0; x = 0.0;
for (i = 0; i <= (subdivide_w + 1); i++) { for (i = 0; i <= (subdivide_w + 1); i++) {

1
servers/physics/broad_phase_octree.cpp
View File

@ -124,6 +124,5 @@ BroadPhaseOctree::BroadPhaseOctree() {
octree.set_unpair_callback(_unpair_callback, this); octree.set_unpair_callback(_unpair_callback, this);
pair_callback = NULL; pair_callback = NULL;
pair_userdata = NULL; pair_userdata = NULL;
pair_callback = NULL;
unpair_userdata = NULL; unpair_userdata = NULL;
} }

10
servers/physics/space_sw.cpp
View File

@ -474,8 +474,7 @@ bool PhysicsDirectSpaceStateSW::rest_info(RID p_shape, const Transform &p_shape_
Vector3 PhysicsDirectSpaceStateSW::get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const { Vector3 PhysicsDirectSpaceStateSW::get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const {
CollisionObjectSW *obj = NULL; CollisionObjectSW *obj = PhysicsServerSW::singleton->area_owner.getornull(p_object);
obj = PhysicsServerSW::singleton->area_owner.getornull(p_object);
if (!obj) { if (!obj) {
obj = PhysicsServerSW::singleton->body_owner.getornull(p_object); obj = PhysicsServerSW::singleton->body_owner.getornull(p_object);
} }
@ -598,11 +597,8 @@ bool SpaceSW::test_body_motion(BodySW *p_body, const Transform &p_from, const Ve
cbk.amount = 0; cbk.amount = 0;
cbk.ptr = sr; cbk.ptr = sr;
CollisionSolverSW::CallbackResult cbkres = NULL; PhysicsServerSW::CollCbkData *cbkptr = &cbk;
CollisionSolverSW::CallbackResult cbkres = PhysicsServerSW::_shape_col_cbk;
PhysicsServerSW::CollCbkData *cbkptr = NULL;
cbkptr = &cbk;
cbkres = PhysicsServerSW::_shape_col_cbk;
bool collided = false; bool collided = false;

6
servers/physics_2d/joints_2d_sw.cpp
View File

@ -408,8 +408,10 @@ bool GrooveJoint2DSW::setup(real_t p_step) {
//joint->bias = cpvclamp(cpvmult(delta, -joint->constraint.biasCoef*dt_inv), joint->constraint.maxBias); //joint->bias = cpvclamp(cpvmult(delta, -joint->constraint.biasCoef*dt_inv), joint->constraint.maxBias);
Vector2 delta = (B->get_transform().get_origin() + rB) - (A->get_transform().get_origin() + rA); Vector2 delta = (B->get_transform().get_origin() + rB) - (A->get_transform().get_origin() + rA);
real_t _b = get_bias();
_b = 0.001; // FIXME: We used to do this assignment and then override it with 0.001 right after. Investigate why.
//real_t _b = get_bias();
real_t _b = 0.001;
gbias = (delta * -(_b == 0 ? space->get_constraint_bias() : _b) * (1.0 / p_step)).clamped(get_max_bias()); gbias = (delta * -(_b == 0 ? space->get_constraint_bias() : _b) * (1.0 / p_step)).clamped(get_max_bias());
// apply accumulated impulse // apply accumulated impulse

7
servers/physics_2d/space_2d_sw.cpp
View File

@ -532,11 +532,8 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body, const Transform2D &p_from, co
cbk.amount = 0; cbk.amount = 0;
cbk.ptr = sr; cbk.ptr = sr;
CollisionSolver2DSW::CallbackResult cbkres = NULL; Physics2DServerSW::CollCbkData *cbkptr = &cbk;
CollisionSolver2DSW::CallbackResult cbkres = Physics2DServerSW::_shape_col_cbk;
Physics2DServerSW::CollCbkData *cbkptr = NULL;
cbkptr = &cbk;
cbkres = Physics2DServerSW::_shape_col_cbk;
bool collided = false; bool collided = false;