Skip to content

null-terminated sprnames, lumpinfo reallocate #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CodeAnarchist wants to merge 1 commit into
base: master
Choose a base branch
from
Open

null-terminated sprnames, lumpinfo reallocate #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions redacteddoom/info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ rcsid[] = "$Id: info.c,v 1.3 1997/01/26 07:45:00 b1 Exp $";

#include "p_mobj.h"

char *sprnames[NUMSPRITES] = {
char *sprnames[NUMSPRITES+1] = {
"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",
Expand All @@ -51,7 +51,7 @@ char *sprnames[NUMSPRITES] = {
"POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2",
"COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU",
"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",0
};


Expand Down
2 changes: 1 addition & 1 deletion redacteddoom/info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ typedef struct
} state_t;

extern state_t states[NUMSTATES];
extern char *sprnames[NUMSPRITES];
extern char *sprnames[NUMSPRITES+1];



Expand Down
7 changes: 5 additions & 2 deletions redacteddoom/w_wad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ static const char
rcsid[] = "$Id: w_wad.c,v 1.5 1997/02/03 16:47:57 b1 Exp $";

#include "std/memory.h"
#include "alloc/allocate.h"

#include "doomtype.h"
#include "m_swap.h"
Expand Down Expand Up @@ -193,7 +194,9 @@ void W_AddFile (char *filename)


// Fill in lumpinfo
lumpinfo = (lumpinfo_t*)realloc_sized(lumpinfo, sizeof(*lumpinfo), numlumps*sizeof(lumpinfo_t));
size_t new_size = (size_t)numlumps * sizeof(lumpinfo_t);
if (!lumpinfo) lumpinfo = (lumpinfo_t*)zalloc(new_size);
else lumpinfo = (lumpinfo_t*)reallocate(lumpinfo, new_size);

if (!lumpinfo)
I_Error ("Couldn't realloc lumpinfo");
Expand Down Expand Up @@ -287,7 +290,7 @@ void W_InitMultipleFiles (char** filenames)
numlumps = 0;

// will be realloced as lumps are added
lumpinfo = (lumpinfo_t*)zalloc(1);
lumpinfo = 0;

for ( ; *filenames ; filenames++)
W_AddFile (*filenames);
Expand Down