diff --git a/docs/building.rst b/docs/building.rst index 7509f8f..dc9c9c0 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -143,8 +143,15 @@ to the file /etc/make.conf, but read the ports documentation to be sure of what .. _centos: -CentOS ------- +CentOS 5 +-------- + +.. note:: + + If you are using CentOS 6, you do not need to install the epel repo. + CentOS 6 should come with the right python version, you can check + your version running *python --version*. + Since CentOS has an older version of Python (2.4), there are some difficulties in getting the Overviewer to work. Follow these steps which have been reported to work. diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index 4825a65..d9102c2 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -19,6 +19,7 @@ import codecs import locale import time import logging +import traceback from PIL import Image @@ -51,6 +52,7 @@ directory. except Exception, e: if os.path.exists(os.path.join(self.outputdir, "overviewerConfig.js")): logging.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config") + logging.debug(traceback.format_exc()) self.overviewerConfig = dict(tilesets=dict()) def get_tileset_config(self, name): diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index 5d0c0b6..6a846ed 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -57,7 +57,9 @@ def handlePlayers(rset, render, worldpath): playerdir = os.path.join(worldpath, "players") if os.path.isdir(playerdir): playerfiles = os.listdir(playerdir) + playerfiles = [x for x in playerfiles if x.endswith(".dat")] isSinglePlayer = False + else: playerfiles = [os.path.join(worldpath, "level.dat")] isSinglePlayer = True diff --git a/overviewer_core/data/web_assets/overviewer.css b/overviewer_core/data/web_assets/overviewer.css index fff3458..700a9ef 100644 --- a/overviewer_core/data/web_assets/overviewer.css +++ b/overviewer_core/data/web_assets/overviewer.css @@ -25,7 +25,7 @@ body { .infoWindow>img { width:80px; float: left; - + image-rendering: -moz-crisp-edges; } .infoWindow>p { diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index cff4e4c..23ff5fa 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -136,7 +136,7 @@ extern unsigned int max_blockid; extern unsigned int max_data; extern unsigned char *block_properties; static inline int -block_has_property(unsigned char b, BlockProperty prop) { +block_has_property(unsigned short b, BlockProperty prop) { if (b >= max_blockid || !(block_properties[b] & (1 << KNOWN))) { /* block is unknown, return defaults */ if (prop == TRANSPARENT) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 8de4805..bc8dab7 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -860,7 +860,7 @@ def wood(self, blockid, data): if self.rotation == 1: if wood_orientation == 4: wood_orientation = 8 elif wood_orientation == 8: wood_orientation = 4 - elif self.rotation == 2: + elif self.rotation == 3: if wood_orientation == 4: wood_orientation = 8 elif wood_orientation == 8: wood_orientation = 4 diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index 1a91f51..683cb2e 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -513,7 +513,7 @@ class TileSet(object): """ def bgcolorformat(color): return "#%02x%02x%02x" % color[0:3] - isOverlay = not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode")) + isOverlay = self.options.get("overlay") or (not any(isinstance(x, rendermodes.Base) for x in self.options.get("rendermode"))) d = dict(name = self.options.get('title'), zoomLevels = self.treedepth,