Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 1800 points bug and finally get beautiful support working 

This commit (finally) fixes beautiful support, now it should work with
beautiful and without.

Another fixed serious bug is that no more enemies are spawned if the
score is higher than 1800
This commit is contained in:
Gregor Best 2008-10-15 18:59:31 +02:00
parent 497f5b45d8
commit 1f8d52b3f5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/invaders.lua.in
View File

@ -25,7 +25,7 @@
local wibox = wibox local wibox = wibox
local widget = widget local widget = widget
local awful = require("awful") local awful = require("awful")
local beautiful = awful.beautiful.get() local beautiful = require("awful.beautiful")
local keygrabber = keygrabber local keygrabber = keygrabber
local image = image local image = image
@ -261,7 +261,7 @@ function enemies.handle ()
if gamedata.enemies.number == 0 then if gamedata.enemies.number == 0 then
enemies.setup() enemies.setup()
if gamedata.enemies.speed > 0 then gamedata.enemies.speed = gamedata.enemies.speed - 1 end if gamedata.enemies.speed > 1 then gamedata.enemies.speed = gamedata.enemies.speed - 1 end
return false return false
end end
@ -426,8 +426,8 @@ function game.highscore (score)
end end
gamedata.highscore.window = wibox({ position = "floating", gamedata.highscore.window = wibox({ position = "floating",
bg = beautiful.bg_focus or "#333333", bg = gamedata.btheme.bg_focus or "#333333",
fg = beautiful.fg_focus or "#FFFFFF" }) fg = gamedata.btheme.fg_focus or "#FFFFFF" })
gamedata.highscore.window:geometry({ height = 20, width = 300, gamedata.highscore.window:geometry({ height = 20, width = 300,
x = gamedata.field.x + math.floor(gamedata.field.w / 2) - 150, x = gamedata.field.x + math.floor(gamedata.field.w / 2) - 150,
y = gamedata.field.y + math.floor(gamedata.field.h / 2) }) y = gamedata.field.y + math.floor(gamedata.field.h / 2) })
@ -452,13 +452,13 @@ function run()
gamedata.score = 0 gamedata.score = 0
gamedata.name = "" gamedata.name = ""
gamedata.ammo = gamedata.ammo_max gamedata.ammo = gamedata.ammo_max
gamedata.btheme = beautiful.get()
gamedata.player = player.new() gamedata.player = player.new()
gamedata.field.north = wibox({ position = "floating", gamedata.field.north = wibox({ position = "floating",
bg = beautiful.bg_focus or "#333333", bg = gamedata.btheme.bg_focus or "#333333",
fg = beautiful.fg_focus or "#FFFFFF" }) fg = gamedata.btheme.fg_focus or "#FFFFFF" })
gamedata.field.north:geometry({ width = gamedata.field.w + 10, gamedata.field.north:geometry({ width = gamedata.field.w + 10,
height = 15, height = 15,
x = gamedata.field.x - 5, x = gamedata.field.x - 5,
@ -474,16 +474,16 @@ function run()
gamedata.field.north:widgets({ gamedata.field.caption, gamedata.field.status }) gamedata.field.north:widgets({ gamedata.field.caption, gamedata.field.status })
gamedata.field.south = wibox({ position = "floating", gamedata.field.south = wibox({ position = "floating",
bg = beautiful.bg_focus or "#333333", bg = gamedata.btheme.bg_focus or "#333333",
fg = beautiful.fg_focus or "#FFFFFF" }) fg = gamedata.btheme.fg_focus or "#FFFFFF" })
gamedata.field.south:geometry({ width = gamedata.field.w, height = 5, gamedata.field.south:geometry({ width = gamedata.field.w, height = 5,
x = gamedata.field.x, x = gamedata.field.x,
y = gamedata.field.y + gamedata.field.h - 5 }) y = gamedata.field.y + gamedata.field.h - 5 })
gamedata.field.south.screen = gamedata.screen gamedata.field.south.screen = gamedata.screen
gamedata.field.west = wibox({ position = "floating", gamedata.field.west = wibox({ position = "floating",
bg = beautiful.bg_focus or "#333333", bg = gamedata.btheme.bg_focus or "#333333",
fg = beautiful.fg_focus or "#FFFFFF" }) fg = gamedata.btheme.fg_focus or "#FFFFFF" })
gamedata.field.west:geometry({ width = 5, gamedata.field.west:geometry({ width = 5,
height = gamedata.field.h, height = gamedata.field.h,
x = gamedata.field.x - 5, x = gamedata.field.x - 5,
@ -491,8 +491,8 @@ function run()
gamedata.field.west.screen = gamedata.screen gamedata.field.west.screen = gamedata.screen
gamedata.field.east = wibox({ position = "floating", gamedata.field.east = wibox({ position = "floating",
bg = beautiful.bg_focus or "#333333", bg = gamedata.btheme.bg_focus or "#333333",
fg = beautiful.fg_focus or "#FFFFFF" }) fg = gamedata.btheme.fg_focus or "#FFFFFF" })
gamedata.field.east:geometry({ width = 5, gamedata.field.east:geometry({ width = 5,
height = gamedata.field.h, height = gamedata.field.h,
x = gamedata.field.x + gamedata.field.w, x = gamedata.field.x + gamedata.field.w,