Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/api/Game.py2
-rw-r--r--src/api/Points.py2
-rw-r--r--src/api/Sprite.py (renamed from src/api/Sprite2.py)0
-rw-r--r--src/game/Area1Game1.py2
-rw-r--r--src/game/Area1Game3.py4
-rw-r--r--src/game/Area1Game4.py2
-rw-r--r--src/game/Area1Game5.py2
-rw-r--r--src/game/Area1Game6.py2
-rw-r--r--src/game/Area2Game2.py2
-rw-r--r--src/game/BoyHall.py4
-rw-r--r--src/game/CreditsState.py2
-rw-r--r--src/game/HallState.py2
-rw-r--r--src/game/HelpState.py2
-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
17 files changed, 18 insertions, 18 deletions
diff --git a/src/api/Game.py b/src/api/Game.py
index bf4b9ce..b785f49 100644
--- a/src/api/Game.py
+++ b/src/api/Game.py
@@ -6,7 +6,7 @@ import pygame
#import pygame.font
#import pygame.display
#import pygame.sprite
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.Mouse import CMouse
from PartidasMan import getPartidasFromFile
from PartidasMan import setPartidasToFile
diff --git a/src/api/Points.py b/src/api/Points.py
index 0d425c2..f857388 100644
--- a/src/api/Points.py
+++ b/src/api/Points.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pygame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
class CPoints(CSprite):
diff --git a/src/api/Sprite2.py b/src/api/Sprite.py
index b8c9e42..b8c9e42 100644
--- a/src/api/Sprite2.py
+++ b/src/api/Sprite.py
diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py
index 660941f..9dbc305 100644
--- a/src/game/Area1Game1.py
+++ b/src/game/Area1Game1.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pygame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.Button import CButton
from api.Points import CPoints
from api.Label import CLabel
diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py
index 73b87f2..5e75f01 100644
--- a/src/game/Area1Game3.py
+++ b/src/game/Area1Game3.py
@@ -6,7 +6,7 @@ import api.Image as Image
from api.Game import CGame
from api.GameState import CGameState
from api.Button import CButton
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.Points import CPoints
from api.Globe import Globe
import HallState
@@ -423,4 +423,4 @@ class CArea1Game3(CGameState):
self.mInstructions = None
self.mButtonAccept = None
self.mDialog = None
- \ No newline at end of file
+
diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index d14c734..f25d3d3 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -7,7 +7,7 @@ from api.Game import CGame
from api.GameState import CGameState
from api.Button import CButton
from api.Globe import Globe
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.MultiLabel import CMultiLabel
from api.Points import CPoints
import HallState
diff --git a/src/game/Area1Game5.py b/src/game/Area1Game5.py
index 7948ec8..83b930f 100644
--- a/src/game/Area1Game5.py
+++ b/src/game/Area1Game5.py
@@ -6,7 +6,7 @@ import api.Image as Image
from api.Game import CGame
from api.GameState import CGameState
from api.Button import CButton
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.Points import CPoints
from api.Globe import Globe
import HallState
diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index 110f0d5..b399b33 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pygame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.Points import CPoints
from api.MultiLabel import CMultiLabel
from api.Mouse import CMouse
diff --git a/src/game/Area2Game2.py b/src/game/Area2Game2.py
index b1912f7..eb58ada 100644
--- a/src/game/Area2Game2.py
+++ b/src/game/Area2Game2.py
@@ -5,7 +5,7 @@ import api.Image as Image
from api.Game import CGame
from api.GameState import CGameState
from api.Button import CButton
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.MultiLabel import CMultiLabel
from api.Points import CPoints
import HallState
diff --git a/src/game/BoyHall.py b/src/game/BoyHall.py
index 917dcaa..1b672ad 100644
--- a/src/game/BoyHall.py
+++ b/src/game/BoyHall.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pygame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
import api.Image as Image
from api.Anim import CAnim
from api.Mouse import CMouse
@@ -151,4 +151,4 @@ class CBoyHall(CSprite):
def getState(self):
return self.mState
- \ No newline at end of file
+
diff --git a/src/game/CreditsState.py b/src/game/CreditsState.py
index 1d546be..b40a88a 100644
--- a/src/game/CreditsState.py
+++ b/src/game/CreditsState.py
@@ -4,7 +4,7 @@ import pygame
import MenuState
from api.GameState import CGameState
from api.Game import CGame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.MultiLabel import CMultiLabel
import api.Image as Image
diff --git a/src/game/HallState.py b/src/game/HallState.py
index c440954..f2d9dec 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -5,7 +5,7 @@ import SelectAreaState
from api.GameState import CGameState
from api.Game import CGame
import api.Image as CImage
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
import api.Image as Image
from api.Mouse import CMouse
import api.Math as CMath
diff --git a/src/game/HelpState.py b/src/game/HelpState.py
index c3b85d5..47d328d 100644
--- a/src/game/HelpState.py
+++ b/src/game/HelpState.py
@@ -3,7 +3,7 @@
import MenuState
from api.GameState import CGameState
from api.Game import CGame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.MultiLabel import CMultiLabel
import api.Image as Image
diff --git a/src/game/PresentationState.py b/src/game/PresentationState.py
index fe5e104..ff2c23e 100644
--- a/src/game/PresentationState.py
+++ b/src/game/PresentationState.py
@@ -3,7 +3,7 @@
import MenuState
from api.GameState import CGameState
from api.Game import CGame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
import api.Image as Image
from api.Mouse import CMouse
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index d035bc1..cef2136 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -5,7 +5,7 @@ import MenuState
from api.GameState import CGameState
from api.MultiLabel import CMultiLabel
from api.Game import CGame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
import api.Image as Image
from api.Mouse import CMouse
import api.Math as CMath
diff --git a/src/game/SelectCharacterState.py b/src/game/SelectCharacterState.py
index 18da7d8..99220a9 100644
--- a/src/game/SelectCharacterState.py
+++ b/src/game/SelectCharacterState.py
@@ -4,7 +4,7 @@ import pygame
from api.GameState import CGameState
from api.Label import CLabel
from api.Game import CGame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from SelectAreaState import CSelectAreaState
import api.Image as Image
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
index e4818c5..4f7e5f3 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -4,7 +4,7 @@ import pygame
from api.GameState import CGameState
from api.Label import CLabel
from api.Game import CGame
-from api.Sprite2 import CSprite
+from api.Sprite import CSprite
from api.Globe import Globe
from api.Button import CButton
from api.PartidasMan import Partida
generated by cgit v0.9.1 at 2024-04-19 08:13:18 (GMT)