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

- use the script interface where needed.

Browse source 
Later the scripts should only see some token representing an actor, not an index.
This commit is contained in:
Christoph Oelckers 2020-10-25 06:40:05 +01:00
parent 773aa9976d
commit f598c16e03
5 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/funct.h
View file

@ -177,7 +177,7 @@ void OnEvent(int id, int pnum = -1, DDukeActor* snum = nullptr, int dist = -1);
short EGS(short whatsect, int s_x, int s_y, int s_z, short s_pn, signed char s_s, signed char s_xr, signed char s_yr, short s_a, short s_ve, int s_zv, short s_ow, signed char s_ss); short EGS(short whatsect, int s_x, int s_y, int s_z, short s_pn, signed char s_s, signed char s_xr, signed char s_yr, short s_a, short s_ve, int s_zv, short s_ow, signed char s_ss);
void ceilingglass(int snum, int sectnum, int cnt); void ceilingglass(int snum, int sectnum, int cnt);
void spriteglass(int snum, int cnt); void spriteglass(DDukeActor* snum, int cnt);
void lotsofcolourglass(int snum, int wallNum, int cnt); void lotsofcolourglass(int snum, int wallNum, int cnt);
void lotsofglass(int snum, int wallnum, int cnt); void lotsofglass(int snum, int wallnum, int cnt);

42
source/games/duke/src/gameexec.cpp
View file

@ -1148,7 +1148,7 @@ void DoActor(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
else else
{ {
iActor = GetGameVarID((int)lVar1, sActor, sPlayer); iActor = GetGameVarID((int)lVar1, sActor, sPlayer);
act = &hittype[iActor]; act = ScriptIndexToActor(iActor);
} }
auto spr = &act->s; auto spr = &act->s;
@ -1905,7 +1905,7 @@ int ParseState::parse(void)
break; break;
case concmd_lotsofglass: case concmd_lotsofglass:
insptr++; insptr++;
spriteglass(g_ac->GetIndex(),*insptr); spriteglass(g_ac, *insptr);
insptr++; insptr++;
break; break;
case concmd_killit: case concmd_killit:
@ -2590,7 +2590,7 @@ int ParseState::parse(void)
} }
else if( aGameVars[*insptr].dwFlags & GAMEVAR_FLAG_PERACTOR) else if( aGameVars[*insptr].dwFlags & GAMEVAR_FLAG_PERACTOR)
{ {
DPrintf(DMSG_NOTIFY, " (Per Actor. Actor=%d)",g_ac->GetIndex()); DPrintf(DMSG_NOTIFY, " (Per Actor. Actor=%p)",g_ac);
} }
else else
{ {
@ -2621,8 +2621,6 @@ int ParseState::parse(void)
{ int i; { int i;
insptr++; insptr++;
i=*(insptr++); // ID of def i=*(insptr++); // ID of def
//sprintf(g_szBuf,"AddVar %d to Var ID=%d, g_ac->GetIndex()=%d, g_p=%d\n",*insptr, i, g_ac, g_p);
//AddLog(g_szBuf);
SetGameVarID(i, GetGameVarID(i, g_ac, g_p) + *insptr, g_ac, g_p ); SetGameVarID(i, GetGameVarID(i, g_ac, g_p) + *insptr, g_ac, g_p );
insptr++; insptr++;
break; break;
@ -2830,7 +2828,7 @@ int ParseState::parse(void)
break; break;
case concmd_ifnosounds: case concmd_ifnosounds:
parseifelse(!S_CheckAnyActorSoundPlaying(g_ac->GetIndex()) ); parseifelse(!S_CheckAnyActorSoundPlaying(g_ac));
break; break;
case concmd_ifplaybackon: //Twentieth Anniversary World Tour case concmd_ifplaybackon: //Twentieth Anniversary World Tour
@ -2839,28 +2837,26 @@ int ParseState::parse(void)
case concmd_espawnvar: case concmd_espawnvar:
{ {
int lReturn; DDukeActor* lReturn = nullptr;
int lIn; int lIn;
lReturn = -1;
insptr++; insptr++;
lIn = *insptr++; lIn = *insptr++;
lIn = GetGameVarID(lIn, g_ac, g_p); lIn = GetGameVarID(lIn, g_ac, g_p);
if (g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS) if (g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS)
lReturn = fi.spawn(g_ac->GetIndex(), lIn); lReturn = spawn(g_ac, lIn);
SetGameVarID(g_iReturnVarID, lReturn, g_ac, g_p); SetGameVarID(g_iReturnVarID, ActorToScriptIndex(lReturn), g_ac, g_p);
break; break;
} }
case concmd_espawn: case concmd_espawn:
{ {
int lReturn; DDukeActor* lReturn = nullptr;
lReturn = -1;
insptr++; insptr++;
if (g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS) if (g_sp->sectnum >= 0 && g_sp->sectnum < MAXSECTORS)
lReturn = fi.spawn(g_ac->GetIndex(), *insptr); lReturn = spawn(g_ac, *insptr);
insptr++; insptr++;
SetGameVarID(g_iReturnVarID, lReturn, g_ac, g_p); SetGameVarID(g_iReturnVarID, ActorToScriptIndex(lReturn), g_ac, g_p);
break; break;
} }
case concmd_setsector: case concmd_setsector:
@ -2907,7 +2903,6 @@ int ParseState::parse(void)
int lMaxDist; int lMaxDist;
int lVarID; int lVarID;
int lTemp; int lTemp;
int lFound;
int lDist; int lDist;
insptr++; insptr++;
@ -2916,7 +2911,7 @@ int ParseState::parse(void)
lMaxDist = *(insptr++); lMaxDist = *(insptr++);
lVarID = *(insptr++); lVarID = *(insptr++);
lFound = -1; DDukeActor* lFound = nullptr;
lDist = 32767; // big number lDist = 32767; // big number
DukeStatIterator it(STAT_ACTOR); DukeStatIterator it(STAT_ACTOR);
@ -2929,13 +2924,13 @@ int ParseState::parse(void)
{ {
if (lTemp < lDist) if (lTemp < lDist)
{ {
lFound = j->GetIndex(); lFound = j;
} }
} }
} }
} }
SetGameVarID(lVarID, lFound, g_ac, g_p); SetGameVarID(lVarID, ActorToScriptIndex(lFound), g_ac, g_p);
break; break;
} }
@ -2951,7 +2946,6 @@ int ParseState::parse(void)
int lMaxDist; int lMaxDist;
int lVarID; int lVarID;
int lTemp; int lTemp;
int lFound;
int lDist; int lDist;
insptr++; insptr++;
@ -2960,7 +2954,7 @@ int ParseState::parse(void)
lMaxDistVar = *(insptr++); lMaxDistVar = *(insptr++);
lVarID = *(insptr++); lVarID = *(insptr++);
lMaxDist = GetGameVarID(lMaxDistVar, g_ac, g_p); lMaxDist = GetGameVarID(lMaxDistVar, g_ac, g_p);
lFound = -1; DDukeActor* lFound;
lDist = 32767; // big number lDist = 32767; // big number
DukeStatIterator it(STAT_ACTOR); DukeStatIterator it(STAT_ACTOR);
@ -2973,13 +2967,13 @@ int ParseState::parse(void)
{ {
if (lTemp < lDist) if (lTemp < lDist)
{ {
lFound = j->GetIndex(); lFound = j;
} }
} }
} }
} }
SetGameVarID(lVarID, lFound, g_ac, g_p); SetGameVarID(lVarID, ActorToScriptIndex(lFound), g_ac, g_p);
break; break;
} }
@ -3058,7 +3052,7 @@ int ParseState::parse(void)
if (lSprite >= 0) if (lSprite >= 0)
{ {
lTemp = GetGameVarID(lVar3, g_ac, g_p); lTemp = GetGameVarID(lVar3, g_ac, g_p);
SetGameVarID(lVar2, lTemp, &hittype[lSprite], g_p); SetGameVarID(lVar2, lTemp, ScriptIndexToActor(lSprite), g_p);
} }
break; break;
@ -3080,7 +3074,7 @@ int ParseState::parse(void)
lSprite = GetGameVarID(lVar1, g_ac, g_p); lSprite = GetGameVarID(lVar1, g_ac, g_p);
if (lSprite >= 0) if (lSprite >= 0)
{ {
lTemp = GetGameVarID(lVar2, &hittype[lSprite], g_p); lTemp = GetGameVarID(lVar2, ScriptIndexToActor(lSprite), g_p);
SetGameVarID(lVar3, lTemp, g_ac, g_p); SetGameVarID(lVar3, lTemp, g_ac, g_p);
} }

6
source/games/duke/src/sounds.cpp
View file

@ -591,10 +591,10 @@ int S_CheckActorSoundPlaying(int spriteNum, int soundNum, int channel)
} }
// Check if actor <i> is playing any sound. // Check if actor <i> is playing any sound.
int S_CheckAnyActorSoundPlaying(int spriteNum) int S_CheckAnyActorSoundPlaying(DDukeActor* actor)
{ {
if ((unsigned)spriteNum >= MAXSPRITES) return false; if (!actor) return false;
return soundEngine->IsSourcePlayingSomething(SOURCE_Actor, &sprite[spriteNum], CHAN_AUTO, 0); return soundEngine->IsSourcePlayingSomething(SOURCE_Actor, &actor->s, CHAN_AUTO, 0);
} }
int S_CheckSoundPlaying(int soundNum) int S_CheckSoundPlaying(int soundNum)

2
source/games/duke/src/sounds.h
View file

@ -50,7 +50,7 @@ void S_StopSound(int sndNum, int sprNum = -1, int flags = -1);
int S_CheckSoundPlaying(int soundNum); int S_CheckSoundPlaying(int soundNum);
inline int S_CheckSoundPlaying(int sprnum, int soundNum) { return S_CheckSoundPlaying(soundNum); } inline int S_CheckSoundPlaying(int sprnum, int soundNum) { return S_CheckSoundPlaying(soundNum); }
int S_CheckActorSoundPlaying(int spriteNum, int soundNum, int channel = 0); int S_CheckActorSoundPlaying(int spriteNum, int soundNum, int channel = 0);
int S_CheckAnyActorSoundPlaying(int spriteNum); int S_CheckAnyActorSoundPlaying(DDukeActor* spriteNum);
void S_ChangeSoundPitch(int soundNum, int spriteNum, int pitchoffset); void S_ChangeSoundPitch(int soundNum, int spriteNum, int pitchoffset);
int S_GetUserFlags(int sndnum); int S_GetUserFlags(int sndnum);

15
source/games/duke/src/spawn.cpp
View file

@ -1148,17 +1148,16 @@ void lotsofglass(int i, int wallnum, int n)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void spriteglass(int i, int n) void spriteglass(DDukeActor* actor, int n)
{ {
int j, k, a, z; auto sp = &actor->s;
auto sp = &sprite[i];
for (j = n; j > 0; j--) for (int j = n; j > 0; j--)
{ {
a = krand() & 2047; int a = krand() & 2047;
z = sp->z - ((krand() & 16) << 8); int z = sp->z - ((krand() & 16) << 8);
k = EGS(sp->sectnum, sp->x, sp->y, z, TILE_GLASSPIECES + (j % 3), krand() & 15, 36, 36, a, 32 + (krand() & 63), -512 - (krand() & 2047), i, 5); auto k = EGS(sp->sectnum, sp->x, sp->y, z, TILE_GLASSPIECES + (j % 3), krand() & 15, 36, 36, a, 32 + (krand() & 63), -512 - (krand() & 2047), actor, 5);
sprite[k].pal = sprite[i].pal; k->s.pal = sp->pal;
} }
} }