summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRussell Rice2007-03-10 02:11:18 +0000
committerRussell Rice2007-03-10 02:11:18 +0000
commit80746e7900d91688eba6c2a3f8bb1164bdb3de73 (patch)
tree9b2d0da14604829e9f5307593c53f4dfa57b0f9a /src
parenteba59fdf4448693b73b19ba12a11bff265d4ddfc (diff)
downloadchocolate-doom-80746e7900d91688eba6c2a3f8bb1164bdb3de73.tar.gz
chocolate-doom-80746e7900d91688eba6c2a3f8bb1164bdb3de73.tar.bz2
chocolate-doom-80746e7900d91688eba6c2a3f8bb1164bdb3de73.zip
Lots of changes/additions:
* Add libpcsound codeblocks project * Use libraries that are built and project dependencies inside main chocolate-doom/setup project and remove source files. * libraries are now built in the "lib" top level directory * Fix some warnings Subversion-branch: /trunk/chocolate-doom Subversion-revision: 852
Diffstat (limited to 'src')
-rw-r--r--src/d_iwad.c6
-rw-r--r--src/i_pcsound.c2
-rw-r--r--src/i_sound.c2
-rw-r--r--src/net_gui.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/d_iwad.c b/src/d_iwad.c
index 25d62ea0..ef68ced9 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -190,7 +190,7 @@ static char *GetRegistryString(registry_value_t *reg_val)
static void CheckUninstallStrings(void)
{
- int i;
+ unsigned int i;
for (i=0; i<sizeof(uninstall_values) / sizeof(*uninstall_values); ++i)
{
@@ -226,7 +226,7 @@ static void CheckCollectorsEdition(void)
{
char *install_path;
char *subpath;
- int i;
+ unsigned int i;
install_path = GetRegistryString(&collectors_edition_value);
@@ -783,7 +783,7 @@ void D_SetGameDescription(void)
void D_FindInstalledIWADs(void)
{
- int i;
+ unsigned int i;
int result;
BuildIWADDirList();
diff --git a/src/i_pcsound.c b/src/i_pcsound.c
index d9b76eec..0dced9c1 100644
--- a/src/i_pcsound.c
+++ b/src/i_pcsound.c
@@ -84,7 +84,7 @@ void PCSCallbackFunc(int *duration, int *freq)
// for a full discussion of this.
// Check we don't overflow the frequency table.
- if (tone < NUM_FREQUENCIES)
+ if (tone < (int)NUM_FREQUENCIES)
{
*freq = (int) frequencies[tone];
}
diff --git a/src/i_sound.c b/src/i_sound.c
index 16d8ce7f..33a4cf1c 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -189,7 +189,7 @@ static void ExpandSoundData(byte *data, int samplerate, int length,
static boolean CacheSFX(int sound)
{
int lumpnum;
- int lumplen;
+ unsigned int lumplen;
int samplerate;
unsigned int length;
unsigned int expanded_length;
diff --git a/src/net_gui.c b/src/net_gui.c
index 9ebec568..9816346b 100644
--- a/src/net_gui.c
+++ b/src/net_gui.c
@@ -155,7 +155,7 @@ static void UpdateGUI(void)
static void PrintMD5Digest(char *s, byte *digest)
{
- int i;
+ unsigned int i;
printf("%s: ", s);