Merge from trunk.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2537

5 files changed, 16 insertions, 16 deletions

diff --git a/src/heretic/d_net.c b/src/heretic/d_net.c
index 6a6a8abb..73a09ec6 100644
--- a/src/heretic/d_net.c
+++ b/src/heretic/d_net.c
@@ -177,8 +177,8 @@ static void SaveGameSettings(net_gamesettings_t *settings,
 
     // Read checksums of our WAD directory and dehacked information
 
-    W_Checksum(connect_data->wad_md5sum);
-    DEH_Checksum(connect_data->deh_md5sum);
+    W_Checksum(connect_data->wad_sha1sum);
+    DEH_Checksum(connect_data->deh_sha1sum);
 
     connect_data->is_freedoom = 0;
 }
diff --git a/src/heretic/deh_ammo.c b/src/heretic/deh_ammo.c
index fe86c757..08241863 100644
--- a/src/heretic/deh_ammo.c
+++ b/src/heretic/deh_ammo.c
@@ -95,18 +95,18 @@ static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
     }
 }
 
-static void DEH_AmmoMD5Hash(md5_context_t *context)
+static void DEH_AmmoSHA1Hash(sha1_context_t *context)
 {
     int i;
 
     for (i=0; i<NUMAMMO; ++i)
     {
-        MD5_UpdateInt32(context, maxammo[i]);
+        SHA1_UpdateInt32(context, maxammo[i]);
     }
 
     for (i=0; i<NUMWEAPONS; ++i)
     {
-        MD5_UpdateInt32(context, GetWeaponAmmo[i]);
+        SHA1_UpdateInt32(context, GetWeaponAmmo[i]);
     }
 }
 
@@ -117,6 +117,6 @@ deh_section_t deh_section_ammo =
     DEH_AmmoStart,
     DEH_AmmoParseLine,
     NULL,
-    DEH_AmmoMD5Hash,
+    DEH_AmmoSHA1Hash,
 };
 
diff --git a/src/heretic/deh_frame.c b/src/heretic/deh_frame.c
index 8623ab0c..4a1581a7 100644
--- a/src/heretic/deh_frame.c
+++ b/src/heretic/deh_frame.c
@@ -322,13 +322,13 @@ static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
     }
 }
 
-static void DEH_FrameMD5Sum(md5_context_t *context)
+static void DEH_FrameSHA1Sum(sha1_context_t *context)
 {
     int i;
 
     for (i=0; i<NUMSTATES; ++i)
     {
-        DEH_StructMD5Sum(context, &state_mapping, &states[i]);
+        DEH_StructSHA1Sum(context, &state_mapping, &states[i]);
     }
 }
 
@@ -339,6 +339,6 @@ deh_section_t deh_section_frame =
     DEH_FrameStart,
     DEH_FrameParseLine,
     NULL,
-    DEH_FrameMD5Sum,
+    DEH_FrameSHA1Sum,
 };
 
diff --git a/src/heretic/deh_thing.c b/src/heretic/deh_thing.c
index ffededf2..dbb239e4 100644
--- a/src/heretic/deh_thing.c
+++ b/src/heretic/deh_thing.c
@@ -128,13 +128,13 @@ static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
     DEH_SetMapping(context, &thing_mapping, mobj, variable_name, ivalue);
 }
 
-static void DEH_ThingMD5Sum(md5_context_t *context)
+static void DEH_ThingSHA1Sum(sha1_context_t *context)
 {
     int i;
 
     for (i=0; i<NUMMOBJTYPES; ++i)
     {
-        DEH_StructMD5Sum(context, &thing_mapping, &mobjinfo[i]);
+        DEH_StructSHA1Sum(context, &thing_mapping, &mobjinfo[i]);
     }
 }
 
@@ -145,6 +145,6 @@ deh_section_t deh_section_thing =
     DEH_ThingStart,
     DEH_ThingParseLine,
     NULL,
-    DEH_ThingMD5Sum,
+    DEH_ThingSHA1Sum,
 };
 
diff --git a/src/heretic/deh_weapon.c b/src/heretic/deh_weapon.c
index 28a90c68..0c417e2b 100644
--- a/src/heretic/deh_weapon.c
+++ b/src/heretic/deh_weapon.c
@@ -108,14 +108,14 @@ static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
     DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
 }
 
-static void DEH_WeaponMD5Sum(md5_context_t *context)
+static void DEH_WeaponSHA1Sum(sha1_context_t *context)
 {
     int i;
 
     for (i=0; i<NUMWEAPONS ;++i)
     {
-        DEH_StructMD5Sum(context, &weapon_mapping, &wpnlev1info[i]);
-        DEH_StructMD5Sum(context, &weapon_mapping, &wpnlev2info[i]);
+        DEH_StructSHA1Sum(context, &weapon_mapping, &wpnlev1info[i]);
+        DEH_StructSHA1Sum(context, &weapon_mapping, &wpnlev2info[i]);
     }
 }
 
@@ -126,6 +126,6 @@ deh_section_t deh_section_weapon =
     DEH_WeaponStart,
     DEH_WeaponParseLine,
     NULL,
-    DEH_WeaponMD5Sum,
+    DEH_WeaponSHA1Sum,
 };