RomanNum3ral
/
open-toontown
mirror of https://github.com/open-toontown/open-toontown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

general: Getting somewhere

This commit is contained in:
Open Toontown 2022-12-17 14:03:45 -05:00
parent a338b886f5
commit 677fabf99f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/otp.dc
View File

@ -209,7 +209,7 @@ dclass AvatarHandle : TalkPath_whisper {
dclass DistributedAvatar : DistributedSmoothNode, TalkPath_owner, TalkPath_whisper {
string DcObjectType db;
setName(string) required broadcast db airecv;
setName(string = "unknownDistributedAvatar") required broadcast db airecv;
friendsNotify(int32, int8) ownrecv airecv clsend;
checkAvOnShard(uint32) clsend airecv;
confirmAvOnShard(uint32, int8);
@ -217,7 +217,7 @@ dclass DistributedAvatar : DistributedSmoothNode, TalkPath_owner, TalkPath_whisp
dclass DistributedPlayer : DistributedAvatar {
arrivedOnDistrict(uint32) ownrecv ram;
setAccountName(string) required ownrecv db;
setAccountName(string = "unknown") required ownrecv db;
setWhisperFrom(uint32, string(0-256), uint32) ownrecv clsend;
setWhisperWLFrom(uint32, string(0-256), uint32) ownrecv clsend;
setWhisperSCFrom(uint32, uint16) ownrecv clsend;
@ -228,14 +228,14 @@ dclass DistributedPlayer : DistributedAvatar {
setWhitelistChatFlags(uint8) broadcast ownrecv ram airecv;
setSC(uint16) broadcast ownsend airecv;
setSCCustom(uint16) broadcast ownsend airecv;
setFriendsList(uint32uint8array) ownrecv required db airecv;
setFriendsList(uint32uint8array = {}) ownrecv required db airecv;
setDISLname(string) broadcast ownrecv ram;
setDISLid(uint32) broadcast ownrecv ram db airecv required;
OwningAccount(uint32);
WishName(string) db ram;
WishNameState(string) db ram;
setPreviousAccess(uint8) required db airecv;
setAccess(uint8) broadcast ownrecv required ram airecv;
setPreviousAccess(uint8 access = 0) required db airecv;
setAccess(uint8 access = 2) broadcast ownrecv required ram airecv;
setAsGM(bool) required ram broadcast ownrecv airecv;
};

2
etc/toon.dc
View File

@ -442,7 +442,7 @@ typedef int16 pair16[2];
dclass DistributedToon : DistributedPlayer {
setDNAString(blob) required broadcast ownrecv db;
setGM(uint8) required broadcast ownrecv db;
setGM(uint8 = 0) required broadcast ownrecv db;
setMaxBankMoney(int16) required broadcast ownrecv db;
setBankMoney(int16) required broadcast ownrecv db;
setMaxMoney(int16) required broadcast ownrecv db;

2
otp/distributed/OTPClientRepository.py
View File

@ -942,7 +942,7 @@ class OTPClientRepository(ClientRepositoryBase):
avNames[1] = di.getString()
avNames[2] = di.getString()
avNames[3] = di.getString()
avDNA = di.getString()
avDNA = di.getBlob()
avPosition = di.getUint8()
aname = di.getUint8()
potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)

8
toontown/building/DistributedBuildingMgrAI.py
View File

@ -384,7 +384,7 @@ class DistributedBuildingMgrAI:
if os.path.exists(working):
os.remove(working)
os.rename(fileName, working)
file=open(working, 'w')
file=open(working, 'wb')
file.seek(0, 2)
self.saveTo(file, block)
file.close()
@ -404,7 +404,7 @@ class DistributedBuildingMgrAI:
# Move current file as the backup file:
if os.path.exists(fileName):
os.rename(fileName, backup)
file=open(fileName, 'w')
file=open(fileName, 'wb')
file.seek(0)
self.saveTo(file)
file.close()
@ -433,7 +433,7 @@ class DistributedBuildingMgrAI:
fileName=self.getFileName()
try:
# Try to open the backup file:
file=open(fileName+self.backupExtension, 'r')
file=open(fileName+self.backupExtension, 'rb')
# Remove the (assumed) broken file:
if os.path.exists(fileName):
os.remove(fileName)
@ -441,7 +441,7 @@ class DistributedBuildingMgrAI:
# OK, there's no backup file, good.
try:
# Open the real file:
file=open(fileName, 'r')
file=open(fileName, 'rb')
except IOError:
# OK, there's no file. Start new list:
return {}