Skip to content

Commit 33330e8

Browse files
committed
Godot 4.0 compatibility
FuncRefs are replaced by Callables, and there's a change to array syntax The demo projects will still need attention, but the console works in Godot 4.
1 parent 2e15416 commit 33330e8

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

addons/quentincaffeino/callback/src/FuncRefCallback.gd renamed to addons/quentincaffeino/callback/src/CallableCallback.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ func call(argv = []):
2222
return
2323

2424
# Execute call
25-
return self._target.call_funcv(self._get_args(argv))
25+
return self._target.call(self._get_args(argv))

addons/quentincaffeino/callback/src/CallbackBuilder.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extends RefCounted
33

44
const Utils = preload("./Utils.gd")
55
const Callback = preload("./Callback.gd")
6-
const FuncRefCallback = preload("./FuncRefCallback.gd")
6+
const CallableCallback = preload("./CallableCallback.gd")
77
const errors = preload("../assets/translations/errors.en.gd").messages
88

99

@@ -76,8 +76,8 @@ func build():
7676
print(errors["qc.callback.canCreate.first_arg"] % str(typeof(self._target)))
7777
return null
7878

79-
if Utils.is_funcref(self._target):
80-
return FuncRefCallback.new(self._target)
79+
if self._target is Callable:
80+
return CallableCallback.new(self._target)
8181

8282
if typeof(self._name) != TYPE_STRING:
8383
print(errors["qc.callback.canCreate.second_arg"] % str(typeof(self._name)))

addons/quentincaffeino/console/src/ConsoleLine.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static func _parse_commands(input):
143143
# @returns Dictionary
144144
static func _parse_command(rawCommand):
145145
var name = ''
146-
var arguments: Array[String] = Array()
146+
var arguments: Array[String] = []
147147

148148
var beginning = 0 # int
149149
var openQuote # String|null

demo-csharp/Demo-csharp.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Godot.NET.Sdk/4.0.0-beta.16">
2-
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4-
<RootNamespace>Democsharp</RootNamespace>
5-
</PropertyGroup>
1+
<Project Sdk="Godot.NET.Sdk/4.0.0">
2+
<PropertyGroup>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<RootNamespace>Democsharp</RootNamespace>
5+
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)