Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Aguiar <alanjas@hotmail.com>2013-09-18 04:30:00 (GMT)
committer Alan Aguiar <alanjas@hotmail.com>2013-09-18 04:30:00 (GMT)
commit7a6c1b7479dc2ee85b197beb04f499173dd0c359 (patch)
treee0ffd236970e420748acd4b5f4e0cfaf642052a5 /src
parent47b13508d85b14003f92a4683f2b135f1c6fb2e3 (diff)
update paths with new .jpgs
Diffstat (limited to 'src')
-rw-r--r--src/game/Area1Game1.py5
-rw-r--r--src/game/Area1Game6.py2
-rw-r--r--src/game/HallState.py12
-rw-r--r--src/game/PresentationState.py2
-rw-r--r--src/game/SelectAreaState.py2
-rw-r--r--src/game/SelectCharacterState.py2
-rw-r--r--src/game/SelectPartidaState.py2
7 files changed, 13 insertions, 14 deletions
diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index ff5ce27..90b1ae2 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -148,8 +148,9 @@ class CArea1Game1(CGameState):
self.mActivePiece = None
self.mBad = 0
self.mGood = 0
+ self.mDialog = None
- self.mBackground = Image.loadImage('assets/images/a1g1/A1G1-back.png', False)
+ self.mBackground = Image.loadImage('assets/images/a1g1/A1G1-back.jpg', False)
CGame().setBackground(self.mBackground)
self.mBox = CSprite()
@@ -239,8 +240,6 @@ class CArea1Game1(CGameState):
self.mAlphaSet = False
-
-
self.mButtonAccept = CButton()
self.mButtonAccept.set_bgColor((125, 255, 125))
self.mButtonAccept.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index d36075d..3fdee2a 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -178,7 +178,7 @@ class CArea1Game6(CGameState):
self.mButtonBack.set_text(_('Volver'))
CGame().addChild(self.mButtonBack)
- self.mBackground = Image.loadImage('assets/images/a1g6/A1G6-fondo.png', False)
+ self.mBackground = Image.loadImage('assets/images/a1g6/A1G6-fondo.jpg', False)
CGame().setBackground(self.mBackground)
self.mBase = CSprite()
diff --git a/src/game/HallState.py b/src/game/HallState.py
index 06ed4e8..b8e9eae 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -55,12 +55,12 @@ class CHallState(CGameState):
self.mButtonBack.set_text(_("Volver"))
CGame().addChild(self.mButtonBack)
- self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-1.png', False))
- self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-2.png', False))
- self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-3.png', False))
- self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-4.png', False))
- self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-5.png', False))
- self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-6.png', False))
+ self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-1.jpg', False))
+ self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-2.jpg', False))
+ self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-3.jpg', False))
+ self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-4.jpg', False))
+ self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-5.jpg', False))
+ self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-6.jpg', False))
CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index b4336d7..f12f06d 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -15,7 +15,7 @@ class CPresentationState(CGameState):
def init(self):
CGameState.__init__(self)
- self.mBackground = Image.loadImage('assets/images/selectArea/background.png', False)
+ self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
CGame().setBackground(self.mBackground)
self.mElisa = CSprite()
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index 6b0c774..261ccb1 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -53,7 +53,7 @@ class CSelectAreaState(CGameState):
self.mButtonBack.set_text(_("Volver"))
CGame().addChild(self.mButtonBack)
- self.mBackground = Image.loadImage('assets/images/selectArea/background.png', False)
+ self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
CGame().setBackground(self.mBackground)
self.mAreas_list = []
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index be3ae02..94e66c1 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -23,7 +23,7 @@ class CSelectCharacterState(CGameState):
self.mPartida = None
- self.mBackground = Image.loadImage('assets/images/selectArea/background.png', False)
+ self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
CGame().setBackground(self.mBackground)
border = Image.loadImage('assets/images/selectPartida/border.png')
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
index f966541..7bec1df 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -21,7 +21,7 @@ class CSelectPartidaState(CGameState):
def init(self):
CGameState.__init__(self)
- self.mBackground = Image.loadImage('assets/images/selectArea/background.png', False)
+ self.mBackground = Image.loadImage('assets/images/selectArea/background.jpg', False)
CGame().setBackground(self.mBackground)
self.mOverEnabled = True