diff options
author | Aki <nthirtyone@gmail.com> | 2017-09-22 19:38:39 +0200 |
---|---|---|
committer | Aki <nthirtyone@gmail.com> | 2017-09-22 19:38:39 +0200 |
commit | 6d530ace4d6a445d3136cca180f54f8add3d81fc (patch) | |
tree | 0dd6d7b0ffe24a8f9962d71ef6c3bfc572871ce1 /not/World.lua | |
parent | c4524ee39e0ff90bde0df0ce7a0c14f74eeb152f (diff) | |
parent | eabad160152f5bf6e7dd442de46b135a1a59f75e (diff) | |
download | roflnauts-6d530ace4d6a445d3136cca180f54f8add3d81fc.zip roflnauts-6d530ace4d6a445d3136cca180f54f8add3d81fc.tar.gz roflnauts-6d530ace4d6a445d3136cca180f54f8add3d81fc.tar.bz2 |
Merge branch 'icons'
Diffstat (limited to 'not/World.lua')
-rw-r--r-- | not/World.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/not/World.lua b/not/World.lua index 4523efa..6bc5e18 100644 --- a/not/World.lua +++ b/not/World.lua @@ -468,7 +468,7 @@ function World:controlpressed (set, action, key) map.filename = filename local nauts = {} for _,naut in pairs(self:getNautsAll()) do - table.insert(nauts, {naut.name, naut:getControllerSet()}) + table.insert(nauts, {naut.config, naut:getControllerSet()}) end local new = World(map, nauts) sceneManager:changeScene(new) |