From b2fbaf78290362e04ebaa6dc944225dd5adeca07 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Tue, 21 Oct 2008 11:38:03 +0000
Subject: [PATCH] Fix some gcc 4.0 warnings (-wall flag)

---
 CHANGELOG.txt  | 4 ++++
 iff/iff.c      | 2 +-
 main/inferno.c | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b47875af7..52e478d4a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20081021
+--------
+iff/iff.c, main/inferno.c: Fix some gcc 4.0 warnings (-wall flag)
+
 20081020
 --------
 main/menu.c: resolution 1440x960 to 1440x900 - typo
diff --git a/iff/iff.c b/iff/iff.c
index 4f72cf7d9..4244ec984 100644
--- a/iff/iff.c
+++ b/iff/iff.c
@@ -916,7 +916,7 @@ int iff_write_bitmap(char *ofilename,grs_bitmap *bm,ubyte *palette)
 //returns iff error codes
 int iff_read_animbrush(char *ifilename,grs_bitmap **bm_list,int max_bitmaps,int *n_bitmaps,ubyte *palette)
 {
-	int ret;			//return code
+	int ret = IFF_NO_ERROR;			//return code
 	PHYSFS_file *ifile;
 	iff_bitmap_header bmheader;
 	int sig,form_len;
diff --git a/main/inferno.c b/main/inferno.c
index a372a824c..9f83eba0c 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -116,7 +116,6 @@ static char *__reference[2]={copyright,(char *)__reference};
 #include "console.h"
 
 
-static const char desc_id_checksum_str[] = DESC_ID_CHKSUM;
 char desc_id_exit_num = 0;
 int Function_mode=FMODE_MENU; //game or editor?
 int Screen_mode=-1; //game screen or editor screen?