CON_MOVESECTOR. Triggers built-in sector movement routines... not really appropriate to use outside of EVENT_MOVEEFFECTORS.

git-svn-id: https://svn.eduke32.com/eduke32@5581 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-01-21 19:35:34 +00:00
parent 10fca8594d
commit 3e82145e2c
5 changed files with 10 additions and 1 deletions

View file

@ -745,7 +745,7 @@ static int32_t move_rotfixed_sprite(int32_t j, int32_t pivotspr, int32_t daang)
return 1; return 1;
} }
static void A_MoveSector(int i) void A_MoveSector(int i)
{ {
// T1,T2 and T3 are used for all the sector moving stuff!!! // T1,T2 and T3 are used for all the sector moving stuff!!!

View file

@ -307,6 +307,7 @@ void A_DoGutsDir(int32_t sp,int32_t gtype,int32_t n);
int32_t A_IncurDamage(int32_t sn); int32_t A_IncurDamage(int32_t sn);
void A_MoveCyclers(void); void A_MoveCyclers(void);
void A_MoveDummyPlayers(void); void A_MoveDummyPlayers(void);
void A_MoveSector(int i);
void A_PlayAlertSound(int32_t i); void A_PlayAlertSound(int32_t i);
void A_RadiusDamage(int32_t i,int32_t r,int32_t hp1,int32_t hp2,int32_t hp3,int32_t hp4); void A_RadiusDamage(int32_t i,int32_t r,int32_t hp1,int32_t hp2,int32_t hp3,int32_t hp4);
void A_SpawnMultiple(int32_t sp,int32_t pic,int32_t n); void A_SpawnMultiple(int32_t sp,int32_t pic,int32_t n);

View file

@ -574,6 +574,7 @@ const char *keyw[] =
"ifvarle", // 392 "ifvarle", // 392
"ifvarge", // 393 "ifvarge", // 393
"ifvarboth", // 394 "ifvarboth", // 394
"movesector", // 395
"<null>" "<null>"
}; };
#endif #endif
@ -4012,6 +4013,7 @@ DO_DEFSTATE:
case CON_SETMUSICPOSITION: case CON_SETMUSICPOSITION:
case CON_STARTCUTSCENE: case CON_STARTCUTSCENE:
case CON_RESETPLAYERFLAGS: case CON_RESETPLAYERFLAGS:
case CON_MOVESECTOR:
C_GetNextVar(); C_GetNextVar();
continue; continue;

View file

@ -1069,6 +1069,7 @@ enum ScriptKeywords_t
CON_IFVARLE, // 392 CON_IFVARLE, // 392
CON_IFVARGE, // 393 CON_IFVARGE, // 393
CON_IFVARBOTH, // 394 CON_IFVARBOTH, // 394
CON_MOVESECTOR, // 395
CON_END CON_END
}; };
// KEEPINSYNC with the keyword list in lunatic/con_lang.lua // KEEPINSYNC with the keyword list in lunatic/con_lang.lua

View file

@ -2554,6 +2554,11 @@ nullquote:
G_InitTimer(Gv_GetVarX(*insptr++)); G_InitTimer(Gv_GetVarX(*insptr++));
continue; continue;
case CON_MOVESECTOR:
insptr++;
A_MoveSector(Gv_GetVarX(*insptr++));
continue;
case CON_TIME: case CON_TIME:
insptr += 2; insptr += 2;
continue; continue;