projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow custom flags for blending.
[naja.git]
/
naja
/
widgets
/
info_area.py
diff --git
a/naja/widgets/info_area.py
b/naja/widgets/info_area.py
index 0a3990e80054711da2d792449eb82d720935ea00..ef3f017fbc4b661efaa1d42ed89909909b11961c 100644
(file)
--- a/
naja/widgets/info_area.py
+++ b/
naja/widgets/info_area.py
@@
-5,7
+5,7
@@
import pygame
import pygame.locals as pgl
from naja.constants import (
import pygame.locals as pgl
from naja.constants import (
- INFO_SIZE,
EIGHT_BIT_SCALE,
ACT, KEYS, EXAMINE, PALETTE,
+ INFO_SIZE, ACT, KEYS, EXAMINE, PALETTE,
ACTION_TEXT_OFFSET, INFO_LEFT_PADDING)
from naja.events import finish_event
from naja.resources import resources
ACTION_TEXT_OFFSET, INFO_LEFT_PADDING)
from naja.events import finish_event
from naja.resources import resources
@@
-77,7
+77,7
@@
class InfoAreaWidget(Widget):
hint_text += HINT_LEGAL_MOVE
hint = TextBoxWidget((4, 0), hint_text, padding=2,
hint_text += HINT_LEGAL_MOVE
hint = TextBoxWidget((4, 0), hint_text, padding=2,
- box_width=(INFO_SIZE[0] - 4)
// EIGHT_BIT_SCALE
)
+ box_width=(INFO_SIZE[0] - 4))
hint.prepare()
y_offset = (
INFO_SIZE[1] - hint.surface.get_rect().height - INFO_LEFT_PADDING
hint.prepare()
y_offset = (
INFO_SIZE[1] - hint.surface.get_rect().height - INFO_LEFT_PADDING
@@
-94,8
+94,7
@@
class InfoAreaWidget(Widget):
text = TextBoxWidget(
(x_offset, y_offset), action.get_text(self.card),
text = TextBoxWidget(
(x_offset, y_offset), action.get_text(self.card),
- box_width=(INFO_SIZE[0] - 16) // EIGHT_BIT_SCALE,
- fontsize=28, colour=text_colour)
+ box_width=(INFO_SIZE[0] - 16), fontsize=28, colour=text_colour)
text.render(self.surface)
border_colour = None
text.render(self.surface)
border_colour = None
@@
-168,7
+167,7
@@
class InfoAreaWidget(Widget):
else:
sound.play_sound('chirp.ogg', volume=0.5)
action.perform_action(self.state.gameboard, self.card)
else:
sound.play_sound('chirp.ogg', volume=0.5)
action.perform_action(self.state.gameboard, self.card)
- self.state.gameboard.
replace_car
d(player.position)
+ self.state.gameboard.
card_use
d(player.position)
self.state.gameboard.change_mode(EXAMINE)
self.set_position(player.position)
self.state.gameboard.change_mode(EXAMINE)
self.set_position(player.position)