zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

gamedef.c: make some variables static and remove some #if 0'ed code.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2262 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-15 22:40:16 +00:00
parent 031da6280d
commit ebb3d0a378
2 changed files with 15 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
polymer/eduke32/source/gamedef.c
View file

@ -1026,17 +1026,17 @@ char *bitptr; // pointer to bitmap of which bytecode positions contain pointers
hashtable_t h_gamevars = { MAXGAMEVARS>>1, NULL }; hashtable_t h_gamevars = { MAXGAMEVARS>>1, NULL };
hashtable_t h_arrays = { MAXGAMEARRAYS>>1, NULL }; hashtable_t h_arrays = { MAXGAMEARRAYS>>1, NULL };
hashtable_t h_labels = { 11264>>1, NULL }; hashtable_t h_labels = { 11264>>1, NULL };
hashtable_t h_keywords = { CON_END>>1, NULL }; static hashtable_t h_keywords = { CON_END>>1, NULL };
hashtable_t sectorH = { SECTOR_END>>1, NULL }; static hashtable_t sectorH = { SECTOR_END>>1, NULL };
hashtable_t wallH = { WALL_END>>1, NULL }; static hashtable_t wallH = { WALL_END>>1, NULL };
hashtable_t userdefH = { USERDEFS_END>>1, NULL }; static hashtable_t userdefH = { USERDEFS_END>>1, NULL };
hashtable_t projectileH = { PROJ_END>>1, NULL }; static hashtable_t projectileH = { PROJ_END>>1, NULL };
hashtable_t playerH = { PLAYER_END>>1, NULL }; static hashtable_t playerH = { PLAYER_END>>1, NULL };
hashtable_t inputH = { INPUT_END>>1, NULL }; static hashtable_t inputH = { INPUT_END>>1, NULL };
hashtable_t actorH = { ACTOR_END>>1, NULL }; static hashtable_t actorH = { ACTOR_END>>1, NULL };
hashtable_t tspriteH = { ACTOR_END>>1, NULL }; static hashtable_t tspriteH = { ACTOR_END>>1, NULL };
void inithashnames(); void inithashnames();
void freehashnames(); void freehashnames();
@ -1103,14 +1103,7 @@ static int32_t C_SetScriptSize(int32_t newsize)
int32_t osize = g_scriptSize; int32_t osize = g_scriptSize;
char *scriptptrs; char *scriptptrs;
char *newbitptr; char *newbitptr;
#if 0
for (i=MAXSECTORS-1; i>=0; i--)
if (labelcode[i] && labeltype[i] != LABEL_DEFINE)
{
j = (intptr_t)labelcode[i]-(intptr_t)&script[0];
labelcode[i] = (intptr_t)j;
}
#endif
scriptptrs = Bcalloc(1, g_scriptSize * sizeof(uint8_t)); scriptptrs = Bcalloc(1, g_scriptSize * sizeof(uint8_t));
for (i=g_scriptSize-1; i>=0; i--) for (i=g_scriptSize-1; i>=0; i--)
@ -1174,16 +1167,7 @@ static int32_t C_SetScriptSize(int32_t newsize)
if (g_parsingActorPtr) if (g_parsingActorPtr)
g_parsingActorPtr = (intptr_t *)(script+oparsingActorPtr); g_parsingActorPtr = (intptr_t *)(script+oparsingActorPtr);
#if 0
for (i=MAXSECTORS-1; i>=0; i--)
{
if (labelcode[i] && labeltype[i] != LABEL_DEFINE)
{
j = (intptr_t)labelcode[i]+(intptr_t)&script[0];
labelcode[i] = j;
}
}
#endif
for (i=(((newsize>=osize)?osize:newsize))-1; i>=0; i--) for (i=(((newsize>=osize)?osize:newsize))-1; i>=0; i--)
if (scriptptrs[i]) if (scriptptrs[i])
{ {
@ -1664,13 +1648,7 @@ static int32_t C_GetNextValue(int32_t type)
initprintf("%s:%d: debug: accepted %s label `%s'.\n",g_szScriptFileName,g_lineNumber,gl,label+(i<<6)); initprintf("%s:%d: debug: accepted %s label `%s'.\n",g_szScriptFileName,g_lineNumber,gl,label+(i<<6));
Bfree(gl); Bfree(gl);
} }
#if 0 #if !defined SAMESIZE_ACTOR_T
if (labeltype[i] != LABEL_DEFINE && labelcode[i] >= (intptr_t)&script[0] && labelcode[i] < (intptr_t)&script[g_scriptSize])
bitptr[(g_scriptPtr-script)>>3] |= (BITPTR_POINTER<<((g_scriptPtr-script)&7));
else
bitptr[(g_scriptPtr-script)>>3] &= ~(BITPTR_POINTER<<((g_scriptPtr-script)&7));
*(g_scriptPtr++) = labelcode[i];
#elif !defined SAMESIZE_ACTOR_T
if ((labeltype[i]&LABEL_DEFINE)==0) if ((labeltype[i]&LABEL_DEFINE)==0)
bitptr[(g_scriptPtr-script)>>3] |= (BITPTR_POINTER<<((g_scriptPtr-script)&7)); bitptr[(g_scriptPtr-script)>>3] |= (BITPTR_POINTER<<((g_scriptPtr-script)&7));
else // the 'define' label type is the only one that doesn't reference the script else // the 'define' label type is the only one that doesn't reference the script
@ -1972,14 +1950,10 @@ static int32_t C_ParseCommand(int32_t loop)
if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1) if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1)
initprintf("%s:%d: debug: accepted state label `%s'.\n",g_szScriptFileName,g_lineNumber,label+(j<<6)); initprintf("%s:%d: debug: accepted state label `%s'.\n",g_szScriptFileName,g_lineNumber,label+(j<<6));
*g_scriptPtr = (intptr_t)(script+labelcode[j]); *g_scriptPtr = (intptr_t)(script+labelcode[j]);
#if 0
if (labelcode[j] >= (intptr_t)&script[0] && labelcode[j] < (intptr_t)&script[g_scriptSize])
bitptr[(g_scriptPtr-script)>>3] |= (BITPTR_POINTER<<((g_scriptPtr-script)&7));
else bitptr[(g_scriptPtr-script)>>3] &= ~(BITPTR_POINTER<<((g_scriptPtr-script)&7));
#else
// 'state' type labels are always script addresses, as far as I can see // 'state' type labels are always script addresses, as far as I can see
bitptr[(g_scriptPtr-script)>>3] |= (BITPTR_POINTER<<((g_scriptPtr-script)&7)); bitptr[(g_scriptPtr-script)>>3] |= (BITPTR_POINTER<<((g_scriptPtr-script)&7));
#endif
g_scriptPtr++; g_scriptPtr++;
continue; continue;
} }

2
polymer/eduke32/source/gamedef.h
View file

@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern hashtable_t h_gamevars; extern hashtable_t h_gamevars;
extern hashtable_t h_arrays; extern hashtable_t h_arrays;
extern hashtable_t h_keywords; //extern hashtable_t h_keywords;
extern hashtable_t h_gamefuncs; extern hashtable_t h_gamefuncs;
extern hashtable_t h_labels; extern hashtable_t h_labels;