Break out status bar code into sbar.c/h

git-svn-id: https://svn.eduke32.com/eduke32@5613 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/Makefile

@@ -230,7 +230,7 @@ MAPSTER32_TARGET:=$(MAPSTER32)$(EXESUFFIX)
 COMMON_OBJS=rev
 COMMON_EDITOR_OBJS=m32common m32def m32exec m32vars rev
 
-DUKE3D_OBJS=game global actors gamedef gameexec gamevars player premap sector anim animsounds common config demo input menus namesdyn net savegame rts osdfuncs osdcmds grpscan sounds soundsdyn cheats
+DUKE3D_OBJS=game global actors gamedef gameexec gamevars player premap sector anim animsounds common config demo input menus namesdyn net savegame rts osdfuncs osdcmds grpscan sounds soundsdyn cheats sbar
 DUKE3D_EDITOR_OBJS=astub common grpscan sounds_mapster32
 
 ifneq ($(USE_LIBVPX),0)

polymer/eduke32/Makefile.deps

@@ -55,6 +55,7 @@ $(DUKE3D_OBJ)/net.$o: $(DUKE3D_SRC)/net.c $(duke3d_h)
 $(DUKE3D_OBJ)/player.$o: $(DUKE3D_SRC)/player.c $(duke3d_h)
 $(DUKE3D_OBJ)/premap.$o: $(DUKE3D_SRC)/premap.c $(duke3d_h) $(ENGINE_INC)/osd.h
 $(DUKE3D_OBJ)/savegame.$o: $(DUKE3D_SRC)/savegame.c $(duke3d_h) $(DUKE3D_SRC)/savegame.h
+$(DUKE3D_OBJ)/sbar.$o: $(DUKE3D_SRC)/sbar.c $(DUKE3D_SRC)/sbar.h
 $(DUKE3D_OBJ)/sector.$o: $(DUKE3D_SRC)/sector.c $(duke3d_h) $(DUKE3D_SRC)/input.h
 $(DUKE3D_OBJ)/sounds.$o: $(DUKE3D_SRC)/sounds.c $(duke3d_h)
 $(DUKE3D_OBJ)/soundsdyn.$o: $(DUKE3D_SRC)/soundsdyn.c $(duke3d_h)

polymer/eduke32/Makefile.msvc

@@ -196,6 +196,7 @@ DUKE3D_OBJS=$(DUKE3D_OBJ)\game.$o \
 	$(DUKE3D_OBJ)\animsounds.$o \
 	$(DUKE3D_OBJ)\animvpx.$o \
         $(DUKE3D_OBJ)\cheats.$o \
+        $(DUKE3D_OBJ)\sbar.$o \
 	$(DUKE3D_OBJ)\common.$o \
 	$(DUKE3D_OBJ)\demo.$o \
 	$(DUKE3D_OBJ)\gamedef.$o \

polymer/eduke32/eduke32.vcxproj

@@ -193,6 +193,7 @@
     <ClInclude Include="source\premap.h" />
     <ClInclude Include="source\quotes.h" />
     <ClInclude Include="source\savegame.h" />
+    <ClInclude Include="source\sbar.h" />
     <ClInclude Include="source\sector.h" />
     <ClInclude Include="source\_functio.h" />
     <ClInclude Include="source\_midi.h" />
@@ -341,6 +342,7 @@
     <ClCompile Include="source\premap.c" />
     <ClCompile Include="source\rts.c" />
     <ClCompile Include="source\savegame.c" />
+    <ClCompile Include="source\sbar.c" />
     <ClCompile Include="source\sdlmusic.c" />
     <ClCompile Include="source\sector.c" />
     <ClCompile Include="source\sounds.c" />

polymer/eduke32/eduke32.vcxproj.filters

@@ -513,6 +513,9 @@
     <ClInclude Include="source\cheats.h">
       <Filter>eduke32\headers</Filter>
     </ClInclude>
+    <ClInclude Include="source\sbar.h">
+      <Filter>eduke32\source\editor</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="build\src\a-c.c">
@@ -899,6 +902,9 @@
     <ClCompile Include="source\cheats.c">
       <Filter>eduke32\source</Filter>
     </ClCompile>
+    <ClCompile Include="source\sbar.c">
+      <Filter>eduke32\source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.msvc">

polymer/eduke32/source/game.h

@@ -323,6 +323,7 @@ int32_t G_DoMoveThings(void);
 int32_t G_GameTextLen(int32_t x,const char *t);
 int32_t G_PrintGameText(int32_t hack,int32_t tile,int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t o,int32_t x1,int32_t y1,int32_t x2,int32_t y2,int32_t z, int32_t a);
 extern int32_t minitext_lowercase;
+extern int32_t minitext_yofs;
 int32_t minitext_(int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t sb);
 int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits);
 

polymer/eduke32/source/osdcmds.c

@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "osdfuncs.h"
 #include "demo.h"  // g_firstDemoFile[]
 #include "cheats.h"
+#include "sbar.h"
 
 #ifdef LUNATIC
 # include "lunatic_game.h"
@@ -35,16 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "android/in_android.h"
 #endif
 
-extern int32_t voting, g_doQuickSave;
 struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat;
 float r_ambientlight = 1.0, r_ambientlightrecip = 1.0;
-extern int32_t althud_numbertile, althud_numberpal, althud_shadows, althud_flashing, hud_glowingquotes;
-extern int32_t hud_showmapname;
-extern int32_t r_maxfps;
-extern uint32_t g_frameDelay;
-extern int32_t demorec_diffs_cvar, demorec_force_cvar, demorec_seeds_cvar, demoplay_diffs, demoplay_showsync;
-extern int32_t demorec_difftics_cvar, demorec_diffcompress_cvar, demorec_synccompress_cvar;
-extern void G_CheckPlayerColor(int32_t *color,int32_t prev_color);
 
 uint32_t cl_cheatmask;
 

polymer/eduke32/source/sbar.h

@@ -0,0 +1,26 @@
+//-------------------------------------------------------------------------
+/*
+Copyright (C) 2016 EDuke32 developers and contributors
+
+This file is part of EDuke32.
+
+EDuke32 is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+//-------------------------------------------------------------------------
+int32_t sbarsc(int32_t sc);
+int32_t sbarx16(int32_t x);
+int32_t sbary16(int32_t y);
+void G_DrawInventory(const DukePlayer_t *p);
+void G_DrawStatusBar(int32_t snum);