diff --git a/astron/dclass/otp.dc b/astron/dclass/otp.dc index da6260c1..f269e245 100644 --- a/astron/dclass/otp.dc +++ b/astron/dclass/otp.dc @@ -18,8 +18,6 @@ from otp.distributed import ObjectServer/AI/UD from otp.distributed import DistributedDistrict/AI/UD from otp.distributed import DistributedDirectory/AI from otp.distributed import DistributedTestObject/AI -from otp.snapshot import SnapshotDispatcher/AI/UD -from otp.snapshot import SnapshotRenderer/AI/UD from otp.chat import ChatAgent/UD from otp.distributed import CentralLogger/AI/UD from otp.status import StatusDatabase/UD @@ -434,21 +432,6 @@ dclass PlayerFriendsManager : DistributedObject, TalkPath_account { removePlayerFriend(uint32); }; -dclass SnapshotDispatcher : DistributedObject { - online(); - requestRender(uint32); - avatarDeleted(uint32); - requestNewWork(uint32); - errorFetchingAvatar(uint32, uint32); - errorRenderingAvatar(uint32, uint32); - renderSuccessful(uint32, uint32); -}; - -dclass SnapshotRenderer : DistributedObject { - online(); - requestRender(uint32, uint32, string); -}; - dclass CentralLogger : DistributedObject { sendMessage(string(0-256), string(0-1024), uint32, uint32) clsend; logAIGarbage() airecv; diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py index ec722e4c..382e63e6 100644 --- a/otp/distributed/DCClassImports.py +++ b/otp/distributed/DCClassImports.py @@ -2,7 +2,7 @@ from pandac.PandaModules import * -hashVal = 2485415640L +hashVal = 1411931781 from toontown.cogdominium import DistributedCogdoInterior, DistributedCogdoBattleBldg, DistributedCogdoElevatorExt, DistributedCogdoElevatorInt, DistributedCogdoBarrel, DistCogdoGame, DistCogdoLevelGame, DistCogdoBoardroomGame, DistCogdoCraneGame, DistCogdoMazeGame, DistCogdoFlyingGame, DistCogdoCrane, DistCogdoCraneMoneyBag, DistCogdoCraneCog @@ -27,10 +27,10 @@ from toontown.ai.DistributedPhaseEventMgr import DistributedPhaseEventMgr from toontown.pets.PetDCImports import * from toontown.suit import DistributedSuitPlanner, DistributedSuitBase, DistributedSuit, DistributedTutorialSuit, DistributedFactorySuit, DistributedMintSuit, DistributedStageSuit, DistributedSellbotBoss, DistributedCashbotBoss, DistributedCashbotBossGoon, DistributedGoon, DistributedGridGoon, DistributedLawbotBoss, DistributedLawbotBossSuit, DistributedBossbotBoss from toontown.distributed import ToontownDistrict, ToontownDistrictStats, DistributedTimer -from toontown.fishing import DistributedFishingPond, DistributedFishingTarget, DistributedPondBingoManager +from toontown.effects import DistributedFireworkShow from toontown.uberdog.DistributedDataStoreManager import DistributedDataStoreManager from toontown.safezone import DistributedTrolley, DistributedPartyGate, DistributedBoat, DistributedButterfly, DistributedMMPiano, DistributedDGFlower, DistributedFishingSpot, SafeZoneManager, DistributedTreasure, DistributedGolfKart, DistributedPicnicBasket, DistributedGameTable, DistributedChineseCheckers, DistributedCheckers, DistributedFindFour -from toontown.effects import DistributedFireworkShow +from toontown.fishing import DistributedFishingPond, DistributedFishingTarget, DistributedPondBingoManager from toontown.minigame import DistributedMinigame, DistributedMinigameTemplate, DistributedRaceGame, DistributedCannonGame, DistributedPhotoGame, DistributedPatternGame, DistributedRingGame, DistributedTagGame, DistributedMazeGame, DistributedTugOfWarGame, DistributedCatchGame, DistributedDivingGame, DistributedTargetGame, DistributedTravelGame, DistributedPairingGame, DistributedVineGame, DistributedIceGame, DistributedCogThiefGame, DistributedTwoDGame from toontown.racing import DistributedVehicle, DistributedStartingBlock, DistributedRace, DistributedKartPad, DistributedRacePad, DistributedViewPad, DistributedStartingBlock, DistributedLeaderBoard, DistributedGag, DistributedProjectile from toontown.distributed.NonRepeatableRandomSourceUD import NonRepeatableRandomSourceUD @@ -38,7 +38,6 @@ from toontown.catalog import CatalogManager from toontown.ai.DistributedHydrantZeroMgr import DistributedHydrantZeroMgr from toontown.rpc.AwardManager import AwardManager from toontown.parties import DistributedParty, DistributedPartyActivity, DistributedPartyTeamActivity, DistributedPartyCannon, DistributedPartyCannonActivity, DistributedPartyCatchActivity, DistributedPartyWinterCatchActivity, DistributedPartyCogActivity, DistributedPartyWinterCogActivity, DistributedPartyFireworksActivity, DistributedPartyDanceActivityBase, DistributedPartyDanceActivity, DistributedPartyDance20Activity, DistributedPartyValentineDanceActivity, DistributedPartyValentineDance20Activity, DistributedPartyTrampolineActivity, DistributedPartyValentineTrampolineActivity, DistributedPartyVictoryTrampolineActivity, DistributedPartyWinterTrampolineActivity, DistributedPartyTugOfWarActivity, DistributedPartyJukeboxActivityBase, DistributedPartyJukeboxActivity, DistributedPartyJukebox40Activity, DistributedPartyValentineJukeboxActivity, DistributedPartyValentineJukebox40Activity -from otp.snapshot import SnapshotDispatcher, SnapshotRenderer from toontown.uberdog.DistributedInGameNewsMgr import DistributedInGameNewsMgr from toontown.coghq.InGameEditorDCImports import * from toontown.friends import TTPlayerFriendsManager, TTUFriendsManager diff --git a/otp/snapshot/SnapshotDispatcher.py b/otp/snapshot/SnapshotDispatcher.py deleted file mode 100644 index cbc751cf..00000000 --- a/otp/snapshot/SnapshotDispatcher.py +++ /dev/null @@ -1,5 +0,0 @@ -from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal -from direct.directnotify.DirectNotifyGlobal import directNotify - -class SnapshotDispatcher(DistributedObjectGlobal): - pass diff --git a/otp/snapshot/SnapshotDispatcherAI.py b/otp/snapshot/SnapshotDispatcherAI.py deleted file mode 100644 index 4f28979a..00000000 --- a/otp/snapshot/SnapshotDispatcherAI.py +++ /dev/null @@ -1,27 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectAI import DistributedObjectAI - -class SnapshotDispatcherAI(DistributedObjectAI): - notify = DirectNotifyGlobal.directNotify.newCategory("SnapshotDispatcherAI") - - def online(self): - pass - - def requestRender(self, todo0): - pass - - def avatarDeleted(self, todo0): - pass - - def requestNewWork(self, todo0): - pass - - def errorFetchingAvatar(self, todo0, todo1): - pass - - def errorRenderingAvatar(self, todo0, todo1): - pass - - def renderSuccessful(self, todo0, todo1): - pass - diff --git a/otp/snapshot/SnapshotDispatcherUD.py b/otp/snapshot/SnapshotDispatcherUD.py deleted file mode 100644 index ce6aff6a..00000000 --- a/otp/snapshot/SnapshotDispatcherUD.py +++ /dev/null @@ -1,27 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectUD import DistributedObjectUD - -class SnapshotDispatcherUD(DistributedObjectUD): - notify = DirectNotifyGlobal.directNotify.newCategory("SnapshotDispatcherUD") - - def online(self): - pass - - def requestRender(self, todo0): - pass - - def avatarDeleted(self, todo0): - pass - - def requestNewWork(self, todo0): - pass - - def errorFetchingAvatar(self, todo0, todo1): - pass - - def errorRenderingAvatar(self, todo0, todo1): - pass - - def renderSuccessful(self, todo0, todo1): - pass - diff --git a/otp/snapshot/SnapshotRenderer.py b/otp/snapshot/SnapshotRenderer.py deleted file mode 100644 index fa69b32b..00000000 --- a/otp/snapshot/SnapshotRenderer.py +++ /dev/null @@ -1,5 +0,0 @@ -from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal -from direct.directnotify.DirectNotifyGlobal import directNotify - -class SnapshotRenderer(DistributedObjectGlobal): - pass diff --git a/otp/snapshot/SnapshotRendererAI.py b/otp/snapshot/SnapshotRendererAI.py deleted file mode 100644 index 1f6d15cc..00000000 --- a/otp/snapshot/SnapshotRendererAI.py +++ /dev/null @@ -1,12 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectAI import DistributedObjectAI - -class SnapshotRendererAI(DistributedObjectAI): - notify = DirectNotifyGlobal.directNotify.newCategory("SnapshotRendererAI") - - def online(self): - pass - - def requestRender(self, todo0, todo1, todo2): - pass - diff --git a/otp/snapshot/SnapshotRendererUD.py b/otp/snapshot/SnapshotRendererUD.py deleted file mode 100644 index 3af22620..00000000 --- a/otp/snapshot/SnapshotRendererUD.py +++ /dev/null @@ -1,12 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectUD import DistributedObjectUD - -class SnapshotRendererUD(DistributedObjectUD): - notify = DirectNotifyGlobal.directNotify.newCategory("SnapshotRendererUD") - - def online(self): - pass - - def requestRender(self, todo0, todo1, todo2): - pass - diff --git a/otp/snapshot/__init__.py b/otp/snapshot/__init__.py deleted file mode 100644 index e69de29b..00000000