id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-11-24 13:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from JamesDunne/sprnames-fix

Browse source 
Crash fix when starting up Doom Classic; sprnames list must be NULL-terminated
This commit is contained in:
Brian Harris 2012-11-27 07:47:33 -08:00
commit be311f42e1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doomclassic/doom/info.cpp
View file

@ -40,7 +40,7 @@ If you have questions concerning this license or the applicable additional terms
#include "p_mobj.h" #include "p_mobj.h"
const char * const sprnames[NUMSPRITES] = { const char * const sprnames[NUMSPRITES + 1] = {
"TROO","SHTG","PUNG","PISG","PISF","SHTF","SHT2","CHGG","CHGF","MISG", "TROO","SHTG","PUNG","PISG","PISF","SHTF","SHT2","CHGG","CHGF","MISG",
"MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2", "MISF","SAWG","PLSG","PLSF","BFGG","BFGF","BLUD","PUFF","BAL1","BAL2",
"PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY","POSS", "PLSS","PLSE","MISL","BFS1","BFE1","BFE2","TFOG","IFOG","PLAY","POSS",
@ -54,7 +54,7 @@ const char * const sprnames[NUMSPRITES] = {
"POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2", "POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2",
"COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU", "COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU",
"COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2","HDB3", "COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2","HDB3",
"HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2" "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2",(const char * const)NULL
}; };
extern "C" extern "C"

2
doomclassic/doom/info.h
View file

@ -1169,7 +1169,7 @@ typedef struct
} state_t; } state_t;
extern const state_t tempStates[NUMSTATES]; extern const state_t tempStates[NUMSTATES];
extern const char * const sprnames[NUMSPRITES]; extern const char * const sprnames[NUMSPRITES+1];
typedef enum { typedef enum {
MT_PLAYER, MT_PLAYER,