hanged a bunch of function definition from in to ZONEID_TYPE OR DOID_TYPE .. having problems with high bits on 32 bit builds.

direct/src/dcparser/dcClass.cxx

@@ -880,7 +880,7 @@ pack_required_field(DCPacker &packer, PyObject *distobj,
 //               object from the client.
 ////////////////////////////////////////////////////////////////////
 Datagram DCClass::
-client_format_update(const string &field_name, int do_id, 
+client_format_update(const string &field_name, DOID_TYPE do_id, 
                      PyObject *args) const {
   DCField *field = get_field_by_name(field_name);
   if (field == (DCField *)NULL) {
@@ -904,7 +904,7 @@ client_format_update(const string &field_name, int do_id,
 //               object from the AI.
 ////////////////////////////////////////////////////////////////////
 Datagram DCClass::
-ai_format_update(const string &field_name, int do_id, 
+ai_format_update(const string &field_name, DOID_TYPE do_id, 
                  CHANNEL_TYPE to_id, CHANNEL_TYPE from_id, PyObject *args) const {
   DCField *field = get_field_by_name(field_name);
   if (field == (DCField *)NULL) {
@@ -932,8 +932,8 @@ ai_format_update(const string &field_name, int do_id,
 //               in addition to the normal required fields.
 ////////////////////////////////////////////////////////////////////
 Datagram DCClass::
-client_format_generate(PyObject *distobj, int do_id, 
-                   int zone_id, PyObject *optional_fields) const {
+client_format_generate(PyObject *distobj, DOID_TYPE do_id, 
+                   ZONEID_TYPE zone_id, PyObject *optional_fields) const {
   DCPacker packer;
 
   //packer.raw_pack_uint8('A');
@@ -1007,8 +1007,8 @@ client_format_generate(PyObject *distobj, int do_id,
 //               in addition to the normal required fields.
 ////////////////////////////////////////////////////////////////////
 Datagram DCClass::
-ai_format_generate(PyObject *distobj, int do_id, 
-                   int parent_id, int zone_id,
+ai_format_generate(PyObject *distobj, DOID_TYPE do_id, 
+                   DOID_TYPE parent_id, ZONEID_TYPE zone_id,
                    CHANNEL_TYPE district_channel_id, CHANNEL_TYPE from_channel_id,
                    PyObject *optional_fields) const {
   DCPacker packer;
@@ -1093,7 +1093,7 @@ ai_format_generate(PyObject *distobj, int do_id,
 ////////////////////////////////////////////////////////////////////
 Datagram DCClass::
 ai_database_generate_context(
-    unsigned int context_id, unsigned int parent_id, unsigned int zone_id,
+    unsigned int context_id, DOID_TYPE parent_id, ZONEID_TYPE zone_id,
     CHANNEL_TYPE owner_channel,
     CHANNEL_TYPE database_server_id, CHANNEL_TYPE from_channel_id) const 
 {
@@ -1137,7 +1137,7 @@ ai_database_generate_context(
 ////////////////////////////////////////////////////////////////////
 Datagram DCClass::
 ai_database_generate_context_old(
-    unsigned int context_id, unsigned int parent_id, unsigned int zone_id,
+    unsigned int context_id, DOID_TYPE parent_id, ZONEID_TYPE zone_id,
     CHANNEL_TYPE database_server_id, CHANNEL_TYPE from_channel_id) const 
 {
   DCPacker packer;

direct/src/dcparser/dcClass.h

@@ -113,18 +113,18 @@ PUBLISHED:
 
 
   Datagram client_format_update(const string &field_name,
-                                int do_id, PyObject *args) const;
-  Datagram ai_format_update(const string &field_name, int do_id, 
+                                DOID_TYPE do_id, PyObject *args) const;
+  Datagram ai_format_update(const string &field_name, DOID_TYPE do_id, 
                             CHANNEL_TYPE to_id, CHANNEL_TYPE from_id, PyObject *args) const;
-  Datagram ai_format_generate(PyObject *distobj, int do_id, int parent_id, int zone_id,
+  Datagram ai_format_generate(PyObject *distobj, DOID_TYPE do_id, ZONEID_TYPE parent_id, ZONEID_TYPE zone_id,
                               CHANNEL_TYPE district_channel_id, CHANNEL_TYPE from_channel_id,
                               PyObject *optional_fields) const;
-  Datagram client_format_generate(PyObject *distobj, int do_id, int zone_id,                              
+  Datagram client_format_generate(PyObject *distobj, DOID_TYPE do_id, ZONEID_TYPE zone_id,                              
                                   PyObject *optional_fields) const;
 
-  Datagram ai_database_generate_context(unsigned int context_id, unsigned int parent_id, unsigned int zone_id, CHANNEL_TYPE owner_channel,
+  Datagram ai_database_generate_context(unsigned int context_id, DOID_TYPE parent_id, ZONEID_TYPE zone_id, CHANNEL_TYPE owner_channel,
                                 CHANNEL_TYPE database_server_id, CHANNEL_TYPE from_channel_id) const;
-  Datagram ai_database_generate_context_old(unsigned int context_id, unsigned int parent_id, unsigned int zone_id,
+  Datagram ai_database_generate_context_old(unsigned int context_id, DOID_TYPE parent_id, ZONEID_TYPE zone_id,
                                 CHANNEL_TYPE database_server_id, CHANNEL_TYPE from_channel_id) const;
   
 #endif 

direct/src/dcparser/dcField.cxx

@@ -438,7 +438,7 @@ receive_update(DCPacker &packer, PyObject *distobj) const {
 //               object from the client.
 ////////////////////////////////////////////////////////////////////
 Datagram DCField::
-client_format_update(int do_id, PyObject *args) const {
+client_format_update(DOID_TYPE do_id, PyObject *args) const {
   DCPacker packer;
 
   packer.raw_pack_uint16(CLIENT_OBJECT_UPDATE_FIELD);
@@ -464,7 +464,7 @@ client_format_update(int do_id, PyObject *args) const {
 //               object from the AI.
 ////////////////////////////////////////////////////////////////////
 Datagram DCField::
-ai_format_update(int do_id, CHANNEL_TYPE to_id, CHANNEL_TYPE from_id, PyObject *args) const {
+ai_format_update(DOID_TYPE do_id, CHANNEL_TYPE to_id, CHANNEL_TYPE from_id, PyObject *args) const {
   DCPacker packer;
 
   packer.raw_pack_uint8(1);

direct/src/dcparser/dcField.h

@@ -89,8 +89,8 @@ PUBLISHED:
 
   void receive_update(DCPacker &packer, PyObject *distobj) const;
 
-  Datagram client_format_update(int do_id, PyObject *args) const;
-  Datagram ai_format_update(int do_id, CHANNEL_TYPE to_id, CHANNEL_TYPE from_id,
+  Datagram client_format_update(DOID_TYPE do_id, PyObject *args) const;
+  Datagram ai_format_update(DOID_TYPE do_id, CHANNEL_TYPE to_id, CHANNEL_TYPE from_id,
                             PyObject *args) const;
 #endif 
 

direct/src/dcparser/dcbase.h

@@ -114,11 +114,16 @@ typedef long long PN_int64;
 typedef unsigned long long PN_uint64;
 #endif
 
+typedef unsigned char PN_uint8;
+typedef unsigned short PN_uint16;
+typedef unsigned int PN_uint32;
 
 
 #endif  // WITHIN_PANDA
 
 //typedef       unsigned long   CHANNEL_TYPE;
 typedef       PN_uint64   CHANNEL_TYPE;
+typedef       PN_uint32   DOID_TYPE;
+typedef       PN_uint32   ZONEID_TYPE;
 
 #endif  // DCBASE_H