Mercurial > parpg-source

diff gamemap.py @ 167:b3b82c2aebee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Using fife settings module again instead of our own.
author Beliar <KarstenBock@gmx.net>
date Mon, 20 Feb 2012 16:50:10 +0100
parents 80672955ab70
children
line wrap: on
line diff
--- a/gamemap.py	Thu Jan 12 18:42:48 2012 +0100
+++ b/gamemap.py	Mon Feb 20 16:50:10 2012 +0100
@@ -92,8 +92,8 @@
         the proper camera is set as the 'main' camera.
         At this point we also set the viewport to the current resolution."""
         for cam in self.map.getCameras():
-            width = self.settings.fife.ScreenWidth
-            height = self.settings.fife.ScreenHeight
+            width = self.engine.getSettings().getScreenWidth()
+            height = self.engine.getSettings().getScreenHeight()
             viewport = fife.Rect(0, 0, width, height)
             cam.setViewPort(viewport)
             self.my_cam_id = cam.getId()
@@ -113,7 +113,7 @@
         font = pychan.manager.hook.guimanager.createFont(
             'fonts/rpgfont.png',
             0,
-            self.settings.fife.FontGlyphs
+            self.settings.get("FIFE", "FontGlyphs")
         )
 
         rend.setFont(font)