diff --git a/deployment/public_client.prc b/deployment/public_client.prc index afde724a..76eaaa54 100644 --- a/deployment/public_client.prc +++ b/deployment/public_client.prc @@ -74,6 +74,9 @@ want-pstats 0 want-whitelist #f want-sequence-list #f +want-emblems #t +cogdo-want-barrel-room #t + # show-total-population #t diff --git a/deployment/server.prc b/deployment/server.prc index 69ff6976..1ea79dc8 100644 --- a/deployment/server.prc +++ b/deployment/server.prc @@ -40,6 +40,10 @@ get-key-reward-always #t get-crate-reward-always #t +want-emblems #t +cogdo-want-barrel-room #t + + # Chat Settings want-whitelist #f want-sequence-list #f diff --git a/resources b/resources index 769d2639..aacdc95e 160000 --- a/resources +++ b/resources @@ -1 +1 @@ -Subproject commit 769d26390634d17384aa28021cc7afd88306c4af +Subproject commit aacdc95eac2459a4af7234f2b8ad7b36eab5d516 diff --git a/toontown/catalog/CatalogFurnitureItem.py b/toontown/catalog/CatalogFurnitureItem.py index 089c403a..adb8a9e2 100755 --- a/toontown/catalog/CatalogFurnitureItem.py +++ b/toontown/catalog/CatalogFurnitureItem.py @@ -1059,7 +1059,7 @@ class CatalogFurnitureItem(CatalogAtticItem.CatalogAtticItem): return 24 * 60 def getPicture(self, avatar): - model = self.loadModel(animate=0) + model = self.loadModel() spin = 1 flags = self.getFlags() if flags & FLRug: @@ -1095,7 +1095,7 @@ class CatalogFurnitureItem(CatalogAtticItem.CatalogAtticItem): def getBasePrice(self): return FurnitureTypes[self.furnitureType][FTBasePrice] - def loadModel(self, animate=1): + def loadModel(self): type = FurnitureTypes[self.furnitureType] model = loader.loadModel(type[FTModelName]) self.applyColor(model, type[FTColor])