diff options
author | Aki <nthirtyone@gmail.com> | 2018-04-08 15:20:58 +0200 |
---|---|---|
committer | Aki <nthirtyone@gmail.com> | 2018-04-08 15:20:58 +0200 |
commit | ea62ce8ec8ae07ff6d421b4146d2503ef0f67574 (patch) | |
tree | b0adc2b1735d103e55aed7bdd0c462b2ea5e359f /not/World.lua | |
parent | 08271656cbe18fbc4432fc758ac42750e818da84 (diff) | |
parent | 290d75dceb905217cb67fcb32e95dbeb45e27e3c (diff) | |
download | roflnauts-ea62ce8ec8ae07ff6d421b4146d2503ef0f67574.zip roflnauts-ea62ce8ec8ae07ff6d421b4146d2503ef0f67574.tar.gz roflnauts-ea62ce8ec8ae07ff6d421b4146d2503ef0f67574.tar.bz2 |
Merge branch 'love-11.0' into control
Diffstat (limited to 'not/World.lua')
-rw-r--r-- | not/World.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/not/World.lua b/not/World.lua index 6bc5e18..b01a94e 100644 --- a/not/World.lua +++ b/not/World.lua @@ -132,9 +132,9 @@ function World:buildMap () x = op.x y = op.y elseif op.animations then - entity:setAnimationsList(getAnimations(op.animations)) - _,_,x,y = bg:getAnimation()[1]:getViewport() - bg:setPosition(x / -2, y / -2) + entity:setAnimations(getAnimations(op.animations)) + _,_,x,y = entity:getAnimation()[1]:getViewport() + x, y = x / -2, y / -2 else local image = love.graphics.newImage(imagePath) x = image:getWidth() / -2 @@ -369,11 +369,11 @@ function World:draw () self.camera:push() self.camera:transform(getScale(), 1, love.graphics.getDimensions()) - love.graphics.setColor(130,130,130) + love.graphics.setColor(.5, .5, .5) love.graphics.line(ax,center.y,bx,center.y) love.graphics.line(center.x,ay,center.x,by) - love.graphics.setColor(200,200,200) + love.graphics.setColor(.78, .78, .78) love.graphics.line(ax,0,bx,0) love.graphics.line(0,ay,0,by) self.camera:pop() |