Move some global vars from Globals.cpp, add decls to headers

[lugaru.git] / Source / GameDraw.cpp

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 5286b5ddf6585f18b27680b92838ab041cbbc858..34926564c6b4937fc0bb3921f5a57a808140b204 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Game.h"
 #include "openal_wrapper.h"
 #include "Input.h"
+#include "Awards.h"
 
 using namespace std;
 
@@ -44,8 +45,6 @@ extern int detail;
 extern float usermousesensitivity;
 extern bool osx;
 extern float camerashake;
-extern Weapons weapons;
-extern Person player[maxplayers];
 extern int slomo;
 extern float slomodelay;
 extern bool ismotionblur;
@@ -53,7 +52,6 @@ extern float woozy;
 extern float blackout;
 extern bool damageeffects;
 extern float volume;
-extern int numplayers;
 extern bool texttoggle;
 extern float blurness;
 extern float targetblurness;
@@ -159,7 +157,6 @@ extern bool gamestarted;
 
 extern bool showdamagebar;
 
-extern OPENAL_SAMPLE   *samp[100];
 extern int channels[100];
 extern "C"     void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 
@@ -1844,32 +1841,8 @@ int Game::DrawGLScene(StereoSide side)
                        strcat(string,temp);
                        text.glPrintOutlined(1024/30,768*6/8-40,string,1,2,1024,768);
 
-                       for(i=0;i<numawards;i++){
-                               if(i<6){
-                                       if(awards[i]==awardklutz)sprintf (string, "Suicidal");
-                                       if(awards[i]==awardflawless)sprintf (string, "Flawless!");
-                                       if(awards[i]==awardalldead)sprintf (string, "Take no prisoners");
-                                       if(awards[i]==awardnodead)sprintf (string, "Merciful");
-                                       if(awards[i]==awardstealth)sprintf (string, "One with the shadows!");
-                                       if(awards[i]==awardswordsman)sprintf (string, "Swordsman");
-                                       if(awards[i]==awardkungfu)sprintf (string, "Unarmed!");
-                                       if(awards[i]==awardknifefighter)sprintf (string, "Knife fighter");
-                                       if(awards[i]==awardcoward)sprintf (string, "Coward");
-                                       if(awards[i]==awardevasion)sprintf (string, "Escape artist");
-                                       if(awards[i]==awardacrobat)sprintf (string, "Gymnast");
-                                       if(awards[i]==awardlongrange)sprintf (string, "Blade slinger");
-                                       if(awards[i]==awardbrutal)sprintf (string, "Brutal");
-                                       if(awards[i]==awardhyper)sprintf (string, "Hyper");
-                                       if(awards[i]==awardaikido)sprintf (string, "Aikido master!");
-                                       if(awards[i]==awardrambo)sprintf (string, "Rambo");
-                                       if(awards[i]==awardfast)sprintf (string, "Fast");
-                                       if(awards[i]==awardrealfast)sprintf (string, "Real fast");
-                                       if(awards[i]==awarddamnfast)sprintf (string, "Damn fast");
-                                       if(awards[i]==awardstrategy)sprintf (string, "Divide and conquer");
-                                       if(awards[i]==awardbojutsu)sprintf (string, "Bojutsu");
-                                       text.glPrintOutlined(1024/30,768*6/8-90-40*i,string,1,2,1024,768);
-                               }
-                       }
+                       for (i = 0; i < numawards && i < 6; i++)
+                         text.glPrintOutlined(1024/30,768*6/8-90-40*i,award_names[awards[i]],1,2,1024,768);
                }
 
                if(drawmode!=normalmode){