foxygit / doom Log in
commit 402de607125c70919e6b0f5c850c16ba8853a22f
Author:     Turo Lamminen <turotl@gmail.com>
AuthorDate: Sat Jul 28 15:47:58 2018 +0300
Commit:     Turo Lamminen <turotl@gmail.com>
CommitDate: Tue Jul 31 18:30:08 2018 +0300

    doom: Make sprnames contents const and fix some function parameters to match
---
 src/doom/info.c     | 2 +-
 src/doom/info.h     | 2 +-
 src/doom/r_things.c | 6 +++---
 src/doom/r_things.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/doom/info.c b/src/doom/info.c
index 9389e84f..11ea1abf 100644
--- a/src/doom/info.c
+++ b/src/doom/info.c
@@ -29,7 +29,7 @@

 #include "p_mobj.h"

-char *sprnames[] = {
+const char *sprnames[] = {
     "TROO","SHTG","PUNG","PISG","PISF","SHTF","SHT2","CHGG","CHGF","MISG",
     "MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2",
     "PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY","POSS",
diff --git a/src/doom/info.h b/src/doom/info.h
index 648b5188..c426d07b 100644
--- a/src/doom/info.h
+++ b/src/doom/info.h
@@ -1154,7 +1154,7 @@ typedef struct
 } state_t;

 extern state_t	states[NUMSTATES];
-extern char *sprnames[];
+extern const char *sprnames[];

 typedef enum {
     MT_PLAYER,
diff --git a/src/doom/r_things.c b/src/doom/r_things.c
index d7d281b9..b9e879c1 100644
--- a/src/doom/r_things.c
+++ b/src/doom/r_things.c
@@ -168,9 +168,9 @@ R_InstallSpriteLump
 //  letter/number appended.
 // The rotation character can be 0 to signify no rotations.
 //
-void R_InitSpriteDefs (char** namelist)
+void R_InitSpriteDefs(const char **namelist)
 {
-    char**	check;
+    const char **check;
     int		i;
     int		l;
     int		frame;
@@ -288,7 +288,7 @@ int		newvissprite;
 // R_InitSprites
 // Called at program start.
 //
-void R_InitSprites (char** namelist)
+void R_InitSprites(const char **namelist)
 {
     int		i;

diff --git a/src/doom/r_things.h b/src/doom/r_things.h
index 256a5ebb..fc51c34a 100644
--- a/src/doom/r_things.h
+++ b/src/doom/r_things.h
@@ -51,7 +51,7 @@ void R_SortVisSprites (void);
 void R_AddSprites (sector_t* sec);
 void R_AddPSprites (void);
 void R_DrawSprites (void);
-void R_InitSprites (char** namelist);
+void R_InitSprites(const char **namelist);
 void R_ClearSprites (void);
 void R_DrawMasked (void);