--- letters.py 2009-02-18 23:06:37.000000000 +0100 +++ letters.py 2009-02-27 23:19:01.000000000 +0100 @@ -25,7 +25,7 @@ from pygame.constants import * from CPConstants import DATADIR,HOMEDIR -from utils import load_image,load_sound,font2surf,MyError,ProgressBar,ScaleImages +from utils import load_image,load_sound,font2surf,MyError,ProgressBar,ScaleImages,PIXY try: import pyassetml,pyassetmlSDL except (ImportError,MyError),info: @@ -219,10 +219,11 @@ self.fontsize = self.fontsize - 10 l = 350 self.userword = u"" - self.wordcoor = (400-l-50,340) - self.usercoor = (self.wordcoor[0]+l+50,340) + self.wordcoor = (400-l-50,PIXY-260) + self.usercoor = (self.wordcoor[0]+l+50,PIXY-260) box = pygame.Rect(self.usercoor + (l,item[1])) box.inflate_ip(4,4) + self.pbar.clearbar(Img.screen,Img.backgr) br = pygame.draw.rect(self.screen,(9,244,9),box,2) # pythonish case in :) apply({"1":self._level_1, @@ -230,7 +231,6 @@ "3":self._level_3, "4":self._level_4}[str(level)]) - self.pbar.clearbar(Img.screen,Img.backgr) r1 = Img.screen.blit(self.wordsurf,self.wordcoor) r2 = Img.screen.blit(self.wordpic,self.piccoor) pygame.display.update((r1,r2,br)) --- memory.py 2009-02-18 22:50:34.000000000 +0100 +++ memory.py 2009-02-27 23:19:01.000000000 +0100 @@ -114,11 +114,11 @@ random.shuffle(objects) objects = objects[:num] if num > 6:# more then 12 cards -> 3x4 - size = 112 + size = (PIXY-100)/4-13 self.card_offset = 4 else: - size = 136 + size = (PIXY-100)/3-30 self.card_offset = 16 scaled = ScaleImages((Img.cback,), (size,size)) --- numbers.py 2009-02-27 21:11:02.000000000 +0100 +++ numbers.py 2009-02-27 23:19:02.000000000 +0100 @@ -24,7 +24,7 @@ import pygame from pygame.constants import * from CPConstants import DATADIR -from utils import load_image,load_sound,font2surf,MyError +from utils import load_image,load_sound,font2surf,MyError,PIXX,PIXY from SpriteUtils import CPinit,CPSprite class Img: @@ -67,7 +67,7 @@ self.oper = {"x":"*","/":"/","+":"+","-":"-"}[oper] self.rect = self.image.get_rect() self.rect.move_ip(start) - self.playfield = pygame.Rect(0,0,800,500) + self.playfield = pygame.Rect(0,0,PIXX,PIXY-100) def update(self): pos = pygame.mouse.get_pos() @@ -174,7 +174,7 @@ self.dirty_rects = [] self.objs_to_move = [] - Img.backgr.blit(Img.backorg,(0,0),(0,0,800,500)) # Restore org backgr + Img.backgr.blit(Img.backorg,(0,0),(0,0,PIXX,PIXY-100)) # Restore org backgr self._setup() self.som = apply(random.choice((self._add,self._min,self._div,self._mul)), (l*3,)) #self.som = self._div(l*3) # FOR TESTING @@ -195,7 +195,7 @@ Img.question = payload.surface #print self.hitzone up = random.choice(range(-6,-1)) - bal = Balloon(payload,(offset,500),(offset,200),up) + bal = Balloon(payload,(offset,PIXY-100),(offset,200),up) offset = offset + 100 self.objs_to_move.append((bal)) @@ -207,7 +207,7 @@ for rec in self.tokensrects: if rec.contains(pos): #print self.tokensdic - Img.backgr.blit(Img.screen,(0,0,800,500)) + Img.backgr.blit(Img.screen,(0,0,PIXX,PIXY-100)) self.objs_to_move.append((self.tokensdic[tuple(rec)])) self.token_activate = 1 return --- pong.py 2009-02-18 22:29:43.000000000 +0100 +++ pong.py 2009-02-27 23:42:51.000000000 +0100 @@ -33,7 +33,7 @@ import pygame from pygame.constants import * from utils import trace_error,MyError,load_image,load_sound,load_music,char2surf,\ - font2surf,txtfmt + font2surf,txtfmt,PIXX,PIXY from SpriteUtils import CPSprite,CPGroup,CPinit from CPMenu import MenuItem import Timer @@ -58,7 +58,7 @@ 'batsize':'72',\ 'batspeed':'12',\ 'ballspeed':'3',\ - 'goalsize':'300',\ + 'goalsize':PIXY-300,\ 'winpoints':'11',\ 'useprofile':'none',\ 'left_keyup':'q',\ @@ -232,13 +232,13 @@ def move(self): self.oldrect = self.rect[:4] - if self.rect.centerx > 764: + if self.rect.centerx > PIXX-36: Snd.bump.play() self.xoffset = -self.xoffset if self.rect.centerx < 37: Snd.bump.play() self.xoffset = abs(self.xoffset) - if self.rect.centery > 464: + if self.rect.centery > PIXY-136: Snd.bump.play() self.yoffset = -self.yoffset if self.rect.centery < 36: @@ -274,7 +274,7 @@ self.init_speed = speed self.speed = 0 self.size = size - self.top,self.bottom = 18,482 + self.top,self.bottom = 18,PIXY-118 self.up,self.down = action_keys[0].upper(),action_keys[1].upper() self.image = pygame.Surface((8,size)) self.image.fill(GREEN) @@ -337,7 +337,7 @@ self.libdir = libdir self.cpg = cpg self.datadir = os.path.join(self.libdir,'PongData') - self.gamelevels =[((130,70),(130,220),(130,370),),(None)]#positions of the game choices objects + self.gamelevels =[((130,40),(130,150),(130,260),),(None)]#positions of the game choices objects self.gameitems = [('single.jpg','multi_person.jpg','multi_pc.jpg')]#image files Misc.actives = CPinit(Img.screen,Img.backgr) self._setup() @@ -393,7 +393,7 @@ Misc.scoreboard.update() Misc.goal_r = Goal() Misc.goal_r.set_scoreboard('left') - Misc.goal_r.move((774,100)) + Misc.goal_r.move((PIXX-26,100)) Misc.goal_l = Goal() Misc.goal_l.set_scoreboard('right') if ONEPLAYER: @@ -412,7 +412,7 @@ except (TypeError,KeyError): u,d = u'p',u'l' Misc.bat_r = Bat(action_keys=(u,d),speed=rspeed)# to keep a reference to the bat, see class Ball - Misc.bat_r.set_position((768,220)) + Misc.bat_r.set_position((PIXX-32,(PIXY-300)/2+70)) try: u = unicode(Misc.rc_dic['left_keyup']) d = unicode(Misc.rc_dic['left_keydown']) @@ -437,21 +437,21 @@ def _draw_field(self): Img.screen.fill((0,0,0)) Img.backgr.fill((0,0,0)) - box = pygame.Rect(0,0,800,500).inflate(-32,-32) + box = pygame.Rect(0,0,PIXX,PIXY-100).inflate(-32,-32) #box.inflate(-32,-32) pygame.draw.rect(Img.screen,\ GREEN,\ box,\ 4) - pygame.draw.line(Img.screen,\ + pygame.draw.line(Img.screen,\ GREEN,\ (398,16),\ - (398,484),\ + (398,PIXY-116),\ 4) pygame.draw.line(Img.backgr,\ GREEN,\ (398,16),\ - (398,484),\ + (398,PIXY-116),\ 4) def _splash_controls(self): Img.screen.fill((0,0,0)) --- soundmemory.py 2009-02-27 22:17:25.000000000 +0100 +++ soundmemory.py 2009-02-27 23:19:04.000000000 +0100 @@ -23,7 +23,7 @@ import os,sys,random import pygame from pygame.constants import * -from utils import load_image,MyError,import_module,trace_error +from utils import load_image,MyError,import_module,trace_error,PIXX,PIXY from SpriteUtils import CPSprite,CPinit class Img: @@ -112,7 +112,7 @@ self.screen = screen self.backgr = backgr back_img = load_image(os.path.join(libdir,'SoundMemory','but_back.png')) - s = pygame.Surface((768, 468)).convert() + s = pygame.Surface((PIXX-32, PIXY-132)).convert() for y in range(0,257, 256): for x in range(0, 513, 256): s.blit(back_img, (x,y)) --- soundNpic.py 2009-02-18 22:24:36.000000000 +0100 +++ soundNpic.py 2009-02-27 23:19:05.000000000 +0100 @@ -22,7 +22,7 @@ import os,sys,operator,random import pygame from pygame.constants import * -from utils import load_image,load_sound,MyError,get_files +from utils import load_image,load_sound,MyError,get_files,PIXY class Img: @@ -119,13 +119,13 @@ self.rectlist = [] x = 10 offset = 10 - y = 325 + y = PIXY-250 random.shuffle(filenames) try: for item in filenames: img = load_image(os.path.join(self.libdir,'SoundNpicData',level,item+'.png'),1) snd = os.path.join(self.libdir,'SoundNpicData',level,item+'.ogg') - obj = PicSnd(img,snd,12,(x,y),(x,y-250)) + obj = PicSnd(img,snd,12,(x,y),(x,10)) objlist.append((obj)) x = x + obj.image.get_width()+ offset