I just downloaded Shawn's CVS and did another merge. One thing to watch for:
In DR2 common\servertalk.h:
Code:
// ZONEPROXY BEGIN
#define ServerOP_SetAliasZone 0x002D
// ZONEPROXY END
This causes a conflict in DR3. You should change it to:
Code:
// ZONEPROXY BEGIN
#define ServerOP_SetAliasZone 0x0300
// ZONEPROXY END
That should be high enough. From what I can see there should be no difference in any of the other ZP changes. Make sure to pay attention to the ZP change in zone/client_process.cpp where the following line is remarked out for ZP:
Code:
//sze->zone_id = zone->GetZoneID();
If someone could show me how to make a diff I can try it tomorrow with what I have. This time I used #ifdefs to keep the original code separate from the ZP stuff...
WC
P.S. There was a bug in line 1511 of zone/spells.cpp from the CVS dump. The variable "ndx" was being redeclared. I had to change it to:
Code:
for(ndx=1;ndx<=18;ndx++){
It has nothing to do with ZoneProxy and I had to make this fix before making any ZP changes to DR3.
P.P.S. I just built it and tested a DR3-ZP server and it works just fine. If you do the DR2-ZP changes but make the above change to 0x300 you should be ok. My offer to do a diff still stands though...
Threaded Mode
