shithub: choc

Info  •  Files  •  Log  •  Branches

Fixups to make compiles work under the Solaris/SPARC compiler. Thanks to
Mike Spooner <[email protected]> for his work on porting this.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 763

--- a/setup/multiplayer.c

+++ b/setup/multiplayer.c

@@ -59,8 +59,8 @@

 char *net_player_name;

 char *chat_macros[10];

-static char *wads[NUM_WADS] = {};

-static char *extra_params[NUM_EXTRA_PARAMS] = {};

+static char *wads[NUM_WADS];

+static char *extra_params[NUM_EXTRA_PARAMS];

 static int skill = 2;

 static int nomonsters = 0;

 static int deathmatch = 0;

--- a/src/deh_mapping.c

+++ b/src/deh_mapping.c

@@ -56,7 +56,7 @@

                 return false;

             }

-            location = structptr + (entry->location - mapping->base);

+            location = (uint8_t *)structptr + ((uint8_t *)entry->location - (uint8_t *)mapping->base);

      //       printf("Setting %p::%s to %i (%i bytes)\n",

      //               structptr, name, value, entry->size);

@@ -64,13 +64,13 @@

             switch (entry->size)

             {

                 case 1:

-                    * ((unsigned char *) location) = value;

+                    * ((uint8_t *) location) = value;

                     break;

                 case 2:

-                    * ((unsigned short *) location) = value;

+                    * ((uint16_t *) location) = value;

                     break;

                 case 4:

-                    * ((unsigned int *) location) = value;

+                    * ((uint32_t *) location) = value;

                     break;

                 default:

                     DEH_Error(context, "Unknown field type for '%s' (BUG)", name);

@@ -109,18 +109,18 @@

         // Add in data for this field

-        location = structptr + (entry->location - mapping->base);

+        location = (uint8_t *)structptr + ((uint8_t *)entry->location - (uint8_t *)mapping->base);

         switch (entry->size)

         {

             case 1:

-                MD5_UpdateInt32(context, *((unsigned char *) location));

+                MD5_UpdateInt32(context, *((uint8_t *) location));

                 break;

             case 2:

-                MD5_UpdateInt32(context, *((unsigned short *) location));

+                MD5_UpdateInt32(context, *((uint16_t *) location));

                 break;

             case 4:

-                MD5_UpdateInt32(context, *((unsigned int *) location));

+                MD5_UpdateInt32(context, *((uint32_t *) location));

                 break;

             default:

                 I_Error("Unknown dehacked mapping field type for '%s' (BUG)",