teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON parser/runtime: two bound tweaks, defer setting insptr in (load)actor.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2750 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-06-10 18:56:24 +00:00
parent c2c8b00a78
commit c3955f7462
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5264,7 +5264,7 @@ repeatcase:
k = *(g_scriptPtr-1);
if (k >= MAXQUOTES)
if ((unsigned)k >= MAXQUOTES)
{
initprintf("%s:%d: error: quote number exceeds limit of %d.\n",g_szScriptFileName,g_lineNumber,MAXQUOTES);
g_numCompilerErrors++;

12
polymer/eduke32/source/gameexec.c
View file

@ -582,7 +582,7 @@ GAMEEXEC_STATIC void VM_Move(void)
dead:
#ifndef LUNATIC
if ((unsigned)vm.g_t[1] >= (unsigned)g_scriptSize)
if ((unsigned)vm.g_t[1] >= (unsigned)g_scriptSize-1)
{
vm.g_t[1] = 0;
OSD_Printf(OSD_ERROR "clearing bad moveptr for actor %d (%d)\n", vm.g_i, vm.g_sp->picnum);
@ -5001,9 +5001,8 @@ void A_LoadActor(int32_t iActor)
vm.g_sp = &sprite[vm.g_i]; // Pointer to sprite structure
vm.g_t = &actor[vm.g_i].t_data[0]; // Sprite's 'extra' data
if (actorLoadEventScrptr[vm.g_sp->picnum] == 0) return;
insptr = actorLoadEventScrptr[vm.g_sp->picnum];
if (actorLoadEventScrptr[vm.g_sp->picnum] == NULL)
return;
vm.g_flags &= ~(VM_RETURN|VM_KILL|VM_NOEXECUTE);
@ -5015,6 +5014,7 @@ void A_LoadActor(int32_t iActor)
return;
}
insptr = actorLoadEventScrptr[vm.g_sp->picnum];
VM_Execute(1);
insptr = NULL;
@ -5040,8 +5040,6 @@ void A_Execute(int32_t iActor,int32_t iPlayer,int32_t lDist)
Bmemcpy(&vm, &tempvm, sizeof(vmstate_t));
insptr = 4 + (actorscrptr[vm.g_sp->picnum]);
if ((unsigned)vm.g_sp->sectnum >= MAXSECTORS)
{
if (A_CheckEnemySprite(vm.g_sp))
@ -5086,6 +5084,8 @@ void A_Execute(int32_t iActor,int32_t iPlayer,int32_t lDist)
if (El_IsInitialized(&g_ElState) && El_HaveActor(vm.g_sp->picnum))
El_CallActor(&g_ElState, vm.g_sp->picnum, iActor, iPlayer, lDist);
#endif
insptr = 4 + (actorscrptr[vm.g_sp->picnum]);
VM_Execute(1);
insptr = NULL;