Tons of warnings fixed - now only 7 warnings at warning level 3, and

most of those are outside of our own code (get on those signed/unsigned
mismatches in the midi code, fraggle ;)

Subversion-branch: /branches/strife-branch
Subversion-revision: 2110

1 files changed, 6 insertions, 2 deletions

diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index da46f4c2..98f308fc 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -28,6 +28,8 @@
 //

 //-----------------------------------------------------------------------------

 

+#include <stdlib.h>

+

 #include "z_zone.h"

 #include "w_wad.h"

 #include "deh_str.h"

@@ -41,6 +43,9 @@
 #include "p_local.h"

 #include "sounds.h"

 #include "p_dialog.h"

+#include "s_sound.h"

+#include "p_local.h"

+#include "p_inter.h"

 

 //

 // Defines and Macros

@@ -1221,7 +1226,7 @@ void P_DialogDoChoice(int choice)
 

     dialogtalker->angle = dialogtalkerangle;

     dialogplayer->st_update = true;

-    M_ClearMenus();

+    M_ClearMenus(0);

 

     if(nextdialog >= 0 || gameaction == ga_victory) // Macil hack

         menuindialog = false;

@@ -1251,7 +1256,6 @@ void P_DialogStart(player_t *player)
     int j = 0;

     int pic;

     int rnd = 0;

-    mapdialog_t* dialog;

     char* byetext;

     int jumptoconv;