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

relocated some key events

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1530 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2009-10-11 20:13:16 +00:00
parent fb7efbd4b7
commit 256c729910
5 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
polymer/eduke32/a.m32
View file

@ -24,7 +24,7 @@ definequote 2 BU:%d ABS:%d
definequote TQUOTE write on me!
definequote 4 ASPECT: VR=%d, YX=%d
definequote 5 KEY:%d
definequote 5 ALPHA KEY: %d (SCANCODE: %d)
definequote 6 time: %d ms
@ -44,9 +44,12 @@ definequote 15 x/yoffset: %d %d
definequote 16 (r/g/b)color: %d %d %d
definequote 17 PICNUM:
definequote 18 NUMBER KEY: %d (SCANCODE: %d)
gamearray ar 128
gamearray parm 8
// various tests of m32-script features
defstate tests
// array test
getarraysize ar tmp
@ -103,6 +106,7 @@ defstate printlights
print 11
ends
// convenient polymer SE light manipulation with keypad keys
defstate fiddlewithlights
ife searchstat 3 ife sprite[searchwall].picnum SECTOREFFECTOR
ifge sprite[searchwall].lotag 49 ifle sprite[searchwall].lotag 50
@ -199,7 +203,32 @@ defstate fiddlewithlights
}
ends
defstate testkeyavail
for i range 27
{
ifholdkey alphakeys[i]
{
qsprintf TQUOTE 5 i alphakeys[i]
quote TQUOTE
}
}
for i range 10
{
ifholdkey numberkeys[i]
{
qsprintf TQUOTE 18 i numberkeys[i]
quote TQUOTE
}
}
ends
//onevent EVENT_PREKEYS2D
// state testkeyavail
//endevent
onevent EVENT_PREKEYS3D
// state testkeyavail
state fiddlewithlights
endevent
@ -281,26 +310,6 @@ onevent EVENT_INSERTSPRITE2D
}
endevent
onevent EVENT_PREKEYS2D // formerly EVENT_OVERHEADEDITOR
for i range 27
{
ifholdkey alphakeys[i]
{
qsprintf TQUOTE 5 i
quote TQUOTE
}
}
for i range 10
{
ifholdkey numberkeys[i]
{
qsprintf TQUOTE 5 i
quote TQUOTE
}
}
endevent
onevent EVENT_KEYS3D
// swinging doors tester -- hit space on a door wall
ife searchstat 0

2
polymer/eduke32/build/include/m32script.h
View file

@ -92,7 +92,7 @@ enum GameEvent_t {
EVENT_DRAW2DSCREEN,
EVENT_KEYS2D,
EVENT_KEYS3D,
EVENT_OVERHEADEDITOR,
EVENT_PREKEYS2D,
EVENT_PREKEYS3D,
MAXEVENTS
};

3
polymer/eduke32/build/src/build.c
View file

@ -1615,6 +1615,7 @@ void overheadeditor(void)
OSD_Draw();
X_OnEvent(EVENT_PREKEYS2D, -1);
ExtCheckKeys(); // TX 20050101, it makes more sense to have this here so keys can be overwritten with new functions in bstub.c
// Flip/mirror sector Ed Coolidge
@ -4717,7 +4718,7 @@ CANCEL:
clearkeys();
}
X_OnEvent(EVENT_OVERHEADEDITOR, -1);
X_OnEvent(EVENT_KEYS2D, -1);
//nextpage();
}

3
polymer/eduke32/source/astub.c
View file

@ -8230,9 +8230,6 @@ static void Keys2d(void)
printmessage16(tempbuf);
keystatus[KEYSC_J]=0;
}
X_OnEvent(EVENT_KEYS2D, -1);
}// end key2d
static void InitCustomColors(void)

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

@ -3114,7 +3114,7 @@ static void C_AddDefaultDefinitions(void)
C_AddDefinition("EVENT_DRAW2DSCREEN", EVENT_DRAW2DSCREEN, LABEL_EVENT);
C_AddDefinition("EVENT_KEYS2D", EVENT_KEYS2D, LABEL_EVENT);
C_AddDefinition("EVENT_KEYS3D", EVENT_KEYS3D, LABEL_EVENT);
C_AddDefinition("EVENT_PREKEYS2D", EVENT_OVERHEADEDITOR, LABEL_EVENT);
C_AddDefinition("EVENT_PREKEYS2D", EVENT_PREKEYS2D, LABEL_EVENT);
C_AddDefinition("EVENT_PREKEYS3D", EVENT_PREKEYS3D, LABEL_EVENT);
C_AddDefinition("CLIPMASK0", CLIPMASK0, LABEL_DEFINE);