Skip to content

Commit a36602f

Browse files
committed
Fix compilation errors for Godot 4.2
1 parent 0d50c62 commit a36602f

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

register_types.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ VisualScriptLanguage *visual_script_language = nullptr;
4646
static VisualScriptCustomNodes *vs_custom_nodes_singleton = nullptr;
4747
#endif
4848

49-
void initialize_visual_script_module(ModuleInitializationLevel p_level) {
49+
void initialize_godot_visual_script_module(ModuleInitializationLevel p_level) {
5050
if (p_level == MODULE_INITIALIZATION_LEVEL_SERVERS) {
5151
visual_script_language = memnew(VisualScriptLanguage);
5252
// script_language_gd->init();
@@ -122,7 +122,7 @@ void initialize_visual_script_module(ModuleInitializationLevel p_level) {
122122
#endif
123123
}
124124

125-
void uninitialize_visual_script_module(ModuleInitializationLevel p_level) {
125+
void uninitialize_godot_visual_script_module(ModuleInitializationLevel p_level) {
126126
if (p_level == MODULE_INITIALIZATION_LEVEL_SERVERS) {
127127
unregister_visual_script_nodes();
128128

register_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include "modules/register_module_types.h"
3535

36-
void initialize_visual_script_module(ModuleInitializationLevel p_level);
37-
void uninitialize_visual_script_module(ModuleInitializationLevel p_level);
36+
void initialize_godot_visual_script_module(ModuleInitializationLevel p_level);
37+
void uninitialize_godot_visual_script_module(ModuleInitializationLevel p_level);
3838

3939
#endif // VISUAL_SCRIPT_REGISTER_TYPES_H

visual_script.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,10 @@ bool VisualScript::is_valid() const {
873873
return true; // Always valid.
874874
}
875875

876+
bool VisualScript::is_abstract() const {
877+
return false;
878+
}
879+
876880
ScriptLanguage *VisualScript::get_language() const {
877881
return VisualScriptLanguage::singleton;
878882
}
@@ -2432,6 +2436,9 @@ bool VisualScriptLanguage::is_control_flow_keyword(String p_keyword) const {
24322436
void VisualScriptLanguage::get_comment_delimiters(
24332437
List<String> *p_delimiters) const {}
24342438

2439+
void VisualScriptLanguage::get_doc_comment_delimiters(
2440+
List<String> *p_delimiters) const {}
2441+
24352442
void VisualScriptLanguage::get_string_delimiters(
24362443
List<String> *p_delimiters) const {}
24372444

visual_script.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ class VisualScript : public Script {
269269
protected:
270270
void _node_ports_changed(int p_id);
271271
static void _bind_methods();
272-
273272
public:
274273
bool inherits_script(const Ref<Script> &p_script) const override;
275274

@@ -380,6 +379,7 @@ class VisualScript : public Script {
380379

381380
virtual bool is_tool() const override;
382381
virtual bool is_valid() const override;
382+
virtual bool is_abstract() const override;
383383

384384
virtual ScriptLanguage *get_language() const override;
385385

@@ -636,6 +636,8 @@ class VisualScriptLanguage : public ScriptLanguage {
636636
virtual bool is_control_flow_keyword(String p_keyword) const override;
637637
virtual void
638638
get_comment_delimiters(List<String> *p_delimiters) const override;
639+
virtual void
640+
get_doc_comment_delimiters(List<String> *p_delimiters) const override;
639641
virtual void get_string_delimiters(List<String> *p_delimiters) const override;
640642
virtual bool is_using_templates() override;
641643
virtual Ref<Script>

0 commit comments

Comments
 (0)